From 9ad8ecb0f5c06c4e1a1394cce5df7ef24ce97cf3 Mon Sep 17 00:00:00 2001
From: KaNi-04 <136799210+KaNi-04@users.noreply.github.com>
Date: Fri, 31 Jul 2026 10:57:11 +0530
Subject: [PATCH] gccofficer portal frontcode deleted (wrongly committed
 before)

---
 src/main/resources/templates/error-403.html   |   57 -
 src/main/resources/templates/error-404.html   |   57 -
 src/main/resources/templates/error-500.html   |   57 -
 .../templates/fragments/modules/.DS_Store     |  Bin 8196 -> 0 bytes
 .../fragments/modules/admin/modal-box.html    |   53 -
 .../fragments/modules/base/.DS_Store          |  Bin 6148 -> 0 bytes
 .../modules/base/app_module_menu_box.html     |   94 -
 .../fragments/modules/base/footer.html        |    7 -
 .../fragments/modules/base/head.html          |  633 ---
 .../fragments/modules/base/header.html        |   74 -
 .../fragments/modules/base/loader.html        |    7 -
 .../fragments/modules/base/menu.html          |   23 -
 .../fragments/modules/base/menu_source.html   |  153 -
 .../templates/fragments/modules/base/nav.html |    0
 .../fragments/modules/base/script.html        |  366 --
 .../fragments/modules/base/search.html        |  141 -
 .../modules/c_petition/modal-box.html         |  116 -
 .../c_petition/petition_view_script.html      |  290 --
 .../fragments/modules/c_petition/script.html  |  338 --
 .../modules/c_petition/search_form.html       |   19 -
 .../fragments/modules/circular/modal-box.html |  116 -
 .../fragments/modules/circular/script.html    |   50 -
 .../modules/com_petition/modal-box.html       |  116 -
 .../com_petition/petition_view_script.html    |  293 --
 .../modules/com_petition/script.html          |  360 --
 .../modules/com_petition/search_form.html     |   19 -
 .../modules/m_petition/modal-box.html         |  116 -
 .../m_petition/petition_view_script.html      |  291 --
 .../fragments/modules/m_petition/script.html  |  360 --
 .../modules/m_petition/search_form.html       |   19 -
 .../modules/mtm/event_search_form.html        |   22 -
 .../fragments/modules/mtm/modal-box.html      |  119 -
 .../fragments/modules/mtm/script.html         |  709 ----
 .../fragments/modules/pgr/modal-box.html      |   68 -
 .../fragments/modules/pgr/script.html         |  275 --
 .../fragments/modules/pgr/search_form.html    |   19 -
 .../modules/ward_sabha/modal-box.html         |  139 -
 .../ward_sabha/petition_view_script.html      |  293 --
 .../fragments/modules/ward_sabha/script.html  |  660 ---
 .../modules/ward_sabha/search_form.html       |   19 -
 .../modules/works/edit_stage_script.html      |  108 -
 .../fragments/modules/works/modal-box.html    |  140 -
 .../fragments/modules/works/script.html       |  185 -
 .../fragments/modules/works/search_form.html  |   19 -
 .../works/user_works_update_script.html       |  239 --
 .../modules/works/user_works_view_script.html |  328 --
 .../modules/works/works_view_script.html      |  120 -
 .../modules/zerohours_petition/modal-box.html |  139 -
 .../petition_view_script.html                 |  293 --
 .../modules/zerohours_petition/script.html    |  660 ---
 .../zerohours_petition/search_form.html       |   19 -
 src/main/resources/templates/index.html       |  359 --
 src/main/resources/templates/login.html       |   63 -
 .../resources/templates/modules/.DS_Store     |  Bin 18436 -> 0 bytes
 .../templates/modules/admin/index.html        |   92 -
 .../modules/admin/user-group-access.html      |  272 --
 .../modules/admin/user-group-list.html        |  183 -
 .../templates/modules/admin/user-list.html    |  226 -
 .../modules/bulkwaste/requestdetails.html     | 3007 -------------
 .../modules/c_petition/complaint_list.html    |  789 ----
 .../modules/c_petition/new_petition.html      |  267 --
 .../modules/c_petition/petition_ack.html      |  237 --
 .../modules/c_petition/petition_list.html     |  282 --
 .../c_petition/petition_not_mapped_list.html  |  267 --
 .../modules/c_petition/petition_update.html   |  719 ----
 .../modules/c_petition/petition_view.html     |  158 -
 .../c_petition/petition_view_modal_page.html  |  108 -
 .../modules/callcenter/addcategory.html       |  974 -----
 .../modules/callcenter/agentscampaign.html    | 1807 --------
 .../modules/callcenter/attendancereport.html  |  230 -
 .../modules/callcenter/campaignlist.html      | 1256 ------
 .../modules/callcenter/campaignreport.html    |  973 -----
 .../modules/callcenter/createcampaign.html    | 1956 ---------
 .../modules/callcenterqaqc/.DS_Store          |  Bin 8196 -> 0 bytes
 .../agentgrievancedashboard.html              |  416 --
 .../callcenterqaqc/agentqaqccalls.html        | 1171 ------
 .../agentqaqcfollowupcalls.html               | 1015 -----
 .../agentqaqcinprogresscalls.html             | 1022 -----
 .../agentqaqcpublicfollowupcalls.html         | 1088 -----
 .../callcenterqaqc/complaintstatus.html       | 1000 -----
 .../callcenterqaqc/domesticwastecancel.html   |  783 ----
 .../domesticwastecheckstatus.html             |  459 --
 .../domesticwastecomplaints.html              | 1579 -------
 .../modules/callcenterqaqc/overallreport.html |  613 ---
 .../modules/callcenterqaqc/pgrcomplaints.html | 2145 ----------
 .../callcenterqaqc/qaqcadminsettings.html     |  597 ---
 .../callcenterqaqc/qaqcagentperformance.html  |  801 ----
 .../callcenterqaqc/qaqcfollowuplist.html      |  659 ---
 .../qaqcgrievancedashboard.html               | 1050 -----
 .../callcenterqaqc/qaqctaskagentassign.html   |  925 ----
 .../modules/callcenterqaqc/qaqctasklist.html  |  639 ---
 .../modules/callcenterqaqc/scpreport.html     | 1040 -----
 .../callcenterqaqc/scpverification.html       | 1149 -----
 .../callcenterqaqc/socialmediacomplaints.html | 1486 -------
 .../socialmediacompletedlist.html             |  756 ----
 .../socialmediaregcompclosing.html            |  805 ----
 .../callcenterqaqc/unattendedclosing.html     |  649 ---
 .../templates/modules/cdwaste/approval.html   |  401 --
 .../templates/modules/cdwaste/pending.html    |  537 ---
 .../templates/modules/cdwaste/receipt.html    |  139 -
 .../modules/cdwaste/registration.html         |  307 --
 .../templates/modules/cdwaste/rejected.html   |  409 --
 .../modules/cdwastecollect/.DS_Store          |  Bin 6148 -> 0 bytes
 .../modules/cdwastecollect/lessoneton.html    |  430 --
 .../modules/cdwastecollect/officer.html       | 1122 -----
 .../modules/cdwastecollect/reports.html       |  411 --
 .../modules/childrensurvey/castemaster.html   |  563 ---
 .../modules/childrensurvey/childlist.html     | 1189 ------
 .../documentcorrectionmaster.html             |  574 ---
 .../childrensurvey/documentreasonmaster.html  |  576 ---
 .../childrensurvey/dropoutreasonmaster.html   |  576 ---
 .../childrensurvey/educationmaster.html       |  564 ---
 .../modules/childrensurvey/gendermaster.html  |  576 ---
 .../modules/childrensurvey/incomemaster.html  |  575 ---
 .../childrensurvey/interestfieldmaster.html   |  572 ---
 .../modules/childrensurvey/livingmaster.html  |  576 ---
 .../childrensurvey/locationmaster.html        |  577 ---
 .../modules/childrensurvey/nonchildlist.html  |  958 -----
 .../modules/childrensurvey/ownermaster.html   |  575 ---
 .../childrensurvey/religionmaster.html        |  575 ---
 .../modules/childrensurvey/surveylist.html    | 1030 -----
 .../childrensurvey/surveyorsreports.html      |  873 ----
 .../childrensurvey/vulnerabilitymaster.html   |  575 ---
 .../childrensurvey/whereaboutmaster.html      |  574 ---
 .../templates/modules/circular/inbox.html     |  300 --
 .../modules/circular/new_circular.html        |  287 --
 .../templates/modules/circular/report.html    |  287 --
 .../modules/com_petition/complaint_list.html  |  843 ----
 .../modules/com_petition/new_petition.html    |  301 --
 .../modules/com_petition/pending_list.html    |  351 --
 .../modules/com_petition/petition_ack.html    |  237 --
 .../modules/com_petition/petition_list.html   |  287 --
 .../petition_not_mapped_list.html             |  268 --
 .../modules/com_petition/petition_update.html |  764 ----
 .../modules/com_petition/petition_view.html   |  158 -
 .../petition_view_modal_page.html             |  116 -
 .../flagpole/approvedandrejectedlist.html     |  673 ---
 .../modules/flagpole/requestlist.html         |  909 ----
 .../modules/garbagecollection/.DS_Store       |  Bin 6148 -> 0 bytes
 .../modules/garbagecollection/index.html      |  240 --
 .../garbagecollection/request-completed.html  |  702 ----
 .../garbagecollection/request-create.html     |  256 --
 .../garbagecollection/request-new.html        |  711 ----
 .../garbagecollection/request-outofscope.html |  701 ----
 .../garbagecollection/request-pending.html    |  701 ----
 .../modules/greencommittee/createmeeting.html |  255 --
 .../modules/greencommittee/dashboard.html     |  859 ----
 .../modules/greencommittee/monitoring.html    |  658 ---
 .../modules/greencommittee/pendinglist.html   | 1077 -----
 .../modules/greencommittee/reports.html       |  560 ---
 .../greencommittee/treepruningreports.html    | 1136 -----
 .../modules/homelesssurvey/aadhar.html        |  576 ---
 .../modules/homelesssurvey/bankpassbook.html  |  576 ---
 .../birthcertficatenoreason.html              |  576 ---
 .../modules/homelesssurvey/caste.html         |  576 ---
 .../modules/homelesssurvey/cminsurance.html   |  576 ---
 .../homelesssurvey/comeoutshelter.html        |  576 ---
 .../homelesssurvey/communitynoreason.html     |  576 ---
 .../homelesssurvey/currentlyliving.html       |  576 ---
 .../modules/homelesssurvey/disability.html    |  576 ---
 .../homelesssurvey/disabiltycertificate.html  |  576 ---
 .../modules/homelesssurvey/discontinued.html  |  576 ---
 .../modules/homelesssurvey/driver.html        |  576 ---
 .../modules/homelesssurvey/education.html     |  576 ---
 .../homelesssurvey/employmenttype.html        |  576 ---
 .../modules/homelesssurvey/gccshelter.html    |  576 ---
 .../modules/homelesssurvey/gendermaster.html  |  576 ---
 .../homelesssurvey/healthcondition.html       |  576 ---
 .../modules/homelesssurvey/homelesslist.html  | 2085 ----------
 .../homelesssurvey/homelessreason.html        |  576 ---
 .../modules/homelesssurvey/martial.html       |  576 ---
 .../modules/homelesssurvey/movingreason.html  |  576 ---
 .../homelesssurvey/nonsurveyedhomelist.html   | 1007 -----
 .../modules/homelesssurvey/notemployed.html   |  576 ---
 .../modules/homelesssurvey/occupation.html    |  576 ---
 .../modules/homelesssurvey/relationtype.html  |  576 ---
 .../modules/homelesssurvey/religion.html      |  576 ---
 .../modules/homelesssurvey/sleepingspace.html |  576 ---
 .../modules/homelesssurvey/smart.html         |  576 ---
 .../modules/homelesssurvey/surveyorlist.html  | 1257 ------
 .../homelesssurvey/surveyorsreports.html      | 1012 -----
 .../modules/homelesssurvey/voterid.html       |  576 ---
 .../modules/m_petition/complaint_list.html    |  881 ----
 .../modules/m_petition/new_petition.html      |  301 --
 .../modules/m_petition/pending_list.html      |  351 --
 .../modules/m_petition/petition_ack.html      |  237 --
 .../modules/m_petition/petition_list.html     |  370 --
 .../m_petition/petition_not_mapped_list.html  |  267 --
 .../modules/m_petition/petition_update.html   |  758 ----
 .../modules/m_petition/petition_view.html     |  158 -
 .../m_petition/petition_view_modal_page.html  |  108 -
 .../templates/modules/mtm/index.html          |  237 --
 .../modules/mtm/mayor/by-event-list.html      |  204 -
 .../modules/mtm/mayor/by-officer-list.html    |  186 -
 .../modules/mtm/mayor/complaint-list.html     |  208 -
 .../mtm/mayor/completed-complaint-list.html   |  208 -
 .../mtm/mayor/completed-petition-list.html    |  185 -
 .../templates/modules/mtm/mayor/index.html    |  238 --
 .../mtm/mayor/partial-petition-list.html      |  185 -
 .../mtm/mayor/pending-complaint-list.html     |  208 -
 .../mtm/mayor/pending-petition-list.html      |  185 -
 .../modules/mtm/mayor/petition-list.html      |  185 -
 .../templates/modules/mtm/officer/index.html  |  237 --
 .../templates/modules/nulm/.DS_Store          |  Bin 8196 -> 0 bytes
 .../templates/modules/nulm/addstaff.html      |  558 ---
 .../templates/modules/nulm/appointment.html   |  485 ---
 .../modules/nulm/attendance-report-park.html  |  552 ---
 .../modules/nulm/attendance-report.html       |  548 ---
 .../nulm/attendance-report.html.27022025.html |  422 --
 .../templates/modules/nulm/create-order.html  |  425 --
 .../templates/modules/nulm/dropout.html       |  334 --
 .../templates/modules/nulm/nulm-payment.html  |  241 --
 .../modules/nulm/salary-approve-park.html     |  394 --
 .../modules/nulm/salary-approve.html          |  394 --
 .../modules/nulm/salary-details.html          |  312 --
 .../nulm/salary-nonInitiatedreport-park.html  |  358 --
 .../nulm/salary-nonInitiatedreport.html       |  358 --
 .../modules/nulm/salary-report-park.html      |  274 --
 .../templates/modules/nulm/salary-report.html |  274 --
 .../templates/modules/nulm/scheme-group.html  |  259 --
 .../templates/modules/nulm/selfHelpGroup.html |  202 -
 .../modules/nulm/staff-enrollment.html        |  430 --
 .../templates/modules/nulm/staffupdate.html   | 1525 -------
 .../modules/nulm/staffupdatenoacess.html      |   63 -
 .../templates/modules/nulm/update.html        |   10 -
 .../modules/nulm/updated-staff-park.html      |  380 --
 .../templates/modules/nulm/updated-staff.html |  380 --
 .../modules/nulm/zone-wise-report-park.html   |  430 --
 .../modules/nulm/zone-wise-report.html        |  430 --
 .../templates/modules/pensioner/.DS_Store     |  Bin 8196 -> 0 bytes
 .../modules/pensioner/department/.DS_Store    |  Bin 10244 -> 0 bytes
 .../department/audit/familypension.html       |  750 ----
 .../pensioner/department/audit/pendency.html  |  736 ----
 .../department/audit/retirement.html          |  646 ---
 .../pensioner/department/closedList.html      | 1155 -----
 .../completed/contributorypensionscheme.html  |  691 ---
 .../department/completed/familypension.html   |  834 ----
 .../pensioner/department/completed/gis.html   |  560 ---
 .../department/completed/pendency.html        |  822 ----
 .../completed/provisionalretirement.html      |  701 ----
 .../department/completed/retirement.html      |  769 ----
 .../pensioner/department/dashboard.html       |  968 -----
 .../pensioner/department/fileclosing.html     | 1308 ------
 .../pensioner/department/newentry/.DS_Store   |  Bin 6148 -> 0 bytes
 .../newentry/contributorypensionscheme.html   | 1022 -----
 .../department/newentry/familypension.html    |  884 ----
 .../pensioner/department/newentry/gis.html    | 1071 -----
 .../department/newentry/pendency.html         |  808 ----
 .../newentry/provisionalretirement.html       |  884 ----
 .../department/newentry/retirement.html       |  802 ----
 .../department/partial/familypension.html     | 1195 ------
 .../department/partial/pendency.html          | 1188 ------
 .../department/partial/retirement.html        | 1159 ------
 .../department/received/familypension.html    |  998 -----
 .../department/received/pendency.html         |  970 -----
 .../received/provisionalretirement.html       |  939 -----
 .../department/received/retirement.html       |  918 ----
 .../modules/pensioner/department/reports.html | 1411 -------
 .../department/return/familypension.html      |  728 ----
 .../pensioner/department/return/pendency.html |  726 ----
 .../department/return/retirement.html         |  613 ---
 .../modules/pensioner/pensioner/.DS_Store     |  Bin 8196 -> 0 bytes
 .../pensioner/audit/familypension.html        |  742 ----
 .../pensioner/pensioner/audit/pendency.html   |  738 ----
 .../pensioner/pensioner/audit/retirement.html |  614 ---
 .../completed/contributorypensionscheme.html  |  703 ----
 .../pensioner/completed/familypension.html    |  828 ----
 .../pensioner/pensioner/completed/gis.html    |  559 ---
 .../pensioner/completed/pendency.html         |  809 ----
 .../completed/provisionalretirement.html      |  722 ----
 .../pensioner/completed/retirement.html       |  772 ----
 .../pensioner/pensioner/dashboard.html        |  966 -----
 .../pensioner/forward/familypension.html      |  731 ----
 .../pensioner/pensioner/forward/pendency.html |  730 ----
 .../pensioner/forward/retirement.html         |  595 ---
 .../pensioner/partial/familypension.html      | 1230 ------
 .../pensioner/pensioner/partial/pendency.html | 1184 ------
 .../pensioner/partial/retirement.html         | 1184 ------
 .../pensioner/received/familypension.html     | 1429 -------
 .../pensioner/pensioner/received/gis.html     |  742 ----
 .../pensioner/received/pendency.html          | 1415 -------
 .../received/provisionalretirement.html       | 1000 -----
 .../pensioner/received/retirement.html        | 1364 ------
 .../modules/pensioner/pensioner/reports.html  | 1820 --------
 .../modules/petregistration/.DS_Store         |  Bin 6148 -> 0 bytes
 .../petregistration/accepted-list.html        |  638 ---
 .../modules/petregistration/index.html        |  845 ----
 .../petregistration/license-issued.html       |  536 ---
 .../modules/petregistration/rejected.html     |  607 ---
 .../modules/petregistration/request-list.html |  687 ---
 .../templates/modules/pgr/all-list.html       |  290 --
 .../templates/modules/pgr/index.html          |  788 ----
 .../templates/modules/pgr/qa-qc-list.html     |  299 --
 .../modules/pgr/zone-wise-with-reopen.html    |  648 ---
 .../modules/pgr/zone-wise-without-reopen.html |  646 ---
 .../templates/modules/qrfeedback/.DS_Store    |  Bin 6148 -> 0 bytes
 .../modules/qrfeedback/assets/asset-list.html |  278 --
 .../qrfeedback/assets/asset-questions.html    |  269 --
 .../feedbacks/feedback-list-no.html           |  358 --
 .../feedbacks/feedback-list-yes.html          |  358 --
 .../qrfeedback/feedbacks/feedback-list.html   |  358 --
 .../templates/modules/qrfeedback/index.html   |  578 ---
 .../qrfeedback/jquery.datetimepicker.min.css  |    1 -
 .../master/asset-category-questions.html      |  700 ----
 .../qrfeedback/master/asset-category.html     |  521 ---
 .../master/asset-parameter-questions.html     |  269 --
 .../qrfeedback/master/asset-parameter.html    |  264 --
 .../templates/modules/roadwar/regform.html    | 2427 -----------
 .../templates/modules/roadwar/updateform.html | 3543 ----------------
 .../templates/modules/school/.DS_Store        |  Bin 8196 -> 0 bytes
 .../modules/school/addelectricalasset.html    |  740 ----
 .../modules/school/addfurnitureasset.html     |  728 ----
 .../modules/school/assetmanagement.html       |  819 ----
 .../templates/modules/school/building.html    | 1583 -------
 .../templates/modules/school/dashboard.html   |  323 --
 .../modules/school/drinkingwater.html         | 1662 --------
 .../modules/school/electricalassets.html      |  405 --
 .../modules/school/furnitureassets.html       |  411 --
 .../templates/modules/school/itassets.html    |  602 ---
 .../templates/modules/school/kitchen.html     | 1250 ------
 .../modules/school/otherdetails.html          | 1020 -----
 .../templates/modules/school/playground.html  |  842 ----
 .../school/reportfolder/aeoallschools.html    |  646 ---
 .../modules/school/reportfolder/aeolist.html  |  316 --
 .../templates/modules/school/reports.html     |  478 ---
 .../templates/modules/school/room.html        | 1015 -----
 .../templates/modules/school/roomassets.html  | 1589 -------
 .../modules/school/staffdetails.html          | 1148 -----
 .../modules/school/studentdetails.html        |  747 ----
 .../modules/school/studentregister.html       | 3704 -----------------
 .../templates/modules/school/toilets.html     |  678 ---
 .../templates/modules/sos/closed_inbox.html   |  427 --
 .../templates/modules/sos/inbox.html          |  298 --
 .../templates/modules/sos/new_sos.html        |  667 ---
 .../templates/modules/sos/pending_inbox.html  |  298 --
 .../templates/modules/sos/report.html         |  287 --
 .../modules/taxcollection/index.html          |  237 --
 .../modules/taxcollection/request-create.html |  874 ----
 .../modules/taxcollection/request-list.html   |  813 ----
 .../templates/modules/vendors/EventList.html  |  805 ----
 .../modules/vendors/RequestList.html          | 1144 -----
 .../templates/modules/vendors/addevent.html   |  274 --
 .../modules/vendors/certificate.html          |  764 ----
 .../vendors/streetVendorRequestForm.html      | 1486 -------
 .../vendors/streetVendorRequestList.html      | 1621 --------
 .../modules/vendors/zonerequests.html         | 1606 -------
 .../templates/modules/vtrack/.DS_Store        |  Bin 6148 -> 0 bytes
 .../templates/modules/vtrack/messagelist.html |  535 ---
 .../modules/vtrack/messagelist.html.old.html  |  367 --
 .../modules/ward_sabha/complaint_list.html    |  882 ----
 .../modules/ward_sabha/new_event.html         |  257 --
 .../modules/ward_sabha/new_petition.html      |  456 --
 .../modules/ward_sabha/petition_ack.html      |  237 --
 .../modules/ward_sabha/petition_list.html     |  325 --
 .../ward_sabha/petition_not_mapped_list.html  |  463 ---
 .../modules/ward_sabha/petition_update.html   |  775 ----
 .../modules/ward_sabha/petition_view.html     |  158 -
 .../ward_sabha/petition_view_modal_page.html  |  108 -
 .../modules/ward_shaba/eventcreation.html     |  315 --
 .../modules/ward_shaba/minutes_list.html      |  934 -----
 .../modules/ward_shaba/new_minutes.html       |  322 --
 .../templates/modules/works/.DS_Store         |  Bin 8196 -> 0 bytes
 .../modules/works/edit_stage_modal.html       |   47 -
 .../modules/works/erp-works-list.html         |  761 ----
 .../modules/works/erp-works-update.html       |  928 -----
 .../templates/modules/works/erpworkslist.html |  777 ----
 .../modules/works/erpworkslist_old.html       | 2960 -------------
 .../modules/works/erpworkslist_report.html    |  878 ----
 .../templates/modules/works/index.html        |  242 --
 .../modules/works/non-erp-works-add.html      |  975 -----
 .../modules/works/nonerpworkslist.html        | 2716 ------------
 .../modules/works/project_status_update.html  |  500 ---
 .../works/update_works_stage_modal.html       |  151 -
 .../user_works_details_update_modal_page.html |  370 --
 .../user_works_details_view_modal_page.html   |  202 -
 .../works_details_update_modal_page.html      |  366 --
 .../works/works_details_view_modal_page.html  |  163 -
 .../zerohours_petition/complaint_list.html    |  882 ----
 .../zerohours_petition/new_petition.html      |  456 --
 .../zerohours_petition/pending_list.html      |  290 --
 .../zerohours_petition/petition_ack.html      |  237 --
 .../zerohours_petition/petition_list.html     |  325 --
 .../petition_not_mapped_list.html             |  463 ---
 .../zerohours_petition/petition_update.html   |  775 ----
 .../zerohours_petition/petition_view.html     |  158 -
 .../petition_view_modal_page.html             |  108 -
 .../resources/templates/widget-statistic.html |  145 -
 387 files changed, 228546 deletions(-)
 delete mode 100644 src/main/resources/templates/error-403.html
 delete mode 100644 src/main/resources/templates/error-404.html
 delete mode 100644 src/main/resources/templates/error-500.html
 delete mode 100644 src/main/resources/templates/fragments/modules/.DS_Store
 delete mode 100644 src/main/resources/templates/fragments/modules/admin/modal-box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/base/.DS_Store
 delete mode 100644 src/main/resources/templates/fragments/modules/base/app_module_menu_box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/base/footer.html
 delete mode 100644 src/main/resources/templates/fragments/modules/base/head.html
 delete mode 100644 src/main/resources/templates/fragments/modules/base/header.html
 delete mode 100644 src/main/resources/templates/fragments/modules/base/loader.html
 delete mode 100644 src/main/resources/templates/fragments/modules/base/menu.html
 delete mode 100644 src/main/resources/templates/fragments/modules/base/menu_source.html
 delete mode 100644 src/main/resources/templates/fragments/modules/base/nav.html
 delete mode 100644 src/main/resources/templates/fragments/modules/base/script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/base/search.html
 delete mode 100644 src/main/resources/templates/fragments/modules/c_petition/modal-box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/c_petition/petition_view_script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/c_petition/script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/c_petition/search_form.html
 delete mode 100644 src/main/resources/templates/fragments/modules/circular/modal-box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/circular/script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/com_petition/modal-box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/com_petition/petition_view_script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/com_petition/script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/com_petition/search_form.html
 delete mode 100644 src/main/resources/templates/fragments/modules/m_petition/modal-box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/m_petition/petition_view_script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/m_petition/script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/m_petition/search_form.html
 delete mode 100644 src/main/resources/templates/fragments/modules/mtm/event_search_form.html
 delete mode 100644 src/main/resources/templates/fragments/modules/mtm/modal-box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/mtm/script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/pgr/modal-box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/pgr/script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/pgr/search_form.html
 delete mode 100644 src/main/resources/templates/fragments/modules/ward_sabha/modal-box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/ward_sabha/petition_view_script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/ward_sabha/script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/ward_sabha/search_form.html
 delete mode 100644 src/main/resources/templates/fragments/modules/works/edit_stage_script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/works/modal-box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/works/script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/works/search_form.html
 delete mode 100644 src/main/resources/templates/fragments/modules/works/user_works_update_script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/works/user_works_view_script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/works/works_view_script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/zerohours_petition/modal-box.html
 delete mode 100644 src/main/resources/templates/fragments/modules/zerohours_petition/petition_view_script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/zerohours_petition/script.html
 delete mode 100644 src/main/resources/templates/fragments/modules/zerohours_petition/search_form.html
 delete mode 100644 src/main/resources/templates/index.html
 delete mode 100644 src/main/resources/templates/login.html
 delete mode 100644 src/main/resources/templates/modules/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/admin/index.html
 delete mode 100644 src/main/resources/templates/modules/admin/user-group-access.html
 delete mode 100644 src/main/resources/templates/modules/admin/user-group-list.html
 delete mode 100644 src/main/resources/templates/modules/admin/user-list.html
 delete mode 100644 src/main/resources/templates/modules/bulkwaste/requestdetails.html
 delete mode 100644 src/main/resources/templates/modules/c_petition/complaint_list.html
 delete mode 100644 src/main/resources/templates/modules/c_petition/new_petition.html
 delete mode 100644 src/main/resources/templates/modules/c_petition/petition_ack.html
 delete mode 100644 src/main/resources/templates/modules/c_petition/petition_list.html
 delete mode 100644 src/main/resources/templates/modules/c_petition/petition_not_mapped_list.html
 delete mode 100644 src/main/resources/templates/modules/c_petition/petition_update.html
 delete mode 100644 src/main/resources/templates/modules/c_petition/petition_view.html
 delete mode 100644 src/main/resources/templates/modules/c_petition/petition_view_modal_page.html
 delete mode 100644 src/main/resources/templates/modules/callcenter/addcategory.html
 delete mode 100644 src/main/resources/templates/modules/callcenter/agentscampaign.html
 delete mode 100644 src/main/resources/templates/modules/callcenter/attendancereport.html
 delete mode 100644 src/main/resources/templates/modules/callcenter/campaignlist.html
 delete mode 100644 src/main/resources/templates/modules/callcenter/campaignreport.html
 delete mode 100644 src/main/resources/templates/modules/callcenter/createcampaign.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/agentgrievancedashboard.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/agentqaqcfollowupcalls.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/agentqaqcinprogresscalls.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/agentqaqcpublicfollowupcalls.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/complaintstatus.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/domesticwastecancel.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/domesticwastecheckstatus.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/domesticwastecomplaints.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/overallreport.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/pgrcomplaints.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/qaqcadminsettings.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/qaqcagentperformance.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/qaqcfollowuplist.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/qaqcgrievancedashboard.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/qaqctaskagentassign.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/qaqctasklist.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/scpreport.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/scpverification.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/socialmediacomplaints.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/socialmediacompletedlist.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/socialmediaregcompclosing.html
 delete mode 100644 src/main/resources/templates/modules/callcenterqaqc/unattendedclosing.html
 delete mode 100644 src/main/resources/templates/modules/cdwaste/approval.html
 delete mode 100644 src/main/resources/templates/modules/cdwaste/pending.html
 delete mode 100644 src/main/resources/templates/modules/cdwaste/receipt.html
 delete mode 100644 src/main/resources/templates/modules/cdwaste/registration.html
 delete mode 100644 src/main/resources/templates/modules/cdwaste/rejected.html
 delete mode 100644 src/main/resources/templates/modules/cdwastecollect/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/cdwastecollect/lessoneton.html
 delete mode 100644 src/main/resources/templates/modules/cdwastecollect/officer.html
 delete mode 100644 src/main/resources/templates/modules/cdwastecollect/reports.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/castemaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/childlist.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/documentcorrectionmaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/documentreasonmaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/dropoutreasonmaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/educationmaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/gendermaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/incomemaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/interestfieldmaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/livingmaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/locationmaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/nonchildlist.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/ownermaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/religionmaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/surveylist.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/surveyorsreports.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/vulnerabilitymaster.html
 delete mode 100644 src/main/resources/templates/modules/childrensurvey/whereaboutmaster.html
 delete mode 100644 src/main/resources/templates/modules/circular/inbox.html
 delete mode 100644 src/main/resources/templates/modules/circular/new_circular.html
 delete mode 100644 src/main/resources/templates/modules/circular/report.html
 delete mode 100644 src/main/resources/templates/modules/com_petition/complaint_list.html
 delete mode 100644 src/main/resources/templates/modules/com_petition/new_petition.html
 delete mode 100644 src/main/resources/templates/modules/com_petition/pending_list.html
 delete mode 100644 src/main/resources/templates/modules/com_petition/petition_ack.html
 delete mode 100644 src/main/resources/templates/modules/com_petition/petition_list.html
 delete mode 100644 src/main/resources/templates/modules/com_petition/petition_not_mapped_list.html
 delete mode 100644 src/main/resources/templates/modules/com_petition/petition_update.html
 delete mode 100644 src/main/resources/templates/modules/com_petition/petition_view.html
 delete mode 100644 src/main/resources/templates/modules/com_petition/petition_view_modal_page.html
 delete mode 100644 src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html
 delete mode 100644 src/main/resources/templates/modules/flagpole/requestlist.html
 delete mode 100644 src/main/resources/templates/modules/garbagecollection/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/garbagecollection/index.html
 delete mode 100644 src/main/resources/templates/modules/garbagecollection/request-completed.html
 delete mode 100644 src/main/resources/templates/modules/garbagecollection/request-create.html
 delete mode 100644 src/main/resources/templates/modules/garbagecollection/request-new.html
 delete mode 100644 src/main/resources/templates/modules/garbagecollection/request-outofscope.html
 delete mode 100644 src/main/resources/templates/modules/garbagecollection/request-pending.html
 delete mode 100644 src/main/resources/templates/modules/greencommittee/createmeeting.html
 delete mode 100644 src/main/resources/templates/modules/greencommittee/dashboard.html
 delete mode 100644 src/main/resources/templates/modules/greencommittee/monitoring.html
 delete mode 100644 src/main/resources/templates/modules/greencommittee/pendinglist.html
 delete mode 100644 src/main/resources/templates/modules/greencommittee/reports.html
 delete mode 100644 src/main/resources/templates/modules/greencommittee/treepruningreports.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/aadhar.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/bankpassbook.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/birthcertficatenoreason.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/caste.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/cminsurance.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/comeoutshelter.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/communitynoreason.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/currentlyliving.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/disability.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/disabiltycertificate.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/discontinued.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/driver.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/education.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/employmenttype.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/gccshelter.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/gendermaster.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/healthcondition.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/homelesslist.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/homelessreason.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/martial.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/movingreason.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/nonsurveyedhomelist.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/notemployed.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/occupation.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/relationtype.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/religion.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/sleepingspace.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/smart.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/surveyorlist.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/surveyorsreports.html
 delete mode 100644 src/main/resources/templates/modules/homelesssurvey/voterid.html
 delete mode 100644 src/main/resources/templates/modules/m_petition/complaint_list.html
 delete mode 100644 src/main/resources/templates/modules/m_petition/new_petition.html
 delete mode 100644 src/main/resources/templates/modules/m_petition/pending_list.html
 delete mode 100644 src/main/resources/templates/modules/m_petition/petition_ack.html
 delete mode 100644 src/main/resources/templates/modules/m_petition/petition_list.html
 delete mode 100644 src/main/resources/templates/modules/m_petition/petition_not_mapped_list.html
 delete mode 100644 src/main/resources/templates/modules/m_petition/petition_update.html
 delete mode 100644 src/main/resources/templates/modules/m_petition/petition_view.html
 delete mode 100644 src/main/resources/templates/modules/m_petition/petition_view_modal_page.html
 delete mode 100644 src/main/resources/templates/modules/mtm/index.html
 delete mode 100644 src/main/resources/templates/modules/mtm/mayor/by-event-list.html
 delete mode 100644 src/main/resources/templates/modules/mtm/mayor/by-officer-list.html
 delete mode 100644 src/main/resources/templates/modules/mtm/mayor/complaint-list.html
 delete mode 100644 src/main/resources/templates/modules/mtm/mayor/completed-complaint-list.html
 delete mode 100644 src/main/resources/templates/modules/mtm/mayor/completed-petition-list.html
 delete mode 100644 src/main/resources/templates/modules/mtm/mayor/index.html
 delete mode 100644 src/main/resources/templates/modules/mtm/mayor/partial-petition-list.html
 delete mode 100644 src/main/resources/templates/modules/mtm/mayor/pending-complaint-list.html
 delete mode 100644 src/main/resources/templates/modules/mtm/mayor/pending-petition-list.html
 delete mode 100644 src/main/resources/templates/modules/mtm/mayor/petition-list.html
 delete mode 100644 src/main/resources/templates/modules/mtm/officer/index.html
 delete mode 100644 src/main/resources/templates/modules/nulm/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/nulm/addstaff.html
 delete mode 100644 src/main/resources/templates/modules/nulm/appointment.html
 delete mode 100644 src/main/resources/templates/modules/nulm/attendance-report-park.html
 delete mode 100644 src/main/resources/templates/modules/nulm/attendance-report.html
 delete mode 100644 src/main/resources/templates/modules/nulm/attendance-report.html.27022025.html
 delete mode 100644 src/main/resources/templates/modules/nulm/create-order.html
 delete mode 100644 src/main/resources/templates/modules/nulm/dropout.html
 delete mode 100644 src/main/resources/templates/modules/nulm/nulm-payment.html
 delete mode 100644 src/main/resources/templates/modules/nulm/salary-approve-park.html
 delete mode 100644 src/main/resources/templates/modules/nulm/salary-approve.html
 delete mode 100644 src/main/resources/templates/modules/nulm/salary-details.html
 delete mode 100644 src/main/resources/templates/modules/nulm/salary-nonInitiatedreport-park.html
 delete mode 100644 src/main/resources/templates/modules/nulm/salary-nonInitiatedreport.html
 delete mode 100644 src/main/resources/templates/modules/nulm/salary-report-park.html
 delete mode 100644 src/main/resources/templates/modules/nulm/salary-report.html
 delete mode 100644 src/main/resources/templates/modules/nulm/scheme-group.html
 delete mode 100644 src/main/resources/templates/modules/nulm/selfHelpGroup.html
 delete mode 100644 src/main/resources/templates/modules/nulm/staff-enrollment.html
 delete mode 100644 src/main/resources/templates/modules/nulm/staffupdate.html
 delete mode 100644 src/main/resources/templates/modules/nulm/staffupdatenoacess.html
 delete mode 100644 src/main/resources/templates/modules/nulm/update.html
 delete mode 100644 src/main/resources/templates/modules/nulm/updated-staff-park.html
 delete mode 100644 src/main/resources/templates/modules/nulm/updated-staff.html
 delete mode 100644 src/main/resources/templates/modules/nulm/zone-wise-report-park.html
 delete mode 100644 src/main/resources/templates/modules/nulm/zone-wise-report.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/audit/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/audit/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/audit/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/closedList.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/completed/contributorypensionscheme.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/completed/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/completed/gis.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/completed/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/completed/provisionalretirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/completed/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/dashboard.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/fileclosing.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/newentry/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/newentry/contributorypensionscheme.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/newentry/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/newentry/gis.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/newentry/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/newentry/provisionalretirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/newentry/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/partial/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/partial/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/partial/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/received/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/received/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/received/provisionalretirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/received/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/reports.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/return/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/return/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/department/return/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/audit/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/audit/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/audit/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/completed/contributorypensionscheme.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/completed/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/completed/gis.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/completed/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/completed/provisionalretirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/completed/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/dashboard.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/forward/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/forward/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/forward/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/partial/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/partial/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/partial/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/received/familypension.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/received/gis.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/received/pendency.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/received/provisionalretirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/received/retirement.html
 delete mode 100644 src/main/resources/templates/modules/pensioner/pensioner/reports.html
 delete mode 100644 src/main/resources/templates/modules/petregistration/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/petregistration/accepted-list.html
 delete mode 100644 src/main/resources/templates/modules/petregistration/index.html
 delete mode 100644 src/main/resources/templates/modules/petregistration/license-issued.html
 delete mode 100644 src/main/resources/templates/modules/petregistration/rejected.html
 delete mode 100644 src/main/resources/templates/modules/petregistration/request-list.html
 delete mode 100644 src/main/resources/templates/modules/pgr/all-list.html
 delete mode 100644 src/main/resources/templates/modules/pgr/index.html
 delete mode 100644 src/main/resources/templates/modules/pgr/qa-qc-list.html
 delete mode 100644 src/main/resources/templates/modules/pgr/zone-wise-with-reopen.html
 delete mode 100644 src/main/resources/templates/modules/pgr/zone-wise-without-reopen.html
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/assets/asset-list.html
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/assets/asset-questions.html
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list-no.html
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list-yes.html
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list.html
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/index.html
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/jquery.datetimepicker.min.css
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/master/asset-category-questions.html
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/master/asset-category.html
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/master/asset-parameter-questions.html
 delete mode 100644 src/main/resources/templates/modules/qrfeedback/master/asset-parameter.html
 delete mode 100644 src/main/resources/templates/modules/roadwar/regform.html
 delete mode 100644 src/main/resources/templates/modules/roadwar/updateform.html
 delete mode 100644 src/main/resources/templates/modules/school/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/school/addelectricalasset.html
 delete mode 100644 src/main/resources/templates/modules/school/addfurnitureasset.html
 delete mode 100644 src/main/resources/templates/modules/school/assetmanagement.html
 delete mode 100644 src/main/resources/templates/modules/school/building.html
 delete mode 100644 src/main/resources/templates/modules/school/dashboard.html
 delete mode 100644 src/main/resources/templates/modules/school/drinkingwater.html
 delete mode 100644 src/main/resources/templates/modules/school/electricalassets.html
 delete mode 100644 src/main/resources/templates/modules/school/furnitureassets.html
 delete mode 100644 src/main/resources/templates/modules/school/itassets.html
 delete mode 100644 src/main/resources/templates/modules/school/kitchen.html
 delete mode 100644 src/main/resources/templates/modules/school/otherdetails.html
 delete mode 100644 src/main/resources/templates/modules/school/playground.html
 delete mode 100644 src/main/resources/templates/modules/school/reportfolder/aeoallschools.html
 delete mode 100644 src/main/resources/templates/modules/school/reportfolder/aeolist.html
 delete mode 100644 src/main/resources/templates/modules/school/reports.html
 delete mode 100644 src/main/resources/templates/modules/school/room.html
 delete mode 100644 src/main/resources/templates/modules/school/roomassets.html
 delete mode 100644 src/main/resources/templates/modules/school/staffdetails.html
 delete mode 100644 src/main/resources/templates/modules/school/studentdetails.html
 delete mode 100644 src/main/resources/templates/modules/school/studentregister.html
 delete mode 100644 src/main/resources/templates/modules/school/toilets.html
 delete mode 100644 src/main/resources/templates/modules/sos/closed_inbox.html
 delete mode 100644 src/main/resources/templates/modules/sos/inbox.html
 delete mode 100644 src/main/resources/templates/modules/sos/new_sos.html
 delete mode 100644 src/main/resources/templates/modules/sos/pending_inbox.html
 delete mode 100644 src/main/resources/templates/modules/sos/report.html
 delete mode 100644 src/main/resources/templates/modules/taxcollection/index.html
 delete mode 100644 src/main/resources/templates/modules/taxcollection/request-create.html
 delete mode 100644 src/main/resources/templates/modules/taxcollection/request-list.html
 delete mode 100644 src/main/resources/templates/modules/vendors/EventList.html
 delete mode 100644 src/main/resources/templates/modules/vendors/RequestList.html
 delete mode 100644 src/main/resources/templates/modules/vendors/addevent.html
 delete mode 100644 src/main/resources/templates/modules/vendors/certificate.html
 delete mode 100644 src/main/resources/templates/modules/vendors/streetVendorRequestForm.html
 delete mode 100644 src/main/resources/templates/modules/vendors/streetVendorRequestList.html
 delete mode 100644 src/main/resources/templates/modules/vendors/zonerequests.html
 delete mode 100644 src/main/resources/templates/modules/vtrack/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/vtrack/messagelist.html
 delete mode 100644 src/main/resources/templates/modules/vtrack/messagelist.html.old.html
 delete mode 100644 src/main/resources/templates/modules/ward_sabha/complaint_list.html
 delete mode 100644 src/main/resources/templates/modules/ward_sabha/new_event.html
 delete mode 100644 src/main/resources/templates/modules/ward_sabha/new_petition.html
 delete mode 100644 src/main/resources/templates/modules/ward_sabha/petition_ack.html
 delete mode 100644 src/main/resources/templates/modules/ward_sabha/petition_list.html
 delete mode 100644 src/main/resources/templates/modules/ward_sabha/petition_not_mapped_list.html
 delete mode 100644 src/main/resources/templates/modules/ward_sabha/petition_update.html
 delete mode 100644 src/main/resources/templates/modules/ward_sabha/petition_view.html
 delete mode 100644 src/main/resources/templates/modules/ward_sabha/petition_view_modal_page.html
 delete mode 100644 src/main/resources/templates/modules/ward_shaba/eventcreation.html
 delete mode 100644 src/main/resources/templates/modules/ward_shaba/minutes_list.html
 delete mode 100644 src/main/resources/templates/modules/ward_shaba/new_minutes.html
 delete mode 100644 src/main/resources/templates/modules/works/.DS_Store
 delete mode 100644 src/main/resources/templates/modules/works/edit_stage_modal.html
 delete mode 100644 src/main/resources/templates/modules/works/erp-works-list.html
 delete mode 100644 src/main/resources/templates/modules/works/erp-works-update.html
 delete mode 100644 src/main/resources/templates/modules/works/erpworkslist.html
 delete mode 100644 src/main/resources/templates/modules/works/erpworkslist_old.html
 delete mode 100644 src/main/resources/templates/modules/works/erpworkslist_report.html
 delete mode 100644 src/main/resources/templates/modules/works/index.html
 delete mode 100644 src/main/resources/templates/modules/works/non-erp-works-add.html
 delete mode 100644 src/main/resources/templates/modules/works/nonerpworkslist.html
 delete mode 100644 src/main/resources/templates/modules/works/project_status_update.html
 delete mode 100644 src/main/resources/templates/modules/works/update_works_stage_modal.html
 delete mode 100644 src/main/resources/templates/modules/works/user_works_details_update_modal_page.html
 delete mode 100644 src/main/resources/templates/modules/works/user_works_details_view_modal_page.html
 delete mode 100644 src/main/resources/templates/modules/works/works_details_update_modal_page.html
 delete mode 100644 src/main/resources/templates/modules/works/works_details_view_modal_page.html
 delete mode 100644 src/main/resources/templates/modules/zerohours_petition/complaint_list.html
 delete mode 100644 src/main/resources/templates/modules/zerohours_petition/new_petition.html
 delete mode 100644 src/main/resources/templates/modules/zerohours_petition/pending_list.html
 delete mode 100644 src/main/resources/templates/modules/zerohours_petition/petition_ack.html
 delete mode 100644 src/main/resources/templates/modules/zerohours_petition/petition_list.html
 delete mode 100644 src/main/resources/templates/modules/zerohours_petition/petition_not_mapped_list.html
 delete mode 100644 src/main/resources/templates/modules/zerohours_petition/petition_update.html
 delete mode 100644 src/main/resources/templates/modules/zerohours_petition/petition_view.html
 delete mode 100644 src/main/resources/templates/modules/zerohours_petition/petition_view_modal_page.html
 delete mode 100644 src/main/resources/templates/widget-statistic.html

diff --git a/src/main/resources/templates/error-403.html b/src/main/resources/templates/error-403.html
deleted file mode 100644
index b004416b..00000000
--- a/src/main/resources/templates/error-403.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="auth-wrapper">
-            <div class="container-fluid h-100">
-                <div class="row flex-row h-100 bg-white">
-                    <div class="col-xl-6 col-lg-6 col-md-5 p-0 d-md-block d-lg-block d-sm-none d-none">
-                        <div class="lavalite-bg authentication-form mx-auto text-center">
-                            <div class="logo-centered" style="padding-top: 30px;"></div>
-                             <img src="images/403.png" width="90%"/>
-                        </div>
-                    </div>
-                    <div class="col-xl-6 col-lg-6 col-md-7 my-auto p-0">
-                        <div class="authentication-form mx-auto text-center">
-                            <div class="logo-centered">
-                                <a href="/"><img src="images/logo.png" alt="Greater Chennai Corporation" class="header-brand-img" width="100%"></a>
-                            </div>
-                            <h3>Greater Chennai Corporation</h3>
-                            <!-- Content -->
-				              <div class="flex-grow-1 d-flex align-items-center p-5 bg-body-light">
-				                <div class="w-100">
-				                  <p class="text-danger fs-4 fw-bold text-uppercase mb-2" th:utext="${errorStatus}">
-				                    403 Error
-				                  </p>
-				                  <h1 class="fw-bold mb-2" th:utext="${errorError}">
-				                    403 - Access Denied
-				                  </h1>
-				                  <p class="fs-4 fw-medium text-muted mb-5" th:utext="${errorMessage}">
-				                    Oops, You don`t have permission to access this page.
-				                  </p>
-				                  <a class="btn btn-lg btn-alt-danger" href="#403" onclick="return goBack();">
-				                    <i class="fa fa-arrow-left opacity-50 me-1"></i> Back
-				                  </a>
-				                </div>
-				              </div>
-				              <!-- END Content -->
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script>
-			function goBack() {
-			  history.go(-1); // This will go back one step in the browser's history
-			  return false;   // Prevent the default link behavior
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/error-404.html b/src/main/resources/templates/error-404.html
deleted file mode 100644
index 7146e531..00000000
--- a/src/main/resources/templates/error-404.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="auth-wrapper">
-            <div class="container-fluid h-100">
-                <div class="row flex-row h-100 bg-white">
-                    <div class="col-xl-6 col-lg-6 col-md-5 p-0 d-md-block d-lg-block d-sm-none d-none my-auto">
-                        <div class="lavalite-bg authentication-form mx-auto text-center" >
-                            <div class="logo-centered" style="padding-top: 120px;"></div>
-                            <img src="images/error-bg-404.png" width="90%"/>
-                        </div>
-                    </div>
-                    <div class="col-xl-6 col-lg-6 col-md-7 my-auto p-0">
-                        <div class="authentication-form mx-auto text-center">
-                            <div class="logo-centered">
-                                <a href="/"><img src="images/logo.png" alt="Greater Chennai Corporation" class="header-brand-img" width="100%"></a>
-                            </div>
-                            <h3>Greater Chennai Corporation</h3>
-                            <!-- Content -->
-				              <div class="flex-grow-1 d-flex align-items-center p-5 bg-body-light">
-				                <div class="w-100">
-				                  <p class="text-danger fs-4 fw-bold text-uppercase mb-2">
-				                    404 Error
-				                  </p>
-				                  <h1 class="fw-bold mb-2">
-				                    Page Not Found
-				                  </h1>
-				                  <p class="fs-4 fw-medium text-muted mb-5">
-				                    We are sorry but the page you are looking for was not found.
-				                  </p>
-				                  <a class="btn btn-lg btn-alt-danger" href="#404" onclick="return goBack();">
-				                    <i class="fa fa-arrow-left opacity-50 me-1"></i> Back
-				                  </a>
-				                </div>
-				              </div>
-				              <!-- END Content -->
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script>
-			function goBack() {
-			  history.go(-1); // This will go back one step in the browser's history
-			  return false;   // Prevent the default link behavior
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/error-500.html b/src/main/resources/templates/error-500.html
deleted file mode 100644
index 055a7491..00000000
--- a/src/main/resources/templates/error-500.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="auth-wrapper">
-            <div class="container-fluid h-100">
-                <div class="row flex-row h-100 bg-white">
-                    <div class="col-xl-6 col-lg-6 col-md-5 p-0 d-md-block d-lg-block d-sm-none d-none">
-                        <div class="lavalite-bg authentication-form mx-auto text-center">
-                            <div class="logo-centered" style="padding-top: 30px;"></div>
-                             <img src="images/error-bg.png" width="90%"/>
-                        </div>
-                    </div>
-                    <div class="col-xl-6 col-lg-6 col-md-7 my-auto p-0">
-                        <div class="authentication-form mx-auto text-center">
-                            <div class="logo-centered">
-                                <a href="/"><img src="images/logo.png" alt="Greater Chennai Corporation" class="header-brand-img" width="100%"></a>
-                            </div>
-                            <h3>Greater Chennai Corporation</h3>
-                            <!-- Content -->
-				              <div class="flex-grow-1 d-flex align-items-center p-5 bg-body-light">
-				                <div class="w-100">
-				                  <p class="text-danger fs-4 fw-bold text-uppercase mb-2">
-				                    500 Error
-				                  </p>
-				                  <h1 class="fw-bold mb-2">
-				                    Internal Server Error
-				                  </h1>
-				                  <p class="fs-4 fw-medium text-muted mb-5">
-				                    The server encountered an internal error or misconfiguration and was unable to complete your request
-				                  </p>
-				                  <a class="btn btn-lg btn-alt-danger" href="#500" onclick="return goBack();">
-				                    <i class="fa fa-arrow-left opacity-50 me-1"></i> Back
-				                  </a>
-				                </div>
-				              </div>
-				              <!-- END Content -->
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script>
-			function goBack() {
-			  history.go(-1); // This will go back one step in the browser's history
-			  return false;   // Prevent the default link behavior
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/fragments/modules/.DS_Store b/src/main/resources/templates/fragments/modules/.DS_Store
deleted file mode 100644
index bd28d0e24fac2d4f498e2cd66284c51c403619cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMU60a06ukqiTUd?6Xu^w06JLq)v5_UdRCayvRg6BU!4`10+0r5fNhBnF*8kvN
z@YO$}|HUUgcV;A%4~ZrkH_lCF&UEIU>Gbrr!!1N4T9aOts6<2-3S;pA)du5nE^C(2
zJy(GOe4_AS5OuvE^45G!hf%;NU=%P47zK<1|AqqCv)QaI`@R}AwNbz*@Lwvx?*|)&
z(b1SFl&=m{G6ewU&@ByZ<N=anYjiXw3MCbDs_a2%s?aHhP;`vj><)A^CJGgugrbws
zXBIj`5%TQd+0vbaqtMhw0i(dW0-U?=kxM-qke|xm@gRx!7`^>Xnxy8)gKtdzr97V>
zxcl4uylFht-vd5*!@!TnmC6^9$>#Ph?OXfSf%T$&7ERk@cRYz(?&ujGJ&vNl`_Xp2
zCw_n0DPBL0!m;az{gEX2y*^x?KlQ_2G;Kwbuop{iTMbxwE8i)WX0vLeQnqW2=Dcjr
znl-c!>v!k#ymjN&oqLZu=fNP1-pMN?p<gU?MIA3{)?jhnZ`z|Uh{99!v44TO)S)5u
zX$<waL~9y;h2OG<7C1hQP){g;nxnLq8J>ID|1vxy+?^fg$$Vbn6?Sv7$19vHIAa>5
zS41DzyoPkTx^5W*AC_XJK(BF?ub@pI(ZzAorStU6;^xZC1)8!V@b4hXT(Hi_O>^XG
z(&yR0`Dxr)e=zRyD(-5Bjj~-o;;^e$n)R}MRIB|)+-=ljB?hn2TPQq2jGUoN(294(
ziqw5sL)?Z9#u09#Fgh9&h1|vcau)`g{htLfW)!$U3S`w<OPv2d*#7<h0$q_=s!_lw
z@T&@l+)4YS1(w{^H?Vn^w^3fAu(4mFP*PB(ehA=r@rNPWHe8wGXiOBM2WCD5NEu9J
J6!@zOd<SbnBH#c3

diff --git a/src/main/resources/templates/fragments/modules/admin/modal-box.html b/src/main/resources/templates/fragments/modules/admin/modal-box.html
deleted file mode 100644
index 864f74da..00000000
--- a/src/main/resources/templates/fragments/modules/admin/modal-box.html
+++ /dev/null
@@ -1,53 +0,0 @@
-			<div class="modal fade" id="viewUserDetails" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="exampleModalDefaultLabel">Exploring User Details:</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body pb-1">
-                        	<div id="profilehtml">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<div class="modal fade" id="petitionStatus" tabindex="-1" role="dialog" aria-labelledby="otpFormLabel" aria-hidden="true">
-		              <div class="modal-dialog modal-xl" role="document">
-		                  <div class="modal-content">
-		                      <div class="modal-header">
-		                          <h6 class="modal-title m-0" id="exampleModalDefaultLabel">புகார் நிலை / Complaint Status</h6>
-			                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-		                      </div><!--end modal-header-->
-		                      <div class="modal-body">
-		                          <div class="row">
-									<div class="col-sm-6 col-xl-6">
-						              <div class="block block-rounded d-flex flex-column h-100 mb-0" id="petitionStatusForm" style="font-size:12px;">
-						                
-						              </div>
-						            </div>
-									
-									<div class="col-sm-6 col-xl-6">
-						              <div class="block block-rounded d-flex flex-column h-100 mb-0" id="petitionUpdateForm" style="font-size:12px;">
-						              	
-						              </div>
-						            </div>
-									
-		                          </div><!--end row-->                                                      
-		                      </div><!--end modal-body-->
-		                      <div class="modal-footer bg-body">
-		                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-		                      </div><!--end modal-footer-->
-				
-		                  </div><!--end modal-content-->
-		              </div><!--end modal-dialog-->
-		    </div><!--end modal-->
-			
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/base/.DS_Store b/src/main/resources/templates/fragments/modules/base/.DS_Store
deleted file mode 100644
index 758b9a98e7ac46bc17ddea80adef511b8f6eda84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!A^rf5Peg7py9&NiwR%Q#6Q5M9z6R2+EPqSP>dGO-2DfC!SC~=Z+2HgL3%MU
z#>|k}w+!<bc)MX)0J5kzr$7QAqAN~jY`!tQu0F6yi0DOe_bBj)Ikwp0Zjfz(zo>wY
zU5p!4Ja*`gUwKhh`MRvu%+Tp^MxTE;V-J{doC~b5X-B-zc<V9ZmT{ntoD5hcpH1r=
zV!iZO31?t|d(^nX6Zth~X3ogh?Cd?Oy!ZGKxhp)6<vTTAJ8HzNlC#Dw9;o9;6{sS8
zmTIWawjE<RMY=5B#LN^h1x$e-DZn*bEs8x_YYLbGra-HJejif0VivIR=sq26+!la1
zW!M?}`m?B<G+-96@yIJQ@l>LxO4wqEr!$_0yewej(bFMe^C6+KgdK{w>b!sI(jl2g
zYfS-DU|)eFf12p}e?Gqd-zV9bDPRixD+Oe_yj(8$N?~msyqvDJDgBzRrg@FWmcou(
gikYiR@iE;Q<EeItS-{34BQ*OFa57k93jC@9pP3|o`2YX_

diff --git a/src/main/resources/templates/fragments/modules/base/app_module_menu_box.html b/src/main/resources/templates/fragments/modules/base/app_module_menu_box.html
deleted file mode 100644
index 15b13ac5..00000000
--- a/src/main/resources/templates/fragments/modules/base/app_module_menu_box.html
+++ /dev/null
@@ -1,94 +0,0 @@
-
-		<div class="modal fade apps-modal" id="appsModal" tabindex="-1" role="dialog" aria-labelledby="appsModalLabel" aria-hidden="true" data-backdrop="false">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="ik ik-x-circle"></i></button>
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="quick-search">
-                        <div class="container">
-                            <div class="row">
-                                <div class="col-md-4 ml-auto mr-auto">
-                                    <div class="input-wrap">
-                                        <input type="text" id="quick-search" class="form-control" placeholder="Search..." />
-                                        <i class="ik ik-search"></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-body d-flex align-items-center">
-                        <div class="container">
-                            <div class="apps-wrap">
-                                
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        
-        <!--  Box 1 -->
-			<div class="modal fade" id="passwordreset" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-l" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="ackModalTitle">Password Reset Form</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    
-	                    <div class="modal-body">
-                        	<div id="passwordModalBody">
-                        		<input type="hidden" value="" name="resetuserid" id="resetuserid">
-                        		<div class="form-group">
-                                  <label for="councillorName">Old Password / பழைய கடவுச்சொல்</label>
-                                  <input type="password" class="form-control" name="oldpassword" id="oldpassword" required>
-                              	</div>
-                              	<div class="form-group">
-                                  <label for="councillorName">New Password / புதிய கடவுச்சொல்</label>
-                                  <input type="password" class="form-control" name="password" id="password" required>
-                              	</div>
-                              	<div class="form-group">
-                                  <label for="councillorName">Confirm Password / கடவுச்சொல்லை உறுதிப்படுத்தவும்</label>
-                                  <input type="password" class="form-control" name="newpassword" id="newpassword" required>
-                              	</div>
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                          <button type="button" class="btn btn-secondary" onclick="savePassword();">Save</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Kural Modal Page -->
-			<div class="modal fade" id="kuralModal" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="kuralTitle">Kural</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    
-	                    <div class="modal-body">
-                        	<div id="kuralBody">
-                        		
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			
-       
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/base/footer.html b/src/main/resources/templates/fragments/modules/base/footer.html
deleted file mode 100644
index 84b3a62a..00000000
--- a/src/main/resources/templates/fragments/modules/base/footer.html
+++ /dev/null
@@ -1,7 +0,0 @@
-		<footer class="footer">
-			<form id="logout-form" th:action="@{/gcc/logout}" method="post" style="display: none;"></form>
-            <div class="w-100 clearfix">
-                <span class="text-center text-sm-left d-md-inline-block">Copyright &copy; Greater Chennai Corporation | All rights reserved</span>
-                <span class="float-none float-sm-right mt-1 mt-sm-0 text-center">Coded By BonTon Softwares Pvt Ltd</span>
-            </div>
-        </footer>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/base/head.html b/src/main/resources/templates/fragments/modules/base/head.html
deleted file mode 100644
index a8e07305..00000000
--- a/src/main/resources/templates/fragments/modules/base/head.html
+++ /dev/null
@@ -1,633 +0,0 @@
-
-	<head>
-        <meta charset="utf-8">
-        <meta http-equiv="x-ua-compatible" content="ie=edge">
-        <title>GCC APP</title>
-        <meta name="description" content="">
-        <meta name="keywords" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        
-        <base th:href="${assetsBaseUrl}">
-        
-        <link rel="icon" href="/favicon.ico" type="image/x-icon" />
-        <link href="https://fonts.googleapis.com/css?family=Nunito+Sans:300,400,600,700,800" rel="stylesheet">
-        <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
-        <link rel="stylesheet" href="node_modules/@fortawesome/fontawesome-free/css/all.min.css">
-        <link rel="stylesheet" href="node_modules/ionicons/dist/css/ionicons.min.css">
-        <link rel="stylesheet" href="node_modules/icon-kit/dist/css/iconkit.min.css">
-        <link rel="stylesheet" href="node_modules/fullcalendar/dist/fullcalendar.min.css">
-        <link rel="stylesheet" href="node_modules/perfect-scrollbar/css/perfect-scrollbar.css">
-        <link rel="stylesheet" href="node_modules/select2/dist/css/select2.min.css">
-        <link rel="stylesheet" href="node_modules/weather-icons/css/weather-icons.min.css">
-        <link rel="stylesheet" href="node_modules/sweetalert2/sweetalert2.min.css">
-       
-        <link href="node_modules/datatable/DataTables-1.13.6/css/jquery.dataTables.min.css" rel="stylesheet">
-        <link href="node_modules/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/AutoFill-2.6.0/css/autoFill.bootstrap4.css" rel="stylesheet">
-		<link href="node_modules/datatable/Buttons-2.4.1/css/buttons.bootstrap4.css" rel="stylesheet">
-		<link href="node_modules/datatable/ColReorder-1.7.0/css/colReorder.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/DateTime-1.5.1/css/dataTables.dateTime.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/FixedColumns-4.3.0/css/fixedColumns.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/FixedHeader-3.4.0/css/fixedHeader.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/KeyTable-2.10.0/css/keyTable.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/Responsive-2.5.0/css/responsive.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/RowGroup-1.4.0/css/rowGroup.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/RowReorder-1.4.1/css/rowReorder.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/Scroller-2.2.0/css/scroller.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/SearchBuilder-1.5.0/css/searchBuilder.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/SearchPanes-2.2.0/css/searchPanes.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/Select-1.7.0/css/select.bootstrap4.min.css" rel="stylesheet">
-		<link href="node_modules/datatable/StateRestore-1.3.0/css/stateRestore.bootstrap4.min.css" rel="stylesheet">
-        
-        <link rel="stylesheet" href="dist/css/theme.css">
-        <script src="js/vendor/modernizr-2.8.3.min.js"></script>
-        <style>
-        .text-center {
-		    text-align: center !important;
-		}
-        /* Define the keyframes for the ringing animation */
-		.bell{
-	 	  padding-top: 12px;
-		  display:block;
-		  font-size: 40px;
-		  /*margin:50px auto 0;*/
-		  /*color: #9e9e9e;*/
-		  -webkit-animation: ring 4s .7s ease-in-out infinite;
-		  -webkit-transform-origin: 50% 4px;
-		  -moz-animation: ring 4s .7s ease-in-out infinite;
-		  -moz-transform-origin: 50% 4px;
-		  animation: ring 4s .7s ease-in-out infinite;
-		  transform-origin: 50% 4px;
-		}
-		
-		@-webkit-keyframes ring {
-		  0% { -webkit-transform: rotateZ(0); }
-		  1% { -webkit-transform: rotateZ(30deg); }
-		  3% { -webkit-transform: rotateZ(-28deg); }
-		  5% { -webkit-transform: rotateZ(34deg); }
-		  7% { -webkit-transform: rotateZ(-32deg); }
-		  9% { -webkit-transform: rotateZ(30deg); }
-		  11% { -webkit-transform: rotateZ(-28deg); }
-		  13% { -webkit-transform: rotateZ(26deg); }
-		  15% { -webkit-transform: rotateZ(-24deg); }
-		  17% { -webkit-transform: rotateZ(22deg); }
-		  19% { -webkit-transform: rotateZ(-20deg); }
-		  21% { -webkit-transform: rotateZ(18deg); }
-		  23% { -webkit-transform: rotateZ(-16deg); }
-		  25% { -webkit-transform: rotateZ(14deg); }
-		  27% { -webkit-transform: rotateZ(-12deg); }
-		  29% { -webkit-transform: rotateZ(10deg); }
-		  31% { -webkit-transform: rotateZ(-8deg); }
-		  33% { -webkit-transform: rotateZ(6deg); }
-		  35% { -webkit-transform: rotateZ(-4deg); }
-		  37% { -webkit-transform: rotateZ(2deg); }
-		  39% { -webkit-transform: rotateZ(-1deg); }
-		  41% { -webkit-transform: rotateZ(1deg); }
-		
-		  43% { -webkit-transform: rotateZ(0); }
-		  100% { -webkit-transform: rotateZ(0); }
-		}
-		
-		@-moz-keyframes ring {
-		  0% { -moz-transform: rotate(0); }
-		  1% { -moz-transform: rotate(30deg); }
-		  3% { -moz-transform: rotate(-28deg); }
-		  5% { -moz-transform: rotate(34deg); }
-		  7% { -moz-transform: rotate(-32deg); }
-		  9% { -moz-transform: rotate(30deg); }
-		  11% { -moz-transform: rotate(-28deg); }
-		  13% { -moz-transform: rotate(26deg); }
-		  15% { -moz-transform: rotate(-24deg); }
-		  17% { -moz-transform: rotate(22deg); }
-		  19% { -moz-transform: rotate(-20deg); }
-		  21% { -moz-transform: rotate(18deg); }
-		  23% { -moz-transform: rotate(-16deg); }
-		  25% { -moz-transform: rotate(14deg); }
-		  27% { -moz-transform: rotate(-12deg); }
-		  29% { -moz-transform: rotate(10deg); }
-		  31% { -moz-transform: rotate(-8deg); }
-		  33% { -moz-transform: rotate(6deg); }
-		  35% { -moz-transform: rotate(-4deg); }
-		  37% { -moz-transform: rotate(2deg); }
-		  39% { -moz-transform: rotate(-1deg); }
-		  41% { -moz-transform: rotate(1deg); }
-		
-		  43% { -moz-transform: rotate(0); }
-		  100% { -moz-transform: rotate(0); }
-		}
-		
-		@keyframes ring {
-		  0% { transform: rotate(0); }
-		  1% { transform: rotate(30deg); }
-		  3% { transform: rotate(-28deg); }
-		  5% { transform: rotate(34deg); }
-		  7% { transform: rotate(-32deg); }
-		  9% { transform: rotate(30deg); }
-		  11% { transform: rotate(-28deg); }
-		  13% { transform: rotate(26deg); }
-		  15% { transform: rotate(-24deg); }
-		  17% { transform: rotate(22deg); }
-		  19% { transform: rotate(-20deg); }
-		  21% { transform: rotate(18deg); }
-		  23% { transform: rotate(-16deg); }
-		  25% { transform: rotate(14deg); }
-		  27% { transform: rotate(-12deg); }
-		  29% { transform: rotate(10deg); }
-		  31% { transform: rotate(-8deg); }
-		  33% { transform: rotate(6deg); }
-		  35% { transform: rotate(-4deg); }
-		  37% { transform: rotate(2deg); }
-		  39% { transform: rotate(-1deg); }
-		  41% { transform: rotate(1deg); }
-		
-		  43% { transform: rotate(0); }
-		  100% { transform: rotate(0); }
-		}
-
-			.showInputValue {
-			    padding: 0.375rem 0.75rem !important;
-			    margin-bottom: 0.5rem !important;
-			}
-			.h4{
-				font-size: 14px;
-			    border-bottom: 1px solid rgba(204,204,204,0.35);
-			    color: #2c3e50;
-			}
-			
-			/* Change the background color of the tooltip for elements with the .custom-tooltip class */
-			.custom-tooltip-success .tooltip-inner {
-				background-color: #2dce89;
-				color: white; /* Optional: Change the text color for better readability */
-			}
-			.custom-tooltip-success .tooltip.bs-tooltip-top .arrow:before {
-			   border-top-color: #2dce89;
-			}
-			.custom-tooltip-success .tooltip.bs-tooltip-right .arrow:before {
-			   border-right-color: #2dce89;
-			}
-			.custom-tooltip-success .tooltip.bs-tooltip-bottom .arrow:before {
-			   border-bottom-color: #2dce89;
-			}
-			.custom-tooltip-success .tooltip.bs-tooltip-left .arrow:before {
-			   border-left-color: #2dce89;
-			}
-			
-			
-			.custom-tooltip-warning .tooltip-inner {
-				background-color: #fb6340;
-				color: white; /* Optional: Change the text color for better readability */
-			}
-			
-			.custom-tooltip-warning .tooltip.bs-tooltip-top .arrow:before {
-			   border-top-color: #fb6340;
-			}
-			.custom-tooltip-warning .tooltip.bs-tooltip-right .arrow:before {
-			   border-right-color: #fb6340;
-			}
-			.custom-tooltip-warning .tooltip.bs-tooltip-bottom .arrow:before {
-			   border-bottom-color: #fb6340;
-			}
-			.custom-tooltip-warning .tooltip.bs-tooltip-left .arrow:before {
-			   border-left-color: #fb6340;
-			}
-			
-			.form-label{
-				font-weight: bold !important;
-			}
-			 .modal-header{
-				 color:#fff !important;
-				 background-color: #404E67 !important;
-			 }
-			.bg-modal-title{
-				background-color: rgb(220, 221, 226) !important;
-			}
-			
-			.close{
-				color: #fff !important;
-			}
-			
-			
-			/* For tree view */
-			ul {
-			  list-style-type: none;
-			  margin: 3px;
-			}
-			
-			ul.checktree li:before {
-			  height: 1em;
-			  width: 12px;
-			  border-bottom: 1px dashed;
-			  content: "";
-			  display: inline-block;
-			  top: -0.3em;
-			}
-			
-			ul.checktree li { border-left: 1px dashed; }
-			
-			ul.checktree li:last-child:before { border-left: 1px dashed; }
-			
-			ul.checktree li:last-child { border-left: none; }
-			 
-			/* For datatable */
-			th.no-sort {
-			    pointer-events: none;
-			    cursor: default;
-			}
-			
-			th.no-sort::after {
-			    display: none !important;
-			}
-			
-			th.no-sort::before {
-			    display: none !important;
-			}
-			.link{
-				color:#0d6efd;
-			}
-			
-			.swal-title-custom {
-			    font-size: 15px; /* Change the font size as needed */
-			}
-			
-
-::-webkit-file-upload-button {
-  font: inherit;
-  -webkit-appearance: button;
-}
-
-::file-selector-button {
-  font: inherit;
-  -webkit-appearance: button;
-}
-.form-control[type=file] {
-  overflow: hidden;
-}
-.form-control[type=file]:not(:disabled):not([readonly]) {
-  cursor: pointer;
-}
-.form-control::-webkit-file-upload-button {
-  padding: 0.375rem 0.75rem;
-  margin: -0.375rem -0.75rem;
-  min-height: 40px;
-  -webkit-margin-end: 0.75rem;
-          margin-inline-end: 0.75rem;
-  color: #343a40;
-  background-color: #edf0f7;
-  pointer-events: none;
-  border-color: inherit;
-  border-style: solid;
-  border-width: 0;
-  border-inline-end-width: 1px;
-  border-radius: 0;
-  -webkit-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-}
-.form-control::file-selector-button {
-  padding: 0.375rem 0.75rem;
-  margin: -0.375rem -0.75rem;
-  min-height: 40px;
-  -webkit-margin-end: 0.75rem;
-          margin-inline-end: 0.75rem;
-  color: #343a40;
-  background-color: #edf0f7;
-  pointer-events: none;
-  border-color: inherit;
-  border-style: solid;
-  border-width: 0;
-  border-inline-end-width: 1px;
-  border-radius: 0;
-  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-}
-@media (prefers-reduced-motion: reduce) {
-  .form-control::-webkit-file-upload-button {
-    -webkit-transition: none;
-    transition: none;
-  }
-  .form-control::file-selector-button {
-    transition: none;
-  }
-}
-.form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
-  background-color: #e1e4eb;
-}
-.form-control:hover:not(:disabled):not([readonly])::file-selector-button {
-  background-color: #e1e4eb;
-}
-	
-/* For print */	
-@media print {
-.wrapper .page-wrap .main-content {
-    padding:  0 !important;
-    background-color: #F6F7FB;
-    min-height:  0 !important;
-    margin-top:  0 !important;
-    padding-right:  0 !important;
-    padding-left:  0 !important;
-}
-  .header-top,
-  .app-sidebar,
-  .page-overlay,
-  .page-loader,
-  .page-header,
-  .footer,
-  .sidebar,
-  .side-overlay,
-  .block-options {
-    padding: 0 !important;
-    margin: 0 !important;
-    display: none !important;
-  }
-  .block {
-    box-shadow: none !important;
-  }
-  /*
-  #ack1table{
-   	margin-top:50px !important;
-   	margin-right:100px !important;
-   	margin-left:100px !important;
-  }
-  #ack2table{
-   	margin-top:50px !important;
-   	margin-right:100px !important;
-   	margin-left:100px !important;
-  }
-  */
-
-
-.ack {
-    height: 100%; /* Set height to 100% */
-}
-
-.ack-container {
-    display: flex;
-    justify-content: center; /* Center horizontally */
-    align-items: center; /* Center vertically */
-    height: 100%; /* Set height to 100% */
-   
-}
-
-#ack1table {
-    width: 70% !important; /* Set width */
- 	page-break-before: auto; /* Avoid page breaks after ack1table */ 
-}
-
-#ack2table {
-    width: 70% !important; /* Set width */
-    page-break-before: auto; /* Avoid page breaks after ack1table */ 
-}
-
-.printack2{
-	margin-top:250px;
-}
-  .print_no{
-  	display: none !important;
-  }
-}
-
-.ack {
-    height: 100%; /* Set height to 100% */
-}
-
-.ack-container {
-    display: flex;
-    justify-content: center; /* Center horizontally */
-    align-items: center; /* Center vertically */
-    height: 100%; /* Set height to 100% */
-}
-
-#ack1table {
-    border: 1px solid black; /* Add border */
-    width: 99%; /* Set width */
-    height: 100%; /* Set height */
-}
-#ack2table {
-    border: 1px solid black; /* Add border */
-    width: 99%; /* Set width */
-    height: 100%; /* Set height */
-}
-		</style>
-		<style>
-		.ribbon1 {
-  position: absolute;
-  top: -6.1px;
-  right: 10px;
-}
-.ribbon1:after {
-  position: absolute;
-  content: "";
-  width: 0;
-  height: 0;
-  border-left: 53px solid transparent;
-  border-right: 53px solid transparent;
-  border-top: 10px solid #F8463F;
-}
-.ribbon1 span {
-  position: relative;
-  display: block;
-  text-align: center;
-  background: #F8463F;
-  font-size: 14px;
-  line-height: 1;
-  padding: 12px 8px 10px;
-  border-top-right-radius: 8px;
-  width: 90px;
-}
-.ribbon1 span:before, .ribbon1 span:after {
-  position: absolute;
-  content: "";
-}
-.ribbon1 span:before {
- height: 6px;
- width: 6px;
- left: -6px;
- top: 0;
- background: #F8463F;
-}
-.ribbon1 span:after {
- height: 6px;
- width: 8px;
- left: -8px;
- top: 0;
- border-radius: 8px 8px 0 0;
- background: #C02031;
-}
-.ribbon2 {
- width: 60px;
- padding: 10px 0;
- position: absolute;
- top: -6px;
- left: 25px;
- text-align: center;
- border-top-left-radius: 3px;
- background: #F47530;
-}
-.ribbon2:before {
- height: 0;
- width: 0;
- right: -5.5px;
- top: 0.1px;
- border-bottom: 6px solid #8D5A20;
- border-right: 6px solid transparent;
-}
-.ribbon2:before, .ribbon2:after {
-  content: "";
-  position: absolute;
-}
-.ribbon2:after {
-  height: 0;
-  width: 0;
-  bottom: -29.5px;
-  left: 0;
-  border-left: 30px solid #F47530;
-  border-right: 30px solid #F47530;
-  border-bottom: 30px solid transparent;
-}
-.ribbon3 {
-  width: 150px;
-  height: 50px;
-  line-height: 50px;
-  padding-left: 15px;
-  position: absolute;
-  left: -8px;
-  top: 20px;
-  background: #59324C;
-}
-.ribbon3:before, .ribbon3:after {
-  content: "";
-  position: absolute;
-}
-.ribbon3:before {
-  height: 0;
-  width: 0;
-  top: -8.5px;
-  left: 0.1px;
-  border-bottom: 9px solid black;
-  border-left: 9px solid transparent;
-}
-.ribbon3:after {
-  height: 0;
-  width: 0;
-  right: -14.5px;
-  border-top: 25px solid transparent;
-  border-bottom: 25px solid transparent;
-  border-left: 15px solid #59324C;
-}
-.ribbon4 {
-  position: absolute;
-  top: 15px;
-  padding: 8px 10px;
-  background: #00B3ED;
-  box-shadow: -1px 2px 3px rgba(0,0,0,.3);
-}
-.ribbon4:before, .ribbon4:after {
-  content: "";
-  position: absolute;
-}
-.ribbon4:before {
-  width: 7px;
-  height: 100%;
-  top: 0;
-  left: -6.5px;
-  padding: 0 0 7px;
-  background: inherit;
-  border-radius: 5px 0 0 5px;
-}
-.ribbon4:after {
-  width: 5px;
-  height: 5px;
-  bottom: -5px;
-  left: -4.5px;
-  background: lightblue;
-  border-radius: 5px 0 0 5px;
- }
-.ribbon5 {
-  display: block;
-  width: calc(100% + 20px);
-  height: 50px;
-  line-height: 50px;
-  text-align: center;
-  margin-left: -10px;
-  margin-right: -10px;
-  background: #EDBA19;
-  position: relative;
-  top: 20px;
-}
-.ribbon5:before, .ribbon5:after {
-  content: "";
-  position: absolute;
-}
-.ribbon5:before {
-  height: 0;
-  width: 0;
-  bottom: -10px;
-  left: 0;
-  border-top: 10px solid #cd8d11;
-  border-left: 10px solid transparent;
-}
-.ribbon5:after {
-  height: 0;
-  width: 0;
-  right: 0;
-  bottom: -10px;
-  border-top: 10px solid #cd8d11;
-  border-right: 10px solid transparent;
-}
-.wrap {
-  width: 100%;
-  height: 188px;
-  position: absolute;
-  top: -8px;
-  left: 8px;
-  overflow: hidden;
-}
-.wrap:before, .wrap:after {
-  content: ""; 
-  position: absolute;
-}
-.wrap:before {
-  width: 40px;
-  height: 8px;
-  right: 100px;
-  background: #4D6530;
-  border-radius: 8px 8px 0px 0px;
-}
-.wrap:after {
-  width: 8px;
-  height: 40px;
-  right: 0px;
-  top: 100px;
-  background: #4D6530;
-  border-radius: 0px 8px 8px 0px;
-}
-.ribbon6 {
-  width: 200px;
-  height: 40px;
-  line-height: 40px;
-  position: absolute;
-  top: 30px;
-  right: -50px;
-  z-index: 2;
-  overflow: hidden;
-  -webkit-transform: rotate(45deg);
-  transform: rotate(45deg);
-  border: 1px dashed;
-  box-shadow:0 0 0 3px #57DD43,  0px 21px 5px -18px rgba(0,0,0,0.6);
-  background: #57DD43;
-  text-align: center;
-}
-@media (min-width: 500px) {
-  .ribbons-wrapper {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-  }
-  .ribbon {
-    width: 48%;
-  }
-}
-
-.cursure_poiter{
-cursor: pointer;
-}
-		</style>
-    </head>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/base/header.html b/src/main/resources/templates/fragments/modules/base/header.html
deleted file mode 100644
index 872f9391..00000000
--- a/src/main/resources/templates/fragments/modules/base/header.html
+++ /dev/null
@@ -1,74 +0,0 @@
-			<header class="header-top" header-theme="dark">
-                <div class="container-fluid">
-                    <div class="d-flex justify-content-between">
-                        <div class="top-menu d-flex align-items-center">
-                            <button type="button" class="btn-icon mobile-nav-toggle d-lg-none"><span></span></button> 
-                           <!-- <div class="header-search">
-                                <div class="input-group">
-                                    <span class="input-group-addon search-close"><i class="ik ik-x"></i></span>
-                                    <input type="text" class="form-control">
-                                    <span class="input-group-addon search-btn"><i class="ik ik-search"></i></span>
-                                </div>
-                            </div>
-                             --> 
-                            <button type="button" id="navbar-fullscreen" class="nav-link"><i class="ik ik-maximize"></i></button>
-                        </div>
-                        <div class="top-menu d-flex align-items-center">
-                        <!-- 
-                            <div class="dropdown">
-                                <a class="nav-link dropdown-toggle" href="#" id="notiDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                <i class="ik ik-bell bell"></i><span class="badge bg-danger">3</span>
-                                </a>
-                                <div class="dropdown-menu dropdown-menu-right notification-dropdown" aria-labelledby="notiDropdown">
-                                    <h4 class="header">Notifications</h4>
-                                    <div class="notifications-wrap">
-                                        <a href="#" class="media">
-                                            <span class="d-flex">
-                                                <i class="ik ik-check"></i> 
-                                            </span>
-                                            <span class="media-body">
-                                                <span class="heading-font-family media-heading">Invitation accepted</span> 
-                                                <span class="media-content">Your have been Invited ...</span>
-                                            </span>
-                                        </a>
-                                        <a href="#" class="media">
-                                            <span class="d-flex">
-                                                <img src="images/users/user.jpg" class="rounded-circle" alt="">
-                                            </span>
-                                            <span class="media-body">
-                                                <span class="heading-font-family media-heading">Steve Smith</span> 
-                                                <span class="media-content">I slowly updated projects</span>
-                                            </span>
-                                        </a>
-                                        <a href="#" class="media">
-                                            <span class="d-flex">
-                                                <i class="ik ik-calendar"></i> 
-                                            </span>
-                                            <span class="media-body">
-                                                <span class="heading-font-family media-heading">To Do</span> 
-                                                <span class="media-content">Meeting with Nathan on Friday 8 AM ...</span>
-                                            </span>
-                                        </a>
-                                    </div>
-                                    <div class="footer"><a href="javascript:void(0);">See all activity</a></div>
-                                </div>
-                            </div>
-                            -->
-                            <div class="dropdown">
-                                <a class="dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-									<img class="avatar" src="images/users/user.jpg" alt="">
-                                </a>
-                                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="userDropdown">
-                                  <!--   <a class="dropdown-item" href="profile.html"><i class="ik ik-user dropdown-icon"></i> Profile</a>
-                                    <a class="dropdown-item" href="#"><i class="ik ik-settings dropdown-icon"></i> Settings</a>
-                                    <a class="dropdown-item" href="#"><span class="float-right"><span class="badge badge-primary">6</span></span><i class="ik ik-mail dropdown-icon"></i> Inbox</a>
-                                    <a class="dropdown-item" href="#"><i class="ik ik-navigation dropdown-icon"></i> Message</a> -->
-                                    <a class="dropdown-item" th:href="@{/gcc/logout}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();"><i class="ik ik-power dropdown-icon"></i> Logout</a>
-                                    <a class="dropdown-item" th:href="@{#}" onclick="event.preventDefault();passwordReset();"><i class="ik ik-settings dropdown-icon"></i> Password Reset</a>
-                                </div>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-            </header>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/base/loader.html b/src/main/resources/templates/fragments/modules/base/loader.html
deleted file mode 100644
index 0435e8a6..00000000
--- a/src/main/resources/templates/fragments/modules/base/loader.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<loader>
-	<div class='loadscreen' id="preloader">
-        <div class="loader spinner-bubble spinner-bubble-primary">
-
-        </div>
-    </div>
-</loader>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/base/menu.html b/src/main/resources/templates/fragments/modules/base/menu.html
deleted file mode 100644
index fa8a4b26..00000000
--- a/src/main/resources/templates/fragments/modules/base/menu.html
+++ /dev/null
@@ -1,23 +0,0 @@
-		<menu>
-			<div class="app-sidebar colored">
-                    <div class="sidebar-header">
-                        <a class="header-brand" href="/gcc">
-                            <div class="logo-img">
-                               <img src="images/logo.png" class="header-brand-img" alt="GCC" width="25px"> 
-                            </div>
-                            <span class="text"> GCC APP</span>
-                        </a>
-                        <!-- <button type="button" class="nav-toggle"><i data-toggle="expanded" class="ik ik-toggle-right toggle-icon"></i></button>  -->
-                        <button id="sidebarClose" class="nav-close"><i class="ik ik-x"></i></button>
-                    </div>
-                    
-                    <div class="sidebar-content">
-                        <div class="nav-container">
-                            <nav id="main-menu-navigation" class="navigation-main">
-                                <!--<div class="nav-lavel">Makkalai Thedi Mayor</div>-->
-                                <div th:utext="${menuItemsHTML}"></div>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-            </menu>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/base/menu_source.html b/src/main/resources/templates/fragments/modules/base/menu_source.html
deleted file mode 100644
index 0af03cb0..00000000
--- a/src/main/resources/templates/fragments/modules/base/menu_source.html
+++ /dev/null
@@ -1,153 +0,0 @@
-		<menu>
-			<div class="app-sidebar colored">
-                    <div class="sidebar-header">
-                        <a class="header-brand" href="index.html">
-                            <div class="logo-img">
-                               <img src="/assets/images/logo.png" class="header-brand-img" alt="GCC" width="25px"> 
-                            </div>
-                            <span class="text"> GCC APP</span>
-                        </a>
-                        <button type="button" class="nav-toggle"><i data-toggle="expanded" class="ik ik-toggle-right toggle-icon"></i></button>
-                        <button id="sidebarClose" class="nav-close"><i class="ik ik-x"></i></button>
-                    </div>
-                    
-                    <div class="sidebar-content">
-                        <div class="nav-container">
-                            <nav id="main-menu-navigation" class="navigation-main">
-                                <div class="nav-lavel">Makkalai Thedi Mayor</div>
-                                <div class="nav-item">
-                                    <a href="index"><i class="ik ik-bar-chart-2"></i><span>Dashboard</span></a>
-                                </div>
-                                <div class="nav-item">
-                                    <a href="navbar.html"><i class="ik ik-menu"></i><span>Navigation</span> <span class="badge badge-success">New</span></a>
-                                </div>
-                                <div class="nav-item has-sub">
-                                    <a href="javascript:void(0)"><i class="ik ik-layers"></i><span>Widgets</span> <span class="badge badge-danger">150+</span></a>
-                                    <div class="submenu-content">
-                                        <a href="widgets" class="menu-item">Basic</a>
-                                        <a href="widget-statistic" class="menu-item">Statistic</a>
-                                        <a href="widget-data" class="menu-item">Data</a>
-                                        <a href="widget-chart" class="menu-item">Chart Widget</a>
-                                    </div>
-                                </div>
-                                <div class="nav-lavel">UI Element</div>
-                                <div class="nav-item has-sub">
-                                    <a href="#"><i class="ik ik-box"></i><span>Basic</span></a>
-                                    <div class="submenu-content">
-                                        <a href="ui/alerts.html" class="menu-item">Alerts</a>
-                                        <a href="ui/badges.html" class="menu-item">Badges</a>
-                                        <a href="ui/buttons.html" class="menu-item">Buttons</a>
-                                        <a href="ui/navigation.html" class="menu-item">Navigation</a>
-                                    </div>
-                                </div>
-                                <div class="nav-item has-sub">
-                                    <a href="#"><i class="ik ik-gitlab"></i><span>Advance</span> <span class="badge badge-success">New</span></a>
-                                    <div class="submenu-content">
-                                        <a href="ui/modals.html" class="menu-item">Modals</a>
-                                        <a href="ui/notifications.html" class="menu-item">Notifications</a>
-                                        <a href="ui/carousel.html" class="menu-item">Slider</a>
-                                        <a href="ui/range-slider.html" class="menu-item">Range Slider</a>
-                                        <a href="ui/rating.html" class="menu-item">Rating</a>
-                                    </div>
-                                </div>
-                                <div class="nav-item has-sub">
-                                    <a href="#"><i class="ik ik-package"></i><span>Extra</span></a>
-                                    <div class="submenu-content">
-                                        <a href="ui/session-timeout.html" class="menu-item">Session Timeout</a>
-                                    </div>
-                                </div>
-                                <div class="nav-item">
-                                    <a href="ui/icons.html"><i class="ik ik-command"></i><span>Icons</span></a>
-                                </div>
-                                <div class="nav-lavel">Forms</div>
-                                <div class="nav-item has-sub">
-                                    <a href="#"><i class="ik ik-edit"></i><span>Forms</span></a>
-                                    <div class="submenu-content">
-                                        <a href="form-components.html" class="menu-item">Components</a>
-                                        <a href="form-addon.html" class="menu-item">Add-On</a>
-                                        <a href="form-advance.html" class="menu-item">Advance</a>
-                                    </div>
-                                </div>
-                                <div class="nav-item">
-                                    <a href="form-picker.html"><i class="ik ik-terminal"></i><span>Form Picker</span> <span class="badge badge-success">New</span></a>
-                                </div>
-
-                                <div class="nav-lavel">Tables</div>
-                                <div class="nav-item">
-                                    <a href="table-bootstrap.html"><i class="ik ik-credit-card"></i><span>Bootstrap Table</span></a>
-                                </div>
-                                <div class="nav-item">
-                                    <a href="table-datatable.html"><i class="ik ik-inbox"></i><span>Data Table</span></a>
-                                </div>
-
-                                <div class="nav-lavel">Charts</div>
-                                <div class="nav-item has-sub">
-                                    <a href="#"><i class="ik ik-pie-chart"></i><span>Charts</span> <span class="badge badge-success">New</span></a>
-                                    <div class="submenu-content">
-                                        <a href="charts-chartist.html" class="menu-item">Chartist</a>
-                                        <a href="charts-flot.html" class="menu-item">Flot</a>
-                                        <a href="charts-knob.html" class="menu-item">Knob</a>
-                                        <a href="charts-amcharts.html" class="menu-item">Amcharts</a>
-                                    </div>
-                                </div>
-
-                                <div class="nav-lavel">Apps</div>
-                                <div class="nav-item">
-                                    <a href="calendar.html"><i class="ik ik-calendar"></i><span>Calendar</span></a>
-                                </div>
-                                <div class="nav-item">
-                                    <a href="taskboard.html"><i class="ik ik-server"></i><span>Taskboard</span></a>
-                                </div>
-
-                                <div class="nav-lavel">Pages</div>
-
-                                <div class="nav-item has-sub">
-                                    <a href="#"><i class="ik ik-lock"></i><span>Authentication</span></a>
-                                    <div class="submenu-content">
-                                        <a href="login.html" class="menu-item">Login</a>
-                                        <a href="register.html" class="menu-item">Register</a>
-                                        <a href="forgot-password.html" class="menu-item">Forgot Password</a>
-                                    </div>
-                                </div>
-                                <div class="nav-item has-sub">
-                                    <a href="#"><i class="ik ik-file-text"></i><span>Other</span></a>
-                                    <div class="submenu-content">
-                                        <a href="profile.html" class="menu-item">Profile</a>
-                                        <a href="invoice.html" class="menu-item">Invoice</a>
-                                    </div>
-                                </div>
-                                <div class="nav-item">
-                                    <a href="layouts.html"><i class="ik ik-layout"></i><span>Layouts</span><span class="badge badge-success">New</span></a>
-                                </div>
-                                <div class="nav-lavel">Other</div>
-                                <div class="nav-item has-sub">
-                                    <a href="javascript:void(0)"><i class="ik ik-list"></i><span>Menu Levels</span></a>
-                                    <div class="submenu-content">
-                                        <a href="javascript:void(0)" class="menu-item">Menu Level 2.1</a>
-                                        <div class="nav-item has-sub">
-                                            <a href="javascript:void(0)" class="menu-item">Menu Level 2.2</a>
-                                            <div class="submenu-content">
-                                                <a href="javascript:void(0)" class="menu-item">Menu Level 3.1</a>
-                                            </div>
-                                        </div>
-                                        <a href="javascript:void(0)" class="menu-item">Menu Level 2.3</a>
-                                    </div>
-                                </div>
-                                <div class="nav-item">
-                                    <a href="javascript:void(0)" class="disabled"><i class="ik ik-slash"></i><span>Disabled Menu</span></a>
-                                </div>
-                                <div class="nav-item">
-                                    <a href="javascript:void(0)"><i class="ik ik-award"></i><span>Sample Page</span></a>
-                                </div>
-                                <div class="nav-lavel">Support</div>
-                                <div class="nav-item">
-                                    <a href="javascript:void(0)"><i class="ik ik-monitor"></i><span>Documentation</span></a>
-                                </div>
-                                <div class="nav-item">
-                                    <a href="javascript:void(0)"><i class="ik ik-help-circle"></i><span>Submit Issue</span></a>
-                                </div>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-            </menu>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/base/nav.html b/src/main/resources/templates/fragments/modules/base/nav.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/main/resources/templates/fragments/modules/base/script.html b/src/main/resources/templates/fragments/modules/base/script.html
deleted file mode 100644
index 6fcc0f41..00000000
--- a/src/main/resources/templates/fragments/modules/base/script.html
+++ /dev/null
@@ -1,366 +0,0 @@
-<script src="node_modules/datatable/jQuery-3.7.0/jquery-3.7.0.min.js"></script>
-
-<script src="node_modules/popper.js/dist/umd/popper.min.js"></script>
-<script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
-<script src="node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js"></script>
-<script src="node_modules/select2/dist/js/select2.min.js"></script>
-<script src="node_modules/screenfull/dist/screenfull.js"></script>
-<script src="node_modules/moment/moment.js"></script>
-<script src="node_modules/sweetalert2/sweetalert2.min.js"></script>
-
-<script src="node_modules/datatable/JSZip-3.10.1/jszip.min.js"></script>
-<script src="node_modules/datatable/pdfmake-0.2.7/pdfmake.min.js"></script>
-<script src="node_modules/datatable/pdfmake-0.2.7/vfs_fonts.js"></script>
-<script src="node_modules/datatable/DataTables-1.13.6/js/jquery.dataTables.min.js"></script>
-<script src="node_modules/datatable/AutoFill-2.6.0/js/dataTables.autoFill.min.js"></script>
-<script src="node_modules/datatable/Buttons-2.4.1/js/dataTables.buttons.min.js"></script>
-<script src="node_modules/datatable/Buttons-2.4.1/js/buttons.bootstrap4.min.js"></script>
-<script src="node_modules/datatable/Buttons-2.4.1/js/buttons.colVis.min.js"></script>
-<script src="node_modules/datatable/Buttons-2.4.1/js/buttons.html5.min.js"></script>
-<script src="node_modules/datatable/Buttons-2.4.1/js/buttons.print.min.js"></script>
-<script src="node_modules/datatable/ColReorder-1.7.0/js/dataTables.colReorder.min.js"></script>
-<script src="node_modules/datatable/DateTime-1.5.1/js/dataTables.dateTime.min.js"></script>
-<script src="node_modules/datatable/FixedColumns-4.3.0/js/dataTables.fixedColumns.min.js"></script>
-<script src="node_modules/datatable/FixedHeader-3.4.0/js/dataTables.fixedHeader.min.js"></script>
-<script src="node_modules/datatable/KeyTable-2.10.0/js/dataTables.keyTable.min.js"></script>
-<script src="node_modules/datatable/Responsive-2.5.0/js/dataTables.responsive.min.js"></script>
-<script src="node_modules/datatable/RowGroup-1.4.0/js/dataTables.rowGroup.min.js"></script>
-<script src="node_modules/datatable/RowReorder-1.4.1/js/dataTables.rowReorder.min.js"></script>
-<script src="node_modules/datatable/Scroller-2.2.0/js/dataTables.scroller.min.js"></script>
-<script src="node_modules/datatable/SearchBuilder-1.5.0/js/dataTables.searchBuilder.min.js"></script>
-<script src="node_modules/datatable/SearchPanes-2.2.0/js/dataTables.searchPanes.min.js"></script>
-<script src="node_modules/datatable/Select-1.7.0/js/dataTables.select.min.js"></script>
-<script src="node_modules/datatable/StateRestore-1.3.0/js/dataTables.stateRestore.min.js"></script>
-
-<script src="dist/js/theme.js"></script>
-<script th:inline="javascript">
-  // Get the current page URL path
-  var currentPagePath = window.location.pathname;
-  // Remove the leading slash from the current page URL path
-  currentPagePath = currentPagePath.substr(1);
-  //alert(currentPagePath);
-  // Get the parent menu item and the sub-menu item based on the current page URL path
-  var parentMenuItem = document.querySelector('.nav-item.has-sub');
-  var subMenuItem = document.querySelector('.submenu-content .menu-item[href="' + currentPagePath + '"]');
-
-  // Add the "active" class to the parent menu item and its associated sub-menu item
-  if (parentMenuItem && subMenuItem) {
-    parentMenuItem.classList.add('active', 'open');
-    subMenuItem.classList.add('active');
-  }
-</script>
-
-<script th:inline="javascript">
-  $(document).ready(function() {
-/*
-	  // Get the current URL
-	  var currentUrl = window.location.href;
-
-	  // Remove the query parameter from the URL
-	  var newUrl = currentUrl.split("?")[0];
-
-	  // Replace the current URL with the modified URL without the query parameter
-	  window.history.replaceState({}, document.title, newUrl);
-*/
-	//////////////////////////////////////////////////////////////////////////////////////////////////////  
-    var currentPagePath = window.location.pathname;
-    //console.error(currentPagePath);
-    currentPagePath = "/"+currentPagePath.substr(1);
-    //console.error(currentPagePath);
-    // Set active class for parent menu items
-    $('.nav-item').each(function() {
-      var link = $(this).find('a').attr('href');
-      //console.log("Main: "+link +" == "+ currentPagePath);
-      if (link === currentPagePath || link === currentPagePath) {
-        $(this).addClass('active');
-        $(this).parents('.has-sub').addClass('active open');
-      }
-    });
-
-    // Set active class for submenu items
-    $('.submenu-content .menu-item').each(function() {
-      var link = $(this).attr('href');
-      //console.log("Sub: "+link +" == "+ currentPagePath);
-      if (link === currentPagePath || link === currentPagePath) {
-    	  //console.error("Sub: "+link +" == "+ currentPagePath);
-        $(this).addClass('active');
-        $(this).parents('.has-sub').addClass('active open');
-      }
-    });
-    
-    $(document).ready(function(){
-	  $('[data-toggle="popover"]').popover();   
-	});
-    
-    $(".select2").select2();
-  });
-  
-  
-function call_loading(div,action){
-	var divID="#"+div;
-	var loadingimage= `<center><img src="images/loading.svg" style="opacity: 1; visibility: visible; height:40px;"></center>`;
-	if(action=='start'){
-		$(divID).html(loadingimage)
-	}			
-}
-
-// Date format
-function convertdate(date_txt){
-	var datetxt = date_txt;
-	var date = new Date(datetxt);
-
-	// Extract the date components
-	var day = date.getDate();
-	var month = date.getMonth() + 1; // Month starts from 0, so add 1
-	var year = date.getFullYear();
-
-	// Extract the time components
-	var hours = date.getHours();
-	var minutes = date.getMinutes();
-
-	// Determine if it's AM or PM
-	var period = hours >= 12 ? 'PM' : 'AM';
-
-	// Adjust the hours to 12-hour format
-	hours = hours % 12;
-	hours = hours ? hours : 12; // Handle the case when hours is 0
-
-	// Format the date and time string
-	//var formattedDate = `${day}/${month}/${year}`;
-	//var formattedTime = `${hours}:${minutes.toString().padStart(2, '0')} ${period}`;
-
-	// Format the date and time strings
-	var formattedDate = `${day.toString().padStart(2, '0')}-${month.toString().padStart(2, '0')}-${year}`;
-	var formattedTime = `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')} ${period}`;
-	
-	// Concatenate the formatted date and time
-	var formattedDateTime = `${formattedDate} ${formattedTime}`;
-
-	return formattedDateTime;
-}
-
-//Date format
-function convertdate_2(date_txt){
-	var datetxt = date_txt;
-	var date = new Date(datetxt);
-
-	// Extract the date components
-	var day = date.getDate();
-	var month = date.getMonth() + 1; // Month starts from 0, so add 1
-	var year = date.getFullYear();
-
-	// Format the date and time strings
-	var formattedDate = `${day.toString().padStart(2, '0')}-${month.toString().padStart(2, '0')}-${year}`;
-	
-	// Concatenate the formatted date and time
-	var formattedDateTime = `${formattedDate}`;
-
-	return formattedDateTime;
-}
-
-function date_difference(fromdate,todate,type='datetime'){
-	
-	// Parse the date strings into moment objects with the specified format
-	var startDate = moment(fromdate, 'DD-MM-YYYY hh:mm A');
-	var endDate = moment(todate, 'DD-MM-YYYY hh:mm A');
-	
-	// Calculate the difference in days
-	var daysDifference = endDate.diff(startDate, 'days');
-	
-	// Calculate the remaining time components (hours, minutes)
-	var duration = moment.duration(endDate - startDate);
-	var hoursDifference = duration.hours();
-	var minutesDifference = duration.minutes();
-	
-	var date_diff_txt ="";
-	var day_txt = "day";
-	var hour_txt = "hour";
-	
-	var days_txt ="";
-	
-	if(daysDifference>1){
-		day_txt = "days";
-	}
-	if(hoursDifference>1){
-		hour_txt = "hours";
-	}
-	
-	// Display the result
-	//1 day, 1 hour and 34 minutes.
-	if(type=='days'){
-		date_diff_txt = daysDifference + ' '+day_txt;
-	}else if(type=='time'){
-		date_diff_txt = hoursDifference + ' '+ hour_txt +' and ' + minutesDifference + ' minutes';
-	}
-	else{
-		if(daysDifference>0){
-			days_txt = daysDifference + ' '+day_txt+', ';
-		}
-		date_diff_txt =  days_txt + hoursDifference + ' '+ hour_txt +' and ' + minutesDifference + ' minutes';
-	}
-	return date_diff_txt;
-}
-
-function nodata(message="Data are not availble at this moment please check later"){
-	var nodata = `<center><img src="images/nodata_ani.gif" width="40%"><br><p class="text-warning">`+message+`</p></center>`;
-	return nodata;
-}
-
-function searchinfo(message="Data are not availble at this moment please check later"){
-	var nodata = `<center><img src="images/hi_robo.gif" width="20%"><br><p class="text-warning">`+message+`</p></center>`;
-	return nodata;
-}
-
-//Function to display random messages while waiting
-function getLoadingMessage() {
-    var messages = [
-        "Please wait as we fetch the data. It will take less than 30 seconds.",
-        "Loading data... This won't take long.",
-        "Fetching information. Thank you for your patience.",
-        "Just a moment while we gather the data.",
-        "Loading... Sit tight!",
-        "Hold on tight! We're almost there.",
-        "Data is on its way. Thanks for waiting.",
-        "Patience is a virtue! We're working on it.",
-        "Just a few more seconds...",
-        "Almost done! Thanks for your patience.",
-        "We appreciate your patience. Data is coming shortly.",
-        "Stay tuned! Data is loading."
-    ];
-
-    // Select a random message from the array
-    var randomMessage = messages[Math.floor(Math.random() * messages.length)];
-
-    // Display the random message
-    return randomMessage;
-}
-
-//To convert the file size from bytes
-function formatFileSize(bytes) {
-    if (bytes === 0) return '0 Bytes';
-    const k = 1024;
-    const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-    const i = Math.floor(Math.log(bytes) / Math.log(k));
-    return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
-}
-
-/* Check file Exits */
-function checkFileExists(url) {
-    return fetch(url)
-        .then(response => {
-            if (!response.ok) {
-                throw new Error('File not found');
-            }
-            return true;
-        })
-        .catch(error => {
-            console.error('Error checking file existence:', error);
-            return false;
-        });
-}
-
-/* File Doanload script 
- * Send fileUrl - Full Path 
- * var fileUrl = "/gcc/files/m_petition/m_action_file/filename.jpg";
- */
-function callDownload(fileUrl,fileName){
- 	checkFileExists(fileUrl).then(exists => {
-		if (exists) {
-			//download file - fileUrl
-			// Create a temporary anchor element
-            var link = document.createElement("a");
-            link.href = fileUrl;
-            link.download = fileName; // Set the download attribute to the file name
-            link.click(); // Simulate a click on the anchor element to trigger the download
-	    } else {
-	        console.log('File does not exist');
-	        
-	    }
-	});
-}
- /* encode a string to Base64 */
- function encodeBase64(value) {
-	    if (value && value.trim() !== '') {
-	        // Encode the string to Base64
-	        var encodedString = btoa(value);
-	        return encodedString;
-	    } else {
-	        return '';
-	    }
-	}
- 
- 
- function passwordReset(){
-	var loginid = /*[[${LoginUserId}]]*/'';
-	if(loginid!="" && loginid>0){
-		$("#passwordreset").modal({
-		    backdrop: 'static',
-		    keyboard: false
-		}); // Show Modal Box
-		
-		$("#resetuserid").val(loginid);
-		$("#oldpassword").val('');
-	    $("#password").val('');
-	    $("#newpassword").val('');
-	}
- }
-
- function savePassword() {
-	    var userid = $("#resetuserid").val();
-	    var oldpassword = $("#oldpassword").val();
-	    var password = $("#password").val();
-	    var confirmpassword = $("#newpassword").val();
-
-	    // Input validation
-	    if (!userid || !oldpassword || !password || !confirmpassword) {
-	        alert("All fields are required.");
-	        return;
-	    }
-
-	    if (password !== confirmpassword) {
-	        alert("New password and confirmation password do not match.");
-	        return;
-	    }
-
-	    var formData = new FormData();
-	    formData.append('userid', userid);
-	    formData.append('oldpassword', oldpassword);
-	    formData.append('newpassword', password);
-
-	    // Send AJAX request to reset password
-	    $.ajax({
-	        url: '/gcc/api/resetPassword', // Update with the actual endpoint URL
-	        type: 'POST',
-	        data: formData,
-	        contentType: false, // Required for FormData
-	        processData: false, // Required for FormData
-	        success: function(response) {
-	            // Handle success response
-	            if (response === 'success') {
-	                alert("Password reset successfully.");
-	                // Optionally, redirect the user or reset the form
-	                document.getElementById('logout-form').submit();
-	            } else {
-	                alert(response.message || "Failed to reset password.");
-	            }
-	        },
-	        error: function(xhr, status, error) {
-	            // Handle error response
-	            var errorMessage = "An error occurred. Please try again later.";
-	            if (xhr.responseJSON && xhr.responseJSON.message) {
-	                errorMessage = xhr.responseJSON.message;
-	            }
-	            alert(errorMessage);
-	        }
-	    });
-	}
-</script>
-<!--
-<script th:inline="javascript">
-    function logout() {
-        fetch(/*[[ @{/logout} ]]*/"", { method: 'POST' })
-            .then(() => window.location.href = /*[[ @{/login} ]]*/"")
-            .catch(error => console.error('Error logging out:', error));
-    }
-</script>
--->
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/base/search.html b/src/main/resources/templates/fragments/modules/base/search.html
deleted file mode 100644
index 729d518e..00000000
--- a/src/main/resources/templates/fragments/modules/base/search.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<search>
-	<div class="search-ui">
-        <div class="search-header">
-            <img src="./assets/images/logo.png" alt="" class="logo">
-            <button class="search-close btn btn-icon bg-transparent float-right mt-2">
-                <i class="i-Close-Window text-22 text-muted"></i>
-            </button>
-        </div>
-
-        <input type="text" placeholder="Type here" class="search-input" autofocus>
-
-        <div class="search-title">
-            <span class="text-muted">Search results</span>
-        </div>
-
-        <div class="search-results list-horizontal">
-            <div class="list-item col-md-12 p-0">
-                <div class="card o-hidden flex-row mb-4 d-flex">
-                    <div class="list-thumb d-flex">
-                        <!-- TUMBNAIL -->
-                        <img src="./assets/images/products/headphone-1.jpg" alt="">
-                    </div>
-                    <div class="flex-grow-1 pl-2 d-flex">
-                        <div class="card-body align-self-center d-flex flex-column justify-content-between align-items-lg-center flex-lg-row">
-                            <!-- OTHER DATA -->
-                            <a href="" class="w-40 w-sm-100">
-                                <div class="item-title">Headphone 1</div>
-                            </a>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100">Gadget</p>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100">
-                                $300
-                                <del class="text-secondary">$400</del>
-                            </p>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100 d-none d-lg-block item-badges">
-                                <span class="badge badge-danger">Sale</span>
-                            </p>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-            <div class="list-item col-md-12 p-0">
-                <div class="card o-hidden flex-row mb-4 d-flex">
-                    <div class="list-thumb d-flex">
-                        <!-- TUMBNAIL -->
-                        <img src="./assets/images/products/headphone-2.jpg" alt="">
-                    </div>
-                    <div class="flex-grow-1 pl-2 d-flex">
-                        <div class="card-body align-self-center d-flex flex-column justify-content-between align-items-lg-center flex-lg-row">
-                            <!-- OTHER DATA -->
-                            <a href="" class="w-40 w-sm-100">
-                                <div class="item-title">Headphone 1</div>
-                            </a>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100">Gadget</p>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100">
-                                $300
-                                <del class="text-secondary">$400</del>
-                            </p>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100 d-none d-lg-block item-badges">
-                                <span class="badge badge-primary">New</span>
-                            </p>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-            <div class="list-item col-md-12 p-0">
-                <div class="card o-hidden flex-row mb-4 d-flex">
-                    <div class="list-thumb d-flex">
-                        <!-- TUMBNAIL -->
-                        <img src="./assets/images/products/headphone-3.jpg" alt="">
-                    </div>
-                    <div class="flex-grow-1 pl-2 d-flex">
-                        <div class="card-body align-self-center d-flex flex-column justify-content-between align-items-lg-center flex-lg-row">
-                            <!-- OTHER DATA -->
-                            <a href="" class="w-40 w-sm-100">
-                                <div class="item-title">Headphone 1</div>
-                            </a>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100">Gadget</p>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100">
-                                $300
-                                <del class="text-secondary">$400</del>
-                            </p>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100 d-none d-lg-block item-badges">
-                                <span class="badge badge-primary">New</span>
-                            </p>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-            <div class="list-item col-md-12 p-0">
-                <div class="card o-hidden flex-row mb-4 d-flex">
-                    <div class="list-thumb d-flex">
-                        <!-- TUMBNAIL -->
-                        <img src="./assets/images/products/headphone-4.jpg" alt="">
-                    </div>
-                    <div class="flex-grow-1 pl-2 d-flex">
-                        <div class="card-body align-self-center d-flex flex-column justify-content-between align-items-lg-center flex-lg-row">
-                            <!-- OTHER DATA -->
-                            <a href="" class="w-40 w-sm-100">
-                                <div class="item-title">Headphone 1</div>
-                            </a>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100">Gadget</p>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100">
-                                $300
-                                <del class="text-secondary">$400</del>
-                            </p>
-                            <p class="m-0 text-muted text-small w-15 w-sm-100 d-none d-lg-block item-badges">
-                                <span class="badge badge-primary">New</span>
-                            </p>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!-- PAGINATION CONTROL -->
-        <div class="col-md-12 mt-5 text-center">
-            <nav aria-label="Page navigation example">
-                <ul class="pagination d-inline-flex">
-                    <li class="page-item">
-                        <a class="page-link" href="#" aria-label="Previous">
-                            <span aria-hidden="true">&laquo;</span>
-                            <span class="sr-only">Previous</span>
-                        </a>
-                    </li>
-                    <li class="page-item"><a class="page-link" href="#">1</a></li>
-                    <li class="page-item"><a class="page-link" href="#">2</a></li>
-                    <li class="page-item"><a class="page-link" href="#">3</a></li>
-                    <li class="page-item">
-                        <a class="page-link" href="#" aria-label="Next">
-                            <span aria-hidden="true">&raquo;</span>
-                            <span class="sr-only">Next</span>
-                        </a>
-                    </li>
-                </ul>
-            </nav>
-        </div>
-    </div>
-</search>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/c_petition/modal-box.html b/src/main/resources/templates/fragments/modules/c_petition/modal-box.html
deleted file mode 100644
index ae2f994e..00000000
--- a/src/main/resources/templates/fragments/modules/c_petition/modal-box.html
+++ /dev/null
@@ -1,116 +0,0 @@
-			
-			<!--  Box 1 -->
-			<div class="modal fade" id="ackModalBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="ackModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ackModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 2 -->
-			<div class="modal fade" id="ComplaintStatusBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="complaint-title">புகார் நிலை / Complaint Status:</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ComplaintStatusBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 3 -->
-			<div class="modal fade" id="viewFileBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewFileTitle">View File</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewFileBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 4 -->
-			<div class="modal fade" id="viewpetition" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewPetitionTitle">View Petition</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewPetitionBoxBody">
-                        		<iframe id="iframe" width="100%" height="400px" src=""></iframe>
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 0 common -->
-			<div class="modal fade" id="forwardModalBox" data-backdrop="static" tabindex="1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-lg" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="forwardModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="forwardModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/c_petition/petition_view_script.html b/src/main/resources/templates/fragments/modules/c_petition/petition_view_script.html
deleted file mode 100644
index 645adc74..00000000
--- a/src/main/resources/templates/fragments/modules/c_petition/petition_view_script.html
+++ /dev/null
@@ -1,290 +0,0 @@
-<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Call Petition function to fetch the data
-	    		    get_petition_data();
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-			 
-	     	// Function to get complaint_type and complaint_typeid by complaint_typeid
-	        function getComplaintTypeById(complaintTypeId) {
-	            for (var i = 0; i < complaintTypeList.length; i++) {
-	                if (complaintTypeList[i].complaint_typeid == complaintTypeId) {
-	                    return {
-	                        complaint_type: complaintTypeList[i].complaint_type,
-	                        complaint_typeid: complaintTypeList[i].complaint_typeid
-	                    };
-	                }
-	            }
-	            return null; // Return null if no matching complaint_typeid is found
-	        }
-	     
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint;
-					petitionId = petitionDetails[0].petition_id;
-					var complaintArray = complaint.split(",");
-					$("#complaintType").val(complaintArray);
-					
-					$('#complaintType').trigger('change');
-					
-					closedComplaintsList = complaintArray;
-					$("#cdate_value").html(convertdate(petitionDetails[0].cdate));
-					$("#petition_no_value").html(petitionDetails[0].petition_no);
-					$("#petitioner_name_value").html(petitionDetails[0].petitioner_name);
-					$("#petitioner_mobile_value").html(petitionDetails[0].petitioner_mobile);
-					$("#petitioner_address_value").html(petitionDetails[0].petitioner_address);
-					$("#petitioner_pincode_value").html(petitionDetails[0].petitioner_pincode);
-					
-					$("#complaint_with_maping_value").html(petitionDetails[0].complaint_nature);
-					
-					var petition_status = petitionDetails[0].status
-					
-					if(petition_status=='pending' || petition_status=='partial'){
-						$("#petition_summary_title").html("Pending Summary");
-						var currentDate = new Date();
-						var totaldayspending = date_difference(convertdate(petitionDetails[0].cdate),convertdate(currentDate),'');
-						$("#petition_summary_html").html(`This petition has been pending for more than ${totaldayspending}`);
-					}
-					if(petition_status=='close'){
-						$("#petition_summary_title").html("Close Summary");
-						var currentDate = new Date();
-						var totaldayspending = date_difference(convertdate(petitionDetails[0].cdate),convertdate(currentDate),'');
-						$("#petition_summary_html").html(`The time taken to close this petition is ${totaldayspending}`);
-					}
-						
-					petition_status=petition_status.charAt(0).toUpperCase() + petition_status.slice(1);
-					
-					$("#petition_status_value").html(`<b style="color:red">${petition_status}</b>`);
-					
-					// Call Complaint list based on Petition No and Id
-					get_petition_mapping_data();
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition Data ('+petitionNo+'):', error.message);
-				    call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-				var apiUrl = '/gcc/api/c_petition/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			function get_petition_mapping_data(){
-				get_petition_mapping_list().then(function(mappingDetails) {
-					
-					// Initialize count
-					let totalCount = mappingDetails.length;
-					let completedCount = 0;
-					let pendingCount = 0;
-
-					var tableListHTML = "";
-					
-					for(j = 0; j < mappingDetails.length; j++){
-						var complaint_status=mappingDetails[j].complaint_status;
-						complaint_status=complaint_status.charAt(0).toUpperCase() + complaint_status.slice(1);
-						
-						tableListHTML += `<tr>
-						                    <td>${j+1}</td>
-						                    <td>${mappingDetails[j].complaint_type}</td>
-						                    <td>${mappingDetails[j].off_nm} (${mappingDetails[j].off_id})</td>
-						                    <td>${convertdate(mappingDetails[j].mappedOn)}</td>
-						                    <td>${complaint_status}</td>
-						                  </tr>`;
-						                  
-		               	// Check if the status is "pending"
-					    if (mappingDetails[j].complaint_status === "pending") {
-					        // Increment the count
-					        pendingCount++;
-					    }
-					    else if(mappingDetails[j].complaint_status === "close"){
-					    	completedCount++;
-						}
-					}
-					
-					var listOfComplaintsHTML = `<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th>S.no</th>
-									                    <th>Complaint</th>
-									                    <th>Assigned To</th>
-									                    <th>Assigned On</th>
-									                    <th>Status</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-								                 		${tableListHTML}
-								                	</tbody>
-								              	</table>`;
-					$("#listOfComplaintsHTML").html(listOfComplaintsHTML);
-					
-					$("#total_complaints_value").html(`<b>${totalCount}</b>`);
-					$("#total_complaints_completed_value").html(`<b style="color:green">${completedCount}</b>`);
-					$("#total_complaints_pending_value").html(`<b style="color:red">${pendingCount}</b>`);
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching Mapping Data ('+petitionId+'):', error.message);
-				});
-			}
-			
-			/* Get Petition details by petition number */
-			function get_petition_mapping_list() {
-			    
-				var formData = new FormData();
-				var apiUrl = '/gcc/api/c_petition/getComplaintListByPetitionId?petitionId='+petitionId;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-		
-		function call_petition_search_from(errorTXT){
-			var errorHTML = "";
-			if(errorTXT!=""){
-				errorHTML = `<div class="form-group text-center text-danger">${errorTXT}</div>`;
-			}
-			var searchFormHTML = `<form class="search-form" id="search-form" onsubmit="return searchRequest();">
-										<div class="card-header">
-						                <h3>View Petition Form</h3>
-						                <div class="card-header-right">
-						                    <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-						                </div>
-						            </div>
-						       		<div class="card-body">
-						       			<div class="row">
-											<div class="col-12 text-center">
-												${errorHTML}
-												<div class="form-group">
-						                            <label for="petitionNoSearch">Petition No / மனு எண் </label>
-						                            <input type="text" class="form-control text-center" name="petitionNoSearch" id="petitionNoSearch" autocomplete="off" placeholder="CP00000000" maxlength="10" required>
-						                        </div>
-						                        
-											</div>
-											<div class="col-12">
-												<div class="block-content" id="userinfo2">
-													<div id="comp_mapping_to_officers" class="row"></div>
-												</div>
-										 	</div>
-										</div>
-						          	</div>
-						          	<div class="card-footer text-center">
-										<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            	<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						        	</div>
-						    	</form>`;
-			
-			$("#petitionViewtable").html(searchFormHTML);
-			$("#petitionNoSearch").mask('CP00000000');
-		}
-		
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/c_petition/view-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			if(petitionNo!=null && petitionNo!="error"){
-				get_complaint_type_data();
-				get_officer_master_data();
-			}
-			else{
-				if(petitionNo=="error"){
-					call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				}
-				else{
-					call_petition_search_from("");
-				}
-			}
-			
-		});
-		</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/c_petition/script.html b/src/main/resources/templates/fragments/modules/c_petition/script.html
deleted file mode 100644
index b8e56212..00000000
--- a/src/main/resources/templates/fragments/modules/c_petition/script.html
+++ /dev/null
@@ -1,338 +0,0 @@
-<script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-<script th:inline="javascript">
-	var nodata = nodata();
-	
-	var baseURL = "/gcc/c_petition/";
-	
-	/* Complaint Type List */
-	function get_complaint_type_list() {
-	    
-		var apiUrl = '/gcc/api/c_petition/getComplaintTypes';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Officer Master List */
-	function get_officer_list() {
-	    
-		var apiUrl = '/gcc/api/c_petition/getOfficerList';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	function viewAck(petitionNo){
-
-		loading_text_msg = getLoadingMessage(); // get Loading random text
-		$('#ackModalTitle').html("Loading Petition Acknowledgement ("+petitionNo+")");
-		var loading=searchinfo("<b>"+loading_text_msg+"</b>");
-		var ackContentHTML=`
-							<div class="row">
-							    <div class="col-lg-6">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack1table" class="ack-content">
-						                <div id="ack1">${loading}</div>
-						            </div>
-						        </div>
-						    </div>
-						    
-						    <div class="col-lg-6 printack2">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack2table" class="ack-content">
-						                <div id="ack2">${loading}</div>
-						            </div>
-						        </div>
-						    </div>
-						    <!--<div class="col-lg-12 text-center block-options pt-10">
-						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-						    </div>-->
-						</div>`;
-		
-		$('#ackModalBody').html(ackContentHTML); // Box content (Body)
-		
-		$("#ackModalBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-		}); // Show Modal Box
-			
-		get_petition_ack_data(petitionNo);
-		
-		return false;
-	}
-	
-	
-	 /* Get Petition data */
-	function get_petition_ack_data(petitionNo){
-		get_petition_details_byNo(petitionNo).then(function(petitionDetails) {
-		    // Handle the Complaint list
-		    var complaintHTML = "";
-			var complaint = petitionDetails[0].petitioner_complaint_txt;
-			
-			var complaintArray = complaint.split(',');
-			
-			for(j = 0; j < complaintArray.length; j++){
-				if(j>0){
-					complaintHTML+="<br>";
-				}
-				complaintHTML+= (j+1)+') '+complaintArray[j];
-			}
-			var ack =`
-			<table class="table table-borderless table-vcenter p-0 m-0">
-			  <tbody>
-			    <tr>
-			      <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-			      <td class="fw-semibold text-center">
-						<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-						மக்களை தேடி மேயர் திட்டம்<br>
-						ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-				  </td>
-				  <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-			    </tr>
-			</tbody>
-			</table>
-			<hr style="margin:0px">
-			  <div class="block-content p-0 m-0">
-			    <table class="table table-borderless table-vcenter" style="font-size:12px;">
-			      <tbody>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${convertdate(petitionDetails[0].cdate)}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petition_no}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petitioner_name}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petitioner_mobile}
-			          </td>
-			        </tr>
-			        <tr style="font-size:12px;">
-			          <th style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${complaintHTML}
-					</td>
-			        </tr>
-			        <tr>
-			          <td scope="row" colspan="2" style="font-size:10px">இம்மனுவின் ஒப்புகைச் சீட்டு எண் மனு தாரரின் கைபேசி எண்ணிற்கு குறுஞ்செய்தி மூலம் அனுப்பி வைக்கப்படும் . இம்மனுவின் நிலை குறித்து https://chennaicorporation.gov.in/MTM/ என்ற இணையதளத்தில் மனுவின் எண்ணை குறிப்பிட்டு அறிந்துகொள்ளலாம்</th>
-			        </tr>
-			        <tr style="text-align: right;">
-			          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-			        </tr>
-			      </tbody>
-			    </table>
-			  </div>`;
-		    $('#ackModalTitle').html("Acknowledgement Of Petition ("+petitionNo+")");
-			$("#ack1").html(ack);
-			$("#ack2").html(ack);
-			  
-		}).catch(function(error) {
-		    // Handle errors
-		    console.error('Error fetching petition details ('+petitionNo+'):', error);
-		});
-	}
-	 
-	/* Get Petition details by petition number */
-	function get_petition_details_byNo(petitionNo) {
-		
-		var apiUrl = '/gcc/api/c_petition/getPetitionDetails?petitionNo='+petitionNo
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Get Petition details by petition number */
-	function get_complaint_details_byId(mapId) {
-		
-		var apiUrl = '/gcc/api/c_petition/getComplaintDetails?mapId='+mapId
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Get Petition details by petition number */
-	function get_complaint_action_byId(mapId) {
-		
-		var apiUrl = '/gcc/api/c_petition/getComplaintActionDetails?mapId='+mapId
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	
-	/* File View */
-	function viewFile(fileOf,fileName,fileType){
-		$("#viewFileTitle").html("View File ("+fileName+")"); // Title for the Modal Box
-		
-		var fileUrl = "/gcc/files/c_petition/";
-		
-		if(fileOf=="petition")
-		{
-			fileUrl=fileUrl+fileName;
-		}
-		else if(fileOf="action"){
-			fileUrl=fileUrl+"m_action_file/"+fileName;
-		}
-		else{
-			fileUrl=fileUrl+"invaliedFile.txt"; // For File Not Exits Default file name
-		}
-		
-		checkFileExists(fileUrl).then(exists => {
-			if (exists) {
-				if(fileType=='application/pdf'){
-					var fileHTML = `<iframe src="${fileUrl}" type="application/pdf" width="100%" height="600px"></iframe>`;
-					
-				}
-				else if(fileType=='application/octet-stream'){
-					fileHTML =`<p class='text-danger m-0 p-0'>File Preview not avaiable.<br>Try to download and view.</p>`;
-				}
-				else{
-					fileHTML =`<img src="${fileUrl}" alt="${fileType}" width="100%">`;
-				}
-		    } else {
-		        console.log('File does not exist');
-		        fileHTML = `<p class='text-danger m-0 p-0'>File does not exist</p>`;
-		    }
-			
-			$("#viewFileBoxBody").html(fileHTML); // Modal Box Body
-			$("#viewFileBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-		});
-	}
-	
-	/* Downlaod file */
-	function downloadFile(fileOf,fileName,fileType){
-		$("#viewFileTitle").html("View File ("+fileName+")"); // Title for the Modal Box
-		
-		var fileUrl = "/gcc/files/c_petition/";
-		
-		if(fileOf=="petition")
-		{
-			fileUrl=fileUrl+fileName;
-			callDownload(fileUrl,fileName);
-		}
-		else if(fileOf="action"){
-			fileUrl=fileUrl+"m_action_file/"+fileName;
-			callDownload(fileUrl,fileName);
-		}
-		else{
-			fileUrl=fileUrl+"invaliedFile.txt"; // For File Not Exits Default file name
-		}
-	}
-	
-	/* Show Complaint forward Modal */
-	function forward_compliant(mapId,title){
-		var compmapHTML =`<div class="col-12" id="comp${mapId}">
-			
-								<div class="widget mb-0">
-					                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                    <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-					                </div>
-					                <div class="widget-body">
-					                	<div class="form-group">
-					                    	<label for="dept${mapId}">Select Department Type</label>
-											<select name="dept[]" id="dept${mapId}" class="form-control" onchange="javascript:calloffice(this.value,${mapId})">
-												<option value="0">Select Department</option>
-												<option value="1">GCC Department</option>
-												<option value="2">External Department</option>
-										    </select>
-										</div>
-										<div id="officedata${mapId}"></div>
-										<div id="officers${mapId}"></div>
-					                </div>
-					            </div>
-							
-						  </div>`;
-	  
-		$("#forwardModalBody").html(compmapHTML); // Modal Box Body
-		$("#forwardModalBox").modal({
-		    backdrop: 'static',
-		    keyboard: false
-		}); // Show Modal Box
-	}
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/c_petition/search_form.html b/src/main/resources/templates/fragments/modules/c_petition/search_form.html
deleted file mode 100644
index e0f28b3b..00000000
--- a/src/main/resources/templates/fragments/modules/c_petition/search_form.html
+++ /dev/null
@@ -1,19 +0,0 @@
-				<div class="row">
-					<div class="col-12 mb-2">
-						<div class="input-group mb-0">
-							<span class="input-group-prepend">
-                        	<button type="button" id="filter_reset_btn" class="btn btn-success" onclick="callReSetEventId(0);" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Reset" title="Reset">
-                          	  <i class="ik ik-refresh-ccw"></i>
-                        	</button>
-                        	</span>
-						 <select class="form-control" id="search_department_id" name="search_department_id">
-	                        <option value="0">All Department`s</option>
-	                      </select>
-	                      <span class="input-group-append">
-                         <button type="button" id="filter_search_btn" class="btn btn-success" onclick="callSetEventId();" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Search" title="Search">
-                           <i class="ik ik-search me-1"></i> Search
-                         </button>
-                         </span>
-						</div>
-					</div>
-				</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/circular/modal-box.html b/src/main/resources/templates/fragments/modules/circular/modal-box.html
deleted file mode 100644
index c4a1b48e..00000000
--- a/src/main/resources/templates/fragments/modules/circular/modal-box.html
+++ /dev/null
@@ -1,116 +0,0 @@
-			
-			<!--  Box 1 -->
-			<div class="modal fade" id="ackModalBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="ackModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ackModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 2 -->
-			<div class="modal fade" id="ComplaintStatusBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="complaint-title">புகார் நிலை / Complaint Status:</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ComplaintStatusBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 3 -->
-			<div class="modal fade" id="viewFileBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewFileTitle">View File</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body p-0">
-                        	<div id="viewFileBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 4 -->
-			<div class="modal fade" id="viewFile" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewFileTitle">View File</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewFileBoxBody2">
-                        		ss
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 0 common -->
-			<div class="modal fade" id="forwardModalBox" data-backdrop="static" tabindex="1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-lg" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="forwardModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="forwardModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/circular/script.html b/src/main/resources/templates/fragments/modules/circular/script.html
deleted file mode 100644
index ef9a6733..00000000
--- a/src/main/resources/templates/fragments/modules/circular/script.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-<script th:inline="javascript">
-	var nodata = nodata();
-	
-	var baseURL = "/gcc/circular/";
-	
-	/* Circular Type List */
-	function get_circular_type_list() {
-	    
-		var apiUrl = '/gcc/api/circular/getCircularTypes';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Department List */
-	function get_department_list() {
-	    
-		var apiUrl = '/gcc/api/circular/getDeprtmentList';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/com_petition/modal-box.html b/src/main/resources/templates/fragments/modules/com_petition/modal-box.html
deleted file mode 100644
index ae2f994e..00000000
--- a/src/main/resources/templates/fragments/modules/com_petition/modal-box.html
+++ /dev/null
@@ -1,116 +0,0 @@
-			
-			<!--  Box 1 -->
-			<div class="modal fade" id="ackModalBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="ackModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ackModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 2 -->
-			<div class="modal fade" id="ComplaintStatusBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="complaint-title">புகார் நிலை / Complaint Status:</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ComplaintStatusBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 3 -->
-			<div class="modal fade" id="viewFileBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewFileTitle">View File</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewFileBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 4 -->
-			<div class="modal fade" id="viewpetition" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewPetitionTitle">View Petition</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewPetitionBoxBody">
-                        		<iframe id="iframe" width="100%" height="400px" src=""></iframe>
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 0 common -->
-			<div class="modal fade" id="forwardModalBox" data-backdrop="static" tabindex="1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-lg" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="forwardModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="forwardModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/com_petition/petition_view_script.html b/src/main/resources/templates/fragments/modules/com_petition/petition_view_script.html
deleted file mode 100644
index be2c5901..00000000
--- a/src/main/resources/templates/fragments/modules/com_petition/petition_view_script.html
+++ /dev/null
@@ -1,293 +0,0 @@
-<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Call Petition function to fetch the data
-	    		    get_petition_data();
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-			 
-	     	// Function to get complaint_type and complaint_typeid by complaint_typeid
-	        function getComplaintTypeById(complaintTypeId) {
-	            for (var i = 0; i < complaintTypeList.length; i++) {
-	                if (complaintTypeList[i].complaint_typeid == complaintTypeId) {
-	                    return {
-	                        complaint_type: complaintTypeList[i].complaint_type,
-	                        complaint_typeid: complaintTypeList[i].complaint_typeid
-	                    };
-	                }
-	            }
-	            return null; // Return null if no matching complaint_typeid is found
-	        }
-	     
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint;
-					petitionId = petitionDetails[0].petition_id;
-					var complaintArray = complaint.split(",");
-					$("#complaintType").val(complaintArray);
-					
-					$('#complaintType').trigger('change');
-					
-					closedComplaintsList = complaintArray;
-					$("#cdate_value").html(convertdate(petitionDetails[0].cdate));
-					$("#petition_no_value").html(petitionDetails[0].petition_no);
-					$("#petitioner_name_value").html(petitionDetails[0].petitioner_name);
-					$("#petitioner_mobile_value").html(petitionDetails[0].petitioner_mobile);
-					$("#petitioner_address_value").html(petitionDetails[0].petitioner_address);
-					$("#petitioner_pincode_value").html(petitionDetails[0].petitioner_pincode);
-					
-					$("#complaint_with_maping_value").html(petitionDetails[0].complaint_nature);
-					$("#remarks_with_value").html(petitionDetails[0].remarks);
-					
-					var petition_status = petitionDetails[0].status
-					
-					if(petition_status=='pending' || petition_status=='partial'){
-						$("#petition_summary_title").html("Pending Summary");
-						var currentDate = new Date();
-						var totaldayspending = date_difference(convertdate(petitionDetails[0].cdate),convertdate(currentDate),'');
-						$("#petition_summary_html").html(`This petition has been pending for more than ${totaldayspending}`);
-					}
-					if(petition_status=='close'){
-						$("#petition_summary_title").html("Close Summary");
-						var currentDate = new Date();
-						var totaldayspending = date_difference(convertdate(petitionDetails[0].cdate),convertdate(currentDate),'');
-						$("#petition_summary_html").html(`The time taken to close this petition is ${totaldayspending}`);
-					}
-						
-					petition_status=petition_status.charAt(0).toUpperCase() + petition_status.slice(1);
-					
-					$("#petition_status_value").html(`<b style="color:red">${petition_status}</b>`);
-					
-					// Call Complaint list based on Petition No and Id
-					get_petition_mapping_data();
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition Data ('+petitionNo+'):', error.message);
-				    call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/com_petition/getPetitionDetails?petitionNo='+petitionNo;
-				//alert(petitionNo);
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			function get_petition_mapping_data(){
-				get_petition_mapping_list().then(function(mappingDetails) {
-					
-					// Initialize count
-					let totalCount = mappingDetails.length;
-					let completedCount = 0;
-					let pendingCount = 0;
-
-					var tableListHTML = "";
-					
-					for(j = 0; j < mappingDetails.length; j++){
-						var complaint_status=mappingDetails[j].complaint_status;
-						complaint_status=complaint_status.charAt(0).toUpperCase() + complaint_status.slice(1);
-						
-						tableListHTML += `<tr>
-						                    <td>${j+1}</td>
-						                    <td>${mappingDetails[j].complaint_type}</td>
-						                    <td>${mappingDetails[j].off_nm} (${mappingDetails[j].off_id})</td>
-						                    <td>${convertdate(mappingDetails[j].mappedOn)}</td>
-						                    <td>${complaint_status}</td>
-						                  </tr>`;
-						                  
-		               	// Check if the status is "pending"
-					    if (mappingDetails[j].complaint_status === "pending") {
-					        // Increment the count
-					        pendingCount++;
-					    }
-					    else if(mappingDetails[j].complaint_status === "close"){
-					    	completedCount++;
-						}
-					}
-					
-					var listOfComplaintsHTML = `<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th>S.no</th>
-									                    <th>Complaint</th>
-									                    <th>Assigned To</th>
-									                    <th>Assigned On</th>
-									                    <th>Status</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-								                 		${tableListHTML}
-								                	</tbody>
-								              	</table>`;
-					$("#listOfComplaintsHTML").html(listOfComplaintsHTML);
-					
-					$("#total_complaints_value").html(`<b>${totalCount}</b>`);
-					$("#total_complaints_completed_value").html(`<b style="color:green">${completedCount}</b>`);
-					$("#total_complaints_pending_value").html(`<b style="color:red">${pendingCount}</b>`);
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching Mapping Data ('+petitionId+'):', error.message);
-				});
-			}
-			
-			/* Get Petition details by petition number */
-			function get_petition_mapping_list() {
-			    
-				var formData = new FormData();
-				var apiUrl = '/gcc/api/com_petition/getComplaintListByPetitionId?petitionId='+petitionId;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-		
-		function call_petition_search_from(errorTXT){
-			var errorHTML = "";
-			if(errorTXT!=""){
-				errorHTML = `<div class="form-group text-center text-danger">${errorTXT}</div>`;
-			}
-			var searchFormHTML = `<form class="search-form" id="search-form" onsubmit="return searchRequest();">
-										<div class="card-header">
-						                <h3>View Petition Form</h3>
-						                <div class="card-header-right">
-						                    <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-						                </div>
-						            </div>
-						       		<div class="card-body">
-						       			<div class="row">
-											<div class="col-12 text-center">
-												${errorHTML}
-												<div class="form-group">
-						                            <label for="petitionNoSearch">Petition No / மனு எண் </label>
-						                            <input type="text" class="form-control text-center" name="petitionNoSearch" id="petitionNoSearch" autocomplete="off" placeholder="COM00000000" maxlength="11" required>
-						                        </div>
-						                        
-											</div>
-											<div class="col-12">
-												<div class="block-content" id="userinfo2">
-													<div id="comp_mapping_to_officers" class="row"></div>
-												</div>
-										 	</div>
-										</div>
-						          	</div>
-						          	<div class="card-footer text-center">
-										<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            	<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						        	</div>
-						    	</form>`;
-			
-			$("#petitionViewtable").html(searchFormHTML);
-			$("#petitionNoSearch").mask('COM00000000');
-		}
-		
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/com_petition/view-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			if(petitionNo!=null && petitionNo!="error"){
-				get_complaint_type_data();
-				get_officer_master_data();
-			}
-			else{
-				if(petitionNo=="error"){
-					call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				}
-				else{
-					call_petition_search_from("");
-				}
-			}
-			
-		});
-		</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/com_petition/script.html b/src/main/resources/templates/fragments/modules/com_petition/script.html
deleted file mode 100644
index 9fe9674c..00000000
--- a/src/main/resources/templates/fragments/modules/com_petition/script.html
+++ /dev/null
@@ -1,360 +0,0 @@
-<script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-<script th:inline="javascript">
-	var nodata = nodata();
-	
-	var baseURL = "/gcc/com_petition/";
-	
-	/* Complaint Type List */
-	function get_complaint_type_list() {
-	    
-		var apiUrl = '/gcc/api/com_petition/getComplaintTypes';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Officer Master List */
-	function get_officer_list() {
-	    
-		var apiUrl = '/gcc/api/com_petition/getOfficerList';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Petition Type List */
-	function get_petition_type_list() {
-	    
-		var apiUrl = '/gcc/api/com_petition/getPetitionTypes';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	function viewAck(petitionNo){
-
-		loading_text_msg = getLoadingMessage(); // get Loading random text
-		$('#ackModalTitle').html("Loading Petition Acknowledgement ("+petitionNo+")");
-		var loading=searchinfo("<b>"+loading_text_msg+"</b>");
-		var ackContentHTML=`
-							<div class="row">
-							    <div class="col-lg-6">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack1table" class="ack-content">
-						                <div id="ack1">${loading}</div>
-						            </div>
-						        </div>
-						    </div>
-						    
-						    <div class="col-lg-6 printack2">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack2table" class="ack-content">
-						                <div id="ack2">${loading}</div>
-						            </div>
-						        </div>
-						    </div>
-						    <!--<div class="col-lg-12 text-center block-options pt-10">
-						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-						    </div>-->
-						</div>`;
-		
-		$('#ackModalBody').html(ackContentHTML); // Box content (Body)
-		
-		$("#ackModalBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-		}); // Show Modal Box
-			
-		get_petition_ack_data(petitionNo);
-		
-		return false;
-	}
-	
-	
-	 /* Get Petition data */
-	function get_petition_ack_data(petitionNo){
-		get_petition_details_byNo(petitionNo).then(function(petitionDetails) {
-		    // Handle the Complaint list
-		    var complaintHTML = "";
-			var complaint = petitionDetails[0].petitioner_complaint_txt;
-			
-			var complaintArray = complaint.split(',');
-			
-			for(j = 0; j < complaintArray.length; j++){
-				if(j>0){
-					complaintHTML+="<br>";
-				}
-				complaintHTML+= (j+1)+') '+complaintArray[j];
-			}
-			var ack =`
-			<table class="table table-borderless table-vcenter p-0 m-0">
-			  <tbody>
-			    <tr>
-			      <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-			      <td class="fw-semibold text-center">
-						<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-						மக்களை தேடி மேயர் திட்டம்<br>
-						ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-				  </td>
-				  <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-			    </tr>
-			</tbody>
-			</table>
-			<hr style="margin:0px">
-			  <div class="block-content p-0 m-0">
-			    <table class="table table-borderless table-vcenter" style="font-size:12px;">
-			      <tbody>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${convertdate(petitionDetails[0].cdate)}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petition_no}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petitioner_name}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petitioner_mobile}
-			          </td>
-			        </tr>
-			        <tr style="font-size:12px;">
-			          <th style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${complaintHTML}
-					</td>
-			        </tr>
-			        <tr>
-			          <td scope="row" colspan="2" style="font-size:10px">இம்மனுவின் ஒப்புகைச் சீட்டு எண் மனு தாரரின் கைபேசி எண்ணிற்கு குறுஞ்செய்தி மூலம் அனுப்பி வைக்கப்படும் . இம்மனுவின் நிலை குறித்து https://chennaicorporation.gov.in/MTM/ என்ற இணையதளத்தில் மனுவின் எண்ணை குறிப்பிட்டு அறிந்துகொள்ளலாம்</th>
-			        </tr>
-			        <tr style="text-align: right;">
-			          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-			        </tr>
-			      </tbody>
-			    </table>
-			  </div>`;
-		    $('#ackModalTitle').html("Acknowledgement Of Petition ("+petitionNo+")");
-			$("#ack1").html(ack);
-			$("#ack2").html(ack);
-			  
-		}).catch(function(error) {
-		    // Handle errors
-		    console.error('Error fetching petition details ('+petitionNo+'):', error);
-		});
-	}
-	 
-	/* Get Petition details by petition number */
-	function get_petition_details_byNo(petitionNo) {
-		
-		var apiUrl = '/gcc/api/com_petition/getPetitionDetails?petitionNo='+petitionNo
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Get Petition details by petition number */
-	function get_complaint_details_byId(mapId) {
-		
-		var apiUrl = '/gcc/api/com_petition/getComplaintDetails?mapId='+mapId
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Get Petition details by petition number */
-	function get_complaint_action_byId(mapId) {
-		
-		var apiUrl = '/gcc/api/com_petition/getComplaintActionDetails?mapId='+mapId
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	
-	/* File View */
-	function viewFile(fileOf,fileName,fileType){
-		$("#viewFileTitle").html("View File ("+fileName+")"); // Title for the Modal Box
-		
-		var fileUrl = "/gcc/files/com_petition/";
-		
-		if(fileOf=="petition")
-		{
-			fileUrl=fileUrl+fileName;
-		}
-		else if(fileOf="action"){
-			fileUrl=fileUrl+"com_action_file/"+fileName;
-		}
-		else{
-			fileUrl=fileUrl+"invaliedFile.txt"; // For File Not Exits Default file name
-		}
-		
-		checkFileExists(fileUrl).then(exists => {
-			if (exists) {
-				if(fileType=='application/pdf'){
-					var fileHTML = `<iframe src="${fileUrl}" type="application/pdf" width="100%" height="600px"></iframe>`;
-					
-				}
-				else if(fileType=='application/octet-stream'){
-					fileHTML =`<p class='text-danger m-0 p-0'>File Preview not avaiable.<br>Try to download and view.</p>`;
-				}
-				else{
-					fileHTML =`<img src="${fileUrl}" alt="${fileType}" width="100%">`;
-				}
-		    } else {
-		        console.log('File does not exist');
-		        fileHTML = `<p class='text-danger m-0 p-0'>File does not exist</p>`;
-		    }
-			
-			$("#viewFileBoxBody").html(fileHTML); // Modal Box Body
-			$("#viewFileBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-		});
-	}
-	
-	/* Downlaod file */
-	function downloadFile(fileOf,fileName,fileType){
-		$("#viewFileTitle").html("View File ("+fileName+")"); // Title for the Modal Box
-		
-		var fileUrl = "/gcc/files/com_petition/";
-		
-		if(fileOf=="petition")
-		{
-			fileUrl=fileUrl+fileName;
-			callDownload(fileUrl,fileName);
-		}
-		else if(fileOf="action"){
-			fileUrl=fileUrl+"com_action_file/"+fileName;
-			callDownload(fileUrl,fileName);
-		}
-		else{
-			fileUrl=fileUrl+"invaliedFile.txt"; // For File Not Exits Default file name
-		}
-	}
-	
-	/* Show Complaint forward Modal */
-	function forward_compliant(mapId,title){
-		var compmapHTML =`<div class="col-12" id="comp${mapId}">
-			
-								<div class="widget mb-0">
-					                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                    <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-					                </div>
-					                <div class="widget-body">
-					                	<div class="form-group">
-					                    	<label for="dept${mapId}">Select Department Type</label>
-											<select name="dept[]" id="dept${mapId}" class="form-control" onchange="javascript:calloffice(this.value,${mapId})">
-												<option value="0">Select Department</option>
-												<option value="1">GCC Department</option>
-												<option value="2">External Department</option>
-										    </select>
-										</div>
-										<div id="officedata${mapId}"></div>
-										<div id="officers${mapId}"></div>
-					                </div>
-					            </div>
-							
-						  </div>`;
-	  
-		$("#forwardModalBody").html(compmapHTML); // Modal Box Body
-		$("#forwardModalBox").modal({
-		    backdrop: 'static',
-		    keyboard: false
-		}); // Show Modal Box
-	}
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/com_petition/search_form.html b/src/main/resources/templates/fragments/modules/com_petition/search_form.html
deleted file mode 100644
index e0f28b3b..00000000
--- a/src/main/resources/templates/fragments/modules/com_petition/search_form.html
+++ /dev/null
@@ -1,19 +0,0 @@
-				<div class="row">
-					<div class="col-12 mb-2">
-						<div class="input-group mb-0">
-							<span class="input-group-prepend">
-                        	<button type="button" id="filter_reset_btn" class="btn btn-success" onclick="callReSetEventId(0);" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Reset" title="Reset">
-                          	  <i class="ik ik-refresh-ccw"></i>
-                        	</button>
-                        	</span>
-						 <select class="form-control" id="search_department_id" name="search_department_id">
-	                        <option value="0">All Department`s</option>
-	                      </select>
-	                      <span class="input-group-append">
-                         <button type="button" id="filter_search_btn" class="btn btn-success" onclick="callSetEventId();" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Search" title="Search">
-                           <i class="ik ik-search me-1"></i> Search
-                         </button>
-                         </span>
-						</div>
-					</div>
-				</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/m_petition/modal-box.html b/src/main/resources/templates/fragments/modules/m_petition/modal-box.html
deleted file mode 100644
index ae2f994e..00000000
--- a/src/main/resources/templates/fragments/modules/m_petition/modal-box.html
+++ /dev/null
@@ -1,116 +0,0 @@
-			
-			<!--  Box 1 -->
-			<div class="modal fade" id="ackModalBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="ackModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ackModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 2 -->
-			<div class="modal fade" id="ComplaintStatusBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="complaint-title">புகார் நிலை / Complaint Status:</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ComplaintStatusBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 3 -->
-			<div class="modal fade" id="viewFileBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewFileTitle">View File</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewFileBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 4 -->
-			<div class="modal fade" id="viewpetition" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewPetitionTitle">View Petition</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewPetitionBoxBody">
-                        		<iframe id="iframe" width="100%" height="400px" src=""></iframe>
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 0 common -->
-			<div class="modal fade" id="forwardModalBox" data-backdrop="static" tabindex="1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-lg" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="forwardModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="forwardModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/m_petition/petition_view_script.html b/src/main/resources/templates/fragments/modules/m_petition/petition_view_script.html
deleted file mode 100644
index 07b6d876..00000000
--- a/src/main/resources/templates/fragments/modules/m_petition/petition_view_script.html
+++ /dev/null
@@ -1,291 +0,0 @@
-<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Call Petition function to fetch the data
-	    		    get_petition_data();
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-			 
-	     	// Function to get complaint_type and complaint_typeid by complaint_typeid
-	        function getComplaintTypeById(complaintTypeId) {
-	            for (var i = 0; i < complaintTypeList.length; i++) {
-	                if (complaintTypeList[i].complaint_typeid == complaintTypeId) {
-	                    return {
-	                        complaint_type: complaintTypeList[i].complaint_type,
-	                        complaint_typeid: complaintTypeList[i].complaint_typeid
-	                    };
-	                }
-	            }
-	            return null; // Return null if no matching complaint_typeid is found
-	        }
-	     
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint;
-					petitionId = petitionDetails[0].petition_id;
-					var complaintArray = complaint.split(",");
-					$("#complaintType").val(complaintArray);
-					
-					$('#complaintType').trigger('change');
-					
-					closedComplaintsList = complaintArray;
-					$("#cdate_value").html(convertdate(petitionDetails[0].cdate));
-					$("#petition_no_value").html(petitionDetails[0].petition_no);
-					$("#petitioner_name_value").html(petitionDetails[0].petitioner_name);
-					$("#petitioner_mobile_value").html(petitionDetails[0].petitioner_mobile);
-					$("#petitioner_address_value").html(petitionDetails[0].petitioner_address);
-					$("#petitioner_pincode_value").html(petitionDetails[0].petitioner_pincode);
-					
-					$("#complaint_with_maping_value").html(petitionDetails[0].complaint_nature);
-					
-					var petition_status = petitionDetails[0].status
-					
-					if(petition_status=='pending' || petition_status=='partial'){
-						$("#petition_summary_title").html("Pending Summary");
-						var currentDate = new Date();
-						var totaldayspending = date_difference(convertdate(petitionDetails[0].cdate),convertdate(currentDate),'');
-						$("#petition_summary_html").html(`This petition has been pending for more than ${totaldayspending}`);
-					}
-					if(petition_status=='close'){
-						$("#petition_summary_title").html("Close Summary");
-						var currentDate = new Date();
-						var totaldayspending = date_difference(convertdate(petitionDetails[0].cdate),convertdate(currentDate),'');
-						$("#petition_summary_html").html(`The time taken to close this petition is ${totaldayspending}`);
-					}
-						
-					petition_status=petition_status.charAt(0).toUpperCase() + petition_status.slice(1);
-					
-					$("#petition_status_value").html(`<b style="color:red">${petition_status}</b>`);
-					
-					// Call Complaint list based on Petition No and Id
-					get_petition_mapping_data();
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition Data ('+petitionNo+'):', error.message);
-				    call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/m_petition/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			function get_petition_mapping_data(){
-				get_petition_mapping_list().then(function(mappingDetails) {
-					
-					// Initialize count
-					let totalCount = mappingDetails.length;
-					let completedCount = 0;
-					let pendingCount = 0;
-
-					var tableListHTML = "";
-					
-					for(j = 0; j < mappingDetails.length; j++){
-						var complaint_status=mappingDetails[j].complaint_status;
-						complaint_status=complaint_status.charAt(0).toUpperCase() + complaint_status.slice(1);
-						
-						tableListHTML += `<tr>
-						                    <td>${j+1}</td>
-						                    <td>${mappingDetails[j].complaint_type}</td>
-						                    <td>${mappingDetails[j].off_nm} (${mappingDetails[j].off_id})</td>
-						                    <td>${convertdate(mappingDetails[j].mappedOn)}</td>
-						                    <td>${complaint_status}</td>
-						                  </tr>`;
-						                  
-		               	// Check if the status is "pending"
-					    if (mappingDetails[j].complaint_status === "pending") {
-					        // Increment the count
-					        pendingCount++;
-					    }
-					    else if(mappingDetails[j].complaint_status === "close"){
-					    	completedCount++;
-						}
-					}
-					
-					var listOfComplaintsHTML = `<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th>S.no</th>
-									                    <th>Complaint</th>
-									                    <th>Assigned To</th>
-									                    <th>Assigned On</th>
-									                    <th>Status</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-								                 		${tableListHTML}
-								                	</tbody>
-								              	</table>`;
-					$("#listOfComplaintsHTML").html(listOfComplaintsHTML);
-					
-					$("#total_complaints_value").html(`<b>${totalCount}</b>`);
-					$("#total_complaints_completed_value").html(`<b style="color:green">${completedCount}</b>`);
-					$("#total_complaints_pending_value").html(`<b style="color:red">${pendingCount}</b>`);
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching Mapping Data ('+petitionId+'):', error.message);
-				});
-			}
-			
-			/* Get Petition details by petition number */
-			function get_petition_mapping_list() {
-			    
-				var formData = new FormData();
-				var apiUrl = '/gcc/api/m_petition/getComplaintListByPetitionId?petitionId='+petitionId;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-		
-		function call_petition_search_from(errorTXT){
-			var errorHTML = "";
-			if(errorTXT!=""){
-				errorHTML = `<div class="form-group text-center text-danger">${errorTXT}</div>`;
-			}
-			var searchFormHTML = `<form class="search-form" id="search-form" onsubmit="return searchRequest();">
-										<div class="card-header">
-						                <h3>View Petition Form</h3>
-						                <div class="card-header-right">
-						                    <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-						                </div>
-						            </div>
-						       		<div class="card-body">
-						       			<div class="row">
-											<div class="col-12 text-center">
-												${errorHTML}
-												<div class="form-group">
-						                            <label for="petitionNoSearch">Petition No / மனு எண் </label>
-						                            <input type="text" class="form-control text-center" name="petitionNoSearch" id="petitionNoSearch" autocomplete="off" placeholder="MP00000000" maxlength="10" required>
-						                        </div>
-						                        
-											</div>
-											<div class="col-12">
-												<div class="block-content" id="userinfo2">
-													<div id="comp_mapping_to_officers" class="row"></div>
-												</div>
-										 	</div>
-										</div>
-						          	</div>
-						          	<div class="card-footer text-center">
-										<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            	<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						        	</div>
-						    	</form>`;
-			
-			$("#petitionViewtable").html(searchFormHTML);
-			$("#petitionNoSearch").mask('MP00000000');
-		}
-		
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/m_petition/view-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			if(petitionNo!=null && petitionNo!="error"){
-				get_complaint_type_data();
-				get_officer_master_data();
-			}
-			else{
-				if(petitionNo=="error"){
-					call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				}
-				else{
-					call_petition_search_from("");
-				}
-			}
-			
-		});
-		</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/m_petition/script.html b/src/main/resources/templates/fragments/modules/m_petition/script.html
deleted file mode 100644
index 921cdf92..00000000
--- a/src/main/resources/templates/fragments/modules/m_petition/script.html
+++ /dev/null
@@ -1,360 +0,0 @@
-<script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-<script th:inline="javascript">
-	var nodata = nodata();
-	
-	var baseURL = "/gcc/m_petition/";
-	
-	/* Complaint Type List */
-	function get_complaint_type_list() {
-	    
-		var apiUrl = '/gcc/api/m_petition/getComplaintTypes';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Officer Master List */
-	function get_officer_list() {
-	    
-		var apiUrl = '/gcc/api/m_petition/getOfficerList';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Petition Type List */
-	function get_petition_type_list() {
-	    
-		var apiUrl = '/gcc/api/m_petition/getPetitionTypes';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	function viewAck(petitionNo){
-
-		loading_text_msg = getLoadingMessage(); // get Loading random text
-		$('#ackModalTitle').html("Loading Petition Acknowledgement ("+petitionNo+")");
-		var loading=searchinfo("<b>"+loading_text_msg+"</b>");
-		var ackContentHTML=`
-							<div class="row">
-							    <div class="col-lg-6">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack1table" class="ack-content">
-						                <div id="ack1">${loading}</div>
-						            </div>
-						        </div>
-						    </div>
-						    
-						    <div class="col-lg-6 printack2">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack2table" class="ack-content">
-						                <div id="ack2">${loading}</div>
-						            </div>
-						        </div>
-						    </div>
-						    <!--<div class="col-lg-12 text-center block-options pt-10">
-						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-						    </div>-->
-						</div>`;
-		
-		$('#ackModalBody').html(ackContentHTML); // Box content (Body)
-		
-		$("#ackModalBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-		}); // Show Modal Box
-			
-		get_petition_ack_data(petitionNo);
-		
-		return false;
-	}
-	
-	
-	 /* Get Petition data */
-	function get_petition_ack_data(petitionNo){
-		get_petition_details_byNo(petitionNo).then(function(petitionDetails) {
-		    // Handle the Complaint list
-		    var complaintHTML = "";
-			var complaint = petitionDetails[0].petitioner_complaint_txt;
-			
-			var complaintArray = complaint.split(',');
-			
-			for(j = 0; j < complaintArray.length; j++){
-				if(j>0){
-					complaintHTML+="<br>";
-				}
-				complaintHTML+= (j+1)+') '+complaintArray[j];
-			}
-			var ack =`
-			<table class="table table-borderless table-vcenter p-0 m-0">
-			  <tbody>
-			    <tr>
-			      <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-			      <td class="fw-semibold text-center">
-						<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-						மக்களை தேடி மேயர் திட்டம்<br>
-						ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-				  </td>
-				  <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-			    </tr>
-			</tbody>
-			</table>
-			<hr style="margin:0px">
-			  <div class="block-content p-0 m-0">
-			    <table class="table table-borderless table-vcenter" style="font-size:12px;">
-			      <tbody>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${convertdate(petitionDetails[0].cdate)}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petition_no}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petitioner_name}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petitioner_mobile}
-			          </td>
-			        </tr>
-			        <tr style="font-size:12px;">
-			          <th style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${complaintHTML}
-					</td>
-			        </tr>
-			        <tr>
-			          <td scope="row" colspan="2" style="font-size:10px">இம்மனுவின் ஒப்புகைச் சீட்டு எண் மனு தாரரின் கைபேசி எண்ணிற்கு குறுஞ்செய்தி மூலம் அனுப்பி வைக்கப்படும் . இம்மனுவின் நிலை குறித்து https://chennaicorporation.gov.in/MTM/ என்ற இணையதளத்தில் மனுவின் எண்ணை குறிப்பிட்டு அறிந்துகொள்ளலாம்</th>
-			        </tr>
-			        <tr style="text-align: right;">
-			          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-			        </tr>
-			      </tbody>
-			    </table>
-			  </div>`;
-		    $('#ackModalTitle').html("Acknowledgement Of Petition ("+petitionNo+")");
-			$("#ack1").html(ack);
-			$("#ack2").html(ack);
-			  
-		}).catch(function(error) {
-		    // Handle errors
-		    console.error('Error fetching petition details ('+petitionNo+'):', error);
-		});
-	}
-	 
-	/* Get Petition details by petition number */
-	function get_petition_details_byNo(petitionNo) {
-		
-		var apiUrl = '/gcc/api/m_petition/getPetitionDetails?petitionNo='+petitionNo
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Get Petition details by petition number */
-	function get_complaint_details_byId(mapId) {
-		
-		var apiUrl = '/gcc/api/m_petition/getComplaintDetails?mapId='+mapId
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Get Petition details by petition number */
-	function get_complaint_action_byId(mapId) {
-		
-		var apiUrl = '/gcc/api/m_petition/getComplaintActionDetails?mapId='+mapId
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	
-	/* File View */
-	function viewFile(fileOf,fileName,fileType){
-		$("#viewFileTitle").html("View File ("+fileName+")"); // Title for the Modal Box
-		
-		var fileUrl = "/gcc/files/m_petition/";
-		
-		if(fileOf=="petition")
-		{
-			fileUrl=fileUrl+fileName;
-		}
-		else if(fileOf="action"){
-			fileUrl=fileUrl+"m_action_file/"+fileName;
-		}
-		else{
-			fileUrl=fileUrl+"invaliedFile.txt"; // For File Not Exits Default file name
-		}
-		
-		checkFileExists(fileUrl).then(exists => {
-			if (exists) {
-				if(fileType=='application/pdf'){
-					var fileHTML = `<iframe src="${fileUrl}" type="application/pdf" width="100%" height="600px"></iframe>`;
-					
-				}
-				else if(fileType=='application/octet-stream'){
-					fileHTML =`<p class='text-danger m-0 p-0'>File Preview not avaiable.<br>Try to download and view.</p>`;
-				}
-				else{
-					fileHTML =`<img src="${fileUrl}" alt="${fileType}" width="100%">`;
-				}
-		    } else {
-		        console.log('File does not exist');
-		        fileHTML = `<p class='text-danger m-0 p-0'>File does not exist</p>`;
-		    }
-			
-			$("#viewFileBoxBody").html(fileHTML); // Modal Box Body
-			$("#viewFileBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-		});
-	}
-	
-	/* Downlaod file */
-	function downloadFile(fileOf,fileName,fileType){
-		$("#viewFileTitle").html("View File ("+fileName+")"); // Title for the Modal Box
-		
-		var fileUrl = "/gcc/files/m_petition/";
-		
-		if(fileOf=="petition")
-		{
-			fileUrl=fileUrl+fileName;
-			callDownload(fileUrl,fileName);
-		}
-		else if(fileOf="action"){
-			fileUrl=fileUrl+"m_action_file/"+fileName;
-			callDownload(fileUrl,fileName);
-		}
-		else{
-			fileUrl=fileUrl+"invaliedFile.txt"; // For File Not Exits Default file name
-		}
-	}
-	
-	/* Show Complaint forward Modal */
-	function forward_compliant(mapId,title){
-		var compmapHTML =`<div class="col-12" id="comp${mapId}">
-			
-								<div class="widget mb-0">
-					                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                    <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-					                </div>
-					                <div class="widget-body">
-					                	<div class="form-group">
-					                    	<label for="dept${mapId}">Select Department Type</label>
-											<select name="dept[]" id="dept${mapId}" class="form-control" onchange="javascript:calloffice(this.value,${mapId})">
-												<option value="0">Select Department</option>
-												<option value="1">GCC Department</option>
-												<option value="2">External Department</option>
-										    </select>
-										</div>
-										<div id="officedata${mapId}"></div>
-										<div id="officers${mapId}"></div>
-					                </div>
-					            </div>
-							
-						  </div>`;
-	  
-		$("#forwardModalBody").html(compmapHTML); // Modal Box Body
-		$("#forwardModalBox").modal({
-		    backdrop: 'static',
-		    keyboard: false
-		}); // Show Modal Box
-	}
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/m_petition/search_form.html b/src/main/resources/templates/fragments/modules/m_petition/search_form.html
deleted file mode 100644
index e0f28b3b..00000000
--- a/src/main/resources/templates/fragments/modules/m_petition/search_form.html
+++ /dev/null
@@ -1,19 +0,0 @@
-				<div class="row">
-					<div class="col-12 mb-2">
-						<div class="input-group mb-0">
-							<span class="input-group-prepend">
-                        	<button type="button" id="filter_reset_btn" class="btn btn-success" onclick="callReSetEventId(0);" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Reset" title="Reset">
-                          	  <i class="ik ik-refresh-ccw"></i>
-                        	</button>
-                        	</span>
-						 <select class="form-control" id="search_department_id" name="search_department_id">
-	                        <option value="0">All Department`s</option>
-	                      </select>
-	                      <span class="input-group-append">
-                         <button type="button" id="filter_search_btn" class="btn btn-success" onclick="callSetEventId();" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Search" title="Search">
-                           <i class="ik ik-search me-1"></i> Search
-                         </button>
-                         </span>
-						</div>
-					</div>
-				</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/mtm/event_search_form.html b/src/main/resources/templates/fragments/modules/mtm/event_search_form.html
deleted file mode 100644
index c8bf83a9..00000000
--- a/src/main/resources/templates/fragments/modules/mtm/event_search_form.html
+++ /dev/null
@@ -1,22 +0,0 @@
-				<div class="row">
-					<div class="col-12 mb-2">
-						<div class="input-group mb-0">
-							<span class="input-group-prepend">
-                        	<button type="button" class="btn btn-success" onclick="callReSetEventId(0);" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Reset" title="Reset">
-                          	  <i class="ik ik-refresh-ccw"></i>
-                        	</button>
-                        	</span>
-						 <select class="form-control" id="search_eid" name="search_eid">
-	                        <option value="0">All Events</option>
-							<option th:each="mtmEvents : ${mtmEventsList}" th:value="${mtmEvents.mtmId}" 
-							        th:utext="${mtmEvents.eventName} +'('+${mtmEvents.eventDate}+')'"
-							        th:selected="${session.eventid == #strings.toString(mtmEvents.mtmId)}"></option>
-	                      </select>
-	                      <span class="input-group-append">
-                         <button type="button" class="btn btn-success" onclick="callSetEventId();" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Search" title="Search">
-                           <i class="ik ik-search me-1"></i> Search
-                         </button>
-                         </span>
-						</div>
-					</div>
-				</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/mtm/modal-box.html b/src/main/resources/templates/fragments/modules/mtm/modal-box.html
deleted file mode 100644
index c58dae95..00000000
--- a/src/main/resources/templates/fragments/modules/mtm/modal-box.html
+++ /dev/null
@@ -1,119 +0,0 @@
-			<div class="modal fade" id="viewFile" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="exampleModalDefaultLabel">Petition Files</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="filehtml">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<div class="modal fade" id="petitionStatus" tabindex="-1" role="dialog" aria-labelledby="otpFormLabel" aria-hidden="true">
-		              <div class="modal-dialog modal-xl" role="document">
-		                  <div class="modal-content">
-		                      <div class="modal-header">
-		                          <h6 class="modal-title m-0" id="exampleModalDefaultLabel">புகார் நிலை / Complaint Status</h6>
-			                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-		                      </div><!--end modal-header-->
-		                      <div class="modal-body">
-		                          <div class="row">
-									<div class="col-sm-6 col-xl-6">
-						              <div class="block block-rounded d-flex flex-column h-100 mb-0" id="petitionStatusForm" style="font-size:12px;">
-						                
-						              </div>
-						            </div>
-									
-									<div class="col-sm-6 col-xl-6">
-						              <div class="block block-rounded d-flex flex-column h-100 mb-0" id="petitionUpdateForm" style="font-size:12px;">
-						              	
-						              </div>
-						            </div>
-									
-		                          </div><!--end row-->                                                      
-		                      </div><!--end modal-body-->
-		                      <div class="modal-footer bg-body">
-		                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-		                      </div><!--end modal-footer-->
-				
-		                  </div><!--end modal-content-->
-		              </div><!--end modal-dialog-->
-		    </div><!--end modal-->
-			
-			<!-- PopUp Modal Help Form -->
-			<div class="modal fade" id="complaintStatus" tabindex="-1" role="dialog" aria-labelledby="otpFormLabel" aria-hidden="true">
-		              <div class="modal-dialog modal-lg" role="document">
-		                  <div class="modal-content">
-							  <div class="modal-header">
-		                          <h6 class="modal-title m-0" id="exampleModalDefaultLabel">புகார் நிலை / Complaint Status</h6>
-			                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-		                      </div><!--end modal-header-->
-		                      
-		                      <div class="modal-body">
-		                          <div class="row">
-									  <div class="col-lg-1"></div> <!-- Left column -->
-									  <div class="col-lg-10">
-									  <div class="block block-rounded" style="border: 1px solid black;">
-									  <div id="ack1">
-									  		<table class="table table-borderless table-vcenter p-0 m-0">
-									  		  <tbody>
-									  		    <tr>
-									  		      <th scope="row"><img th:src="@{/assets/images/logo-sm.png}" width="80px"></th>
-									  		      <td class="fw-semibold text-center">
-									  			<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-									  			மக்களை தேடி மேயர் திட்டம்<br>
-									  			ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-									  		    </td></tr>
-									  		</tbody>
-									  		</table>
-									  		<hr style="margin:0px">
-									  		  <div class="block-content p-0 m-0" id="petitionStatusDetails">
-							  		   
-									  		  </div></div>
-										</div>
-										<div class="col-lg-1"></div> <!-- Right column -->
-									</div>
-		                          </div><!--end row-->                                                      
-		                      </div><!--end modal-body-->
-		                      <div class="modal-footer">
-		                          <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">Close</button>
-		                      </div><!--end modal-footer-->
-				
-		                  </div><!--end modal-content-->
-		              </div><!--end modal-dialog-->
-		    </div><!--end modal-->
-		    
-			<div class="modal fade" id="viewCloseFile" tabindex="1" role="dialog" aria-labelledby="otpFormLabel" aria-hidden="true">
-		              <div class="modal-dialog modal-xl" role="document">
-		                  <div class="modal-content">
-		                      <div class="modal-header">
-		                          <h6 class="modal-title m-0" id="exampleModalDefaultLabel">View File</h6>
-			                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-		                      </div><!--end modal-header-->
-		                      <div class="modal-body">
-		                          <div class="row">
-									<div class="col-sm-12 col-xl-12">
-						              <div class="block block-rounded d-flex flex-column h-100 mb-0" id="viewFileHtml" style="font-size:12px;">
-										
-						              </div>
-						            </div>
-		                          </div><!--end row-->                                                      
-		                      </div><!--end modal-body-->
-		                      <div class="modal-footer bg-body">
-		                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-		                      </div><!--end modal-footer-->
-				
-		                  </div><!--end modal-content-->
-		              </div><!--end modal-dialog-->
-		    </div><!--end modal-->
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/mtm/script.html b/src/main/resources/templates/fragments/modules/mtm/script.html
deleted file mode 100644
index 4a0b4a2b..00000000
--- a/src/main/resources/templates/fragments/modules/mtm/script.html
+++ /dev/null
@@ -1,709 +0,0 @@
-<script th:inline="javascript">
-	var nodata = `<center><img src="/assets/images/nodata_ani.gif" width="40%"><br><p class="text-warning">Data are not availble at this moment please check later</p></center>`;
-	
-		var complaintTypesList = /*[[${complaintTypesList}]]*/ [];
-		var complaintTypes =[];
-		var complaintHTML='';
-		console.log(complaintTypesList.length);
-		for (var i = 0; i < complaintTypesList.length; i++) {
-			complaintTypes[complaintTypesList[i].complaintTypeId] = complaintTypesList[i].complaintType;
-		}
-		
-		/* Event Id Search */
-		function callReSetEventId(eventid){
-			$.ajax({
-			    type: "GET",
-			    url: '/gcc/api/mtm/setEventId',
-			    data: {
-			        'eventid': eventid
-			    },
-			}).done(function(response) {
-				location.reload();
-			}).fail(function(jqXHR, textStatus, errorThrown) {
-				/*
-			    // Log the error and any relevant information
-			    console.error("Error sending request: " + textStatus + " " + errorThrown);
-				*/
-			});
-			return false;
-		}
-		
-		function callSetEventId(){
-			var eventid = $("#search_eid").val();
-			$.ajax({
-			    type: "GET",
-			    url: '/gcc/api/mtm/setEventId',
-			    data: {
-			        'eventid': eventid
-			    },
-			}).done(function(response) {
-				location.reload();
-			}).fail(function(jqXHR, textStatus, errorThrown) {
-				/*
-			    // Log the error and any relevant information
-			    console.error("Error sending request: " + textStatus + " " + errorThrown);
-				*/
-			});
-			return false;
-		}
-		
-		/* Event Id Search */
-		function callSetEventById(eventid,link){
-			$.ajax({
-			    type: "GET",
-			    url: '/gcc/api/mtm/setEventId',
-			    data: {
-			        'eventid': eventid
-			    },
-			}).done(function(response) {
-				window.location.href = link;
-			}).fail(function(jqXHR, textStatus, errorThrown) {
-				/*
-			    // Log the error and any relevant information
-			    console.error("Error sending request: " + textStatus + " " + errorThrown);
-				*/
-			});
-			return false;
-		}
-		/* ///////////////// */
-		
-		/* // for Petition // */
-		
-		function callViewFiles( id , pet_num){
-			
-			$('#modaltitle').html(`Petition (${pet_num}) Files`);
-	     	$.ajax({
-	          type: "GET",
-			  dataType: 'json',
-	          url: "/gcc/api/mtm/petitionFilesBypetitionId?pid="+id,
-	          
-	          success: function(data){
-				  petitionFiles = data;
-				  var fileLength = petitionFiles.length;
-				  var fileHTML='';
-				  if(fileLength>0){
-					  for (var i = 0; i < fileLength; i++) {
-						  	var petitionFile = petitionFiles[i];
-							var fileId = petitionFile.mtmPetitionFileId;
-						    var fileName = petitionFile.fileName;
-						    var fileSize = null;
-						    var fileType = null;
-							// Get the file size and type from the data object
-						    if (petitionFile.data && petitionFile.data.wrappedBlob) {
-						        var binaryStream = petitionFile.data.wrappedBlob.binaryStream;
-						        if (binaryStream) {
-						            // Get the file size
-						            fileSize = Object.keys(binaryStream).length;
-						            // Get the file type
-						            fileType = fileName.split(".").pop();
-						        }
-						    }
-							var filetypeico = "file-lines";
-							if(fileType=='pdf'){
-								filetypeico = "file-pdf";
-							}
-							else{
-								filetypeico = "file-image";
-							}
-							sno=i+1;
-							/*
-							fileHTML+=`
-		                        	<li>
-			                          <a class="d-flex py-2" href="/blob/${fileId}/download">
-			                            <div class="flex-shrink-0 me-3 ms-2 overlay-container overlay-left">
-			                              <i class="far fa-3x fa-${filetypeico}"></i>
-			                            </div>
-			                            <div class="flex-grow-1">
-			                              <div class="fw-semibold">FileName: ${fileName}</div>
-			                              <div class="fs-sm text-muted">FileType: ${fileType}</div>
-			                            </div>
-			                          </a>
-			                        </li>
-			                      `;
-			                      */
-			               fileHTML+=`
-		                        	 <tr>
-										 <td>${sno}</td>
-										 <td>${fileName}</td>
-										 <td>${fileType}</td>
-										 <td class="text-center" style="width: 100px;">
-											<a href="/blob/${fileId}/download" data-toggle="tooltip" data-animation="true" data-placement="top" class="js-tooltip-enabled" aria-label="Downlaod" data-original-title="Download"><i class="fa fa-fw fa-download" style="font-size: 18px;"></i></a>
-											<a href="#" onclick="return call_blobData(${fileId},'petition');" data-toggle="tooltip" data-animation="true" data-placement="top" class="js-tooltip-enabled" aria-label="View Files" data-original-title="View"><i class="far fa-3x fa-${filetypeico}" style="font-size: 18px;"></i></a>
-										</td>
-									 </tr>
-			                         `;
-										
-					  }
-					  //$('#filehtml').html('<ul class="nav-items push">'+fileHTML+'</ul>');
-					  fileHTML = `<table class="table table-bordered table-vcenter">
-					                <thead>
-					                  <tr>
-										  <th>S.no</th>
-										  <th>File Name</th>
-										  <th>File Type</th>
-										  <th>Action</th>
-					                  </tr>
-					                </thead>
-					                <tbody>
-										${fileHTML}
-					                </tbody>
-					              </table>`;
-					  $('#filehtml').html(fileHTML);
-				  }
-				  else{
-				  	$('#filehtml').html('<center>NO Data</center>');
-				  }
-				  
-					$('#viewFile').modal({
-					    backdrop: 'static',
-					    keyboard: false
-					})
-					$('#viewFile').modal('show');
-		          }
-		     	});
-			return false;
-		}
-		
-		function call_view_complaint(mapid){
-			
-				$.ajax({
-				    type: "GET",
-				    url: '/gcc/api/mtm/getComMappingDetailsByMapId',
-				    data: {
-				        'mapid': mapid,
-				    },
-					dataType: 'json',
-				}).done(function(response) {
-					//alert(response.length);
-				    // Handle the response here
-					if(response.length<=0){
-						//console.error("Error:"+response);
-						$("#error").html("<p class='text-danger m-0 p-0'>Invalid Acknowledgement Number!</p>");
-					}
-					else{
-						
-						
-						var complaintBodyHTML='';
-						var com_txt = response[0].mtmComplaintTypes.complaintType;
-						var com_status=response[0].status;
-						var com_status_txt = `<span class="badge bg-info">UNDER PROGRESS</span> <i class="fa fa-arrow-right"></i> ${response[0].officer_name}`;
-						if(com_status=='close'){
-							var com_status_txt = `<span class="badge bg-success">Completed</span> <i class="fa fa-arrow-right"></i> ${response[0].officer_name}`;
-						}
-						complaintBodyHTML+=`<tr>
-						                    <td class="fw-semibold">
-						                      ${com_txt} <i class="fa fa-arrow-right"></i> ${com_status_txt}
-						                    </td>
-						                  </tr>`;
-					
-						var complaintHTML=`
-						<table class="table table-bordered table-vcenter">
-			                <thead>
-			                  <tr>
-			                    <th>Complaint <i class="fa fa-arrow-right"></i> Status</th>
-			                  </tr>
-			                </thead>
-			                <tbody>
-			                  ${complaintBodyHTML}
-			                </tbody>
-			              </table>
-						`;
-						var date_txt = convertdate(response[0].mtmEventsPetitionId.cDate);
-						var statusHTML = `<table class="table table-borderless table-vcenter p-0 m-0" style="font-size:12px;">
-							  		      <tbody>
-							  		        <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		           ${date_txt}
-							  		          </td>
-							  		        </tr>
-							  		        <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">Table No / User No: </th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		           ${response[0].mtmEventsPetitionId.tableNo}
-							  		          </td>
-							  		        </tr>
-							  		        <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		           ${response[0].mtmEventsPetitionId.petitionNumber}
-							  		          </td>
-							  		        </tr>
-							  		        <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		          	${response[0].mtmEventsPetitionId.petitionerName}
-							  		          </td>
-							  		        </tr>
-							  		        <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / No.</th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		           ${response[0].mtmEventsPetitionId.petitionerMobile}
-							  		          </td>
-							  		        </tr>
-							  		        <tr style="font-size:12px;">
-							  		          <td colspan="2" style="padding: 0.45rem 0.45rem;"><b>புகாரின் தன்மை / Nature of complaint:</b><br>
-							  		           ${response[0].mtmEventsPetitionId.petitionerNatureOfComplaint}
-							  				</td>
-							  		        <tr style="font-size:12px;">
-							  		          <td colspan="2" style="padding: 0.45rem 0.45rem;">
-							  		           ${complaintHTML}
-							  				</td>
-							  		        </tr>
-							  		        <tr style="text-align: right;">
-							  		          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-							  		        </tr>
-							  		      </tbody>
-							  		    </table>`;
-		
-							$('#petitionStatusDetails').html(statusHTML);
-							$("#error").html("");
-				  			$('#complaintStatus').modal({
-				  			    backdrop: 'static',
-				  			    keyboard: false
-				  			});
-							$('#complaintStatus').modal('show');
-					
-						 return false;
-					}
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					/*
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-				    console.error("URL: /api/ogin");
-				    console.error("Query parameters:", {
-				        'ptax': ptax,
-				        'uname': uname,
-				        'upass': upass
-				    });
-					*/
-				});
-				return false;
-		}
-		
-		function call_view_petition(petitionNo){
-			var petition_no = petitionNo;
-			
-				$.ajax({
-				    type: "GET",
-				    url: '/gcc/api/mtm/getPetitionStatusPublic',
-				    data: {
-				        'petition_no': petition_no,
-				    },
-					dataType: 'json',
-				}).done(function(response) {
-					
-				    // Handle the response here
-					if(response.length<=0){
-						$("#error").html("<p class='text-danger m-0 p-0'>Invalid Acknowledgement Number!</p>");
-					}
-					else{
-						
-						var complaint = response[0].petitionerComplaint;
-						var complaintArray = complaint.split(',');
-						
-						var complaintBodyHTML=``;
-						
-						$.ajax({
-						    type: "GET",
-						    url: '/gcc/api/mtm/getComMappingDetailsByPetId',
-						    data: {
-						        'petid': response[0].petitionId
-						    },
-						    dataType: 'json',
-							
-						}).done(function(response2) {
-							complaintBodyHTML=``;
-							var mapid=0;
-							for(j = 0; j < response2.length; j++){
-								
-								var com_txt= complaintTypes[response2[j].mtmComplaintTypes.complaintTypeId];
-								//console.log(response2[j].mtmComplaintTypes.complaintTypeId);
-								var com_status_link=``;
-								var com_status=response2[j].status;
-								var com_status_txt = `<span class="badge bg-info">UNDER PROGRESS</span> <i class="fa fa-arrow-right"></i> ${response2[j].officer_name}`;
-								if(com_status=='close'){
-									var com_status_txt = `<span class="badge bg-success">Completed</span> <i class="fa fa-arrow-right"></i> ${response2[j].officer_name}`;
-									var com_status_link=`<a href="#" onclick="return call_close_details(${response2[j].mapId});">View</a>`;
-									mapid = response2[j].mapId
-								}
-								complaintBodyHTML+=`<tr>
-								                    	<td class="text-center" scope="row">${j+1}</td>
-								                    	<td class="fw-semibold">
-								                      	${com_txt} <i class="fa fa-arrow-right"></i> ${com_status_txt}
-								                    	</td>
-														<td class="fw-semibold">${com_status_link}</td>
-								                   </tr>`;
-							}
-							
-							if(response2.length==0){
-								var complaint = response[0].petitionerComplaint;
-								var complaintArray = complaint.split(',');
-						
-								var complaintBodyHTML='';
-								for(j = 0; j < complaintArray.length; j++){
-									var sno = (j+1);
-									var com_txt= complaintTypes[complaintArray[j]];
-									var com_status=0;
-									var com_status_txt = `<span class="badge bg-danger">Not Assigned</span>`;
-									complaintBodyHTML+=`<tr>
-									                    	<td class="text-center" scope="row">${sno}</td>
-									                    	<td class="fw-semibold">
-									                      	${com_txt} <i class="fa fa-arrow-right"></i> ${com_status_txt}
-									                    	</td>
-															<td> - </td>
-									                  </tr>`;
-								}
-							}
-							else if(response2.length==1){
-								call_close_details(mapid);
-							}
-					
-					var complaintHTML=`
-					<table class="table table-bordered table-vcenter">
-		                <thead>
-		                  <tr>
-		                    <th class="text-center" style="width: 50px;">#</th>
-		                    <th>Complaint <i class="fa fa-arrow-right"></i> Status</th>
-							<th class="text-center" style="width: 50px;"><i class="fa fa-link"></i></th>
-		                  </tr>
-		                </thead>
-		                <tbody>
-		                  ${complaintBodyHTML}
-		                </tbody>
-		              </table>
-					`;
-					var date_txt = convertdate(response[0].cDate);
-					var statusHTML = `<table class="table table-borderless table-vcenter p-0 m-0" style="font-size:12px;">
-						  		      <tbody>
-						  		        <tr>
-						  		          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-						  		           ${date_txt}
-						  		          </td>
-						  		        </tr>
-						  		        <tr>
-						  		          <th style="padding: 0.45rem 0.45rem;">Table No / User No: </th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-						  		           ${response[0].tableNo}
-						  		          </td>
-						  		        </tr>
-						  		        <tr>
-						  		          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-						  		           ${response[0].petitionNumber}
-						  		          </td>
-						  		        </tr>
-						  		        <tr>
-						  		          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-						  		          	${response[0].petitionerName}
-						  		          </td>
-						  		        </tr>
-						  		        <tr>
-						  		          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / No.</th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-						  		           ${response[0].petitionerMobile}
-						  		          </td>
-						  		        </tr>
-						  		        <tr style="font-size:12px;">
-						  		          <td colspan="2" style="padding: 0.45rem 0.45rem;"><b>புகாரின் தன்மை / Nature of complaint:</b><br>
-						  		           ${response[0].petitionerNatureOfComplaint}
-						  				</td>
-						  		        <tr style="font-size:12px;">
-						  		          <td colspan="2" style="padding: 0.45rem 0.45rem;">
-						  		           ${complaintHTML}
-						  				</td>
-						  		        </tr>
-						  		      </tbody>
-						  		    </table>`;
-						  		    
-						statusHTML = `<div class="card mb-0">
-									      <div class="card-header bg-modal-title"><h3>Complaint Details</h3></div>
-									      <div class="card-body">${statusHTML}</div>
-									  </div>`;	
-						
-						petupdateForm = `<div class="card mb-0">
-									      <div class="card-header bg-modal-title"><h3>Complaint Update Details</h3></div>
-									      <div class="card-body text-center"><br><br>
-											   Select View from Left 'Complaint <i class="fa fa-arrow-right"></i> Status'
-											   <br><br><br>
-										  </div>
-									  </div>`;	
-							
-							$('#petitionUpdateForm').html(petupdateForm);	   
-							$('#petitionStatusForm').html(statusHTML);
-							$("#error").html("");
-				  			$('#petitionStatus').modal({
-				  			    backdrop: 'static',
-				  			    keyboard: false
-				  			});
-							$('#petitionStatus').modal('show');
-						});
-					
-						 return false;
-					}
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					/*
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-				    console.error("URL: /api/ogin");
-					*/
-				});
-				return false;
-		}
-		
-		function call_close_petition_details(mapid){
-			
-				$.ajax({
-				    type: "GET",
-				    url: '/gcc/api/mtm/getComMappingActionByMapId',
-				    data: {
-				        'mapid': mapid,
-				    },
-					dataType: 'json',
-				}).done(function(response) {
-					//alert(response.length);
-				    // Handle the response here
-					if(response.length<=0){
-						//console.error("Error:"+response);
-						var err=`<div scope="row" class="text-warning text-center">Dev Ref ID: ${mapid}</div>
-								 <div scope="row" class="text-danger text-center">No data Found!</div>`;
-						$('#petitionStatusForm').html(err);
-						$('#petitionUpdateForm').html(err);
-			  			$('#petitionStatusupdate').modal({
-			  			    backdrop: 'static',
-			  			    keyboard: false
-			  			});
-						$('#petitionStatusupdate').modal('show');
-					}
-					else{
-						var complaintBodyHTML='';
-						var com_txt = response[0].mtmEventsPetitionMapping.mtmComplaintTypes.complaintType;
-						var com_status=response[0].status;
-						var date_txt = response[0].cDate;
-						var action_taken_date= convertdate(date_txt);
-						var com_status_txt = `<span class="badge bg-info">UNDER PROGRESS</span> <i class="fa fa-arrow-right"></i> ${response[0].officer_name}`;
-						if(com_status=='close'){
-							var com_status_txt = `<span class="badge bg-success">Completed</span> <i class="fa fa-arrow-right"></i> ${response[0].officer_name}`;
-						}
-						complaintBodyHTML+=`<tr>
-						                    <td class="fw-semibold">
-						                      ${com_txt} <i class="fa fa-arrow-right"></i> ${com_status_txt}
-						                    </td>
-						                  </tr>`;
-					
-						var complaintHTML=`
-						<table class="table table-bordered table-vcenter">
-			                <thead>
-			                  <tr>
-			                    <th>Complaint <i class="fa fa-arrow-right"></i> Status</th>
-			                  </tr>
-			                </thead>
-			                <tbody>
-			                  ${complaintBodyHTML}
-			                </tbody>
-			              </table>
-						`;
-						var date_txt = convertdate(response[0].mtmEventsPetitionMapping.mtmEventsPetitionId.cDate);
-						var statusHTML = `<table class="table table-borderless table-vcenter p-0 m-0" style="font-size:12px;">
-							  		      <tbody>
-							  		        <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		           ${date_txt}
-							  		          </td>
-							  		        </tr>
-							  		        <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">Table No / User No: </th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		           ${response[0].mtmEventsPetitionMapping.mtmEventsPetitionId.tableNo}
-							  		          </td>
-							  		        </tr>
-							  		        <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		           ${response[0].mtmEventsPetitionMapping.mtmEventsPetitionId.petitionNumber}
-							  		          </td>
-							  		        </tr>
-							  		        <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		          	${response[0].mtmEventsPetitionMapping.mtmEventsPetitionId.petitionerName}
-							  		          </td>
-							  		        </tr>
-							  		        <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / No.</th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		           ${response[0].mtmEventsPetitionMapping.mtmEventsPetitionId.petitionerMobile}
-							  		          </td>
-							  		        </tr>
-							  		        <tr style="font-size:12px;">
-							  		          <td colspan="2" style="padding: 0.45rem 0.45rem;"><b>புகாரின் தன்மை / Nature of complaint:</b><br>
-							  		           ${response[0].mtmEventsPetitionMapping.mtmEventsPetitionId.petitionerNatureOfComplaint}
-							  				</td>
-							  		        <tr style="font-size:12px;">
-							  		          <td colspan="2" style="padding: 0.45rem 0.45rem;">
-							  		           ${complaintHTML}
-							  				</td>
-							  		        </tr>
-							  		      </tbody>
-							  		    </table>`;
-		
-							statusHTML=`<div class="card mb-0">
-									      <div class="card-header bg-modal-title"><h3>Complaint Details</h3></div>
-									      <div class="card-body">${statusHTML}</div>
-									    </div>`;
-							
-							$('#petitionStatusForm').html(statusHTML);
-							
-							call_close_details(mapid);
-							
-						 return false;
-					}
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-				    
-					
-				});
-				return false;
-		}
-		
-		function call_close_details(mapid){
-			
-				$.ajax({
-				    type: "GET",
-				    url: '/gcc/api/mtm/getComMappingActionByMapId',
-				    data: {
-				        'mapid': mapid,
-				    },
-					dataType: 'json',
-				}).done(function(response) {
-					
-				    // Handle the response here
-					if(response.length<=0){
-						
-						petupdateForm = `<div class="card mb-0">
-									      <div class="card-header bg-modal-title"><h3>Complaint Update Details</h3>
-										      <div class="card-header-right">
-	                                            <p class="bg-warning lbl-card"> Ref ID: ${mapid}</p>
-	                                          </div>
-									      </div>
-									      <div class="card-body">${nodata}</div>
-									     </div>`;
-
-						$('#petitionUpdateForm').html(petupdateForm);
-						$("#formError").html("");
-			  			
-					}
-					else{
-						var complaintBodyHTML='';
-						var com_txt = response[0].mtmEventsPetitionMapping.mtmComplaintTypes.complaintType;
-						var com_status=response[0].status;
-						var date_txt = response[0].cDate;
-						var action_taken_date= convertdate(date_txt);
-						
-						var fromdate=convertdate(response[0].mtmEventsPetitionMapping.mtmEventsPetitionId.cDate);
-						var todate = action_taken_date;
-				        var petupdateForm=`
-									<label class="form-label">நடவடிக்கை தேதி / Action Date:</label>
-									<div class="mb-0 text-warning">${action_taken_date} 
-										<a href="#" onclick="return false;"data-toggle="tooltip" data-html="true" data-animation="true" data-placement="top" title="In Days: ${date_difference(fromdate,todate,'days')}<br> In Time: ${date_difference(fromdate,todate,'time')}"> <i class="ik ik-clock text-success"></i> </a></div>
-									<hr>
-									<label class="form-label">நடவடிக்கை / Action:</label>
-									<div class="text"><p>${response[0].comments}</p></div>
-									<hr>
-									<label class="form-label">ஆவணப் பதிவேற்றம் / Document Upload:</label><br>
-									<p class="mb-0 text btn" onclick="call_blobData(${response[0].solMapId},'action');">${response[0].fileName}</p>
-          					  			<div id="formError" class="text-danger"></div>
-									</div>
-								  `;
-								  
-						petupdateForm = `<div class="card mb-0">
-										      <div class="card-header bg-modal-title"><h3>Complaint Update Details</h3>
-											      <div class="card-header-right">
-													  <span class="badge badge-pill badge-success mb-1">Ref ID: ${mapid}</span>
-			                                      </div>
-										      </div>
-										      <div class="card-body">${petupdateForm}</div>
-										  </div>`;
-						 
-						$('#petitionUpdateForm').html(petupdateForm);
-						$("#formError").html("");
-					}
-						$('#petitionStatus').modal({
-				  			    backdrop: 'static',
-				  			    keyboard: false
-			  			});
-						$('#petitionStatus').modal('show');
-						
-						$('[data-toggle="tooltip"]').tooltip();
-						
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-					
-				});
-				return false;
-		}
-		
-		function call_blobData(id,inTable){
-			
-			$.ajax({
-			    type: "GET",
-			    url: '/gcc/api/mtm/viewBlobData',
-			    data: {
-			        'id': id,
-					'table': inTable,
-			    },
-				dataType: 'json',
-			}).done(function(response) {
-				
-				var fileHTML = '';
-			    // Handle the response here
-				if(response.length<=0){
-					fileHTML = `<p class='text-danger m-0 p-0'>No Data!</p>`;
-				}
-				else{
-					if(response[1]=='application/pdf'){
-						var fileHTML = `<iframe src="data:application/pdf;base64,${response[0]}" type="application/pdf" width="100%" height="600px"></iframe>`;
-						
-					}
-					else if(response[1]=='application/octet-stream'){
-						fileHTML =`<p class='text-danger m-0 p-0'>File Preview not avaiable.<br>Try to download and view.</p>`;
-					}
-					else{
-						fileHTML =`<img src="data:${response[1]};base64,${response[0]}" alt="File">`;
-					}
-					
-				}
-				/*
-				console.log(response);
-				console.log(response.length);
-				console.log(response[1]);
-				console.log(fileHTML);
-				*/
-				$('#viewFileHtml').html(fileHTML);
-	  			$('#viewCloseFile').modal({
-	  			    backdrop: 'static',
-	  			    keyboard: false
-	  			});
-				$('#viewCloseFile').modal('show');
-				
-			}).fail(function(jqXHR, textStatus, errorThrown) {
-				
-			    // Log the error and any relevant information
-			    console.error("Error sending request: " + textStatus + " " + errorThrown);
-			   
-			});
-			return false;
-		}
-		
-		/* //////////////// */ 
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/pgr/modal-box.html b/src/main/resources/templates/fragments/modules/pgr/modal-box.html
deleted file mode 100644
index 51b2ed07..00000000
--- a/src/main/resources/templates/fragments/modules/pgr/modal-box.html
+++ /dev/null
@@ -1,68 +0,0 @@
-			<!--  Box 1 -->
-			<div class="modal fade" id="pgrModalBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="modalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="modalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 2 -->
-			<div class="modal fade" id="pgrModalBox_2" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="modalTitle_2">Modal Box 2 Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="modalBody_2">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 3 -->
-			<div class="modal fade" id="pgrModalBox_3" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-lg" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="modalTitle_3">Complaint Details</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="modalBody_3">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/pgr/script.html b/src/main/resources/templates/fragments/modules/pgr/script.html
deleted file mode 100644
index e5f27912..00000000
--- a/src/main/resources/templates/fragments/modules/pgr/script.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<script th:inline="javascript">
-	var nodata = nodata();//`<center><img src="/assets/images/nodata_ani.gif" width="40%"><br><p class="text-warning">Data are not availble at this moment please check later</p></center>`;
-	
-	var baseURL = "/gcc/pgr/";
-	
-	/* Department List */
-	function get_department_list() {
-	    
-		var apiUrl = '/gcc/api/pgr/getDepartments';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Event Id Search */
-	function callReSetEventId(eventid){
-		$.ajax({
-		    type: "GET",
-		    url: '/gcc/api/mtm/setEventId',
-		    data: {
-		        'eventid': eventid
-		    },
-		}).done(function(response) {
-			location.reload();
-		}).fail(function(jqXHR, textStatus, errorThrown) {
-			/*
-		    // Log the error and any relevant information
-		    console.error("Error sending request: " + textStatus + " " + errorThrown);
-			*/
-		});
-		return false;
-	}
-	
-	function complaintTypes() {
-	    var complaintList = {
-	        "NonBURSTLT": "Street Light not burning",
-	        "REOFGAR": "Removal of Garbage",
-	        "ROAD": "Road Damaged",
-	        "MOSQUITE": "Mosquito Nuisance",
-	        "WATER": "Water Stagnation",
-	        "REOFDEB": "Removal of Debris",
-	        "TREE": "Tree Fallen",
-	        "DOGS": "Dog Menace",
-	        "ENCMTN": "Encroachment",
-	        "POT": "Pothole",
-	        "PTAX": "Property Tax",
-	        "OTHERS": "Others"
-	    };
-	    
-	    return complaintList;
-	}
-	
-	function complaintTypeId() {  
-    	var complaintIdList = {
-	        "NonBURSTLT": "52,146",
-	        "REOFGAR": "1,97",
-	        "ROAD": "22,32,57,59,70,113,114,130,145",
-	        "MOSQUITE": "18,118",
-	        "WATER": "69,138",
-	        "REOFDEB": "7,99",
-	        "TREE": "71,152",
-	        "DOGS": "19,119",
-	        "ENCMTN": "75,181",
-	        "POT": "58,112",
-	        "PTAX": "43,166",
-	        "OTHERS": "52,146,1,97,22,32,57,59,70,113,114,130,145,18,118,69,138,7,99,71,152,19,119,75,181,58,112,43,166"
-	    };
-	    return complaintIdList;
-	}
-	
-/////////////////////////////////////// Common Modal Box - 3   ///////////////////////////////////////
-	
-	var model_box_3 = "#pgrModalBox_3";
-	
-	function viewComplaintDetails(complaintNumber)
-	{
-		
-		get_table_list_modal_box_3(complaintNumber);
-		/*
-		var dept_name_txt = dept_name.split("-");
-		
-		if(dept_name_txt.length<=1){
-			dept_name_txt[0] = "-";
-		}
-
-		dept_name_txt[1] = dept_name_txt[1].charAt(0).toUpperCase() + dept_name_txt[1].slice(1).toLowerCase();
-			
-		$('#modalTitle_2').html("Officer`s Pending Report Of "+dept_name_txt[1]+" Zone ("+dept_name_txt[0]+")"); // Box title
-			*/
-		loading_text_msg = getLoadingMessage(); // get Loading random text
-		
-		$('#modalBody_3').html(searchinfo("<b>"+loading_text_msg+"</b>")); // Box content (Body)
-			
-		$(model_box_3).modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-		
-		//$(model_box_2).modal('show'); // Show Modal Box
-		
-		return false;
-	}
-	
-	/* Get Data of Main Page 1 */
-    function get_modal_box_3_table_data(complaintNumber){
-    	var apiUrl = '/gcc/api/pgr/getComplaintDetails';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            data: {
-			        'complaintNumber': complaintNumber,
-			    },
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                //console.log('Response list:', jsonResponse);
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-    }
-    
-    /* Get Complaints List */
-    function get_table_list_modal_box_3(complaintNumber){
-    	get_modal_box_3_table_data(complaintNumber).then(function(complaintDetails) {
-		    // Handle the data list
-    		//console.log('Response list:', complaintList);
-    		//$('#modalBody_3').html(get_modal_box_3_table_html()); // Box content (Body)
-    		
-    		generate_table_modal_box_3(complaintDetails);
-    		
-    		//$(model_box_3).modal('show'); // Show Modal Box
-    		
-		}).catch(function(error) {
-		    // Handle errors
-		    console.error('Error fetching department list:', error);
-		});
-	}
-    
-    /* Call Complaints Details function */
-    function generate_table_modal_box_3(data){
-    	
-    	var complaintDetailsHTML = "";
-    	
-        $.each(data, function(index, row) {
-        	complaintDetailsHTML = `<table class="table table-bordered table-vcenter p-0 m-0" style="font-size:12px;">
-            							<thead>
-	  					                  <tr>
-	  										  <th colspan="4">Complaint Information:</th>
-	  					                  </tr>
-	  					                </thead>
-						  		      <tbody>
-						  		        <tr>
-						  		          <th style="padding: 0.45rem 0.45rem;">Complaint No: </th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-						  		        	`+row["COMPLAINTNUMBER"]+`
-						  		          </td>
-						  		        	
-						  		          <th style="padding: 0.45rem 0.45rem;">Department: </th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-						  		        	`+row["DEPT_NAME"]+`
-						  		          </td>
-						  		        </tr>
-						  		        <tr>
-						  		          <th style="padding: 0.45rem 0.45rem;">Complaint Date: </th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-						  		        	`+row["COMPDATE"]+`
-						  		          </td>
-						  		        
-						  		          <th style="padding: 0.45rem 0.45rem;">Complaint Type:</th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-						  		        	`+row["COMPLAINTTYPENAME"]+`
-						  		          </td>
-						  		        </tr>
-						  		        
-						  		        <tr>
-						  		          <th style="padding: 0.45rem 0.45rem;">Complaint Title: </th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-						  		        	`+row["COMPLAINTTITLE"]+`
-						  		          </td>
-						  		        
-						  		          <th style="padding: 0.45rem 0.45rem; background-color:#fbffe0;">Officer ID:</th>
-						  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem; background-color:#fbffe0;">
-						  		        	`+row["USER_NAME"]+`
-						  		          </td>
-						  		        </tr>
-						  		        
-					  		         	<tr>
-						  		       		<th style="padding: 0.45rem 0.45rem;">Details of Complaint:</th>
-						  		       		<td class="fw-semibold" style="padding: 0.45rem 0.45rem;" colspan="3">
-						  		       			`+row["COMPLAINTDETAILS"]+`
-					  		       			</td>
-					  		         	</tr>
-					  		         	<tr>
-						  		       		<th style="padding: 0.45rem 0.45rem;">Complaint Location:</th>
-						  		       		<td class="fw-semibold" style="padding: 0.45rem 0.45rem;" colspan="3">
-						  		       			`+row["COMPLAINTLOCATION"]+`
-					  		       			</td>
-					  		         	</tr>
-					  		         	<tr>
-						  		       		<th style="padding: 0.45rem 0.45rem;">Complaint Specific Location:</th>
-						  		       		<td class="fw-semibold" style="padding: 0.45rem 0.45rem;" colspan="3">
-						  		       			`+row["COMPLAINTLANDMARK"]+`
-					  		       			</td>
-					  		         	</tr>
-						  		      </tbody>
-						  		    </table>`;
-						  		    
-        	complaintDetailsHTML +=`<br>
-									<table class="table table-bordered table-vcenter p-0 m-0" style="font-size:12px;">
-										<thead>
-	  					                  <tr>
-	  										  <th colspan="4">Complaining Person\'s Details:</th>
-	  					                  </tr>
-	  					                </thead>
-						  		      <tbody>
-							  		      <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">Person Name: </th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		        	`+row["COMPLAINANTFIRSTNAME"]+`
-							  		          </td>
-							  		        	
-							  		          <th style="padding: 0.45rem 0.45rem;">Email: </th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		        	`+row["COMPLAINANTEMAIL"]+`
-							  		          </td>
-							  		      </tr>
-							  		      <tr>
-							  		          <th style="padding: 0.45rem 0.45rem;">Phone Number: </th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		        	`+row["COMPLAINANTTELEPHONE"]+`
-							  		          </td>
-							  		        	
-							  		          <th style="padding: 0.45rem 0.45rem;">Mobile Number: </th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		        	`+row["MOBILENUMBER"]+`
-							  		          </td>
-					  		         	  </tr>
-							  		      <tr>
-						  		          	  <th style="padding: 0.45rem 0.45rem;">Address: </th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		        	`+row["COMPLAINANTADDRESS"]+`
-							  		          </td>
-							  		        	
-							  		          <th style="padding: 0.45rem 0.45rem;">Pincode: </th>
-							  		          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-							  		        	`+row["PINCODE"]+`
-							  		          </td>
-						  		          </tr>
-						  		      </tbody>
-							  		</table>`;
-        });
-		
-        $('#modalBody_3').html(complaintDetailsHTML); // Box content (Body)
-	}
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/pgr/search_form.html b/src/main/resources/templates/fragments/modules/pgr/search_form.html
deleted file mode 100644
index e0f28b3b..00000000
--- a/src/main/resources/templates/fragments/modules/pgr/search_form.html
+++ /dev/null
@@ -1,19 +0,0 @@
-				<div class="row">
-					<div class="col-12 mb-2">
-						<div class="input-group mb-0">
-							<span class="input-group-prepend">
-                        	<button type="button" id="filter_reset_btn" class="btn btn-success" onclick="callReSetEventId(0);" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Reset" title="Reset">
-                          	  <i class="ik ik-refresh-ccw"></i>
-                        	</button>
-                        	</span>
-						 <select class="form-control" id="search_department_id" name="search_department_id">
-	                        <option value="0">All Department`s</option>
-	                      </select>
-	                      <span class="input-group-append">
-                         <button type="button" id="filter_search_btn" class="btn btn-success" onclick="callSetEventId();" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Search" title="Search">
-                           <i class="ik ik-search me-1"></i> Search
-                         </button>
-                         </span>
-						</div>
-					</div>
-				</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/ward_sabha/modal-box.html b/src/main/resources/templates/fragments/modules/ward_sabha/modal-box.html
deleted file mode 100644
index 38e0c8c2..00000000
--- a/src/main/resources/templates/fragments/modules/ward_sabha/modal-box.html
+++ /dev/null
@@ -1,139 +0,0 @@
-			
-			<!--  Box 1 -->
-			<div class="modal fade" id="ackModalBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="ackModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ackModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 1 -->
-			<div class="modal fade" id="mappingModalBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="mappingModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="mappingModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 2 -->
-			<div class="modal fade" id="ComplaintStatusBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="complaint-title">புகார் நிலை / Complaint Status:</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ComplaintStatusBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 3 -->
-			<div class="modal fade" id="viewFileBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewFileTitle">View File</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewFileBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 4 -->
-			<div class="modal fade" id="viewpetition" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewPetitionTitle">View Petition</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewPetitionBoxBody">
-                        		<iframe id="iframe" width="100%" height="400px" src=""></iframe>
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 0 common -->
-			<div class="modal fade" id="forwardModalBox" data-backdrop="static" tabindex="1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-lg" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="forwardModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="forwardModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/ward_sabha/petition_view_script.html b/src/main/resources/templates/fragments/modules/ward_sabha/petition_view_script.html
deleted file mode 100644
index 56899402..00000000
--- a/src/main/resources/templates/fragments/modules/ward_sabha/petition_view_script.html
+++ /dev/null
@@ -1,293 +0,0 @@
-<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Call Petition function to fetch the data
-	    		    get_petition_data();
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-			 
-	     	// Function to get complaint_type and complaint_typeid by complaint_typeid
-	        function getComplaintTypeById(complaintTypeId) {
-	            for (var i = 0; i < complaintTypeList.length; i++) {
-	                if (complaintTypeList[i].complaint_typeid == complaintTypeId) {
-	                    return {
-	                        complaint_type: complaintTypeList[i].complaint_type,
-	                        complaint_typeid: complaintTypeList[i].complaint_typeid
-	                    };
-	                }
-	            }
-	            return null; // Return null if no matching complaint_typeid is found
-	        }
-	     
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint;
-					petitionId = petitionDetails[0].petition_id;
-					var complaintArray = complaint.split(",");
-					$("#complaintType").val(complaintArray);
-					
-					$('#complaintType').trigger('change');
-					
-					closedComplaintsList = complaintArray;
-					$("#cdate_value").html(convertdate(petitionDetails[0].cdate));
-					$("#petition_no_value").html(petitionDetails[0].petition_no);
-					$("#petitioner_name_value").html(petitionDetails[0].petitioner_name);
-					$("#petitioner_mobile_value").html(petitionDetails[0].petitioner_mobile);
-					$("#petitioner_address_value").html(petitionDetails[0].petitioner_address);
-					$("#petitioner_pincode_value").html(petitionDetails[0].petitioner_pincode);
-					
-					$("#complaint_with_maping_value").html(petitionDetails[0].complaint_nature);
-					
-					var petition_status = petitionDetails[0].status
-					
-					if(petition_status=='pending' || petition_status=='partial'){
-						$("#petition_summary_title").html("Pending Summary");
-						var currentDate = new Date();
-						var totaldayspending = date_difference(convertdate(petitionDetails[0].cdate),convertdate(currentDate),'');
-						$("#petition_summary_html").html(`This petition has been pending for more than ${totaldayspending}`);
-					}
-					if(petition_status=='close'){
-						$("#petition_summary_title").html("Close Summary");
-						var currentDate = new Date();
-						var totaldayspending = date_difference(convertdate(petitionDetails[0].cdate),convertdate(currentDate),'');
-						$("#petition_summary_html").html(`The time taken to close this petition is ${totaldayspending}`);
-					}
-						
-					petition_status=petition_status.charAt(0).toUpperCase() + petition_status.slice(1);
-					
-					$("#petition_status_value").html(`<b style="color:red">${petition_status}</b>`);
-					
-					// Call Complaint list based on Petition No and Id
-					get_petition_mapping_data();
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition Data ('+petitionNo+'):', error.message);
-				    call_petition_search_from("** Invalid Petition Number: Please provide a valid petition number.");
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_petition_details() {
-			    //alert();
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/zerohours_petition/getPetitionDetails?petitionNo='+petitionNo;
-				//alert(petitionNo);
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                //alert(jsonResponse[0].petitioner_name);
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("* Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			function get_petition_mapping_data(){
-				get_petition_mapping_list().then(function(mappingDetails) {
-					
-					// Initialize count
-					let totalCount = mappingDetails.length;
-					let completedCount = 0;
-					let pendingCount = 0;
-
-					var tableListHTML = "";
-					
-					for(j = 0; j < mappingDetails.length; j++){
-						var complaint_status=mappingDetails[j].complaint_status;
-						complaint_status=complaint_status.charAt(0).toUpperCase() + complaint_status.slice(1);
-						
-						tableListHTML += `<tr>
-						                    <td>${j+1}</td>
-						                    <td>${mappingDetails[j].complaint_type}</td>
-						                    <td>${mappingDetails[j].off_nm} (${mappingDetails[j].off_id})</td>
-						                    <td>${convertdate(mappingDetails[j].mappedOn)}</td>
-						                    <td>${complaint_status}</td>
-						                  </tr>`;
-						                  
-		               	// Check if the status is "pending"
-					    if (mappingDetails[j].complaint_status === "pending") {
-					        // Increment the count
-					        pendingCount++;
-					    }
-					    else if(mappingDetails[j].complaint_status === "close"){
-					    	completedCount++;
-						}
-					}
-					
-					var listOfComplaintsHTML = `<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th>S.no</th>
-									                    <th>Complaint</th>
-									                    <th>Assigned To</th>
-									                    <th>Assigned On</th>
-									                    <th>Status</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-								                 		${tableListHTML}
-								                	</tbody>
-								              	</table>`;
-					$("#listOfComplaintsHTML").html(listOfComplaintsHTML);
-					
-					$("#total_complaints_value").html(`<b>${totalCount}</b>`);
-					$("#total_complaints_completed_value").html(`<b style="color:green">${completedCount}</b>`);
-					$("#total_complaints_pending_value").html(`<b style="color:red">${pendingCount}</b>`);
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching Mapping Data ('+petitionId+'):', error.message);
-				});
-			}
-			
-			/* Get Petition details by petition number */
-			function get_petition_mapping_list() {
-			    alert(petitionId);
-				var formData = new FormData();
-				var apiUrl = '/gcc/api/zerohours_petition/getComplaintListByPetitionId?petitionId='+petitionId;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("***Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-		
-		function call_petition_search_from(errorTXT){
-			var errorHTML = "";
-			if(errorTXT!=""){
-				errorHTML = `<div class="form-group text-center text-danger">${errorTXT}</div>`;
-			}
-			var searchFormHTML = `<form class="search-form" id="search-form" onsubmit="return searchRequest();">
-										<div class="card-header">
-						                <h3>View Petition Form</h3>
-						                <div class="card-header-right">
-						                    <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-						                </div>
-						            </div>
-						       		<div class="card-body">
-						       			<div class="row">
-											<div class="col-12 text-center">
-												${errorHTML}
-												<div class="form-group">
-						                            <label for="petitionNoSearch">Petition No / மனு எண் </label>
-						                            <input type="text" class="form-control text-center" name="petitionNoSearch" id="petitionNoSearch" autocomplete="off" placeholder="ZH00000000" maxlength="11" required>
-						                        </div>
-						                        
-											</div>
-											<div class="col-12">
-												<div class="block-content" id="userinfo2">
-													<div id="comp_mapping_to_officers" class="row"></div>
-												</div>
-										 	</div>
-										</div>
-						          	</div>
-						          	<div class="card-footer text-center">
-										<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            	<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						        	</div>
-						    	</form>`;
-			
-			$("#petitionViewtable").html(searchFormHTML);
-			$("#petitionNoSearch").mask('ZH00000000');
-		}
-		
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/zerohours_petition/view-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			if(petitionNo!=null && petitionNo!="error"){
-				get_complaint_type_data();
-				get_officer_master_data();
-			}
-			else{
-				if(petitionNo=="error"){
-					call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				}
-				else{
-					call_petition_search_from("");
-				}
-			}
-			
-		});
-		</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/ward_sabha/script.html b/src/main/resources/templates/fragments/modules/ward_sabha/script.html
deleted file mode 100644
index ca53ecff..00000000
--- a/src/main/resources/templates/fragments/modules/ward_sabha/script.html
+++ /dev/null
@@ -1,660 +0,0 @@
-<script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-<script th:inline="javascript">
-	var nodata = nodata();
-	
-	var baseURL = "/gcc/ward_sabha/";
-	
-	
-	/* Zero Hours Event List */
-	function get_event_list() {
-	    
-		var apiUrl = '/gcc/api/ward_sabha/getEventList';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Zero Hours Event List */
-	function get_current_event_list() {
-	    
-		var apiUrl = '/gcc/api/ward_sabha/getCurrentEventList';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	
-	/* Zone and Ward List */
-	function get_zone_ward_list() {
-	    
-		var apiUrl = '/gcc/api/ward_sabha/getZoneAndWard';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Councillor List */
-	function get_councillor_list(ward) {
-	    
-		var apiUrl = '/gcc/api/ward_sabha/getCouncillor?ward='+ward;
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Complaint Type List */
-	function get_complaint_type_list() {
-	    
-		var apiUrl = '/gcc/api/ward_sabha/getComplaintTypes';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Officer Master List */
-	function get_officer_list() {
-	    
-		var apiUrl = '/gcc/api/ward_sabha/getOfficerList';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Petition Type List */
-	function get_petition_type_list() {
-	    
-		var apiUrl = '/gcc/api/ward_sabha/getPetitionTypes';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	function viewAck(petitionNo){
-
-		loading_text_msg = getLoadingMessage(); // get Loading random text
-		$('#ackModalTitle').html("Loading Petition Acknowledgement ("+petitionNo+")");
-		var loading=searchinfo("<b>"+loading_text_msg+"</b>");
-		var ackContentHTML=`
-							<div class="row">
-							    <div class="col-lg-6">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack1table" class="ack-content">
-						                <div id="ack1">${loading}</div>
-						            </div>
-						        </div>
-						    </div>
-						    
-						    <div class="col-lg-6 printack2">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack2table" class="ack-content">
-						                <div id="ack2">${loading}</div>
-						            </div>
-						        </div>
-						    </div>
-						    <!--<div class="col-lg-12 text-center block-options pt-10">
-						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-						    </div>-->
-						</div>`;
-		
-		$('#ackModalBody').html(ackContentHTML); // Box content (Body)
-		
-		$("#ackModalBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-		}); // Show Modal Box
-			
-		get_petition_ack_data(petitionNo);
-		
-		return false;
-	}
-	
-	
-	 /* Get Petition data */
-	function get_petition_ack_data(petitionNo){
-		get_petition_details_byNo(petitionNo).then(function(petitionDetails) {
-		    // Handle the Complaint list
-		    var complaintHTML = "";
-			var complaint = petitionDetails[0].petitioner_complaint_txt;
-			
-			var complaintArray = complaint.split(',');
-			
-			for(j = 0; j < complaintArray.length; j++){
-				if(j>0){
-					complaintHTML+="<br>";
-				}
-				complaintHTML+= (j+1)+') '+complaintArray[j];
-			}
-			var ack =`
-			<table class="table table-borderless table-vcenter p-0 m-0">
-			  <tbody>
-			    <tr>
-			      <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-			      <td class="fw-semibold text-center">
-						<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-						மக்களை தேடி மேயர் திட்டம்<br>
-						ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-				  </td>
-				  <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-			    </tr>
-			</tbody>
-			</table>
-			<hr style="margin:0px">
-			  <div class="block-content p-0 m-0">
-			    <table class="table table-borderless table-vcenter" style="font-size:12px;">
-			      <tbody>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${convertdate(petitionDetails[0].cdate)}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petition_no}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petitioner_name}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petitioner_mobile}
-			          </td>
-			        </tr>
-			        <tr style="font-size:12px;">
-			          <th style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${complaintHTML}
-					</td>
-			        </tr>
-			        <tr>
-			          <td scope="row" colspan="2" style="font-size:10px">இம்மனுவின் ஒப்புகைச் சீட்டு எண் மனு தாரரின் கைபேசி எண்ணிற்கு குறுஞ்செய்தி மூலம் அனுப்பி வைக்கப்படும் . இம்மனுவின் நிலை குறித்து https://chennaicorporation.gov.in/MTM/ என்ற இணையதளத்தில் மனுவின் எண்ணை குறிப்பிட்டு அறிந்துகொள்ளலாம்</th>
-			        </tr>
-			        <tr style="text-align: right;">
-			          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-			        </tr>
-			      </tbody>
-			    </table>
-			  </div>`;
-		    $('#ackModalTitle').html("Acknowledgement Of Petition ("+petitionNo+")");
-			$("#ack1").html(ack);
-			$("#ack2").html(ack);
-			  
-		}).catch(function(error) {
-		    // Handle errors
-		    console.error('Error fetching petition details ('+petitionNo+'):', error);
-		});
-	}
-	 
-	/* Get Petition details by petition number */
-	function get_petition_details_byNo(petitionNo) {
-		
-		var apiUrl = '/gcc/api/ward_sabha/getPetitionDetails?petitionNo='+petitionNo
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Get Petition details by petition number */
-	function get_complaint_details_byId(mapId) {
-		
-		var apiUrl = '/gcc/api/ward_sabha/getComplaintDetails?mapId='+mapId
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Get Petition details by petition number */
-	function get_complaint_action_byId(mapId) {
-		
-		var apiUrl = '/gcc/api/ward_sabha/getComplaintActionDetails?mapId='+mapId
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	
-	/* File View */
-	function viewFile(fileOf,fileName,fileType){
-		$("#viewFileTitle").html("View File ("+fileName+")"); // Title for the Modal Box
-		
-		var fileUrl = "/gcc/files/zh_petition/";
-		
-		if(fileOf=="petition")
-		{
-			fileUrl=fileUrl+fileName;
-		}
-		else if(fileOf="action"){
-			fileUrl=fileUrl+"zh_action_file/"+fileName;
-		}
-		else{
-			fileUrl=fileUrl+"invaliedFile.txt"; // For File Not Exits Default file name
-		}
-		
-		checkFileExists(fileUrl).then(exists => {
-			if (exists) {
-				if(fileType=='application/pdf'){
-					var fileHTML = `<iframe src="${fileUrl}" type="application/pdf" width="100%" height="600px"></iframe>`;
-					
-				}
-				else if(fileType=='application/octet-stream'){
-					fileHTML =`<p class='text-danger m-0 p-0'>File Preview not avaiable.<br>Try to download and view.</p>`;
-				}
-				else{
-					fileHTML =`<img src="${fileUrl}" alt="${fileType}" width="100%">`;
-				}
-		    } else {
-		        console.log('File does not exist');
-		        fileHTML = `<p class='text-danger m-0 p-0'>File does not exist</p>`;
-		    }
-			
-			$("#viewFileBoxBody").html(fileHTML); // Modal Box Body
-			$("#viewFileBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-		});
-	}
-	
-	/* Downlaod file */
-	function downloadFile(fileOf,fileName,fileType){
-		$("#viewFileTitle").html("View File ("+fileName+")"); // Title for the Modal Box
-		
-		var fileUrl = "/gcc/files/zh_petition/";
-		
-		if(fileOf=="petition")
-		{
-			fileUrl=fileUrl+fileName;
-			callDownload(fileUrl,fileName);
-		}
-		else if(fileOf="action"){
-			fileUrl=fileUrl+"zh_action_file/"+fileName;
-			callDownload(fileUrl,fileName);
-		}
-		else{
-			fileUrl=fileUrl+"invaliedFile.txt"; // For File Not Exits Default file name
-		}
-	}
-	
-	/* Show Complaint forward Modal */
-	function forward_compliant(mapId,title){
-		var compmapHTML =`<div class="col-12" id="comp${mapId}">
-			
-								<div class="widget mb-0">
-					                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                    <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-					                </div>
-					                <div class="widget-body">
-					                	<div class="form-group">
-					                    	<label for="dept${mapId}">Select Department Type</label>
-											<select name="dept[]" id="dept${mapId}" class="form-control" onchange="javascript:calloffice(this.value,${mapId})">
-												<option value="0">Select Department</option>
-												<option value="1">GCC Department</option>
-												<option value="2">External Department</option>
-										    </select>
-										</div>
-										<div id="officedata${mapId}"></div>
-										<div id="officers${mapId}"></div>
-					                </div>
-					            </div>
-							
-						  </div>`;
-	  
-		$("#forwardModalBody").html(compmapHTML); // Modal Box Body
-		$("#forwardModalBox").modal({
-		    backdrop: 'static',
-		    keyboard: false
-		}); // Show Modal Box
-	}
-	
-	/* Show Complaint forward Modal */
-	function compliant_mapping(petitionId,title,petitionNo){
-		get_mapped_list(petitionId).then(function(listHTML) {
-			var compmapHTML =`<div class="row"><div class="col-6" id="comp${petitionId}">
-									<input type="hidden" name="petitionid" id="petitionid" value="${petitionId}">
-									<input type="hidden" name="petitionno" id="petitionno" value="${petitionNo}">
-									<div class="widget mb-0">
-						                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-						                    <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-						                </div>
-						                <div class="widget-body">
-						                	<div class="form-group">
-						                    	<label for="dept${petitionId}">Select Department Type</label>
-												<select name="dept[]" id="dept${petitionId}" class="form-control" onchange="javascript:calloffice(this.value,${petitionId})">
-													<option value="0">Select Department</option>
-													<option value="1">GCC Department</option>
-													<option value="2">External Department</option>
-											    </select>
-											</div>
-											<div id="officedata${petitionId}"></div>
-											<div id="officers${petitionId}"></div>
-						                </div>
-						            </div>
-								
-							  </div>`;
-				
-				var strListHTML = "";
-			  	for (const key in listHTML) {
-				    if (listHTML.hasOwnProperty(key)) {
-				        //console.log(`${key}: ${listHTML[key]}`);
-				    	strListHTML += `<tr>
-							            	<td class="fw-semibold">${key+1}</td>
-							            	<td class="fw-semibold">${listHTML[key]['petition_no']}</td>
-							            	<td class="fw-semibold">${listHTML[key]['off_nm']}</td>
-							            	<td class="fw-semibold">
-							            		<a href="javascript:void(0)" class="link mr-10"  onclick="unmapOfficer(${listHTML[key]['mapid']},${listHTML[key]['petition_id']},'${listHTML[key]['off_nm']}','${listHTML[key]['petition_no']}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Un-Map" data-original-title="Un-Map"><i class="fas fa-unlink"></i></a>
-							            	</td>
-						              	</tr>`;
-				    }
-				}
-			  	strListHTML = `<table class="table table-bordered table-vcenter mb-0">
-							              <thead>
-							              <tr>
-							                <th>S.no</th>
-							                <th>Petition No</th>
-							                <th>Department</th>
-							                <th><i class="fas fa-unlink"></i></th>
-							              </tr>
-							            </thead>
-							        	<tbody>
-							         		${strListHTML}
-							        	</tbody>
-							      	</table>`;
-	      	
-			compmapHTML = compmapHTML + `<div class="col-6" id="mappeddata">
-								
-								<div class="widget mb-0">
-					                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                    <h3 class="widget-title" style="font-size:13px;">Mapped List</h3>
-					                </div>
-					                <div class="widget-body">
-					                	<div id="mappedTableHTML">
-					                    	${strListHTML}
-										</div>
-					                </div>
-					            </div>
-							
-						  </div></div>`;
-		  
-			$("#mappingModalTitle").html("Mapping Form"); 
-			$("#mappingModalBody").html(compmapHTML); // Modal Box Body
-			$("#mappingModalBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-		}).catch(function(error) {
-		    // Handle errors
-		    console.error('Error fetching Mapped data:', error);
-		});
-		return false;
-	}
-	
-	function updateModelBox(petitionId,title,petitionNo){
-		get_mapped_list(petitionId).then(function(listHTML) {
-			var compmapHTML =`<div class="row"><div class="col-6" id="comp${petitionId}">
-									<input type="hidden" name="petitionid" id="petitionid" value="${petitionId}">
-									<input type="hidden" name="petitionno" id="petitionno" value="${petitionNo}">
-									<div class="widget mb-0">
-						                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-						                    <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-						                </div>
-						                <div class="widget-body">
-						                	<div class="form-group">
-						                    	<label for="dept${petitionId}">Select Department Type</label>
-												<select name="dept[]" id="dept${petitionId}" class="form-control" onchange="javascript:calloffice(this.value,${petitionId})">
-													<option value="0">Select Department</option>
-													<option value="1">GCC Department</option>
-													<option value="2">External Department</option>
-											    </select>
-											</div>
-											<div id="officedata${petitionId}"></div>
-											<div id="officers${petitionId}"></div>
-						                </div>
-						            </div>
-								
-							  </div>`;
-							  
-				var strListHTML = "";
-							  
-			  	for (const key in listHTML) {
-				    if (listHTML.hasOwnProperty(key)) {
-				        //console.log(`${key}: ${listHTML[key]}`);
-				    	strListHTML += `<tr>
-							            	<td class="fw-semibold">${key+1}</td>
-							            	<td class="fw-semibold">${listHTML[key]['petition_no']}</td>
-							            	<td class="fw-semibold">${listHTML[key]['off_nm']}</td>
-							            	<td class="fw-semibold">
-							            		<a href="javascript:void(0)" class="link mr-10" onclick="unmapOfficer(${listHTML[key]['mapid']},${listHTML[key]['petition_id']},'${listHTML[key]['off_nm']}','${listHTML[key]['petition_no']}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="un-Map" data-original-title="Un-Map"><i class="fas fa-unlink"></i></a>
-							            	</td>
-						              	</tr>`;
-				    }
-				}
-			  	strListHTML = `<table class="table table-bordered table-vcenter mb-0">
-							              <thead>
-							              <tr>
-							                <th>S.no</th>
-							                <th>Petition No</th>
-							                <th>Department</th>
-							                <th><i class="fas fa-unlink"></i></th>
-							              </tr>
-							            </thead>
-							        	<tbody>
-							         		${strListHTML}
-							        	</tbody>
-							      	</table>`;
-	      	
-			compmapHTML = compmapHTML + `<div class="col-6" id="mappeddata">
-								
-								<div class="widget mb-0">
-					                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                    <h3 class="widget-title" style="font-size:13px;">Mapped List</h3>
-					                </div>
-					                <div class="widget-body">
-					                	<div id="mappedTableHTML">
-					                    	${strListHTML}
-										</div>
-					                </div>
-					            </div>
-							
-						  </div></div>`;
-		  
-			
-			$("#mappingModalBody").html(compmapHTML); // Modal Box Body
-			
-		}).catch(function(error) {
-		    // Handle errors
-		    console.error('Error fetching Mapped data:', error);
-		});
-		return false;
-	}
-	function unmapOfficer(mapid,petitionId,department,petitionNo){
-		// Handle the response
-    	Swal.fire({
-			title: 'Are you sure to unmap this department?<br>'+department,
-			customClass: {
-		        title: 'swal-title-custom' // Add a custom class for the title
-		    },
-			//text: "Error",
-			icon: 'warning',
-			showCancelButton: true,
-			confirmButtonColor: '#3085d6',
-			cancelButtonColor: '#d33',
-			confirmButtonText: 'Yes',
-			}).then(function(result) {
-			if (result.isConfirmed) {
-				unmapPetition(mapid).then(function(status) {
-					if(status=="success"){
-						updateModelBox(petitionId,"Assign to the Department Officer",petitionNo);
-					}
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error unmapping mapid:'+mapid, error);
-				});
-			}
-		});
-		
-		return false;
-	}
-	function unmapPetition(mapid){
-		var apiUrl = '/gcc/api/ward_sabha/unmapPetition?mapid='+mapid
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            //dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition maping details ('+mapid+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/ward_sabha/search_form.html b/src/main/resources/templates/fragments/modules/ward_sabha/search_form.html
deleted file mode 100644
index e0f28b3b..00000000
--- a/src/main/resources/templates/fragments/modules/ward_sabha/search_form.html
+++ /dev/null
@@ -1,19 +0,0 @@
-				<div class="row">
-					<div class="col-12 mb-2">
-						<div class="input-group mb-0">
-							<span class="input-group-prepend">
-                        	<button type="button" id="filter_reset_btn" class="btn btn-success" onclick="callReSetEventId(0);" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Reset" title="Reset">
-                          	  <i class="ik ik-refresh-ccw"></i>
-                        	</button>
-                        	</span>
-						 <select class="form-control" id="search_department_id" name="search_department_id">
-	                        <option value="0">All Department`s</option>
-	                      </select>
-	                      <span class="input-group-append">
-                         <button type="button" id="filter_search_btn" class="btn btn-success" onclick="callSetEventId();" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Search" title="Search">
-                           <i class="ik ik-search me-1"></i> Search
-                         </button>
-                         </span>
-						</div>
-					</div>
-				</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/works/edit_stage_script.html b/src/main/resources/templates/fragments/modules/works/edit_stage_script.html
deleted file mode 100644
index 98a867e7..00000000
--- a/src/main/resources/templates/fragments/modules/works/edit_stage_script.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<script th:inline="javascript">
-/* Get Petition data */
-function get_works_stage_data_data(){
-	get_works_stage_details().then(function(worksDetails) {
-		//alert();
-		//console.log(worksDetails); 
-		//console.log(worksDetails[0].id); 
-		
-	    // Handle the data list
-	    //$("#selectedestid_stage").val(worksDetails[0].estid);
-	    /*
-	    // 1. Basic Details
-	    $("#estno_stage").html(worksDetails[0].estimate_no);
-		$("#estdate_stage").html(convertdate(worksDetails[0].estimate_date));
-		$("#zone_ward_stage").html(worksDetails[0].zone +" / "+ worksDetails[0].ward);
-		$("#projectname_stage").html(worksDetails[0].project_name);
-		$("#location_stage").html(worksDetails[0].location);
-		
-		
-		// 2. Department and Contractor Details
-		
-		$("#department_stage").html(worksDetails[0].department);
-		$("#contractorname_stage").html(worksDetails[0].contractor_name);
-		$("#contractorperiod_stage").html(worksDetails[0].contractor_period);
-		
-		// 3. Funding and Scheme Details
-		$("#sourceoffund_stage").html(worksDetails[0].fund_source);
-		$("#scheme_stage").html(worksDetails[0].scheme);
-		$("#category_stage").html(worksDetails[0].category);
-		$("#subcategory_stage").html(worksDetails[0].sub_category);
-		$("#estamount_stage").html(worksDetails[0].estimation_amount);
-		$("#ordervalue_stage").html(worksDetails[0].est_val_with_oh);
-		
-		
-		// 4. Sanctions and Tender Process
-		$("#techsanctiondate_stage").html(convertdate_2(worksDetails[0].technical_sanction_date));
-		$("#adminsanctiondate_stage").html(convertdate_2(worksDetails[0].admin_sanction_date));
-		$("#tendercalleddate_stage").html(convertdate_2(worksDetails[0].tender_called_date));
-		$("#tenderfinalizeddate_stage").html(convertdate_2(worksDetails[0].tender_finalized_date));
-		
-		// 5. Contract and Execution Details
-		$("#loadate_stage").html(convertdate_2(worksDetails[0].loa_date));
-		$("#agreementdate_stage").html(convertdate_2(worksDetails[0].agreement_date));
-		$("#workorderdate_stage").html(convertdate_2(worksDetails[0].work_order_date));
-		$("#workcommenceddate_stage").html(convertdate_2(worksDetails[0].work_commenced_date));
-		*/
-		
-		
-	}).catch(function(error) {
-	    // Handle errors
-	    console.error('Error fetching works stage data ('+estid+'):', error.message);
-	});
-}
- 
-/* Get Petition details by petition number */
-function get_works_stage_details() {
-    
-	var formData = new FormData();
-	var apiUrl = '/gcc/works/api/estimates/getUserEstWorkDetailsById?estid='+estid;
-    // Return a Promise
-    return new Promise(function(resolve, reject) {
-        $.ajax({
-            url: apiUrl,
-            type: 'GET',
-            //data: formData,
-            dataType: 'json',
-            success: function(jsonResponse) {
-                // Resolve the Promise with the department list
-                if(jsonResponse.length>0){
-                	resolve(jsonResponse);
-				}else{
-					//call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-					console.log('Fetched petition details ('+petitionNo+') Is null:');
-				}
-                
-            },
-            error: function(xhr, status, error) {
-                // Reject the Promise with the error message
-                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-                reject(error);
-            }
-        });
-    });
-}
-
-// For Work Stage
-function get_works_stage_data(estid){
-	let stageListHTML = "";
-	//alert(estid);
-	getStageList(estid).then(function(worksStages) {
-		//alert(worksStages.length);
-        for (let i = 0; i < worksStages.length; i++) {
-        	action = `<a href="" onclick="return EditStage(${worksStages[i].tmid});">Edit</a>`;
-            stageListHTML += `
-                <tr>
-                    <td style="padding: 0.45rem 0.45rem;">${i+1}</td>
-                    <td class="fw-semibold">${worksStages[i].stagename}</td>
-                    <td class="fw-semibold">${worksStages[i].orderby}</td>
-                    <td class="fw-semibold">${action}</td>
-                </tr>`;
-        }
-
-        //$("#stageListHTML").html(stageListHTML);
-        get_works_stage_data_data(estid);
-    });	
-}			
-		
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/works/modal-box.html b/src/main/resources/templates/fragments/modules/works/modal-box.html
deleted file mode 100644
index 5ff1ab19..00000000
--- a/src/main/resources/templates/fragments/modules/works/modal-box.html
+++ /dev/null
@@ -1,140 +0,0 @@
-			
-			<!--  Box 1 -->
-			<div class="modal fade" id="ackModalBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="ackModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ackModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 2 -->
-			<div class="modal fade" id="worksStatusBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="complaint-title">புகார் நிலை / Complaint Status:</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ComplaintStatusBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 3 -->
-			<div class="modal fade" id="viewFileBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewFileTitle">View File</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewFileBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 4 -->
-			<div class="modal fade" id="viewWorks" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewWorksTitle"></h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewWorksBoxBody">
-                        		<iframe id="iframe" width="100%" height="400px" src=""></iframe>
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 4 -->
-			<div class="modal fade" id="addeditStage" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-l" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #5946f0 !important;">
-	                          <h6 class="modal-title m-0" id="addeditStageTitle"></h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="addeditStageBoxBody">
-                        		<iframe id="iframe" width="100%" height="400px" src=""></iframe>
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 0 common -->
-			<div class="modal fade" id="forwardModalBox" data-backdrop="static" tabindex="1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-lg" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="forwardModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="forwardModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/works/script.html b/src/main/resources/templates/fragments/modules/works/script.html
deleted file mode 100644
index d6444836..00000000
--- a/src/main/resources/templates/fragments/modules/works/script.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-<script th:inline="javascript">
-	//var nodata = nodata();
-	
-	var baseURL = "/gcc/works/";
-	
-
-    function loadWards() {
-        var zone = document.getElementById("erpzone").value;
-        var wardDropdown = document.getElementById("erpward");
-        wardDropdown.innerHTML = '<option value="" disabled selected>Select a Ward</option>';
-
-        if (zone) {
-            fetch('/gcc/works/wards?zone=' + zone)
-                .then(response => response.json())
-                .then(data => {
-                    data.forEach(ward => {
-                        var option = document.createElement("option");
-                        option.value = ward;
-                        option.textContent = ward;
-                        wardDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error loading wards:', error));
-        }
-    }
-
-    function loadScheme() {
-        fetch('/gcc/works/api/estimates/getSchemeList')
-            .then(response => response.json())
-            .then(data => {
-                let schemeDropdown = document.getElementById('erpscheme');
-                schemeDropdown.innerHTML = '<option value="" disabled selected>Select Scheme</option>'; // Reset dropdown
-
-                data.forEach(scheme => {
-                    let option = document.createElement('option');
-                    option.value = scheme.id;  // Use ID as the value
-                    option.textContent = scheme.name; // Display Name
-                    schemeDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching schemes:', error));
-    }
-
-    function loadCategory() {
-        fetch('/gcc/works/api/estimates/getCategoryList')
-            .then(response => response.json())
-            .then(data => {
-                let categoryDropdown = document.getElementById('erpcategory');
-                categoryDropdown.innerHTML = '<option value="" disabled selected>Select Category</option>'; // Reset dropdown
-
-                data.forEach(category => {
-                    let option = document.createElement('option');
-                    option.value = category.id;  // Use ID as the value
-                    option.textContent = category.name; // Display Name
-                    categoryDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Category:', error));
-    }
-
-    function loadSubCategory() {
-        fetch('/gcc/works/api/estimates/getSubCategoryList')
-            .then(response => response.json())
-            .then(data => {
-                let subCategoryDropdown = document.getElementById('erpsubcategory');
-                subCategoryDropdown.innerHTML = '<option value="" disabled selected>Select SubCategory</option>'; // Reset dropdown
-
-                data.forEach(subCategory => {
-                    let option = document.createElement('option');
-                    option.value = subCategory.id;  // Use ID as the value
-                    option.textContent = subCategory.description; // Display Name
-                    subCategoryDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching subCategory:', error));
-    }
-
-    function loadDepartment() {
-        fetch('/gcc/works/api/estimates/getDepartmentList')
-            .then(response => response.json())
-            .then(data => {
-                let departmentDropdown = document.getElementById('erpdepartment');
-                departmentDropdown.innerHTML = '<option value="" disabled selected>Select Department</option>'; // Reset dropdown
-
-                data.forEach(department => {
-                    let option = document.createElement('option');
-                    option.value = department.id;  // Use ID as the value
-                    option.textContent = department.dept_name; // Display Name
-                    departmentDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Department:', error));
-    }
-
-    function loadSource() {
-        fetch('/gcc/works/api/estimates/getSourceofFundList')
-            .then(response => response.json())
-            .then(data => {
-                let SourceDropDown = document.getElementById('erpfundsource');
-                SourceDropDown.innerHTML = '<option value="" disabled selected>Select Source of Fund</option>'; // Reset dropdown
-
-                data.forEach(source => {
-                    let option = document.createElement('option');
-                    option.value = source.id;  // Use ID as the value
-                    option.textContent = source.name; // Display Name
-                    SourceDropDown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Department:', error));
-    }
-
-    function loadWardsFilter() {
-        var zone = document.getElementById("zonef").value;
-        var wardDropdown = document.getElementById("wardf");
-        wardDropdown.innerHTML = '<option value="" disabled selected>Select a Ward</option>';
-
-        if (zone) {
-            fetch('/gcc/works/wards?zone=' + zone)
-                .then(response => response.json())
-                .then(data => {
-                    data.forEach(ward => {
-                        var option = document.createElement("option");
-                        option.value = ward;
-                        option.textContent = ward;
-                        wardDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error loading wards:', error));
-        }
-    }
-
-    function loadDepartmentFilter() {
-        fetch('/gcc/works/api/estimates/getDepartmentList')
-            .then(response => response.json())
-            .then(data => {
-                let departmentDropdown = document.getElementById('departmentf');
-                departmentDropdown.innerHTML = '<option value="" disabled selected>Select Department</option>'; // Reset dropdown
-
-                data.forEach(department => {
-                    let option = document.createElement('option');
-                    option.value = department.id;  // Use ID as the value
-                    option.textContent = department.dept_name; // Display Name
-                    departmentDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Department:', error));
-    }
-
-    function loadSourceFilter() {
-        fetch('/gcc/works/api/estimates/getSourceofFundList')
-            .then(response => response.json())
-            .then(data => {
-                let SourceDropDown = document.getElementById('fundsourcef');
-                SourceDropDown.innerHTML = '<option value="" disabled selected>Select Source of Fund</option>'; // Reset dropdown
-
-                data.forEach(source => {
-                    let option = document.createElement('option');
-                    option.value = source.id;  // Use ID as the value
-                    option.textContent = source.name; // Display Name
-                    SourceDropDown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Department:', error));
-    }
-
-	
-	
-	function printContent() {
-	    var popupContent = document.getElementById("printarea").innerHTML;
-	    var printWindow = window.open("", "_blank");
-
-	    var styles = document.head.innerHTML; // Get all existing styles
-
-	    printWindow.document.write("<html><head>" + styles + "<title>Print</title></head><body>");
-	    printWindow.document.write(popupContent);
-	    printWindow.document.write("</body></html>");
-	    printWindow.document.close();
-
-	    setTimeout(function () {
-	        printWindow.print();
-	        printWindow.close();
-	    }, 500);
-	}
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/works/search_form.html b/src/main/resources/templates/fragments/modules/works/search_form.html
deleted file mode 100644
index e0f28b3b..00000000
--- a/src/main/resources/templates/fragments/modules/works/search_form.html
+++ /dev/null
@@ -1,19 +0,0 @@
-				<div class="row">
-					<div class="col-12 mb-2">
-						<div class="input-group mb-0">
-							<span class="input-group-prepend">
-                        	<button type="button" id="filter_reset_btn" class="btn btn-success" onclick="callReSetEventId(0);" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Reset" title="Reset">
-                          	  <i class="ik ik-refresh-ccw"></i>
-                        	</button>
-                        	</span>
-						 <select class="form-control" id="search_department_id" name="search_department_id">
-	                        <option value="0">All Department`s</option>
-	                      </select>
-	                      <span class="input-group-append">
-                         <button type="button" id="filter_search_btn" class="btn btn-success" onclick="callSetEventId();" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Search" title="Search">
-                           <i class="ik ik-search me-1"></i> Search
-                         </button>
-                         </span>
-						</div>
-					</div>
-				</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/works/user_works_update_script.html b/src/main/resources/templates/fragments/modules/works/user_works_update_script.html
deleted file mode 100644
index d6103974..00000000
--- a/src/main/resources/templates/fragments/modules/works/user_works_update_script.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var estid = /*[[${estid}]]*/'';
-			
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-	     
-			 /* Get Petition data */
-			function get_works_update_data(){
-				get_works_update_details().then(function(worksDetails) {
-					
-					//console.log(worksDetails); 
-					//console.log(worksDetails[0].id); 
-					
-				    // Handle the data list
-				    $("#selectedestid").val(worksDetails[0].estid);
-				    
-				    // 1. Basic Details
-				    $("#estno").html(worksDetails[0].estimate_no);
-					$("#estdate").html(convertdate(worksDetails[0].estimate_date));
-					$("#zone_ward").html(worksDetails[0].zone +" / "+ worksDetails[0].ward);
-					$("#projectname").html(worksDetails[0].project_name);
-					$("#location").html(worksDetails[0].location);
-					
-					
-					// 2. Department and Contractor Details
-					
-					$("#department").html(worksDetails[0].department);
-					$("#contractorname").html(worksDetails[0].contractor_name);
-					$("#contractorperiod").html(worksDetails[0].contractor_period);
-					
-					// 3. Funding and Scheme Details
-					$("#sourceoffund").html(worksDetails[0].fund_source);
-					$("#scheme").html(worksDetails[0].scheme);
-					$("#category").html(worksDetails[0].category);
-					$("#subcategory").html(worksDetails[0].sub_category);
-					$("#estamount").html(worksDetails[0].estimation_amount);
-					$("#ordervalue").html(worksDetails[0].est_val_with_oh);
-					
-					if(worksDetails[0].project_type){
-						$("#projecttype").val(worksDetails[0].project_type);
-					}
-					
-					govt_funded_project = 0;
-					if(worksDetails[0].govt_funded_project){
-						govt_funded_project = 1;
-					}
-					$("#govtfund").val(govt_funded_project);
-					
-					special_category = 0;
-					if(worksDetails[0].special_category){
-						special_category = 1;
-					}
-					$("#specialcat").val(special_category);
-					/*
-					// 4. Sanctions and Tender Process
-					$("#techsanctiondate").val(convertdate_2(worksDetails[0].technical_sanction_date));
-					$("#adminsanctiondate").val(convertdate_2(worksDetails[0].admin_sanction_date));
-					$("#tendercalleddate").val(convertdate_2(worksDetails[0].tender_called_date));
-					$("#tenderfinalizeddate").val(convertdate_2(worksDetails[0].tender_finalized_date));
-					
-					// 5. Contract and Execution Details
-					$("#loadate").val(convertdate_2(worksDetails[0].loa_date));
-					$("#agreementdate").val(convertdate_2(worksDetails[0].agreement_date));
-					$("#workorderdate").val(convertdate_2(worksDetails[0].work_order_date));
-					$("#workcommenceddate").val(convertdate_2(worksDetails[0].work_commenced_date));
-					*/
-					
-					// 6. File Details
-					$("#adminfileHTML").html(
-						  `<a href="${worksDetails[0].admin_sanction_file}" 
-						      target="_blank" 
-						      onclick="window.open(this.href, 'popup', 'width=800,height=600'); return false;">
-						      View
-						  </a>`
-						);
-					$("#loafileHTML").html(
-						  `<a href="${worksDetails[0].loa_file}" 
-						      target="_blank" 
-						      onclick="window.open(this.href, 'popup', 'width=800,height=600'); return false;">
-						      View
-						  </a>`
-						);
-					$("#agreementfileHTML").html(
-						  `<a href="${worksDetails[0].agreement_file}" 
-						      target="_blank" 
-						      onclick="window.open(this.href, 'popup', 'width=800,height=600'); return false;">
-						      View
-						  </a>`
-						);
-					$("#workorderfileHTML").html(
-						  `<a href="${worksDetails[0].work_order_file}" 
-						      target="_blank" 
-						      onclick="window.open(this.href, 'popup', 'width=800,height=600'); return false;">
-						      View
-						  </a>`
-						);
-					
-					
-					// For Update
-					// 4. Sanctions and Tender Process
-					if(worksDetails[0].technical_sanction_date==null){
-						$("#erptechsanctiondate").val();
-					}
-					else{
-						$("#erptechsanctiondate").val(convertdate_2(worksDetails[0].technical_sanction_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].admin_sanction_date==null){
-						$("#erptechsanctiondate").val();
-					}
-					else{
-						$("#erpadminsanctiondate").val(convertdate_2(worksDetails[0].admin_sanction_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].tender_called_date==null){
-						$("#erptendercalldate").val();
-					}
-					else{
-						$("#erptendercalldate").val(convertdate_2(worksDetails[0].tender_called_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].tender_finalized_date==null){
-						$("#erptenderfinalizeddate").val();
-					}
-					else{
-						$("#erptenderfinalizeddate").val(convertdate_2(worksDetails[0].tender_finalized_date));
-					}
-					
-					
-					// 5. Contract and Execution Details
-					
-					if(worksDetails[0].loa_date==null){
-						$("#erploadate").val();
-					}
-					else{
-						$("#erploadate").val(convertdate_2(worksDetails[0].loa_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].agreement_date==null){
-						$("#erpagreementdate").val();
-					}
-					else{
-						$("#erpagreementdate").val(convertdate_2(worksDetails[0].agreement_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].work_order_date==null){
-						$("#erpworkorderdate").val();
-					}
-					else{
-						$("#erpworkorderdate").val(convertdate_2(worksDetails[0].work_order_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].work_commenced_date==null){
-						$("#erpworkcommenceddate").val();
-					}
-					else{
-						$("#erpworkcommenceddate").val(convertdate_2(worksDetails[0].work_commenced_date));
-					}
-					
-					//Is iconic Project
-					if(worksDetails[0].isiconic==0){
-						$("#isiconic").prop("checked", false);
-					}
-					else{
-						$("#isiconic").prop("checked", true);
-					}
-				
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching works data ('+estid+'):', error.message);
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_works_update_details() {
-			    
-				var formData = new FormData();
-				var apiUrl = '/gcc/works/api/estimates/getUserEstWorkDetailsById?estid='+estid;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								//call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/c_petition/view-petition?petitionNo="+searchValue;
-			}
-			else{
-				//call_petition_search_from("Invalid EST ID: Please provide a valid EST number.");
-			}
-			return false;
-		}
-		
-		
-		$(document).ready(function() {
-			
-			if(estid!=null && estid!="error"){
-				get_works_update_data();
-			}
-			else{
-				if(estid=="error"){
-					alert("Invalid EST Number: Please provide a valid EST number." + estid);
-				}
-				else{
-					alert(estid);
-				}
-			}
-			
-		});
-		
-		
-		</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/works/user_works_view_script.html b/src/main/resources/templates/fragments/modules/works/user_works_view_script.html
deleted file mode 100644
index c37c4b37..00000000
--- a/src/main/resources/templates/fragments/modules/works/user_works_view_script.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var estid = /*[[${estid}]]*/'';
-			
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-	     
-			 /* Get Petition data */
-			function get_works_data(){
-				get_works_details().then(function(worksDetails) {
-					
-					//console.log(worksDetails); 
-					//console.log(worksDetails[0].id); 
-					
-				    // Handle the data list
-				    $("#selectedestid").val(worksDetails[0].estid);
-				    
-				    // 1. Basic Details
-				    $("#estno").html(worksDetails[0].estimate_no);
-					$("#estdate").html(convertdate(worksDetails[0].estimate_date));
-					$("#zone_ward").html(worksDetails[0].zone +" / "+ worksDetails[0].ward);
-					$("#projectname").html(worksDetails[0].project_name);
-					$("#location").html(worksDetails[0].location);
-					
-					
-					// 2. Department and Contractor Details
-					
-					$("#department").html(worksDetails[0].department);
-					$("#contractorname").html(worksDetails[0].contractor_name);
-					$("#contractorperiod").html(worksDetails[0].contractor_period);
-					
-					// 3. Funding and Scheme Details
-					$("#sourceoffund").html(worksDetails[0].fund_source);
-					$("#scheme").html(worksDetails[0].scheme);
-					$("#category").html(worksDetails[0].category);
-					$("#subcategory").html(worksDetails[0].sub_category);
-					$("#estamount").html(worksDetails[0].estimation_amount);
-					$("#ordervalue").html(worksDetails[0].est_val_with_oh);
-					
-					
-					// 4. Sanctions and Tender Process
-					if(worksDetails[0].technical_sanction_date==null){
-						$("#techsanctiondate").html();
-					}
-					else{
-						$("#techsanctiondate").html(convertdate_2(worksDetails[0].technical_sanction_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].admin_sanction_date==null){
-						$("#techsanctiondate").html();
-					}
-					else{
-						$("#adminsanctiondate").html(convertdate_2(worksDetails[0].admin_sanction_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].tender_called_date==null){
-						$("#tendercalldate").html();
-					}
-					else{
-						$("#tendercalldate").html(convertdate_2(worksDetails[0].tender_called_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].tender_finalized_date==null){
-						$("#tenderfinalizeddate").html();
-					}
-					else{
-						$("#tenderfinalizeddate").html(convertdate_2(worksDetails[0].tender_finalized_date));
-					}
-					
-					
-					// 5. Contract and Execution Details
-					
-					if(worksDetails[0].loa_date==null){
-						$("#loadate").html();
-					}
-					else{
-						$("#loadate").html(convertdate_2(worksDetails[0].loa_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].agreement_date==null){
-						$("#agreementdate").html();
-					}
-					else{
-						$("#agreementdate").html(convertdate_2(worksDetails[0].agreement_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].work_order_date==null){
-						$("#workorderdate").html();
-					}
-					else{
-						$("#workorderdate").html(convertdate_2(worksDetails[0].work_order_date));
-					}
-					/* ===========*/
-					if(worksDetails[0].work_commenced_date==null){
-						$("#workcommenceddate").html();
-					}
-					else{
-						$("#workcommenceddate").html(convertdate_2(worksDetails[0].work_commenced_date));
-					}
-					
-					/*
-					// 4. Sanctions and Tender Process
-					$("#techsanctiondate").html(convertdate_2(worksDetails[0].technical_sanction_date));
-					$("#adminsanctiondate").html(convertdate_2(worksDetails[0].admin_sanction_date));
-					$("#tendercalleddate").html(convertdate_2(worksDetails[0].tender_called_date));
-					$("#tenderfinalizeddate").html(convertdate_2(worksDetails[0].tender_finalized_date));
-					
-					// 5. Contract and Execution Details
-					$("#loadate").html(convertdate_2(worksDetails[0].loa_date));
-					$("#agreementdate").html(convertdate_2(worksDetails[0].agreement_date));
-					$("#workorderdate").html(convertdate_2(worksDetails[0].work_order_date));
-					$("#workcommenceddate").html(convertdate_2(worksDetails[0].work_commenced_date));
-					*/
-					// 6. File Details
-					$("#adminfile").html(
-						  `<a href="${worksDetails[0].admin_sanction_file}" 
-						      target="_blank" 
-						      onclick="window.open(this.href, 'popup', 'width=800,height=600'); return false;">
-						      View
-						  </a>`
-						);
-					$("#loafile").html(
-						  `<a href="${worksDetails[0].loa_file}" 
-						      target="_blank" 
-						      onclick="window.open(this.href, 'popup', 'width=800,height=600'); return false;">
-						      View
-						  </a>`
-						);
-					$("#agreementfile").html(
-						  `<a href="${worksDetails[0].agreement_file}" 
-						      target="_blank" 
-						      onclick="window.open(this.href, 'popup', 'width=800,height=600'); return false;">
-						      View
-						  </a>`
-						);
-					$("#workorderfile").html(
-						  `<a href="${worksDetails[0].work_order_file}" 
-						      target="_blank" 
-						      onclick="window.open(this.href, 'popup', 'width=800,height=600'); return false;">
-						      View
-						  </a>`
-						);
-					
-					
-					// For Update
-					
-					$("#project_type").html(worksDetails[0].project_type);
-					$("#govt_funded_project").html(worksDetails[0].govt_funded_project);
-					$("#special_category").html(worksDetails[0].special_category);
-					
-					/*
-					// 4. Sanctions and Tender Process
-					$("#erptechsanctiondate").val(convertdate_2(worksDetails[0].technical_sanction_date));
-					$("#erpadminsanctiondate").val(convertdate_2(worksDetails[0].admin_sanction_date));
-					$("#erptendercalldate").val(convertdate_2(worksDetails[0].tender_called_date));
-					$("#erptenderfinalizeddate").val(convertdate_2(worksDetails[0].tender_finalized_date));
-					
-					// 5. Contract and Execution Details
-					$("#erploadate").val(convertdate_2(worksDetails[0].loa_date));
-					$("#erpagreementdate").val(convertdate_2(worksDetails[0].agreement_date));
-					$("#erpworkorderdate").val(convertdate_2(worksDetails[0].work_order_date));
-					$("#erpworkcommenceddate").val(convertdate_2(worksDetails[0].work_commenced_date));
-					*/
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching works data ('+estid+'):', error.message);
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_works_details() {
-			    
-				var formData = new FormData();
-				var apiUrl = '/gcc/works/api/estimates/getUserEstWorkDetailsById?estid='+estid;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								//call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/c_petition/view-petition?petitionNo="+searchValue;
-			}
-			else{
-				//call_petition_search_from("Invalid EST ID: Please provide a valid EST number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			
-			if(estid!=null && estid!="error"){
-				get_works_data();
-			}
-			else{
-				if(estid=="error"){
-					alert("Invalid EST Number: Please provide a valid EST number." + estid);
-				}
-				else{
-					alert(estid);
-				}
-			}
-			
-		});
-		
-		
-		// For Work Stage
-		function get_works_stage_data(estid){
-			let stageListHTML = "";
-			//alert(estid);
-			getStageList(estid).then(function(worksStages) {
-				//alert(worksStages.length);
-		        for (let i = 0; i < worksStages.length; i++) {
-		        	action = `<a href="" onclick="return EditStage(${worksStages[i].tmid},${worksStages[i].estid});">Edit</a>`;
-		            stageListHTML += `
-		                <tr>
-		                    <td style="padding: 0.45rem 0.45rem;">${i+1}</td>
-		                    <td class="fw-semibold">${worksStages[i].stagename}</td>
-		                    <td class="fw-semibold">${worksStages[i].orderby}</td>
-		                    <td class="fw-semibold">${action}</td>
-		                </tr>`;
-		        }
-
-		        $("#stageListHTML").html(stageListHTML);
-		    });	
-		}
-		function getStageList(estid){
-			var formData = new FormData();
-			var apiUrl = '/gcc/works/api/estimates/getUserEstWorkStageDetailsByEstid?estid='+estid;
-		    // Return a Promise
-		    return new Promise(function(resolve, reject) {
-		        $.ajax({
-		            url: apiUrl,
-		            type: 'GET',
-		            //data: formData,
-		            dataType: 'json',
-		            success: function(jsonResponse) {
-		                // Resolve the Promise with the department list
-		                if(jsonResponse.length>0){
-		                	resolve(jsonResponse);
-						}else{
-							//call_petition_search_from("Invalid Est Id: Please provide a valid EST number.");
-							//console.log('Fetched petition details ('+petitionNo+') Is null:');
-						}
-		                
-		            },
-		            error: function(xhr, status, error) {
-		                // Reject the Promise with the error message
-		                console.error('Error fetching Est details ('+petitionNo+'):', error.message);
-		                reject(error);
-		            }
-		        });
-		    });
-		}
-		
-		// For Work Stage
-		function get_works_edit_stage_data(estid,tmid){
-			let stageListHTML = "";
-			//alert(estid);
-			getStageList(estid).then(function(worksStages) {
-				//alert(worksStages.length);
-		        for (let i = 0; i < worksStages.length; i++) {
-		        	if(worksStages[i].tmid=tmid){
-		        		$("#tmid_stage").val(worksStages[i].tmid);
-		        		$("#estid_stage").val(worksStages[i].estid);
-		        		$("#orderby_stage").val(worksStages[i].orderby);
-		        		$("#stagename_stage").val(worksStages[i].stagename);
-					}
-		        }
-
-		        $("#stageListHTML").html(stageListHTML);
-		    });	
-		}
-		function EditStage(tmid,estid){
-        	$("#addeditStage").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-			
-			var url = '/gcc/works/edit_stage_modal?tmid='+tmid+'&estid='+estid;
-			
-			$.ajax({
-			    url: url,
-			    type: 'GET',
-			    dataType: 'html',
-			    success: function(data) {
-				  $('#addeditStageTitle').html("Add / Edit Work Stage");
-			      $('#addeditStageBoxBody').html(data); // Inject content into modal body
-			      get_works_edit_stage_data()
-			    },
-			    error: function(xhr, status, error) {
-			      console.error("Error loading URL:", error);
-			      // Handle error, display a message, etc.
-			    }
-			  });
-			
-			return false;
-		}
-		
-		
-		</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/works/works_view_script.html b/src/main/resources/templates/fragments/modules/works/works_view_script.html
deleted file mode 100644
index bb2402e8..00000000
--- a/src/main/resources/templates/fragments/modules/works/works_view_script.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var estid = /*[[${estid}]]*/'';
-			
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-	     
-			 /* Get Petition data */
-			function get_works_data(){
-				get_works_details().then(function(worksDetails) {
-					
-					console.log(worksDetails); 
-					console.log(worksDetails[0].id); 
-					
-				    // Handle the data list
-				    $("#selectedestid").val(worksDetails[0].id);
-				    
-				    // 1. Basic Details
-				    $("#estno").html(worksDetails[0].ESTIMATE_NO);
-					$("#estdate").html(convertdate(worksDetails[0].ESTIMATE_DATE));
-					$("#zone_ward").html(worksDetails[0].ZONE +" / "+ worksDetails[0].WARD);
-					$("#projectname").html(worksDetails[0].PROJECT_NAME);
-					$("#location").html(worksDetails[0].LOCATION);
-					
-					
-					// 2. Department and Contractor Details
-					
-					$("#department").html(worksDetails[0].DEPARTMENT_NAME);
-					$("#contractorname").html(worksDetails[0].CONTRACTOR_NAME);
-					$("#contractorperiod").html(worksDetails[0].CONTRACTOR_PERIOD);
-					
-					// 3. Funding and Scheme Details
-					$("#sourceoffund").html(worksDetails[0].FUND_SOURCE);
-					$("#scheme").html(worksDetails[0].SCHEME);
-					$("#category").html(worksDetails[0].CATEGORY);
-					$("#subcategory").html(worksDetails[0].SUB_CATEGORY);
-					$("#estamount").html(worksDetails[0].ESTIMATION_AMOUNT);
-					$("#ordervalue").html(worksDetails[0].EST_VAL_WITH_OH);
-					
-					// 4. Sanctions and Tender Process
-					//$("#erptechsanctiondate").val(convertdate_2(worksDetails[0].TECHNICAL_SANCTION_DATE));
-					//$("#erpadminsanctiondate").val(convertdate_2(worksDetails[0].ADMIN_SANCTION_DATE));
-					//$("#erptendercalldate").val(convertdate_2(worksDetails[0].TENDER_CALLED_DATE));
-					//$("#erptenderfinalizeddate").val(convertdate_2(worksDetails[0].TENDER_FINALIZED_DATE));
-					
-					// 5. Contract and Execution Details
-					//$("#erploadate").val(convertdate_2(worksDetails[0].LOA_DATE));
-					//$("#erpagreementdate").val(convertdate_2(worksDetails[0].AGREEMENT_DATE));
-					//$("#erpworkorderdate").val(convertdate_2(worksDetails[0].WORK_ORDER_DATE));
-					//$("#erpworkcommenceddate").val(convertdate_2(worksDetails[0].WORK_COMMENCED_DATE));
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching works data ('+estid+'):', error.message);
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_works_details() {
-			    
-				var formData = new FormData();
-				var apiUrl = '/gcc/works/api/estimates/getestimateworkdetailsById?estid='+estid;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/c_petition/view-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			
-			if(estid!=null && estid!="error"){
-				get_works_data();
-			}
-			else{
-				if(estid=="error"){
-					alert("Invalid EST Number: Please provide a valid EST number." + estid);
-				}
-				else{
-					alert(estid);
-				}
-			}
-			
-		});
-		</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/zerohours_petition/modal-box.html b/src/main/resources/templates/fragments/modules/zerohours_petition/modal-box.html
deleted file mode 100644
index 38e0c8c2..00000000
--- a/src/main/resources/templates/fragments/modules/zerohours_petition/modal-box.html
+++ /dev/null
@@ -1,139 +0,0 @@
-			
-			<!--  Box 1 -->
-			<div class="modal fade" id="ackModalBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="ackModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ackModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 1 -->
-			<div class="modal fade" id="mappingModalBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="mappingModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="mappingModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 2 -->
-			<div class="modal fade" id="ComplaintStatusBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header">
-	                          <h6 class="modal-title m-0" id="complaint-title">புகார் நிலை / Complaint Status:</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="ComplaintStatusBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 3 -->
-			<div class="modal fade" id="viewFileBox" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewFileTitle">View File</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewFileBoxBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 4 -->
-			<div class="modal fade" id="viewpetition" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-xl" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="viewPetitionTitle">View Petition</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="viewPetitionBoxBody">
-                        		<iframe id="iframe" width="100%" height="400px" src=""></iframe>
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
-			
-			<!--  Box 0 common -->
-			<div class="modal fade" id="forwardModalBox" data-backdrop="static" tabindex="1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	            <div class="modal-dialog modal-lg" role="document">
-	                <div class="modal-content">
-	                    
-	                  	<div class="modal-header" style="background-color: #28a745 !important;">
-	                          <h6 class="modal-title m-0" id="forwardModalTitle">Modal Title</h6>
-		                      <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div><!--end modal-header-->
-	                    <div class="modal-body">
-                        	<div id="forwardModalBody">
-							</div>
-                    	</div><!--end modal-body-->
-						
-	                    <div class="modal-footer bg-body">
-                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div><!--end modal-footer-->
-	               
-	                </div><!--end modal-content-->
-	            </div><!--end modal-dialog-->
-	        </div><!--end modal-->
-			<!-- END Page Content -->
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/zerohours_petition/petition_view_script.html b/src/main/resources/templates/fragments/modules/zerohours_petition/petition_view_script.html
deleted file mode 100644
index 56899402..00000000
--- a/src/main/resources/templates/fragments/modules/zerohours_petition/petition_view_script.html
+++ /dev/null
@@ -1,293 +0,0 @@
-<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Call Petition function to fetch the data
-	    		    get_petition_data();
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-			 
-	     	// Function to get complaint_type and complaint_typeid by complaint_typeid
-	        function getComplaintTypeById(complaintTypeId) {
-	            for (var i = 0; i < complaintTypeList.length; i++) {
-	                if (complaintTypeList[i].complaint_typeid == complaintTypeId) {
-	                    return {
-	                        complaint_type: complaintTypeList[i].complaint_type,
-	                        complaint_typeid: complaintTypeList[i].complaint_typeid
-	                    };
-	                }
-	            }
-	            return null; // Return null if no matching complaint_typeid is found
-	        }
-	     
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint;
-					petitionId = petitionDetails[0].petition_id;
-					var complaintArray = complaint.split(",");
-					$("#complaintType").val(complaintArray);
-					
-					$('#complaintType').trigger('change');
-					
-					closedComplaintsList = complaintArray;
-					$("#cdate_value").html(convertdate(petitionDetails[0].cdate));
-					$("#petition_no_value").html(petitionDetails[0].petition_no);
-					$("#petitioner_name_value").html(petitionDetails[0].petitioner_name);
-					$("#petitioner_mobile_value").html(petitionDetails[0].petitioner_mobile);
-					$("#petitioner_address_value").html(petitionDetails[0].petitioner_address);
-					$("#petitioner_pincode_value").html(petitionDetails[0].petitioner_pincode);
-					
-					$("#complaint_with_maping_value").html(petitionDetails[0].complaint_nature);
-					
-					var petition_status = petitionDetails[0].status
-					
-					if(petition_status=='pending' || petition_status=='partial'){
-						$("#petition_summary_title").html("Pending Summary");
-						var currentDate = new Date();
-						var totaldayspending = date_difference(convertdate(petitionDetails[0].cdate),convertdate(currentDate),'');
-						$("#petition_summary_html").html(`This petition has been pending for more than ${totaldayspending}`);
-					}
-					if(petition_status=='close'){
-						$("#petition_summary_title").html("Close Summary");
-						var currentDate = new Date();
-						var totaldayspending = date_difference(convertdate(petitionDetails[0].cdate),convertdate(currentDate),'');
-						$("#petition_summary_html").html(`The time taken to close this petition is ${totaldayspending}`);
-					}
-						
-					petition_status=petition_status.charAt(0).toUpperCase() + petition_status.slice(1);
-					
-					$("#petition_status_value").html(`<b style="color:red">${petition_status}</b>`);
-					
-					// Call Complaint list based on Petition No and Id
-					get_petition_mapping_data();
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition Data ('+petitionNo+'):', error.message);
-				    call_petition_search_from("** Invalid Petition Number: Please provide a valid petition number.");
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_petition_details() {
-			    //alert();
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/zerohours_petition/getPetitionDetails?petitionNo='+petitionNo;
-				//alert(petitionNo);
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                //alert(jsonResponse[0].petitioner_name);
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("* Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			function get_petition_mapping_data(){
-				get_petition_mapping_list().then(function(mappingDetails) {
-					
-					// Initialize count
-					let totalCount = mappingDetails.length;
-					let completedCount = 0;
-					let pendingCount = 0;
-
-					var tableListHTML = "";
-					
-					for(j = 0; j < mappingDetails.length; j++){
-						var complaint_status=mappingDetails[j].complaint_status;
-						complaint_status=complaint_status.charAt(0).toUpperCase() + complaint_status.slice(1);
-						
-						tableListHTML += `<tr>
-						                    <td>${j+1}</td>
-						                    <td>${mappingDetails[j].complaint_type}</td>
-						                    <td>${mappingDetails[j].off_nm} (${mappingDetails[j].off_id})</td>
-						                    <td>${convertdate(mappingDetails[j].mappedOn)}</td>
-						                    <td>${complaint_status}</td>
-						                  </tr>`;
-						                  
-		               	// Check if the status is "pending"
-					    if (mappingDetails[j].complaint_status === "pending") {
-					        // Increment the count
-					        pendingCount++;
-					    }
-					    else if(mappingDetails[j].complaint_status === "close"){
-					    	completedCount++;
-						}
-					}
-					
-					var listOfComplaintsHTML = `<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th>S.no</th>
-									                    <th>Complaint</th>
-									                    <th>Assigned To</th>
-									                    <th>Assigned On</th>
-									                    <th>Status</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-								                 		${tableListHTML}
-								                	</tbody>
-								              	</table>`;
-					$("#listOfComplaintsHTML").html(listOfComplaintsHTML);
-					
-					$("#total_complaints_value").html(`<b>${totalCount}</b>`);
-					$("#total_complaints_completed_value").html(`<b style="color:green">${completedCount}</b>`);
-					$("#total_complaints_pending_value").html(`<b style="color:red">${pendingCount}</b>`);
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching Mapping Data ('+petitionId+'):', error.message);
-				});
-			}
-			
-			/* Get Petition details by petition number */
-			function get_petition_mapping_list() {
-			    alert(petitionId);
-				var formData = new FormData();
-				var apiUrl = '/gcc/api/zerohours_petition/getComplaintListByPetitionId?petitionId='+petitionId;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("***Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-		
-		function call_petition_search_from(errorTXT){
-			var errorHTML = "";
-			if(errorTXT!=""){
-				errorHTML = `<div class="form-group text-center text-danger">${errorTXT}</div>`;
-			}
-			var searchFormHTML = `<form class="search-form" id="search-form" onsubmit="return searchRequest();">
-										<div class="card-header">
-						                <h3>View Petition Form</h3>
-						                <div class="card-header-right">
-						                    <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-						                </div>
-						            </div>
-						       		<div class="card-body">
-						       			<div class="row">
-											<div class="col-12 text-center">
-												${errorHTML}
-												<div class="form-group">
-						                            <label for="petitionNoSearch">Petition No / மனு எண் </label>
-						                            <input type="text" class="form-control text-center" name="petitionNoSearch" id="petitionNoSearch" autocomplete="off" placeholder="ZH00000000" maxlength="11" required>
-						                        </div>
-						                        
-											</div>
-											<div class="col-12">
-												<div class="block-content" id="userinfo2">
-													<div id="comp_mapping_to_officers" class="row"></div>
-												</div>
-										 	</div>
-										</div>
-						          	</div>
-						          	<div class="card-footer text-center">
-										<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            	<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						        	</div>
-						    	</form>`;
-			
-			$("#petitionViewtable").html(searchFormHTML);
-			$("#petitionNoSearch").mask('ZH00000000');
-		}
-		
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/zerohours_petition/view-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			if(petitionNo!=null && petitionNo!="error"){
-				get_complaint_type_data();
-				get_officer_master_data();
-			}
-			else{
-				if(petitionNo=="error"){
-					call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				}
-				else{
-					call_petition_search_from("");
-				}
-			}
-			
-		});
-		</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/zerohours_petition/script.html b/src/main/resources/templates/fragments/modules/zerohours_petition/script.html
deleted file mode 100644
index 43fa529f..00000000
--- a/src/main/resources/templates/fragments/modules/zerohours_petition/script.html
+++ /dev/null
@@ -1,660 +0,0 @@
-<script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-<script th:inline="javascript">
-	var nodata = nodata();
-	
-	var baseURL = "/gcc/zerohours_petition/";
-	
-	
-	/* Zero Hours Event List */
-	function get_event_list() {
-	    
-		var apiUrl = '/gcc/api/zerohours_petition/getEventList';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Zero Hours Event List */
-	function get_current_event_list() {
-	    
-		var apiUrl = '/gcc/api/zerohours_petition/getCurrentEventList';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	
-	/* Zone and Ward List */
-	function get_zone_ward_list() {
-	    
-		var apiUrl = '/gcc/api/zerohours_petition/getZoneAndWard';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Councillor List */
-	function get_councillor_list(ward) {
-	    
-		var apiUrl = '/gcc/api/zerohours_petition/getCouncillor?ward='+ward;
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Complaint Type List */
-	function get_complaint_type_list() {
-	    
-		var apiUrl = '/gcc/api/zerohours_petition/getComplaintTypes';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Officer Master List */
-	function get_officer_list() {
-	    
-		var apiUrl = '/gcc/api/zerohours_petition/getOfficerList';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Petition Type List */
-	function get_petition_type_list() {
-	    
-		var apiUrl = '/gcc/api/zerohours_petition/getPetitionTypes';
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	function viewAck(petitionNo){
-
-		loading_text_msg = getLoadingMessage(); // get Loading random text
-		$('#ackModalTitle').html("Loading Petition Acknowledgement ("+petitionNo+")");
-		var loading=searchinfo("<b>"+loading_text_msg+"</b>");
-		var ackContentHTML=`
-							<div class="row">
-							    <div class="col-lg-6">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack1table" class="ack-content">
-						                <div id="ack1">${loading}</div>
-						            </div>
-						        </div>
-						    </div>
-						    
-						    <div class="col-lg-6 printack2">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack2table" class="ack-content">
-						                <div id="ack2">${loading}</div>
-						            </div>
-						        </div>
-						    </div>
-						    <!--<div class="col-lg-12 text-center block-options pt-10">
-						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-						    </div>-->
-						</div>`;
-		
-		$('#ackModalBody').html(ackContentHTML); // Box content (Body)
-		
-		$("#ackModalBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-		}); // Show Modal Box
-			
-		get_petition_ack_data(petitionNo);
-		
-		return false;
-	}
-	
-	
-	 /* Get Petition data */
-	function get_petition_ack_data(petitionNo){
-		get_petition_details_byNo(petitionNo).then(function(petitionDetails) {
-		    // Handle the Complaint list
-		    var complaintHTML = "";
-			var complaint = petitionDetails[0].petitioner_complaint_txt;
-			
-			var complaintArray = complaint.split(',');
-			
-			for(j = 0; j < complaintArray.length; j++){
-				if(j>0){
-					complaintHTML+="<br>";
-				}
-				complaintHTML+= (j+1)+') '+complaintArray[j];
-			}
-			var ack =`
-			<table class="table table-borderless table-vcenter p-0 m-0">
-			  <tbody>
-			    <tr>
-			      <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-			      <td class="fw-semibold text-center">
-						<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-						மக்களை தேடி மேயர் திட்டம்<br>
-						ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-				  </td>
-				  <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-			    </tr>
-			</tbody>
-			</table>
-			<hr style="margin:0px">
-			  <div class="block-content p-0 m-0">
-			    <table class="table table-borderless table-vcenter" style="font-size:12px;">
-			      <tbody>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${convertdate(petitionDetails[0].cdate)}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petition_no}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petitioner_name}
-			          </td>
-			        </tr>
-			        <tr>
-			          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${petitionDetails[0].petitioner_mobile}
-			          </td>
-			        </tr>
-			        <tr style="font-size:12px;">
-			          <th style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:</th>
-			          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-			           ${complaintHTML}
-					</td>
-			        </tr>
-			        <tr>
-			          <td scope="row" colspan="2" style="font-size:10px">இம்மனுவின் ஒப்புகைச் சீட்டு எண் மனு தாரரின் கைபேசி எண்ணிற்கு குறுஞ்செய்தி மூலம் அனுப்பி வைக்கப்படும் . இம்மனுவின் நிலை குறித்து https://chennaicorporation.gov.in/MTM/ என்ற இணையதளத்தில் மனுவின் எண்ணை குறிப்பிட்டு அறிந்துகொள்ளலாம்</th>
-			        </tr>
-			        <tr style="text-align: right;">
-			          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-			        </tr>
-			      </tbody>
-			    </table>
-			  </div>`;
-		    $('#ackModalTitle').html("Acknowledgement Of Petition ("+petitionNo+")");
-			$("#ack1").html(ack);
-			$("#ack2").html(ack);
-			  
-		}).catch(function(error) {
-		    // Handle errors
-		    console.error('Error fetching petition details ('+petitionNo+'):', error);
-		});
-	}
-	 
-	/* Get Petition details by petition number */
-	function get_petition_details_byNo(petitionNo) {
-		
-		var apiUrl = '/gcc/api/zerohours_petition/getPetitionDetails?petitionNo='+petitionNo
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Get Petition details by petition number */
-	function get_complaint_details_byId(mapId) {
-		
-		var apiUrl = '/gcc/api/zerohours_petition/getComplaintDetails?mapId='+mapId
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	/* Get Petition details by petition number */
-	function get_complaint_action_byId(mapId) {
-		
-		var apiUrl = '/gcc/api/zerohours_petition/getComplaintActionDetails?mapId='+mapId
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition details ('+petitionNo+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-	
-	
-	/* File View */
-	function viewFile(fileOf,fileName,fileType){
-		$("#viewFileTitle").html("View File ("+fileName+")"); // Title for the Modal Box
-		
-		var fileUrl = "/gcc/files/zh_petition/";
-		
-		if(fileOf=="petition")
-		{
-			fileUrl=fileUrl+fileName;
-		}
-		else if(fileOf="action"){
-			fileUrl=fileUrl+"zh_action_file/"+fileName;
-		}
-		else{
-			fileUrl=fileUrl+"invaliedFile.txt"; // For File Not Exits Default file name
-		}
-		
-		checkFileExists(fileUrl).then(exists => {
-			if (exists) {
-				if(fileType=='application/pdf'){
-					var fileHTML = `<iframe src="${fileUrl}" type="application/pdf" width="100%" height="600px"></iframe>`;
-					
-				}
-				else if(fileType=='application/octet-stream'){
-					fileHTML =`<p class='text-danger m-0 p-0'>File Preview not avaiable.<br>Try to download and view.</p>`;
-				}
-				else{
-					fileHTML =`<img src="${fileUrl}" alt="${fileType}" width="100%">`;
-				}
-		    } else {
-		        console.log('File does not exist');
-		        fileHTML = `<p class='text-danger m-0 p-0'>File does not exist</p>`;
-		    }
-			
-			$("#viewFileBoxBody").html(fileHTML); // Modal Box Body
-			$("#viewFileBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-		});
-	}
-	
-	/* Downlaod file */
-	function downloadFile(fileOf,fileName,fileType){
-		$("#viewFileTitle").html("View File ("+fileName+")"); // Title for the Modal Box
-		
-		var fileUrl = "/gcc/files/zh_petition/";
-		
-		if(fileOf=="petition")
-		{
-			fileUrl=fileUrl+fileName;
-			callDownload(fileUrl,fileName);
-		}
-		else if(fileOf="action"){
-			fileUrl=fileUrl+"zh_action_file/"+fileName;
-			callDownload(fileUrl,fileName);
-		}
-		else{
-			fileUrl=fileUrl+"invaliedFile.txt"; // For File Not Exits Default file name
-		}
-	}
-	
-	/* Show Complaint forward Modal */
-	function forward_compliant(mapId,title){
-		var compmapHTML =`<div class="col-12" id="comp${mapId}">
-			
-								<div class="widget mb-0">
-					                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                    <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-					                </div>
-					                <div class="widget-body">
-					                	<div class="form-group">
-					                    	<label for="dept${mapId}">Select Department Type</label>
-											<select name="dept[]" id="dept${mapId}" class="form-control" onchange="javascript:calloffice(this.value,${mapId})">
-												<option value="0">Select Department</option>
-												<option value="1">GCC Department</option>
-												<option value="2">External Department</option>
-										    </select>
-										</div>
-										<div id="officedata${mapId}"></div>
-										<div id="officers${mapId}"></div>
-					                </div>
-					            </div>
-							
-						  </div>`;
-	  
-		$("#forwardModalBody").html(compmapHTML); // Modal Box Body
-		$("#forwardModalBox").modal({
-		    backdrop: 'static',
-		    keyboard: false
-		}); // Show Modal Box
-	}
-	
-	/* Show Complaint forward Modal */
-	function compliant_mapping(petitionId,title,petitionNo){
-		get_mapped_list(petitionId).then(function(listHTML) {
-			var compmapHTML =`<div class="row"><div class="col-6" id="comp${petitionId}">
-									<input type="hidden" name="petitionid" id="petitionid" value="${petitionId}">
-									<input type="hidden" name="petitionno" id="petitionno" value="${petitionNo}">
-									<div class="widget mb-0">
-						                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-						                    <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-						                </div>
-						                <div class="widget-body">
-						                	<div class="form-group">
-						                    	<label for="dept${petitionId}">Select Department Type</label>
-												<select name="dept[]" id="dept${petitionId}" class="form-control" onchange="javascript:calloffice(this.value,${petitionId})">
-													<option value="0">Select Department</option>
-													<option value="1">GCC Department</option>
-													<option value="2">External Department</option>
-											    </select>
-											</div>
-											<div id="officedata${petitionId}"></div>
-											<div id="officers${petitionId}"></div>
-						                </div>
-						            </div>
-								
-							  </div>`;
-				
-				var strListHTML = "";
-			  	for (const key in listHTML) {
-				    if (listHTML.hasOwnProperty(key)) {
-				        //console.log(`${key}: ${listHTML[key]}`);
-				    	strListHTML += `<tr>
-							            	<td class="fw-semibold">${key+1}</td>
-							            	<td class="fw-semibold">${listHTML[key]['petition_no']}</td>
-							            	<td class="fw-semibold">${listHTML[key]['off_nm']}</td>
-							            	<td class="fw-semibold">
-							            		<a href="javascript:void(0)" class="link mr-10"  onclick="unmapOfficer(${listHTML[key]['mapid']},${listHTML[key]['petition_id']},'${listHTML[key]['off_nm']}','${listHTML[key]['petition_no']}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Un-Map" data-original-title="Un-Map"><i class="fas fa-unlink"></i></a>
-							            	</td>
-						              	</tr>`;
-				    }
-				}
-			  	strListHTML = `<table class="table table-bordered table-vcenter mb-0">
-							              <thead>
-							              <tr>
-							                <th>S.no</th>
-							                <th>Petition No</th>
-							                <th>Department</th>
-							                <th><i class="fas fa-unlink"></i></th>
-							              </tr>
-							            </thead>
-							        	<tbody>
-							         		${strListHTML}
-							        	</tbody>
-							      	</table>`;
-	      	
-			compmapHTML = compmapHTML + `<div class="col-6" id="mappeddata">
-								
-								<div class="widget mb-0">
-					                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                    <h3 class="widget-title" style="font-size:13px;">Mapped List</h3>
-					                </div>
-					                <div class="widget-body">
-					                	<div id="mappedTableHTML">
-					                    	${strListHTML}
-										</div>
-					                </div>
-					            </div>
-							
-						  </div></div>`;
-		  
-			$("#mappingModalTitle").html("Mapping Form"); 
-			$("#mappingModalBody").html(compmapHTML); // Modal Box Body
-			$("#mappingModalBox").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-		}).catch(function(error) {
-		    // Handle errors
-		    console.error('Error fetching Mapped data:', error);
-		});
-		return false;
-	}
-	
-	function updateModelBox(petitionId,title,petitionNo){
-		get_mapped_list(petitionId).then(function(listHTML) {
-			var compmapHTML =`<div class="row"><div class="col-6" id="comp${petitionId}">
-									<input type="hidden" name="petitionid" id="petitionid" value="${petitionId}">
-									<input type="hidden" name="petitionno" id="petitionno" value="${petitionNo}">
-									<div class="widget mb-0">
-						                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-						                    <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-						                </div>
-						                <div class="widget-body">
-						                	<div class="form-group">
-						                    	<label for="dept${petitionId}">Select Department Type</label>
-												<select name="dept[]" id="dept${petitionId}" class="form-control" onchange="javascript:calloffice(this.value,${petitionId})">
-													<option value="0">Select Department</option>
-													<option value="1">GCC Department</option>
-													<option value="2">External Department</option>
-											    </select>
-											</div>
-											<div id="officedata${petitionId}"></div>
-											<div id="officers${petitionId}"></div>
-						                </div>
-						            </div>
-								
-							  </div>`;
-							  
-				var strListHTML = "";
-							  
-			  	for (const key in listHTML) {
-				    if (listHTML.hasOwnProperty(key)) {
-				        //console.log(`${key}: ${listHTML[key]}`);
-				    	strListHTML += `<tr>
-							            	<td class="fw-semibold">${key+1}</td>
-							            	<td class="fw-semibold">${listHTML[key]['petition_no']}</td>
-							            	<td class="fw-semibold">${listHTML[key]['off_nm']}</td>
-							            	<td class="fw-semibold">
-							            		<a href="javascript:void(0)" class="link mr-10" onclick="unmapOfficer(${listHTML[key]['mapid']},${listHTML[key]['petition_id']},'${listHTML[key]['off_nm']}','${listHTML[key]['petition_no']}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="un-Map" data-original-title="Un-Map"><i class="fas fa-unlink"></i></a>
-							            	</td>
-						              	</tr>`;
-				    }
-				}
-			  	strListHTML = `<table class="table table-bordered table-vcenter mb-0">
-							              <thead>
-							              <tr>
-							                <th>S.no</th>
-							                <th>Petition No</th>
-							                <th>Department</th>
-							                <th><i class="fas fa-unlink"></i></th>
-							              </tr>
-							            </thead>
-							        	<tbody>
-							         		${strListHTML}
-							        	</tbody>
-							      	</table>`;
-	      	
-			compmapHTML = compmapHTML + `<div class="col-6" id="mappeddata">
-								
-								<div class="widget mb-0">
-					                <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                    <h3 class="widget-title" style="font-size:13px;">Mapped List</h3>
-					                </div>
-					                <div class="widget-body">
-					                	<div id="mappedTableHTML">
-					                    	${strListHTML}
-										</div>
-					                </div>
-					            </div>
-							
-						  </div></div>`;
-		  
-			
-			$("#mappingModalBody").html(compmapHTML); // Modal Box Body
-			
-		}).catch(function(error) {
-		    // Handle errors
-		    console.error('Error fetching Mapped data:', error);
-		});
-		return false;
-	}
-	function unmapOfficer(mapid,petitionId,department,petitionNo){
-		// Handle the response
-    	Swal.fire({
-			title: 'Are you sure to unmap this department?<br>'+department,
-			customClass: {
-		        title: 'swal-title-custom' // Add a custom class for the title
-		    },
-			//text: "Error",
-			icon: 'warning',
-			showCancelButton: true,
-			confirmButtonColor: '#3085d6',
-			cancelButtonColor: '#d33',
-			confirmButtonText: 'Yes',
-			}).then(function(result) {
-			if (result.isConfirmed) {
-				unmapPetition(mapid).then(function(status) {
-					if(status=="success"){
-						updateModelBox(petitionId,"Assign to the Department Officer",petitionNo);
-					}
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error unmapping mapid:'+mapid, error);
-				});
-			}
-		});
-		
-		return false;
-	}
-	function unmapPetition(mapid){
-		var apiUrl = '/gcc/api/zerohours_petition/unmapPetition?mapid='+mapid
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            //data: formData,
-	            //dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                console.error('Error fetching petition maping details ('+mapid+'):', error);
-	                reject(error);
-	            }
-	        });
-	    });
-	}
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/modules/zerohours_petition/search_form.html b/src/main/resources/templates/fragments/modules/zerohours_petition/search_form.html
deleted file mode 100644
index e0f28b3b..00000000
--- a/src/main/resources/templates/fragments/modules/zerohours_petition/search_form.html
+++ /dev/null
@@ -1,19 +0,0 @@
-				<div class="row">
-					<div class="col-12 mb-2">
-						<div class="input-group mb-0">
-							<span class="input-group-prepend">
-                        	<button type="button" id="filter_reset_btn" class="btn btn-success" onclick="callReSetEventId(0);" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Reset" title="Reset">
-                          	  <i class="ik ik-refresh-ccw"></i>
-                        	</button>
-                        	</span>
-						 <select class="form-control" id="search_department_id" name="search_department_id">
-	                        <option value="0">All Department`s</option>
-	                      </select>
-	                      <span class="input-group-append">
-                         <button type="button" id="filter_search_btn" class="btn btn-success" onclick="callSetEventId();" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Search" title="Search">
-                           <i class="ik ik-search me-1"></i> Search
-                         </button>
-                         </span>
-						</div>
-					</div>
-				</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
deleted file mode 100644
index 44a4c0c7..00000000
--- a/src/main/resources/templates/index.html
+++ /dev/null
@@ -1,359 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-bar-chart-2 bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Dashboard</h5>
-                                            <span>Main Dashboard of GCC App</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-lg-6 col-md-6 col-sm-12">
-                                <div class="widget">
-                                    <div class="widget-header">
-                                        <h3 class="widget-title">My Details</h3>
-                                        <div class="widget-tools pull-right">
-                                            
-                                        </div>
-                                    </div>
-                                    <div class="widget-body" style="" id="basicUserProfile">
-                                        The body of the widget
-                                    </div>
-                                </div>
-                             </div>
-                             <div class="col-lg-6 col-md-6 col-sm-12">
-                                <div class="widget">
-                                    <div class="widget-header">
-                                        <h3 class="widget-title">தினம் ஒரு திருக்குறள்:</h3>
-                                        <div class="widget-tools pull-right text-right">
-                                            <img src="/gcc/files/app_uploads/icons/thiruvalluvar.jpeg" width="15%" class="rounded-circle">
-                                        </div>
-                                    </div>
-                                   
-                                    <div class="widget-body" id="kural_dashboard">
-                                    	<table>
-	                                    	<tr>
-	                                    		<td class="text-center" width="20%"><img src="/gcc/files/app_uploads/icons/thiruvalluvar.jpeg" width="90%" class="rounded"></td>
-	                                    		<td>
-	                                    			<div class="mb-0" style="font-size:20px;">அகர முதல எழுத்தெல்லாம</div>
-                                        			<div class="mb-0" style="font-size:20px;">ஆதி பகவன் முதற்றே உலக</div>
-                                        			<div class="mb-0 text-right">( குறள் எண் : 6 ) | <a href="javascript:void(0);" class="link"> விளக்கம்</a></div>
-	                                    		</td>
-	                                    	</tr>
-                                    	</table>
-                                    </div>
-                                </div>
-                             </div>
-                             <!-- 
-                             <div class="col-lg-3 col-md-6 col-sm-12">
-                                <div class="widget">
-                                    <div class="widget-header">
-                                        <h3 class="widget-title">Your Info</h3>
-                                        <div class="widget-tools pull-right"></div>
-                                    </div>
-                                    <div class="widget-body" id="">
-                                    </div>
-                                </div>
-                            </div>
-                             -->
-                        </div>
-                        <!-- 
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>User Profile</h3>
-                                    </div>
-                                    <div class="card-body">
-                                        <div class="col-sm-12" id="userProfile"></div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                         -->
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-       
-       <script th:inline="javascript">
-       var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-       
-       var createdBy = /*[[${LoginUserId}]]*/'';
-       //alert(createdBy);
-       // Loading Div id
-   	   const loading = $("#userProfile");
-    
-       function call_loading(){
-			loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-		}
-		
-		function remove_loading(){
-			loading.html("");
-		}
-		
-       
-		/* Get Complaints Data */
-	       function get_user_basic_data(){
-		      	var apiUrl = '/gcc/api/getUserProfileBasic?userId='+createdBy;
-		      	//alert(apiUrl);
-		  	    // Return a Promise
-		  	    return new Promise(function(resolve, reject) {
-		  	        $.ajax({
-		  	            url: apiUrl,
-		  	            type: 'GET',
-		  	            /*dataType: 'json',*/
-		  	            success: function(jsonResponse) {
-		  	                // Resolve the Promise with the department list
-		  	                resolve(jsonResponse);
-		  	            },
-		  	            error: function(xhr, status, error) {
-		  	                // Reject the Promise with the error message
-		  	                reject(error);
-		  	            }
-		  	        });
-		  	    });
-	       }
-	       
-	       /* Get Complaints List */
-	       function get_user_basic_info(){
-	    	   get_user_basic_data().then(function(userProfile) {
-		  		    // Handle the userProfile
-	    		   //$("#basicUserProfile").html(userProfile);
-	    			$("#basicUserProfile").html("<br><br><center>Welecome Back!</center><br><br>");
-		  		}).catch(function(error) {
-		  		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching User Profile:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching user profile:', error);
-			        }
-		  		});
-		   }
-	       
-       /* Get Complaints Data */
-       function get_user_data(){
-	      	var apiUrl = '/gcc/api/getUserProfile?userId='+createdBy;
-	      	//alert(apiUrl);
-	  	    // Return a Promise
-	  	    return new Promise(function(resolve, reject) {
-	  	        $.ajax({
-	  	            url: apiUrl,
-	  	            type: 'GET',
-	  	            /*dataType: 'json',*/
-	  	            success: function(jsonResponse) {
-	  	                // Resolve the Promise with the department list
-	  	                resolve(jsonResponse);
-	  	            },
-	  	            error: function(xhr, status, error) {
-	  	                // Reject the Promise with the error message
-	  	                reject(error);
-	  	            }
-	  	        });
-	  	    });
-       }
-       
-       /* Get Complaints List */
-       function get_user_info(){
-    	   get_user_data().then(function(userProfile) {
-	  		    // Handle the userProfile
-    		   $("#userProfile").html(userProfile);
-	  		}).catch(function(error) {
-	  		    // Handle errors
-		        if (error && error.message) {
-		            console.error('Error fetching User Profile:', error.message);
-		        } else {
-		            console.error('An error occurred while fetching user profile:', error);
-		        }
-	  		});
-	   }
-       
-       function getDailyContent_kural(){
-			get_kural_data().then(function(data) {
-				var kural_html =``;
-				$.each(data, function(index, row) {
-				kural_html =`<table>
-					               	<tr>
-					           		<td class="text-center" width="20%"><img src="/gcc/files/app_uploads/icons/thiruvalluvar.jpeg" width="90%" class="rounded"></td>
-					           		<td>
-					           			<div class="mb-0" style="font-size:20px;">${row['Line1']}</div>
-					           			<div class="mb-0" style="font-size:20px;">${row['Line2']}</div>
-					           			<div class="mb-0 text-right">( குறள் எண் : ${row['Number']} ) | <a href="#" onclick="return openKural(${row['Number']});" class="link"> விளக்கம் </a></div>
-					           		</td>
-					           	</tr>
-					       	</table>`;
-				});
-				$("#kural_dashboard").html(kural_html);
-			}).catch(function(error) {
-	  		    // Handle errors
-		        if (error && error.message) {
-		            console.error('Error fetching Kural:', error.message);
-		        } else {
-		            console.error('An error occurred while fetching Kural:', error);
-		        }
-	  		});
-       }
-       
-       function get_kural_data(){
-    	   var apiUrl = '/gcc/api/getDailyKural';
-	  	    // Return a Promise
-	  	    return new Promise(function(resolve, reject) {
-	  	        $.ajax({
-	  	            url: apiUrl,
-	  	            type: 'GET',
-	  	            success: function(jsonResponse) {
-	  	                // Resolve the Promise with the department list
-	  	                resolve(jsonResponse);
-	  	            },
-	  	            error: function(xhr, status, error) {
-	  	                // Reject the Promise with the error message
-	  	                reject(error);
-	  	            }
-	  	        });
-	  	    });
-       }
-      
-       function openKural(number){
-			//alert(number);
-			get_kural_data().then(function(data) {
-				var kural_html =``;
-				$.each(data, function(index, row) {
-				kural_html =`<table class="table bg-warning" style="color:#fff">
-						            <tr>
-						           		<td>
-						           			<div class="mb-0" style="font-size:18px;">குறள் எண் : ${row['Number']}</div>
-						           		</td>
-						           		<td>
-						           			<div class="mb-0" style="font-size:18px;">${row['Line1']}</div>
-						           			<div class="mb-0" style="font-size:18px;">${row['Line2']}</div>
-						           		</td>
-						           		<td>
-					           				<div class="mb-0" style="font-size:18px;">${row['transliteration1']}</div>
-					           				<div class="mb-0" style="font-size:18px;">${row['transliteration2']}</div>
-					           			</td>
-					           		</tr>
-					       	</table>
-					       	
-							<div class="row pt-10">
-			                    <div class="col-md-6">
-			                        <div class="card" style="min-height: 100px;margin-bottom: 10px;">
-			                            <div class="card-header" style="background:#cdd6a0;padding:5px;">
-			                                <h3>மு.வ விளக்கம்:</h3>
-			                                <div class="card-header-right">
-			                                    
-			                                </div>
-			                            </div>
-			                            <div class="card-body timeline" style="font-size:15px;">
-			                           		${row['mv']}
-			                            </div>
-			                        </div>
-			                    </div>
-			                    
-			                    <div class="col-md-6">
-			                        <div class="card" style="min-height: 100px;margin-bottom: 10px;">
-			                            <div class="card-header" style="background:#cdd6a0;padding:5px;">
-			                                <h3>சாலமன் பாப்பையா விளக்கம்:</h3>
-			                                <div class="card-header-right">
-			                                    
-			                                </div>
-			                            </div>
-			                            <div class="card-body timeline" style="font-size:15px;">
-			                            	${row['sp']}
-			                            </div>
-			                        </div>
-		                    	</div>
-		                    <div class="col-md-6">
-			                    <div class="card" style="min-height: 100px;margin-bottom: 10px;">
-			                        <div class="card-header" style="background:#cdd6a0;padding:5px;">
-			                            <h3>கலைஞர் விளக்கம்:</h3>
-			                            <div class="card-header-right">
-			                            	
-			                            </div>
-			                        </div>
-			                        <div class="card-body timeline" style="font-size:15px;">
-			                        	${row['mk']}
-			                        </div>
-			                    </div>
-		                	</div>
-		                	
-		                	<div class="col-md-6">
-		                    <div class="card" style="min-height: 100px;">
-		                        <div class="card-header" style="background:#cdd6a0;padding:5px;">
-		                            <h3>Explanation:</h3>
-		                            <div class="card-header-right">
-		                            	
-		                            </div>
-		                        </div>
-		                        <div class="card-body timeline" style="font-size:15px;">
-		                        	${row['explanation']}
-		                        </div>
-		                    </div>
-	                	</div>
-	                	</div>
-							`;
-				});
-				$("#kuralBody").html(kural_html);
-				$("#kuralModal").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-			}).catch(function(error) {
-	  		    // Handle errors
-		        if (error && error.message) {
-		            console.error('Error fetching Kural:', error.message);
-		        } else {
-		            console.error('An error occurred while fetching Kural:', error);
-		        }
-	  		});
-			
-			return false;
-       }
-       
-       $(document).ready(function() {
-			call_loading();
-			//get_user_info();
-			get_user_basic_info();
-			getDailyContent_kural();
-		});
-       </script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
deleted file mode 100644
index 8c56c114..00000000
--- a/src/main/resources/templates/login.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="auth-wrapper">
-            <div class="container-fluid h-100">
-                <div class="row flex-row h-100 bg-white">
-                    <div class="col-xl-8 col-lg-6 col-md-5 p-0 d-md-block d-lg-block d-sm-none d-none">
-                        <div class="lavalite-bg" style="background-image: url('images/login-bg.jpg')">
-                            <div class="lavalite-overlay"></div>
-                        </div>
-                    </div>
-                    <div class="col-xl-4 col-lg-6 col-md-7 my-auto p-0">
-                        <div class="authentication-form mx-auto text-center">
-                            <div class="logo-centered">
-                                <a href="/gcc"><img src="images/logo.png" alt="Greater Chennai Corporation" class="header-brand-img" width="100%"></a>
-                            </div>
-                            <h3>Greater Chennai Corporation</h3>
-                            <p>Happy to see you again!</p>
-                            <div th:if="${param.error}">
-						        <p style="color: red;">Invalid credentials.</p>
-						    </div>
-						    <form th:action="@{/gcc/login}" method="post">
-                                <div class="form-group">
-                                    <input type="text" class="form-control" id="username" name="username" placeholder="Username" required="" value="">
-                                    <i class="ik ik-user"></i>
-                                </div>
-                                <div class="form-group">
-                                    <input type="password" class="form-control" id="password" name="password" placeholder="Password" required="" value="">
-                                    <i class="ik ik-lock"></i>
-                                </div>
-                                <div class="row">
-                                    <div class="col text-left">
-                                        <label class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" id="item_checkbox" name="item_checkbox" value="option1">
-                                            <span class="custom-control-label">&nbsp;Remember Me</span>
-                                        </label>
-                                    </div>
-                                    <div class="col text-right">
-                                        <a href="#">Forgot Password ?</a>
-                                    </div>
-                                </div>
-                                <div class="sign-btn text-center">
-                                    <button class="btn btn-theme">Sign In</button>
-                                </div>
-                            </form>
-                            <div class="register">
-                                <p>Don't have an account? <a href="#">Create an account</a></p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/.DS_Store b/src/main/resources/templates/modules/.DS_Store
deleted file mode 100644
index 3b48c244293818e3e0e710fba9e504a049a8c174..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18436
zcmeHPeQX?85r2EOlRG<!FY!k|pyi|kfhwom*-6eOQtLWyLnsg{mzGpX<J`yQa`N4+
zb9c7WoPzvEMcUG!stOVyQHm-dK|u*sLq7PUA&B-5poCTwiAo6)Nbm;=;p2}~Re_ne
zd$%)h_x7$)UDI^e+I@TbW_EYxH#6_edv7g-&?e@xaUsTq5JA|n46lO2Q6VBw#_-(Q
zupW2E)&W;E*na?fC-4g~D|As6dAU2t9Tx&{1$W>T-J&R_8NVS)vj^hIj8UAGoPjAU
zx+LvEQ5O5*S-QxIv`C4Jm|?UX&x&{M(hvRO9-!`kJ6A=qXk;hT1tSetf?GfH&RtOY
zo38<11HJ})4fq=PFlqqXZrFl7X6YY&4fq=HHPFxi#)k;(SdLreqFKt&0SD~9V?B1^
z<p$@F2gqv?s~oq=MYEKwz$00qG+8w(#n4Q4xE?`rD95dG(JW1Np_%MLv!1M38Hy&K
z4tx<wF0^s8^pCy<d<{4?a5r4)7B2bpe6n0B7^NK4qsy%j709v=2m}5KTX#&w<|@@P
zT<;Y3L%v^vJY1pKRxmPFzKt$<58UR;f8_?h6x#GcW!9qoNqV-BuT*2PH?%-UXV;3A
z!Ii<D;KRuS#zL~1s?Jp=Qsv$FYo}op()IIH`oX-uFdgpSVw9?>d`T}$hJ02Bl09F_
zm$JsfgfUmjRwQrItO$mJq3Q5ot+qZk6j>iTG8CyLHo)m<V&jn`q2NID)0=lp&lHL!
z<1zWpLbHO8SZ)4p93NLD%2qOkG`t~FFxBNV^OmUE@w%v&>Y|3adseMp(;HsfyRNsd
zuYX|hromgL!+q&gW+qq0*WY3kjPgWbPT!T!7^P(Xu)eFRAFATXba<UYw?ohFwJ+^_
zWEN=p?F;f=Tg$p$+MO%sv)lLYujtiX<ouyM70~mxs$Sey+Hb)9=RwEYXRCRmRC!P@
zSD<{jkV@-??WGB$S~ZFfrOM@0DW^|7G9B)fyzr7!WgYqCeUr1POum$h-hI{7Ty%V@
ze)1{vBrKxl33N;Q>t|M}g?5%wMLiT9zu&qN6rT{A#iaNG3<4b#kBQ^rS@9!rL0lAn
z5PuWbG)?Q)`m_P<cI{(YOp9xqw1mkSr~`Q`e}-%=7+!@O8G`D0@)FRq`l2z}7*={Z
zIWhQ+kGuk=uF}{;Pt9o9@YSjqz7~6q;*K5Qj)tfxPIf|ZGK-41*O|J_HQXz>gzgmr
z_qw@O8yVY(PKEvzj}4CuMK+Db6$g6)1%|h;<Dxp)SE169h9RO&Ac9s6#bWR4KmT(y
z^)h17sI^gW)-wHT`+%*^r)YjP3?`<;Aqa*L2;onMGaT}S;YyB%cAJ8R2Pc<l`@i7n
z9@JFM;L-38fBkJKrzeLkdwU!%`dBIEL0Sy;1`NNdwg;LHyh;MRLQMmrQpJV8hNhrU
zP=TR#^Ql{;lR2ntA)8Y%!2%H=1V@_(2+QU;vH~I)p3-g++U0hv;SGtQ$jGSaSYzN=
zqr=13;aE(5hK6|l`>K8@7Jq-@;Dy9_X?*M+bgaD@4Z}g4ci^D7UAI^Oe9B;a(-8Vn
z5bzI(6vqnt7=gXS1YLP<5X@X<W7q|bYy+jb(oqbrEqv|Jt1n0lo6y=`)ryv38jzT}
z-qRCXz!m3o6l|es^T5{PxgoK&WMkNhmo7T6wdg3eK(n*!v<tQkS{vI|v<zG5VKsZc
zf^8T0EjAZ3YJ-8zBSVx>5*%N2bXb-;ALy^uAgaosnuv|U*~T#?rhWy5_voy^94gFH
zHsof=1utLawG^*Y7k)bWyT3}j2tSRc?i380&=kHL;a3n@Ck{h1UItV!o125PigV_b
zd!GiaAj7Jyd(bAoEe58jz|_w`jJEiw3XlHh%@^<eoK#_(ytWIxTVAI2z*DI958QSy
zym1#q+$_wJLmtm@#}-xGNm^7w$-olFKFaSyAvt~K?BH|Xl5_EdpIWs$1yip$iK^{}
z&bDKffb!1JQm}V+<)OCeO2EX^uHsEy>8PNuL|+SsUXy}0p|x$T6)h7!5UUHHk~v34
z_QR{_#$0#|st(~DJS4m>OFlRp8ykuY$7Q!QJ`A~GBC$ycvF+r8sAGq0DzFX$25jeZ
zmn~o&bQD;ixwPjuRy*qQP-@GqXc@4b7lB+FmgD(K)L!EzEDU<2V9zK<fXOoTT2EeL
z3?JOFH%|$vNq7=6(+Hi#F$hn3Y9a%>PwhU}E7Q^zJa!Cdmxq~5_Y|6p=Q9-3SqY|-
zmFZIj(p;SziwyD4kPxp>6Z1IrzIVk2YBlJ9#fRm{tb1P!`&zIy9XP^~TSX*l4@woY
z0P!mvlvF4v=BM9$Yi&6z!-9j#M!7i^!&O5u)Tb#(BI*Q5_(jH`6kM^zqPTkU5|o!a
z2yDbI_jL`xdrHWV)y94d+VP~PI0NlX(^n+UEqH9y+vVXlun*Y0-%GKGAlN`2y6_q3
z$QPh7aO)3HD{#;g<d>x{@E(l~JLF<`i^s8@b<j|Z`@WO9eDWW%@8&{h<LX7nuoO=r
zmX3QV_^pyY?6UNgdow0r%$u9?(cspUh$$z~{U^A2Q(CH|?;XG6fytP31P^*!S?$m>
zrI~AdgRr(2jX4MFfib}8RH(IZ83zJ!*>4Vdz$^y3jl*LLr>!9^TpM>FUUAOR>Miw*
z$*r|oJOP8b>*Hq27mp>NzwC^OPojZ&G=0aQvJF|eF)W^IkBgc`@Vj4s<L&#T@3iqe
z+F5>goZM8-!;7{fpW<<Az-r21H#n1lwo{aeZxwq+wxMBT?7AYIyQP3emYJ3-54B!b
z0**lRY_o?`oxkw<z|5n+wQ^0D_(8QyXi;Zu`#AivR>*VN<n$GF8;gp)toD1<RAYtx
zWMe86SJ->6zvs0a+HrivP5=lSwW9J~I3q*ft3gMcc3GOT_h>ezArI4Z$H<*jC)5<a
z`1FNi(K9kCH+U)hZuLyx9e-r{RvacIzse}VD50F>1UFGS88X0rnFLrD4uZ{ccQCJi
zg@=n=45Qos{X8hrg^Hr}$(tX2X~$a<Emumr_4KA>2u37=F85Qg?6tnI!2p;8JTW1}
zc~92~Y#H4st}VE42#j0E$nXvv{w3huf`elJ&*;eU6Z0}?x8$<zpnWc86M>WH)h(W*
z*hdH02Q-gL#KnaS)DA2vrVH(4Cp^unp)#NN{5NlV`(-I}qt=$qS<7V5&Z7*j>(i8X
z#8!d6qbrZ6g)Vis4%V5C#5N2?<T|sl4V&D$bnUD&bCrx?(Q(I?W?G}jJTUf`kt=gn
z7s6!)AZ<hHv`fDL&(Hro#~2icb>x?dTi|@aGo)#D&=Z$fmQItO|H~Yt#iW*>|2J0C
zwvl0SAMo>k@6i(0bOikTAD3-^IP(7$*tvpFdwSpi>j0X4|1XLBgRcQ!12?7yw9d)o
z<OIluVb5*DZ|x$m?}NR*0j(s5gZvZ^O3VQ9M-Yn7;yGNCv(-@U!{4~U`J!3E8Eo(W
khk#Azit#I+7Wp!7EdBhy@!whe{NL+4GyD+d|1AIi9}}&2EdT%j

diff --git a/src/main/resources/templates/modules/admin/index.html b/src/main/resources/templates/modules/admin/index.html
deleted file mode 100644
index 6ae05877..00000000
--- a/src/main/resources/templates/modules/admin/index.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-bar-chart-2 bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>User List</h5>
-                                            <span>GCC Application Admin (Configuration Page)</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item active" aria-current="page">Admin</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>Page Title</h3>
-                                    </div>
-                                    <div class="card-body">
-                                        
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>Datatable Test</h3>
-                                    </div>
-                                    <div class="card-body">
-                                        <div class="col-sm-12"><table id="example" class="table table-striped table-bordered table-hover nowrap dataTable" role="grid" aria-describedby="simpletable_info">
-                                                <thead class="thead-dark">
-                                                <tr role="row"><th class="sorting_asc" tabindex="0" aria-controls="simpletable" rowspan="1" colspan="1" aria-sort="ascending" aria-label="Name: activate to sort column descending" style="width: 178.258px;">Name</th><th class="sorting" tabindex="0" aria-controls="simpletable" rowspan="1" colspan="1" aria-label="Position: activate to sort column ascending" style="width: 268.727px;">Position</th><th class="sorting" tabindex="0" aria-controls="simpletable" rowspan="1" colspan="1" aria-label="Office: activate to sort column ascending" style="width: 129.852px;">Office</th><th class="sorting" tabindex="0" aria-controls="simpletable" rowspan="1" colspan="1" aria-label="Age: activate to sort column ascending" style="width: 72.1875px;">Age</th><th class="sorting" tabindex="0" aria-controls="simpletable" rowspan="1" colspan="1" aria-label="Start date: activate to sort column ascending" style="width: 135.57px;">Start date</th><th class="sorting" tabindex="0" aria-controls="simpletable" rowspan="1" colspan="1" aria-label="Salary: activate to sort column ascending" style="width: 96.4062px;">Salary</th></tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-                                                <tr><th rowspan="1" colspan="1">Name</th><th rowspan="1" colspan="1">Position</th><th rowspan="1" colspan="1">Office</th><th rowspan="1" colspan="1">Age</th><th rowspan="1" colspan="1">Start date</th><th rowspan="1" colspan="1">Salary</th></tr>
-                                                </tfoot>
-                                            </table></div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-       
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/admin/user-group-access.html b/src/main/resources/templates/modules/admin/user-group-access.html
deleted file mode 100644
index 0a5b22e0..00000000
--- a/src/main/resources/templates/modules/admin/user-group-access.html
+++ /dev/null
@@ -1,272 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
- 
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="fa fa-id-badge bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>User Group Access</h5>
-                                            <span>GCC Application Configuration</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Admin</li>
-                                            <li class="breadcrumb-item active" aria-current="page">User Group Access</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <p></p>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-									<div class="card-header">
-										
-										<div class="row">
-											<div class="col-md-12"></div>
-											<div class="input-group col-md-12 mb-0">
-												
-												<label for="search_groupid" class="pt-2"> User Group: &nbsp;</label>
-												
-												<select class="form-control select2" id="search_groupid" name="search_groupid">
-													<option value="">Please choose a User Group Name to retrieve data.</option>
-		                                    		<option th:each="userGroup: ${userGroupList}" th:value="${userGroup.id}" th:text="${userGroup.name}">-</option>
-												</select>
-												<span class="input-group-append">
-													<button type="button" id="groupSearchbtn" class="btn btn-success" onclick="showAccessTree();" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Search" title="">
-												       <i class="ik ik-search me-1"></i> Search
-												     </button>
-												</span>
-											</div>
-                                        </div>
-                                    </div>
-                                    <div class="card-body">
-                                        <div class="col-sm-12">
-                                        	<div id="loadaccesstree"></div>
-											<!-- <div th:utext="${accessHTML}"></div> -->
-										</div>
-                                    </div>
-                                    <div class="card-footer">
-                                        <div class="col-sm-12 text-right">
-											<button type="reset" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="return closeModel();"><i class="ik ik-x-square"></i>Close</button>
-                        					<button type="submit" class="btn btn-success btn-sm" id="savebtn" onclick="return getCheckedData()"><i class="ik ik-save"></i>Save</button>
-										</div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        
-       <script>
-			(function($){
-			    $.fn.extend({
-			    	// Tree Check By Paranet (Check All)
-			        checktree: function(){
-			            $(this)
-			                .addClass('checktree-root')
-			                .on('change', 'input[type="checkbox"]', function(e){
-			                    e.stopPropagation();
-			                    e.preventDefault();
-			
-			                    checkParents($(this));
-			                    checkChildren($(this));
-			                })
-			            ;
-			
-			            var checkParents = function (c)
-			            {
-			                var parentLi = c.parents('ul:eq(0)').parents('li:eq(0)');
-			
-			                if (parentLi.length)
-			                {
-			                    var siblingsChecked = parseInt($('input[type="checkbox"]:checked', c.parents('ul:eq(0)')).length),
-			                        rootCheckbox = parentLi.find('input[type="checkbox"]:eq(0)')
-			                    ;
-			
-			                    if (c.is(':checked'))
-			                        rootCheckbox.prop('checked', true)
-			                    else if (siblingsChecked === 0)
-			                        rootCheckbox.prop('checked', false);
-			
-			                    checkParents(rootCheckbox);
-			                }
-			            }
-			
-			            var checkChildren = function (c)
-			            {
-			                var childLi = $('ul li input[type="checkbox"]', c.parents('li:eq(0)'));
-			
-			                if (childLi.length)
-			                    childLi.prop('checked', c.is(':checked'));
-			            }
-			        }
-			
-			    });
-			})(jQuery);
-			
-			callMenuTreeAccess = function(groupId,groupName){
-
-				const loadaccesstree = $("#loadaccesstree");
-				const searchBtn = $("#groupSearchbtn");
-				const savebtn = $("#savebtn");
-				const apiUrl = "/gcc/api/getAccessTree?groupId="+groupId+"&groupName="+groupName;
-					
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'text',
-				    success: function(Response) {
-						// Handle the API response data here
-						//console.log('Data from API:', Response);
-						
-						// Parse the JSON response into a JavaScript object
-						var data = Response;
-						if(data.ResultStatus=="False")
-						{
-							loadaccesstree.html("<center>"+nodata(data.Message)+"</center>");
-							searchBtn.prop("disabled", false);
-							searchBtn.html('<i class="ik ik-search me-1"></i> Search');
-						}
-						else{
-							
-							loadaccesstree.html(data);
-							$('#tree').checktree();
-							// Enable the button
-							searchBtn.prop("disabled", false);
-							searchBtn.html('<i class="ik ik-search me-1"></i> Search');
-							savebtn.prop("disabled", false);
-						}
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', xhr.status, error);
-				      	if (xhr.status == 404) {
-				            // Handle 404 error specifically
-				            loadaccesstree.html(nodata("<b>Unable to fetch data. Please try again later.<br>Error 404: Resource not found. Please check the URL.</b>"));
-				        } else {
-				            // Handle other errors
-				            loadaccesstree.html(nodata("<b>Error: Unable to fetch data. Please try again later.</b>"));
-				        }
-				      // Enable the button
-				      searchBtn.prop("disabled", false);
-					  searchBtn.html('<i class="ik ik-search me-1"></i> Search');
-				    }
-				});
-			}
-			
-			// Load Access Tree
-			showAccessTree = function(){
-				
-				const loadaccesstree = $("#loadaccesstree");
-			    const selectedGroup = $('#search_groupid');
-			    const selectedGroupId = selectedGroup.val();
-			    const selectedGroupName = selectedGroup.find('option:selected').text();
-			    const searchBtn = $("#groupSearchbtn");
-			    const savebtn = $("#savebtn");
-			    
-			    call_loading('loadaccesstree','start');
-			    savebtn.prop("disabled", true); // Stop Save button
-			    
-			    if(selectedGroupId>0){
-			    	// Disable the button to prevent multiple clicks
-					searchBtn.prop("disabled", true);
-					// Show the loading icon on the button
-					searchBtn.html('<i class="fas fa-spinner fa-spin"></i>');
-					
-			    	callMenuTreeAccess(selectedGroupId,selectedGroupName);
-				}
-			    else{
-			    	loadaccesstree.html(searchinfo("<b>Please select and search for a User Group to continue.</b>"));
-				}
-			}
-			showAccessTree();
-			
-			
-			var getCheckedData = function() {
-	            var checkedData = [];
-	            $('input[type="checkbox"]:checked', "#tree").each(function() {
-	                checkedData.push($(this).val());
-	            });
-	            
-	            
-	            // Push Group ID
-    			const selectedGroup = $('#search_groupid');
-    			const selectedGroupId = selectedGroup.val();;
-	            
-	            console.log(checkedData);
-	            
-	            submitCheckedData(checkedData,selectedGroupId);
-	            
-	            return false;//checkedData;
-	        };
-	        
-	        var submitCheckedData = function(checkedData, groupId) {
-	            // Perform your AJAX request here using checkedData
-	            // Replace the URL and other options with your actual API endpoint and data
-	            const apiUrl = "/gcc/api/saveGroupAccessData";
-	            
-	            const selectedGroup = $('#search_groupid');
-			    const selectedGroupName = selectedGroup.find('option:selected').text();
-	            
-	            $.ajax({
-	                url: apiUrl,
-	                type: 'POST',
-	                contentType: 'application/json',
-	                data: JSON.stringify({ checkedData: checkedData, groupId: groupId }),
-	                success: function(response) {
-	                    // Handle the success response
-	                    console.log('API response:', response);
-	                    Swal.fire(
-	    	  			        'User Group Access!',
-	    	  			        'Access has been successfully mapped to the User Group (' + selectedGroupName + ')!',
-	    	  			        'success'
-	    	  			      ).then(() => {
-	    	  						    location.reload();
-	    	  						 });
-	                },
-	                error: function(error) {
-	                    // Handle the error response
-	                    console.error('API error:', error);
-	                }
-	            });
-	        };
-	        
-		</script>
-       
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/admin/user-group-list.html b/src/main/resources/templates/modules/admin/user-group-list.html
deleted file mode 100644
index 25dab726..00000000
--- a/src/main/resources/templates/modules/admin/user-group-list.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fa fa-users bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>User Group List</h5>
-                                            <span>GCC Application Configuration</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Admin </li>
-                                            <li class="breadcrumb-item active" aria-current="page">User Group List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal code</th>
-														<th class="text-center">Type of complaint</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                <tr th:each="petition, i : ${petitionlist}" class="${petitionlist}">
-						                                <td th:utext="${i.count}">0</td>
-														<td th:utext="${petition.petitionNumber}"></td>
-						 								<td th:utext="${petition.petitionerName}" class="text-center"></td>  
-						                              	<td th:text="${petition.petitionerMobile}"></td>
-						 								<td th:utext="${petition.petitionerAddress}"></td>
-														<td th:utext="${petition.petitionerPincode}"></td>
-														<td th:text="${petition.PetitionerComplaint_txt}"></td>
-														<td style="text-transform: capitalize;" class="text-center"><a href="#" th:onclick="return call_view_petition([[${petition.petitionNumber}]]);" th:utext="${petition.status}" class="text-warning"></a></td>
-						                                <td class="text-center">
-						 									<a th:href="@{#}" th:onclick="return callViewFiles( [[${petition.petitionId}]],[[${petition.petitionNumber}]] );" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Files" data-original-title="View Files"><i class="ik ik-file-text text-green" style="font-size: 18px;"></i></a>
-															<a th:href="@{/petition-ack/{petitionNumber}(petitionNumber=${petition.petitionNumber})}"
-															   data-toggle="tooltip" data-animation="true" data-placement="top" title="View ACK" data-original-title="View ACK">
-															  <i class="far fa-thumbs-up" style="font-size: 18px;"></i>
-															</a>
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal code</th>
-														<th class="text-center">Type of complaint</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/mtm/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script th:inline="javascript">
-			//var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: 'Petition List'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: 'Petition List'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: 'Petition List'
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/admin/user-list.html b/src/main/resources/templates/modules/admin/user-list.html
deleted file mode 100644
index 9973386b..00000000
--- a/src/main/resources/templates/modules/admin/user-list.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fa fa-user bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>User List</h5>
-                                            <span>GCC Application Configuration</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Admin</li>
-                                            <li class="breadcrumb-item active" aria-current="page">User List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Name</th>
-						 								<th class="text-center">E-mail</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Username</th>
-														<th class="text-center">Role</th>
-														<th class="text-center">Access Group</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                               <tr th:each="userlistData, i : ${userlist}" class="${userlist}">
-						                                <td th:utext="${i.count}">0</td>
-														<td th:utext="${userlistData.userid.name}"></td>
-						 								<td th:utext="${userlistData.userid.email}"></td>
-														<td th:utext="${userlistData.userid.phone}"></td>
-														<td th:text="${userlistData.username}"></td>
-						 								<td th:utext="${userlistData.roles}" class="text-center"></td>
-						 								<td th:text="${userlistData.usergroup_id.name}"></td> 
-														<td style="text-transform: capitalize;" th:utext="${userlistData.isActive} ? 'Active' : 'Inactive'" th:class="${userlistData.isActive} ? 'text-center text-green' : 'text-center text-red'"></td>
-						                                <td class="text-center">
-						 									<a th:href="@{#}" th:onclick="return callUserDetails([[${userlistData.id}]]);" data-toggle="tooltip" data-animation="true" data-placement="top" title="View User Details" data-original-title="View User Details"><i class="ik ik-file-text text-green" style="font-size: 18px;"></i></a>
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Name</th>
-						 								<th class="text-center">E-mail</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Username</th>
-														<th class="text-center">Role</th>
-														<th class="text-center">Access Group</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-						                             </tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/admin/modal-box :: div}"></div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:inline="javascript">
-			//var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				var exportTitle = "GCC Application User List";
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: exportTitle
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: exportTitle
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: exportTitle
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			   	 	/* Disable initial sort */
-			        aaSorting: [],
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-					dom: 'Bftip',
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			
-			// For view user details
-			function callUserDetails(userid){
-				$("#profilehtml").html(searchinfo("<b>Retrieving Information, Please Wait...<div id=\"loadingimg\"></div></b>"));
-				call_loading("loadingimg","start");
-
-				$('#viewUserDetails').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#viewUserDetails').modal('show');
-				
-				var userProfileHtml = "";
-				
-				getUserDetails(userid).then(response => {
-			        // Handle the success response
-					$("#profilehtml").html(response);
-			    })
-			    .catch(error => {
-			        // Handle the error response
-					$("#profilehtml").html(error);
-			    });
-				
-			}
-			
-			function getUserDetails(userid){
-				const apiUrl = "/gcc/api/getUserProfile";
-				return new Promise((resolve, reject) => {
-					$.ajax({
-		                url: apiUrl,
-		                type: 'GET',
-		                dataType: 'text',
-		                data: { userId: userid},
-		                success: function(response) {
-		                    // Handle the success response
-		                    resolve(response);
-		                },
-		                error: function(error) {
-		                    // Handle the error response
-		                    console.error('API error:', error);
-		                    reject(error);
-		                }
-		            });
-				});
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/bulkwaste/requestdetails.html b/src/main/resources/templates/modules/bulkwaste/requestdetails.html
deleted file mode 100644
index 4a6c69cc..00000000
--- a/src/main/resources/templates/modules/bulkwaste/requestdetails.html
+++ /dev/null
@@ -1,3007 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    /* Add space between buttons inside the container */
-    .col-md-3.d-flex button {
-        margin-right: 10px; /* Adjust the value as needed */
-    }
-    /* Remove extra margin from the last button */
-    .col-md-3.d-flex button:last-child {
-        margin-right: 0;
-    }
-    
-    .bulk-details-card{
-    border:1px solid #d6dbe2 !important;
-    border-radius:12px;
-    box-shadow:none;
-}
-
-.cattle-detail-card{
-    border:1px solid #d6dbe2 !important;
-    border-radius:12px;
-    box-shadow:none;
-    background:#fff;
-}
-
-#editBulkWasteModal .modal-body{
-    max-height:70vh;
-    overflow-y:auto;
-}
-
-
-</style>
-    <body>
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Request Details</h5>
-                                            <span>Bulk Waste Generator</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Bulk Waste Generator</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Request Details</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12"><span th:text="${LoginUserId}" style="display:none;" id="userIdSpan"></span>
-										<div id="tableLoading"></div>	
-                                        
-                                        <div class="row mb-3">
-						    <div class="col-md-4">
-						        <label for="fromDate">From Date:</label>
-						        <input type="date" id="fromDate" class="form-control">
-						    </div>
-						    <div class="col-md-4">
-						        <label for="toDate">To Date:</label>
-						        <input type="date" id="toDate" class="form-control">
-						    </div>
-						    
-							<div class="col-md-4">
-							    <label for="petitionType">Category Types</label>
-							    <select class="form-control" id="categoryType" name="petitionType">
-							        <option value="">-- All Types --</option>
-							    </select>
-							</div>
-							
-							<div class="col-md-3">
-							    <label for="petitionType">Zone</label>
-							    <select class="form-control" id="zoneType" name="zoneType">
-							        <option value="">-- All Zone --</option>
-							    </select>
-							</div>
-							
-							<div class="col-md-3">
-							    <label for="petitionType">Ward</label>
-							    <select class="form-control" id="wardType" name="wardType">
-							        <option value="">-- All Ward --</option>
-							    </select>
-							</div>
-							
- 						<div class="col-md-4 d-flex align-items-end">
-						    <button id="filterBtn" class="btn btn-primary mr-2">Search</button>
-						
-						    <button id="resetBtn" class="btn btn-secondary mr-2">Reset</button>
-						
-						    <!-- <button id="downloadCattleExcelBtn"
-						            class="btn btn-success">
-						        <i class="fa fa-file-excel"></i>
-						        Download Cattle List
-						    </button> -->
-						</div> 
-						
-
-						</div>
-                                         
-                                        <div>
-											<table id="ReportDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                
-			                                           <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Date</th>
-						 								<th class="text-center">Name of Establishment</th>
-						 								<th class="text-center">Person Name</th>
-						 								<th class="text-center">Category</th>
-						 								<th class="text-center">Mobile Number</th>
-						 								<th class="text-center">Zone</th>
-						                                <th class="text-center">Ward</th>                             
-						                                <th class="text-center">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                          
-                          
-                                                 
-                                            </table>
-                                        </div>
-                                 
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-        
-        
-		
-	    <div th:replace="~{fragments/modules/zerohours_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-        
-        <div class="modal fade" id="bulkwasteModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
-		    <div class="modal-dialog modal-xl modal-dialog-scrollable">
-		        <div class="modal-content">
-		
-		            <div class="modal-header bg-dark text-white">
-		                <h4>Bulk Waste Details</h4>
-		                
-		                <button type="button" class="close" data-dismiss="modal">
-		                    <span>&times;</span>
-		                </button>
-		
-		            </div>
-		
-		            <div class="modal-body">
-		                    
-	                    <!-- Basic Details -->
-						<div class="card mb-3 bulk-details-card">
-						    <div class="card-header bg-light">
-						        <h5 class="mb-0"><b>Basic Details</b></h5>
-						    </div>
-							
-							
-						    <div class="card-body">
-		                        <div class="row">
-		                        
-		                        <!-- Column 1 -->
-						            <div class="col-md-4">
-						
-						                <p><b>Name of Establishment</b></p>
-						                <h5 id="establishmentName"></h5>
-						
-						                <p class="mt-3"><b>Trade License No</b></p>
-						                <span id="tradeLicenseNo"></span>
-						
-						                <p class="mt-3"><b>Address</b></p>
-						                <span id="ownerAddress"></span>
-						
-						            </div>
-						
-						            <!-- Column 2 -->
-						            <div class="col-md-4">
-						
-						                <p><b>Person Name</b></p>
-						                <h5 id="personName"></h5>
-						
-						                <p class="mt-3"><b>GST No</b></p>
-						                <span id="gstNo"></span>
-						
-						            </div>
-						
-						            <!-- Column 3 -->
-						            <div class="col-md-4">
-						
-						                <p><b>Category</b></p>
-						                <span id="category"></span>
-						
-						                <p class="mt-3"><b>Mobile Number</b></p>
-						                <span id="mobileNo"></span>
-						
-						            </div>
-		
-		                          
-		                        </div>
-		
-		                    </div>
-		                </div>
-		                
-		                <!-- Establishment Details -->
-		                <div class="card mb-3 bulk-details-card">
-						    <div class="card-header bg-light">
-						        <h5 class="mb-0"><b>Establishment Details</b></h5>
-						    </div>
-						
-						    <div class="card-body">
-						        <div class="row">
-						
-						            <div class="col-md-4">
-						                <p><b>Total Built-up Area (Sq.m)</b></p>
-						                <span id="builtupArea"></span>
-						            </div>
-						
-						            <div class="col-md-4">
-						                <p><b>Establishment Type</b></p>
-						                <span id="establishmentType"></span>
-						            </div>
-						
-						            <div class="col-md-4" id="dwellingDiv" style="display:none;">
-						                <p><b>Number of Dwelling Units</b></p>
-						                <span id="dwellingUnits"></span>
-						            </div>
-						
-						            <div class="col-md-4" id="footfallDiv" style="display:none;">
-						                <p><b>Average Daily Footfall</b></p>
-						                <span id="dailyFootfall"></span>
-						            </div>
-						
-						            <div class="col-md-4">
-						                <p><b>Total Occupants / Employees</b></p>
-						                <span id="totalEmployees"></span>
-						            </div>
-						
-						        </div>
-						    </div>
-						</div>
-						
-						<!-- Waste Generation Details -->
-						<div class="card mb-3 bulk-details-card">
-						    <div class="card-header bg-light">
-						        <h5 class="mb-0"><b>Waste Generation Details</b></h5>
-						    </div>
-						
-						    <div class="card-body">
-						        <div class="row">
-						
-						            <div class="col-md-4">
-						                <p><b>Wet Waste (kg/day)</b></p>
-						                <span id="wetWaste"></span>
-						            </div>
-						
-						            <div class="col-md-4">
-						                <p><b>Dry Waste (kg/day)</b></p>
-						                <span id="dryWaste"></span>
-						            </div>
-						
-						            <div class="col-md-4">
-						                <p><b>Domestic Hazardous Waste (kg/day)</b></p>
-						                <span id="domesticWaste"></span>
-						            </div>
-						
-						            <div class="col-md-4 mt-3">
-						                <p><b>Sanitary Waste (kg/day)</b></p>
-						                <span id="sanitaryWaste"></span>
-						            </div>
-						
-						            <div class="col-md-4 mt-3">
-						                <p><b>C &amp; D Waste</b></p>
-						                <span id="cdWaste"></span>
-						            </div>
-						
-						            <div class="col-md-4 mt-3">
-						                <p><b>Waste Audit Report</b></p>
-						                <span id="wasteAuditReport"></span>
-						            </div>
-						
-						        </div>
-						    </div>
-						</div>
-						
-						<!-- Waste Processing Details -->
-						<div class="card mb-3 bulk-details-card">
-						    <div class="card-header bg-light">
-						        <h5 class="mb-0"><b>Waste Processing Details</b></h5>
-						    </div>
-						
-						    <div class="card-body">
-						
-						        <div class="row">
-						
-						            <div class="col-md-4">
-						                <p><b>Is Wet Waste Processed On-site</b></p>
-						                <span id="wetWasteProcessed"></span>
-						            </div>
-						
-						        </div>
-						
-						        <!-- Show only if Yes -->
-						        <div id="wasteProcessingSection" style="display:none;">
-						
-						            <div class="row mt-3">
-						
-						                <div class="col-md-4">
-						                    <p><b>Technology Used</b></p>
-						                    <span id="technologyUsed"></span>
-						                </div>
-						
-						                <div class="col-md-4">
-						                    <p><b>Installed Capacity (kg/day)</b></p>
-						                    <span id="installedCapacity"></span>
-						                </div>
-						
-						                <div class="col-md-4">
-						                    <p><b>Year of Installation</b></p>
-						                    <span id="installationYear"></span>
-						                </div>
-						
-						                <div class="col-md-4 mt-3">
-						                    <p><b>Vendor Name</b></p>
-						                    <span id="vendorName"></span>
-						                </div>
-						
-						                <div class="col-md-4 mt-3">
-						                    <p><b>Is the Unit Functional</b></p>
-						                    <span id="unitFunctional"></span>
-						                </div>
-						
-						                <div class="col-md-4 mt-3">
-						                    <p><b>Photo of Installed Unit</b></p>
-						                    <span id="installedUnitPhoto"></span>
-						                </div>
-						                
-						                <div class="col-md-4 mt-3">
-						                    <p><b>Location</b></p>
-						                    <a href="javascript:void(0)" id="viewLocation" 
-						                    class="badge bg-secondary">View Location</a>
-						                </div>
-
-						            </div>
-						
-						        </div>
-						
-						    </div>
-						</div>
-						
-						<!-- Dry Waste Management Details -->
-						<div class="card mb-3 bulk-details-card">
-						    <div class="card-header bg-light">
-						        <h5 class="mb-0"><b>Dry Waste Management Details</b></h5>
-						    </div>
-						
-						    <div class="card-body">
-						
-						        <div class="row">
-						
-						            <div class="col-md-4">
-						                <p><b>Is Dry Waste Given to Authorized Recycler</b></p>
-						                <span id="dryWasteRecycler"></span>
-						            </div>
-						
-						        </div>
-						
-						        <!-- Show only if Yes -->
-						        <div id="dryWasteSection" style="display:none;">
-						
-						            <div class="row mt-3">
-						
-						                <div class="col-md-6">
-						                    <p><b>Name of Recycler / MRF</b></p>
-						                    <span id="recyclerName"></span>
-						                </div>
-						
-						                <div class="col-md-6">
-						                    <p><b>Authorized No of Recycler</b></p>
-						                    <span id="recyclerAuthorizationNo"></span>
-						                </div>
-						
-						            </div>
-						
-						        </div>
-						
-						    </div>
-						</div>
-						
-						
-						
-						<!-- Residual Waste Disposal Details -->
-						<div class="card mb-3 bulk-details-card">
-						    <div class="card-header bg-light">
-						        <h5 class="mb-0"><b>Residual Waste Disposal Details</b></h5>
-						    </div>
-						
-						    <div class="card-body">
-						        <div class="row">
-						
-						            <div class="col-md-4">
-						                <p><b>Quantity of Residual Waste Handed to GCC (kg/day)</b></p>
-						                <span id="residualWasteQty"></span>
-						            </div>
-						
-						            <div class="col-md-4">
-						                <p><b>Collection Frequency</b></p>
-						                <span id="collectionFrequency"></span>
-						            </div>
-						
-						            <div class="col-md-4">
-						                <p><b>Vehicle Type</b></p>
-						                <span id="vehicleType"></span>
-						            </div>
-						
-						        </div>
-						    </div>
-						</div>
-						
-		
-		            </div>
-		            
-		            <!-- ADD THIS FOOTER -->
-		            <div class="modal-footer">
-		                <button type="button" class="btn btn-secondary"  data-dismiss="modal">
-		                    Close
-		                </button>
-		            </div>
-		
-		        </div>
-		    </div>
-		</div>
-		
-		<div class="modal fade" id="wasteauditphotoModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
-		    <div class="modal-dialog modal-lg modal-dialog-centered">
-		        <div class="modal-content">
-		
-		            <div class="modal-header">
-		                <h5 class="modal-title">Waste Audit Photo</h5>
-		                <button type="button" class="close" data-dismiss="modal">
-		                    <span>&times;</span>
-		                </button>
-		            </div>
-		
-		            <div class="modal-body text-center">
-		                <img id="wasteauditmodalPhoto" src="" class="img-fluid" style="max-height:500px;">
-		            </div>
-		
-		        </div>
-		    </div>
-		</div>
-		
-		<div class="modal fade" id="installedunitModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
-		    <div class="modal-dialog modal-lg modal-dialog-centered">
-		        <div class="modal-content">
-		
-		            <div class="modal-header">
-		                <h5 class="modal-title">Installed Unit Photo</h5>
-		                <button type="button" class="close" data-dismiss="modal">
-		                    <span>&times;</span>
-		                </button>
-		            </div>
-		
-		            <div class="modal-body text-center">
-		                <img id="installedunitPhoto" src="" class="img-fluid" style="max-height:500px;">
-		            </div>
-		
-		        </div>
-		    </div>
-		</div>
-		
-		
-		
-		
-		
-		
-		<div class="modal fade" id="mapModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
-		    <div class="modal-dialog modal-lg">
-		        <div class="modal-content">
-		
-		            <div class="modal-header bg-primary text-white">
-		                <h5 class="modal-title">Location</h5>
-		                <button type="button" class="close" data-dismiss="modal">
-		                    <span>&times;</span>
-		                </button>
-		            </div>
-		
-		            <div class="modal-body p-0">
-		                <iframe id="mapFrame" width="100%" height="450" style="border:0;" loading="lazy">
-		                </iframe>
-		            </div>
-		
-		        </div>
-		    </div>
-		</div>
-		
-		
-		<!-- Edit Bulk Waste Modal -->
-		<div class="modal fade" id="editBulkWasteModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
-		    <div class="modal-dialog modal-xl modal-dialog-scrollable">
-		        <div class="modal-content">
-		
-		            <div class="modal-header bg-primary text-white">
-		                <h4>Edit Bulk Waste Request</h4>
-		                <button type="button" class="close text-white" data-dismiss="modal">
-		                    <span>&times;</span>
-		                </button>
-		            </div>
-		
-		            <form id="editBulkWasteForm" enctype="multipart/form-data">
-		
-		                <input type="hidden" id="editRequestId" name="requestId">
-		                		
-		                <div class="modal-body">
-		
-		                    <!-- ================= BASIC DETAILS ================= -->
-		
-		                    <div class="card mb-3">
-		                        <div class="card-header bg-light">
-		                            <b>Basic Details</b>
-		                        </div>
-		
-		                        <div class="card-body">
-		
-		                            <div class="row">
-		
-		                                <div class="col-md-4">
-		                                    <label>Name of Establishment <span class="text-danger">*</span></label>
-		                                    <input type="text" class="form-control" id="editEstablishmentName" name="name_of_establishment">
-		                                </div>
-		                                
-		                                <div class="col-md-4">
-		                                    <label>Person Name <span class="text-danger">*</span></label>
-		                                    <input type="text" class="form-control" id="editPersonName" name="person_name">
-		                                </div>
-		
-		                                <div class="col-md-4">
-		                                    <label>Category <span class="text-danger">*</span></label>
-		                                    <select class="form-control" id="editCategoryId" name="category_id"></select>
-		                                </div>
-		                                
-		                                <div class="col-md-4 mt-3">
-		                                    <label>Email ID<span class="text-danger">*</span></label>
-		                                    <input type="email" class="form-control" id="editEmailId" name="email_id">
-		                                </div>
-		
-		                                <div class="col-md-4 mt-3">
-		                                    <label>Mobile No <span class="text-danger">*</span></label>
-		                                    <input type="text" class="form-control" id="editMobileNo" maxlength="10" name="mobile_no">
-		                                </div>
-		
-		                                <div class="col-md-4 mt-3">
-		                                    <label>Zone <span class="text-danger">*</span></label>
-		                                    <select class="form-control" id="editZoneId" name="zone_id"></select>
-		                                </div>
-		
-		                                <div class="col-md-4 mt-3">
-		                                    <label>Ward <span class="text-danger">*</span></label>
-		                                    <select class="form-control" id="editWardId" name="ward_id"></select>
-		                                </div>
-		
-		                                <div class="col-md-4 mt-3">
-		                                    <label>Trade License No</label>
-		                                    <input type="text" class="form-control" id="editTradeLicenseNo" name="trade_license_No">
-		                                </div>
-			                       
-		                                <div class="col-md-4 mt-3">
-		                                    <label>GST No</label>
-		                                    <input type="text" class="form-control" id="editGstNo" name="gst_No">
-		                                </div>
-		
-		                                <div class="col-md-12 mt-3">
-		                                    <label>Address <span class="text-danger">*</span></label>
-		                                    <textarea class="form-control" rows="3" id="editAddress" name="address"></textarea>
-		                                </div>
-		
-		                            </div>
-		
-		                        </div>
-		                    </div>
-		
-		                    <!-- ================= ESTABLISHMENT ================= -->
-		
-		                    <div class="card mb-3">
-		                        <div class="card-header bg-light">
-		                            <b>Establishment Details</b>
-		                        </div>
-		
-		                        <div class="card-body">
-		
-		                            <div class="row">
-		
-		                                <div class="col-md-4">
-		                                    <label>Total Built-up Area (in sq.m)<span class="text-danger">*</span></label>
-		                                    <input type="text" class="form-control" id="editBuiltupArea" name="total_builtup_area_sqmt">
-		                                </div>
-		                                
-		                                <div class="col-md-4">
-										    <label>Establishment Type<span class="text-danger">*</span></label><br>
-										
-										    <div class="form-check form-check-inline">
-										        <input class="form-check-input" type="radio" name="editEstablishmentType"
-										               id="editCommercial" value="Commercial">
-										
-										        <label class="form-check-label" for="editCommercial">
-										            Commercial
-										        </label>
-										    </div>
-										
-										    <div class="form-check form-check-inline">
-										        <input class="form-check-input" type="radio" name="editEstablishmentType"
-										               id="editApartment" value="Apartment">
-										
-										        <label class="form-check-label" for="editApartment">
-										            Apartment
-										        </label>
-										    </div>
-										
-										</div>
-		
-		                     
-		
-		                                <div class="col-md-4" id="editDwellingDiv">		
-		                                    <label>Number of Dwelling Units (if apartment)<span class="text-danger">*</span></label>		
-		                                    <input type="number" class="form-control" id="editDwellingUnits" name="dwelling_units">		
-		                                </div>
-		
-		                                <div class="col-md-4" id="editFootfallDiv">		
-		                                    <label>Average Daily Footfall (if commercial)<span class="text-danger">*</span></label>		
-		                                    <input type="number" class="form-control" id="editDailyFootfall" name="avg_daily_footfall">		
-		                                </div>
-		
-		                                <div class="col-md-4">
-		                                    <label>Total Occupants / Employees<span class="text-danger">*</span></label>
-		                                    <input type="text" class="form-control"  id="editTotalEmployees" name="totalEmployees">
-		                                </div>
-		
-		                            </div>
-		
-		                        </div>
-		                    </div>
-		
-		                    <!-- ================= WASTE GENERATION ================= -->
-		
-		                    <div class="card mb-3">
-		                        <div class="card-header bg-light">
-		                            <b>Waste Generation Details</b>
-		                        </div>
-		
-		                        <div class="card-body">
-		
-		                            <div class="row">
-		
-		                                <div class="col-md-4">
-		                                    <label>Wet Waste (kg/day)<span class="text-danger">*</span></label>
-		                                    <input class="form-control" id="editWetWaste" name="wet_waste">
-		                                </div>
-		
-		                                <div class="col-md-4">
-		                                    <label>Dry Waste (kg/day)<span class="text-danger">*</span></label>
-		                                    <input class="form-control" id="editDryWaste" name="dry_waste">
-		                                </div>
-		
-		                                <div class="col-md-4">
-		                                    <label>Domestic Hazardous Waste (kg/day)<span class="text-danger">*</span></label>
-		                                    <input class="form-control" id="editDomesticWaste" name="domestic_hazardous_waste">
-		                                </div>
-		
-		                                <div class="col-md-4 mt-3">
-		                                    <label>Sanitary Waste (kg/day)<span class="text-danger">*</span></label>
-		                                    <input class="form-control" id="editSanitaryWaste" name="sanitary_waste">
-		                                </div>
-		
-		                                <div class="col-md-4 mt-3">
-		                                    <label>C & D Waste</label>
-		                                    <input class="form-control" id="editCdWaste" name="cd_waste">
-		                                </div>
-		
-		                                <div class="col-md-4 mt-3">
-		                                    <label>Waste Audit Report</label>
-		                                    <input type="file" class="form-control" id="editWasteAuditFile" name="wasteAuditFile">
-		                                    <div id="oldWasteAuditFile"></div>
-		                                </div>
-		
-		                            </div>
-		
-		                        </div>
-		                    </div>
-		                    
-		                    <!-- ================= WASTE PROCESSING DETAILS ================= -->
-							
-							<div class="card mb-3">
-							    <div class="card-header bg-light">
-							        <b>Waste Processing Details</b>
-							    </div>
-							
-							    <div class="card-body">
-							
-							        <div class="form-group">
-							            <label>Is Wet Waste Processed On-site ?<span class="text-danger">*</span></label><br>
-							
-							            <label class="mr-3">
-							                <input type="radio" name="editWetWasteProcessed" value="Yes">
-							                Yes
-							            </label>
-							
-							            <label>
-							                <input type="radio" name="editWetWasteProcessed" value="No">
-							                No
-							            </label>
-							        </div>
-							
-							        <div id="editWasteProcessingSection" style="display:none;">
-							
-							            <div class="row">
-							            
-							            <div class="col-md-6">
-
-										    <label>Select the Technology Used <span class="text-danger">*</span></label>
-										
-										    <div class="form-check">
-										        <input class="form-check-input technologyChk" type="checkbox"  id="editComposting"  value="Composting">
-										        <label class="form-check-label" for="editComposting"> Composting</label>
-										    </div>
-										
-										    <div class="form-check">
-										        <input class="form-check-input technologyChk" type="checkbox" id="editBioMeth" value="Bio-Methanation">
-										        <label class="form-check-label" for="editBioMeth">Bio-Methanation </label>
-										    </div>
-										
-										    <div class="form-check">
-										        <input class="form-check-input technologyChk" type="checkbox" id="editOWC" value="Organic Waste Converter">
-										        <label class="form-check-label" for="editOWC">Organic Waste Converter </label>
-										    </div>
-										
-										    <div class="form-check">
-										        <input class="form-check-input technologyChk" type="checkbox" id="editOtherTechnology" value="Other">
-										        <label class="form-check-label" for="editOtherTechnology">Other (Specify)<span class="text-danger">*</span></label>
-										    </div>
-										
-										    <input type="text" class="form-control mt-2" id="editOtherTechnologyText"
-										           name="other_technology" placeholder="Please specify" style="display:none;">
-										
-										</div>
-							
-							             
-							
-							                <div class="col-md-4">
-							                    <label>Installed Capacity (kg/day)<span class="text-danger">*</span></label>
-							                    <input type="number" class="form-control" id="editInstalledCapacity" name="installed_capacity_kg">
-							                </div>
-							
-							                <div class="col-md-4 mt-3">
-							                    <label>Year of Installation<span class="text-danger">*</span></label>
-							                    <input type="number" class="form-control" id="editInstallationYear" name="installation_year">
-							                </div>
-							
-							                <div class="col-md-4 mt-3">
-							                    <label>Vendor Name<span class="text-danger">*</span></label>
-							                    <input type="text" class="form-control" id="editVendorName" name="vendor_name">
-							                </div>
-							                
-							                <div class="col-md-4 mt-3">
-										    <label>Is the Unit Functional<span class="text-danger">*</span></label><br>
-										
-										    <div class="form-check form-check-inline">
-										        <input class="form-check-input" type="radio" name="editUnitFunctional"
-										               id="unitFunctional1" value="Fully Functional">
-										
-										        <label class="form-check-label" for="unitFunctional1">
-										            Fully Functional
-										        </label>
-										    </div>
-										
-										    <div class="form-check form-check-inline">
-										        <input class="form-check-input" type="radio" name="editUnitFunctional"
-										               id="unitFunctional2" value="Partial Functional">
-										
-										        <label class="form-check-label" for="unitFunctional2">
-										            Partial Functional
-										        </label>
-										    </div>
-										
-										    <div class="form-check form-check-inline">
-										        <input class="form-check-input" type="radio" name="editUnitFunctional"
-										               id="unitFunctional3" value="Not Functional">
-										
-										        <label class="form-check-label" for="unitFunctional3">
-										            Not Functional
-										        </label>
-										    </div>
-										</div>
-							
-						                <div class="col-md-4 mt-3">
-						
-						                    <label>Photo of Installed Unit<span class="text-danger">*</span></label>							
-						                    <input type="file" class="form-control" id="editInstalledPhoto">							
-						                    <div id="oldInstalledPhoto"></div>							
-						                </div>
-						
-						                <div class="col-md-4 mt-3">
-						                    <label>Longitude<span class="text-danger">*</span></label>
-						                    <input type="text" class="form-control" id="editLongitude" name="longitude">
-						                </div>
-						
-						                <div class="col-md-4 mt-3">
-						                    <label>Latitude<span class="text-danger">*</span></label>
-						                    <input type="text" class="form-control" id="editLatitude" name="latitude">
-						                </div>
-						
-						            </div>
-							
-						        </div>
-						
-						    </div>
-						
-						</div>
-							
-							<!-- ================= DRY WASTE MANAGEMENT ================= -->
-							
-							<div class="card mb-3">
-							
-							    <div class="card-header bg-light">
-							        <b>Dry Waste Management Details</b>
-							    </div>
-							
-							    <div class="card-body">
-							
-							        <div class="form-group">
-							
-							            <label>Is Dry Waste Given to Authorized Recycler ?<span class="text-danger">*</span></label><br>
-							
-							            <label class="mr-3">
-							                <input type="radio" name="editDryWasteRecycler" value="Yes">
-							                Yes
-							            </label>
-							
-							            <label>
-							                <input type="radio" name="editDryWasteRecycler" value="No">
-							                No
-							            </label>
-							
-							        </div>
-							
-							        <div id="editRecyclerSection" style="display:none;">
-							
-							            <div class="row">
-							
-							                <div class="col-md-6">
-							                    <label>Name of Recycler / MRF<span class="text-danger">*</span></label>
-							                    <input type="text" class="form-control" id="editRecyclerName" name="recycler_name">
-							                </div>
-							
-							                <div class="col-md-6">
-							                    <label>Authorized No of Recycler<span class="text-danger">*</span></label>
-							                    <input type="text" class="form-control" id="editRecyclerAuthorization" name="recycler_authorization_no">
-							                </div>
-							
-							            </div>
-							
-							        </div>
-							
-							    </div>
-							
-							</div>
-							
-							<!-- ================= RESIDUAL WASTE ================= -->
-							
-							<div class="card mb-3">
-							
-							    <div class="card-header bg-light">
-							        <b>Residual Waste Disposal Details</b>
-							    </div>
-							
-							    <div class="card-body">
-							
-							        <div class="row">
-							
-							            <div class="col-md-4">
-							                <label>Quantity of Residual Waste Handed to GCC (kg/day)<span class="text-danger">*</span></label>
-							                <input type="number" class="form-control" id="editResidualWaste" name="residual_waste_quantity">
-							            </div>
-							
-							            <div class="col-md-4">
-							                <label>Collection Frequency<span class="text-danger">*</span></label>
-							                <input type="text" class="form-control" id="editCollectionFrequency" name="collection_frequency">
-							            </div>
-							
-							            <div class="col-md-4">
-							                <label>Vehicle Types<span class="text-danger">*</span></label>
-							                <input type="text" class="form-control" id="editVehicleType" name="vehicle_type">
-							            </div>
-							
-							        </div>
-							
-							    </div>
-							
-							</div>
-		
-		                 
-		
-		                </div>
-		
-		                <div class="modal-footer">
-		
-		                    <!-- <button type="submit" class="btn btn-success" id="updateBulkWasteBtn"> -->
-		                    <button type="button" class="btn btn-success" id="updateBulkWasteBtn">
-		                        Update
-		                    </button>
-		
-		                    <button type="button" class="btn btn-secondary" data-dismiss="modal">
-		                        Close
-		                    </button>
-		
-		                </div>
-		
-		            </form>
-		
-		        </div>
-		    </div>
-		</div>
-		
-		
-		<div class="modal fade" id="oldwasteauditphotoModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
-		    <div class="modal-dialog modal-lg modal-dialog-centered">
-		        <div class="modal-content">
-		
-		            <div class="modal-header">
-		                <h5 class="modal-title">Waste Audit Photo</h5>
-		                <button type="button" class="close" data-dismiss="modal">
-		                    <span>&times;</span>
-		                </button>
-		            </div>
-		
-		            <div class="modal-body text-center">
-		                <img id="oldwasteauditmodalPhoto" src="" class="img-fluid" style="max-height:500px;">
-		            </div>
-		
-		        </div>
-		    </div>
-		</div>
-		
-		
-		<div class="modal fade" id="oldinstalledunitModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
-		    <div class="modal-dialog modal-lg modal-dialog-centered">
-		        <div class="modal-content">
-		
-		            <div class="modal-header">
-		                <h5 class="modal-title">Installed Unit Photo</h5>
-		                <button type="button" class="close" data-dismiss="modal">
-		                    <span>&times;</span>
-		                </button>
-		            </div>
-		
-		            <div class="modal-body text-center">
-		                <img id="oldinstalledunitPhoto" src="" class="img-fluid" style="max-height:500px;">
-		            </div>
-		
-		        </div>
-		    </div>
-		</div>
-		
-		
-
-
-		
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-        <script th:inline="javascript">
-        let userId = document.getElementById('userIdSpan').textContent;
-       		
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-			
-			//Report List
-			
-			// Function to load Category types into dropdown
-			function loadcategoryTypes() {
-			    $.ajax({
-			        url: '/gcc/api/bulkwaste/getCategoryTypes',
-			        type: 'GET',
-			        dataType: 'json',
-			        success: function (response) {
-			            let $dropdown = $("#categoryType");
-			            $dropdown.empty(); 
-			            $dropdown.append('<option value="">-- All Types --</option>');
-			
-			            // If response is an array
-			            if (Array.isArray(response)) {
-			                $.each(response, function (index, item) {
-			                    $dropdown.append('<option value="' + item.category_id + '">' + item.category_name + '</option>');
-			                });
-			            } else {
-			                // If response is a single object
-			                $dropdown.append('<option value="' + response.category_id + '">' + response.category_name + '</option>');
-			            }
-			        },
-			        error: function (xhr, status, error) {
-			            console.error("Error loading cattle space types:", error);
-			        }
-			    });
-			}
-			
-			//Function to load zone types into dropdown
-			function loadzoneTypes() {
-			    $.ajax({
-			        url: '/gcc/api/bulkwaste/getZones',
-			        type: 'GET',
-			        dataType: 'json',
-			        success: function (response) {
-			            let $dropdown = $("#zoneType");
-			            $dropdown.empty(); 
-			            $dropdown.append('<option value="">-- All Zone --</option>');
-			
-			            // If response is an array
-			            if (Array.isArray(response)) {
-			                $.each(response, function (index, item) {
-			                    $dropdown.append('<option value="' + item.zone_name  + '">' + item.zone_name + '</option>');
-			                });
-			            } else {
-			                // If response is a single object
-			                $dropdown.append('<option value="' + response.zone_name  + '">' + response.zone_name + '</option>');
-			            }
-			        },
-			        error: function (xhr, status, error) {
-			            console.error("Error loading zone types:", error);
-			        }
-			    });
-			}
-			
-			//Function to load ward types into dropdown
-			let allWards = [];
-			
-			function loadwardTypes(zoneName) {
-
-			    $.ajax({
-			        url: '/gcc/api/bulkwaste/getWards',
-			        type: 'GET',
-			        data: {
-			            zoneName: zoneName
-			        },
-			        dataType: 'json',
-			        success: function(response) {
-
-			            populateWards(response);
-			        },
-			        error: function(xhr, status, error) {
-			            console.error("Error loading wards:", error);
-			        }
-			    });
-			}
-			
-			
-			function populateWards(data) {
-			
-			    let $dropdown = $("#wardType");
-			
-			    $dropdown.empty();
-			    $dropdown.append('<option value="">-- All Ward --</option>');
-			
-			    $.each(data, function(index, item) {
-			        $dropdown.append(
-			            '<option value="' + item.ward_name + '">' +
-			            item.ward_name +
-			            '</option>'
-			        );
-			    });
-			}
-			
-			$("#zoneType").change(function() {
-
-			    let zoneName = $(this).val();
-
-			    if(zoneName == ""){
-
-			        $("#wardType").empty();
-			        $("#wardType").append(
-			            '<option value="">-- All Ward --</option>'
-			        );
-
-			        return;
-			    }
-
-			    loadwardTypes(zoneName);
-			});
-			
-			
-			function loadReportData(fromDate, toDate, categoryType = "", zoneType = "", wardType = "", isReset = false) {
-			
-			    let apiUrl = '/gcc/api/bulkwaste/getBulkWasteRequestDetails';
-			    let params = [];
-			
-			    if (!isReset) {
-			
-			        if (fromDate && toDate) {
-			            params.push("fromDate=" + fromDate);
-			            params.push("toDate=" + toDate);
-			        }
-			
-			        if (categoryType) {
-			            params.push("categoryType=" + categoryType);
-			        }
-			        
-			        if (zoneType) {
-			            params.push("zoneType=" + zoneType);
-			        }
-			
-			        if (wardType) {
-			            params.push("wardType=" + wardType);
-			        }
-			    }
-			
-			    if (params.length > 0) {
-			        apiUrl += "?" + params.join("&");
-			    }
-			
-			    call_loading();
-			
-			    $.ajax({
-			        url: apiUrl,
-			        type: 'GET',
-			        dataType: 'json',
-			
-			        success: function(response) {
-			
-			            remove_loading();
-			
-			            if ($.fn.DataTable.isDataTable('#ReportDatatable')) {
-			                $('#ReportDatatable').DataTable().clear().destroy();
-			            }
-			
-			            $('#ReportDatatable').DataTable({
-			                data: response,
-			                dom: 'Bfrtip',
-			                buttons: buttons,
-			                destroy: true,
-			                responsive: true,
-			
-			                columns: [
-			                    {
-			                        data: null,
-			                        className: "text-center",
-			                        render: function(data, type, row, meta) {
-			                            return meta.row + 1;
-			                        }
-			                    },
-			                    {
-			                        data: 'cdate',
-			                        className: "text-center",
-			                        render: function(data) {
-			                            if (!data) return '';
-			                            return data.split('T')[0];
-			                        }
-			                    },
-			                    {
-			                        data: 'name_of_establishment',
-			                        className: "text-center"
-			                    },
-			                    {
-			                        data: 'person_name',
-			                        className: "text-center"
-			                    },
-			                    {
-			                        data: 'category_name',
-			                        className: "text-center"
-			                    },
-			                    {
-			                        data: 'mobile_no',
-			                        className: "text-center"
-			                    },
-			                    {
-			                        data: 'zone_id',
-			                        className: "text-center"
-			                    },
-			                    {
-			                        data: 'ward_id',
-			                        className: "text-center"
-			                    },
-		            
-			                    {
-			                        data: 'request_id',
-			                        className: "text-center",
-			                        render: function(data) {
-			                            return `
-			                            
-				                            <a href="javascript:void(0);" class="text-info viewBtn mr-2" data-id="${data}" title="View">
-					                            <i class="fa fa-eye"></i>
-					                        </a>
-			                                <a href="javascript:void(0);" class="text-primary editBtn mr-2" data-id="${data}" title="Edit">
-			                                    <i class="fa fa-edit"></i>
-			                                </a>
-
-			                                <a href="javascript:void(0);" class="text-danger deleteBtn" data-id="${data}" title="Delete">
-			                                    <i class="fa fa-trash"></i>
-			                                </a>
-			                            `;
-			                        }
-			                    }
-			                    
-			                ]
-			            });
-			        },
-			
-			        error: function(xhr, status, error) {
-			            remove_loading();
-			            console.error("Error fetching report list:", error);
-			        }
-			    });
-			}
-			
-			$(document).ready(function () {
-			
-			    loadcategoryTypes();
-			    loadzoneTypes();
-			    //loadwardTypes();
-			
-			    $.ajax({
-			        url: '/gcc/api/bulkwaste/getMinSurveyDate',
-			        type: 'GET',
-			        success: function(minDate) {
-			
-			            let today = new Date().toISOString().split('T')[0];
-			
-			            $("#fromDate").val(minDate);
-			            $("#toDate").val(today);
-			
-			            loadReportData(minDate, today);
-			        }
-			    });
-			
-			    $("#filterBtn").click(function () {
-			
-			        let fromDate = $("#fromDate").val();
-			        let toDate = $("#toDate").val();
-			        let categoryType = $("#categoryType").val();
-			        let zoneType = $("#zoneType").val();
-			        let wardType = $("#wardType").val();
-			
-			        loadReportData(fromDate, toDate, categoryType, zoneType, wardType);
-			    });
-			
-			    $("#resetBtn").click(function () {
-			        location.reload();
-			    });
-			
-			});
-			
-			// view button details
-			$(document).on("click", ".viewBtn", function () {
-			
-			    let requestId = $(this).data("id");
-			
-			    loadBulWasteDetails(requestId);
-			
-			});
-			
-			$("#editOtherTechnology").change(function () {
-			    if ($(this).is(":checked")) {
-			        $("#editOtherTechnologyText").show();
-			    } else {
-			        $("#editOtherTechnologyText").hide().val("");
-			    }
-
-			});
-			
-			function loadBulWasteDetails(requestId){
-				
-			    $.ajax({
-			
-			        url:'/gcc/api/bulkwaste/bulkWasteRequestView',
-			        type:'GET',
-			        data:{
-			            requestId:requestId
-			        },
-			
-			        success:function(bulkrequestdata){
-			
-			        	// Basic Details
-			            $("#establishmentName").text(bulkrequestdata.name_of_establishment);
-			            $("#personName").text(bulkrequestdata.person_name);
-			            $("#mobileNo").text(bulkrequestdata.mobile_no);
-			            $("#category").text(bulkrequestdata.category_name);
-			            $("#gstNo").text(bulkrequestdata.gst_No);
-			            $("#tradeLicenseNo").text(bulkrequestdata.trade_license_No);
-			            $("#ownerAddress").text(bulkrequestdata.address);
-			            
-			            // Establishment Details
-			            $("#builtupArea").text(bulkrequestdata.total_builtup_area_sqmt);
-			            $("#establishmentType").text(bulkrequestdata.establishment_type);
-			            $("#totalEmployees").text(bulkrequestdata.totalEmployees);
-
-			            if (bulkrequestdata.establishment_type === "Commercial") {
-
-			                $("#footfallDiv").show();
-			                $("#dailyFootfall").text(bulkrequestdata.avg_daily_footfall);
-
-			                $("#dwellingDiv").hide();
-
-			            } else if (bulkrequestdata.establishment_type === "Apartment") {
-
-			                $("#dwellingDiv").show();
-			                $("#dwellingUnits").text(bulkrequestdata.dwelling_units);
-
-			                $("#footfallDiv").hide();
-
-			            } else {
-
-			                $("#dwellingDiv").hide();
-			                $("#footfallDiv").hide();
-			            }
-			            
-			            // Waste Generation Details
-			            $("#wetWaste").text(bulkrequestdata.wet_waste);
-						$("#dryWaste").text(bulkrequestdata.dry_waste);
-						$("#domesticWaste").text(bulkrequestdata.domestic_hazardous_waste);
-						$("#sanitaryWaste").text(bulkrequestdata.sanitary_waste);
-						
-						// C & D Waste
-						$("#cdWaste").text(
-						    bulkrequestdata.cd_waste != null && bulkrequestdata.cd_waste !== "" ? bulkrequestdata.cd_waste : "NA"
-						);
-						
-						// Waste Audit Report
-						if (bulkrequestdata.waste_audit_report_file != null && bulkrequestdata.waste_audit_report_file !== "") {
-							$("#wasteAuditReport").html(
-								    '<a href="javascript:void(0);" class="wasteauditPhotoBtn text-primary font-weight-bold" data-photo="' 
-								    + bulkrequestdata.waste_audit_report_file + '">View Photo</a>'
-								);
-							
-						} else {
-						    $("#wasteAuditReport").text("No Photo");
-						}
-						
-						//Waste Processing Details
-						
-						$("#wetWasteProcessed").text(bulkrequestdata.wet_waste_processed);
-
-						if (bulkrequestdata.wet_waste_processed === "Yes") {
-						
-						    $("#wasteProcessingSection").show();
-						
-						    $("#technologyUsed").text(
-						        bulkrequestdata.technology_used ? bulkrequestdata.technology_used : "NA"
-						    );
-						
-						    $("#installedCapacity").text(
-						        bulkrequestdata.installed_capacity_kg ? bulkrequestdata.installed_capacity_kg : "NA"
-						    );
-						
-						    $("#installationYear").text(
-						        bulkrequestdata.installation_year ? bulkrequestdata.installation_year : "NA"
-						    );
-						
-						    $("#vendorName").text(
-						        bulkrequestdata.vendor_name ? bulkrequestdata.vendor_name : "NA"
-						    );
-						
-						    $("#unitFunctional").text(
-						        bulkrequestdata.unit_functional_status ? bulkrequestdata.unit_functional_status : "NA"
-						    );
-						    
-						 // Store latitude & longitude
-						    if (bulkrequestdata.latitude && bulkrequestdata.longitude) {
-
-						        $("#viewLocation")
-						            .show()
-						            .data("lat", bulkrequestdata.latitude)
-						            .data("lng", bulkrequestdata.longitude);
-
-						    } else {
-
-						        $("#viewLocation")
-						            .removeData("lat")
-						            .removeData("lng")
-						            .replaceWith('<span id="viewLocation">NA</span>');
-						    }
-						
-						    // Installed Unit Photo
-						    if (bulkrequestdata.installed_unit_photo_file) {
-						        $("#installedUnitPhoto").html(
-						            '<a href="javascript:void(0);" class="installedUnitPhotoBtn text-primary font-weight-bold" data-photo="' +
-						            bulkrequestdata.installed_unit_photo_file +
-						            '">View Photo</a>'
-						        );
-						    } else {
-						        $("#installedUnitPhoto").text("No Photo");
-						    }
-						
-						} else {
-						
-						    $("#wasteProcessingSection").hide();
-						
-						}
-						
-						
-						// Dry Waste Management Details
-						$("#dryWasteRecycler").text(bulkrequestdata.dry_waste_recycler);
-
-						if (bulkrequestdata.dry_waste_recycler === "Yes") {
-
-						    $("#dryWasteSection").show();
-
-						    $("#recyclerName").text(
-						        bulkrequestdata.recycler_name ? bulkrequestdata.recycler_name : "NA"
-						    );
-
-						    $("#recyclerAuthorizationNo").text(
-						        bulkrequestdata.recycler_authorization_no ? bulkrequestdata.recycler_authorization_no : "NA"
-						    );
-
-						} else {
-
-						    $("#dryWasteSection").hide();
-
-						}
-						
-						// Residual Waste Disposal Details
-						$("#residualWasteQty").text(bulkrequestdata.residual_waste_quantity);
-						$("#collectionFrequency").text(bulkrequestdata.collection_frequency);
-						$("#vehicleType").text(bulkrequestdata.vehicle_type);
-			 
-			
-			            $("#bulkwasteModal").modal("show");
-			        }
-			    });
-			}
-			
-			 $(document).on('click', '.wasteauditPhotoBtn', function(){
-					
-				    let wasteauditphotoUrl = $(this).data('photo');
-			
-				    $('#wasteauditmodalPhoto').attr('src', wasteauditphotoUrl);
-			
-				    $('#wasteauditphotoModal').modal('show');
-				});
-			 
-			 $(document).on('click', '.installedUnitPhotoBtn', function(){
-			
-				    let installedunitphotoUrl = $(this).data('photo');
-			
-				    $('#installedunitPhoto').attr('src', installedunitphotoUrl);
-			
-				    $('#installedunitModal').modal('show');
-				});
-	 
-			 
-			 // edit photo show as modal
-			 
-			 $(document).on("click", ".oldWasteAuditPhotoBtn", function () {
-
-				    let oldWasteAuditphotoUrl = $(this).data("photo");
-				
-				    $("#oldwasteauditmodalPhoto").attr("src", oldWasteAuditphotoUrl);
-				
-				    $("#oldwasteauditphotoModal").modal("show");
-				
-				});
-			 
-			 $(document).on("click", ".oldInstalledPhotoBtn", function () {
-
-				    let oldInstalledphotoUrl = $(this).data("photo");
-
-				    $("#oldinstalledunitPhoto").attr("src", oldInstalledphotoUrl);
-
-				    $("#oldinstalledunitModal").modal("show");
-
-				});
-
-				 //map
-				 $(document).on("click", "#viewLocation", function(){
-			
-				    var lat = $(this).data("lat");
-				    var lng = $(this).data("lng");
-				
-				    var mapUrl =
-				        "https://maps.google.com/maps?q=" +
-				        lat + "," + lng +
-				        "&z=18&output=embed";
-				
-				    $("#mapFrame").attr("src", mapUrl);
-				
-				    $("#mapModal").modal("show");
-				});
-				 
-				 
-				// Edit Button
-				 $(document).on("click", ".editBtn", function () {
-
-				     var requestId = $(this).data("id");
-
-				     $.ajax({
-
-				         url: "/gcc/api/bulkwaste/bulkWasteRequestView",
-				         type: "GET",
-				         data: {
-				             requestId: requestId
-				         },
-
-				         success: function (data) {
-
-				             // Hidden
-				             $("#editRequestId").val(data.request_id);
-
-				             // Text Fields
-				             $("#editEstablishmentName").val(data.name_of_establishment);
-				             $("#editTradeLicenseNo").val(data.trade_license_No);
-				             $("#editPersonName").val(data.person_name);
-				             $("#editEmailId").val(data.email_id);
-				             $("#editMobileNo").val(data.mobile_no);
-				             $("#editGstNo").val(data.gst_No);
-				             $("#editAddress").val(data.address);
-				             
-				          	// Load Dropdowns
-				             loadEditCategory(data.category_id);
-				             loadEditZone(data.zone_id, data.ward_id);
-
-				             // Establishment
-				             $("#editBuiltupArea").val(data.total_builtup_area_sqmt);
-				             $("input[name='editEstablishmentType'][value='" + data.establishment_type + "']").prop("checked", true).trigger("change");
-				             
-				             $("#editDwellingUnits").val(data.dwelling_units);
-				             $("#editDailyFootfall").val(data.avg_daily_footfall);
-				             $("#editTotalEmployees").val(data.totalEmployees);
-
-				             // Waste Generation
-				             $("#editWetWaste").val(data.wet_waste);
-				             $("#editDryWaste").val(data.dry_waste);
-				             $("#editDomesticWaste").val(data.domestic_hazardous_waste);
-				             $("#editSanitaryWaste").val(data.sanitary_waste);
-				             $("#editCdWaste").val(data.cd_waste);
-
-				             // Existing File
-				             if (data.waste_audit_report_file) {
-				            	 
-			            	 $("#oldWasteAuditFile").html(
-			            			    '<a href="javascript:void(0);" class="oldWasteAuditPhotoBtn text-primary font-weight-bold" data-photo="' +
-			            			    data.waste_audit_report_file +
-			            			    '">View Existing File</a>'
-			            			);
-
-				             } else {
-				                 $("#oldWasteAuditFile").html("No Photo");
-				             }
-				             
-				          // Waste Processing
-				             $("input[name='editWetWasteProcessed'][value='"+data.wet_waste_processed+"']").prop("checked",true);
-
-				             //$("#editTechnologyUsed").val(data.technology_used);
-				             $(".technologyChk").prop("checked", false);
-							 $("#editOtherTechnologyText").hide().val("");
-							
-							 if (data.technology_used == "Composting") {
-							     $("#editComposting").prop("checked", true);
-							 }
-							 else if (data.technology_used == "Bio-Methanation") {
-							     $("#editBioMeth").prop("checked", true);
-							 }
-							 else if (data.technology_used == "Organic Waste Converter") {
-							     $("#editOWC").prop("checked", true);
-							 }
-							 else {
-							
-							     $("#editOtherTechnology").prop("checked", true);
-							     $("#editOtherTechnologyText").show();
-							     $("#editOtherTechnologyText").val(data.other_technology);
-							 
-							 }
-
-				             $("#editInstalledCapacity").val(data.installed_capacity_kg);
-				             $("#editInstallationYear").val(data.installation_year);
-				             $("#editVendorName").val(data.vendor_name);
-				             
-				             $("input[name='editUnitFunctional'][value='" + data.unit_functional_status + "']").prop("checked", true);
-				             $("#editLongitude").val(data.longitude);
-				             $("#editLatitude").val(data.latitude);
-
-				             if(data.installed_unit_photo_file){
-				            	 
-			            	 $("#oldInstalledPhoto").html(
-			            			    '<a href="javascript:void(0);" class="oldInstalledPhotoBtn text-primary font-weight-bold" data-photo="' +
-			            			    data.installed_unit_photo_file +
-			            			    '">View Existing File</a>'
-			            			);
-
-				             }else{
-				                 $("#oldInstalledPhoto").html("No Photo");
-				             }
-
-				             if(data.wet_waste_processed=="Yes"){
-				                 $("#editWasteProcessingSection").show();
-				             }else{
-				                 $("#editWasteProcessingSection").hide();
-				             }
-
-				             // Dry Waste
-				             $("input[name='editDryWasteRecycler'][value='"+data.dry_waste_recycler+"']").prop("checked",true);
-
-				             $("#editRecyclerName").val(data.recycler_name);
-				             $("#editRecyclerAuthorization").val(data.recycler_authorization_no);
-
-				             if(data.dry_waste_recycler=="Yes"){
-
-				                 $("#editRecyclerSection").show();
-
-				             }else{
-
-				                 $("#editRecyclerSection").hide();
-
-				             }
-
-				             // Residual Waste
-
-				             $("#editResidualWaste").val(data.residual_waste_quantity);
-				             $("#editCollectionFrequency").val(data.collection_frequency);
-				             $("#editVehicleType").val(data.vehicle_type);
-
-				             
-
-				             // Commercial / Apartment
-				             if (data.establishment_type == "Commercial") {
-
-				                 $("#editFootfallDiv").show();
-				                 $("#editDwellingDiv").hide();
-
-				             } else if (data.establishment_type == "Apartment") {
-
-				                 $("#editDwellingDiv").show();
-				                 $("#editFootfallDiv").hide();
-
-				             } else {
-
-				                 $("#editFootfallDiv,#editDwellingDiv").hide();
-
-				             }
-
-				             $("#editBulkWasteModal").modal("show");
-
-				         },
-
-				         error: function () {
-
-				             Swal.fire("Error", "Unable to load details", "error");
-
-				         }
-
-				     });
-
-				 }); 
-				
-				 function loadEditCategory(selectedId){
-
-					    $.get("/gcc/api/bulkwaste/getCategoryTypes", function(response){
-
-					        var html = '<option value="">Select Category</option>';
-
-					        $.each(response,function(i,item){
-
-					            html += '<option value="'+item.category_id+'">'+item.category_name+'</option>';
-
-					        });
-
-					        $("#editCategoryId").html(html);
-
-					        // Must be after html()
-					        $("#editCategoryId").val(String(selectedId));
-
-					    });
-
-					}
-				 
-				 function loadEditZone(selectedZone, selectedWard){
-
-					    $.get("/gcc/api/bulkwaste/getZones", function(response){
-
-					        var html = '<option value="">Select Zone</option>';
-
-					        $.each(response,function(i,item){
-
-					            html += '<option value="'+item.id+'">'+item.zone_name+'</option>';
-
-					            // If your API returns zone_no instead of zone_id, replace item.zone_id with item.zone_no
-					        });
-
-					        $("#editZoneId").html(html);
-
-					        $("#editZoneId").val(String(selectedZone));
-
-					        loadEditWard(selectedZone, selectedWard);
-
-					    });
-
-					}
-				 
-				 function loadEditWard(zoneId, selectedWard){
-
-					    var zoneName = zoneId.toString().padStart(2, '0');
-
-					    $.ajax({
-					        url: "/gcc/api/bulkwaste/getWards",
-					        data:{
-					            zoneName: zoneName
-					        },
-					        success:function(response){
-
-					            var html = '<option value="">Select Ward</option>';
-
-					            $.each(response,function(i,item){
-
-					                html += '<option value="'+item.id+'">'+item.ward_name+'</option>';
-
-					            });
-
-					            $("#editWardId").html(html);
-					            $("#editWardId").val(String(selectedWard));
-
-					            console.log("Selected Ward:", selectedWard);
-					            console.log("After Set:", $("#editWardId").val());
-					        }
-					    });
-					}
-				 
-				 
-				 	$("#editZoneId").on("change", function(){
-
-					    loadEditWard($(this).val(), "");
-
-					});
-				 
-				 	$("input[name='editEstablishmentType']").change(function () {
-
-				 	    if ($(this).val() == "Commercial") {
-
-				 	        $("#editFootfallDiv").show();
-				 	        $("#editDwellingDiv").hide();
-
-				 	        // Clear Apartment field
-				 	        $("#editDwellingUnits").val("");
-
-				 	    } else {
-
-				 	        $("#editDwellingDiv").show();
-				 	        $("#editFootfallDiv").hide();
-
-				 	        // Clear Commercial field
-				 	        $("#editDailyFootfall").val("");
-				 	    }
-
-				 	});
-				 	
-				
-				 	
-				 // Wet Waste
-				 $("input[name='editWetWasteProcessed']").change(function () {
-				
-				    if ($(this).val() == "Yes") {
-				
-				        $("#editWasteProcessingSection").slideDown();
-				
-				    } else {
-				
-				        $("#editWasteProcessingSection").slideUp();
-				
-				        $(".technologyChk").prop("checked", false);
-				        $("#editOtherTechnologyText").hide().val("");
-				
-				        $("#editInstalledCapacity").val("");
-				        $("#editInstallationYear").val("");
-				        $("#editVendorName").val("");
-				
-				        $("input[name='editUnitFunctional']").prop("checked", false);
-				
-				        // Clear selected file
-				        $("#editInstalledPhoto").val("");
-				
-				        // Remove existing file link
-				        $("#oldInstalledPhoto").html("");
-				        console.log($("#oldInstalledPhoto").length);
-				        
-				        $("#oldInstalledPhoto").empty();
-				        console.log("After:", $("#oldInstalledPhoto").html());
-				
-				        $("#editLongitude").val("");
-				        $("#editLatitude").val("");
-				    }
-				
-				});
-				 
-				 $("#editOtherTechnology").change(function () {
-
-					    if ($(this).is(":checked")) {
-
-					        $("#editOtherTechnologyText").show();
-
-					    } else {
-
-					        $("#editOtherTechnologyText").hide().val("");
-					    }
-
-					});
-
-				 	// Dry Waste
-				 	
-				 	$("input[name='editDryWasteRecycler']").change(function () {
-
-					    if ($(this).val() == "Yes") {
-					
-					        $("#editRecyclerSection").slideDown();
-					
-					    } else {
-					
-					        $("#editRecyclerSection").slideUp();
-					
-					        $("#editRecyclerName").val("");
-					        $("#editRecyclerAuthorization").val("");
-					    }
-					
-					});
-				 	
-				 	//Validation for Establishment and Person
-				 	function validateOnlyLetters(inputId, fieldName) {
-
-					    $(document).on("input", inputId, function () {
-					
-					        let value = $(this).val();
-					
-					        if (!/^[A-Za-z\s]*$/.test(value)) {
-					
-					            Swal.fire({
-					                icon: "warning",
-					                title: "Invalid Input",
-					                text: fieldName + " should contain only letters.",
-	                                allowOutsideClick: false
-					            });
-					
-					            $(this).val(value.replace(/[^A-Za-z\s]/g, ""));
-					        }
-					
-					    });
-					
-					}
-					
-					validateOnlyLetters("#editEstablishmentName", "Name of Establishment");
-					validateOnlyLetters("#editPersonName", "Person Name");
-					validateOnlyLetters("#editVendorName", "Vendor Name");
-					validateOnlyLetters("#editRecyclerName", "Name of Recycler / MRF");
-					
-					
-					validateEmail("#editEmailId");
-					validateMobile("#editMobileNo");
-					
-					function validateEmail(inputId) {
-
-					    $(document).on("change", inputId, function () {
-
-					        let email = $(this).val().trim();
-
-					        if (email == "") {
-					            Swal.fire({
-					                icon: "warning",
-					                title: "Validation",
-					                text: "Email ID is required.",
-	                                allowOutsideClick: false
-					            });
-					            $(this).focus();
-					            return;
-					        }
-
-					        let emailRegex = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/;
-
-					        if (!emailRegex.test(email)) {
-
-					            Swal.fire({
-					                icon: "warning",
-					                title: "Invalid Email",
-					                text: "Please enter a valid Email ID.",
-	                                allowOutsideClick: false
-					            });
-
-					            $(this).focus();
-					        }
-
-					    });
-
-					}
-					
-					function validateMobile(inputId) {
-
-					    $(document).on("input", inputId, function () {
-
-					        this.value = this.value.replace(/\D/g, "").substring(0, 10);
-
-					        let mobile = this.value;
-
-					        // Check first digit immediately
-					        if (mobile.length >= 1 && !/^[6-9]/.test(mobile)) {
-
-					            Swal.fire({
-					                icon: "warning",
-					                title: "Invalid Mobile Number",
-					                text: "Mobile Number must start with 6, 7, 8 or 9.",
-	                                allowOutsideClick: false
-					            });
-
-					            $(this).val("").focus();
-					            return;
-					        }
-
-					        // Check repeated numbers after 10 digits
-					        if (mobile.length == 10 && /^(\d)\1{9}$/.test(mobile)) {
-
-					            Swal.fire({
-					                icon: "warning",
-					                title: "Invalid Mobile Number",
-					                text: "Repeated numbers like 1111111111 are not allowed.",
-	                                allowOutsideClick: false
-					            });
-
-					            $(this).val("").focus();
-					            return;
-					        }
-
-					    });
-					   
-
-					}
-					
-					
-					function validateMobileLength(inputId) {
-
-					    let mobile = $(inputId).val().trim();
-
-					    if (mobile.length != 10) {
-
-					        Swal.fire({
-					            icon: "warning",
-					            title: "Invalid Mobile Number",
-					            text: "Mobile Number must contain exactly 10 digits.",
-					            allowOutsideClick: false
-					        });
-
-					        $(inputId).focus();
-					        return false;
-					    }
-
-					    return true;
-					}
-					
-					function validateInstallationYear(inputId) {
-
-					    let year = $(inputId).val().trim();
-
-					    if (year.length != 4) {
-
-					        Swal.fire({
-					            icon: "warning",
-					            title: "Invalid Year",
-					            text: "Year of Installation must contain exactly 4 digits.",
-					            allowOutsideClick: false
-					        });
-
-					        $(inputId).focus();
-					        return false;
-					    }
-
-					    return true;
-					}
-					
-					
-					//Validation for Trade License No
-					 function restrictTradeLicenseInput() {
-
-				            $("#editTradeLicenseNo").on("input", function () {
-
-				                let value = $(this).val();
-
-				                // Allow only digits and dash
-				                value = value.replace(/[^0-9-]/g, '');
-
-				                let digits = value.replace(/-/g, '');
-
-				                if (digits.length > 11) {
-				                    digits = digits.substring(0, 11);
-				                }
-
-				                let formatted = '';
-
-				                if (digits.length > 0) {
-				                    formatted += digits.substring(0, 2);
-				                }
-				                if (digits.length > 2) {
-				                    formatted += '-' + digits.substring(2, 5);
-				                }
-				                if (digits.length > 5) {
-				                    formatted += '-' + digits.substring(5, 11);
-				                }
-
-				                $(this).val(formatted);
-				            });
-				        }
-
-				        $(document).ready(function () {
-				            restrictTradeLicenseInput();
-				        });
-				        
-				        function validateTradeLicense() {
-
-				            let value = $("#editTradeLicenseNo").val().trim();
-
-				            // Optional field
-				            if (value === "") {
-				                return true;
-				            }
-
-				            // Pattern check
-				            let pattern = /^(\d{2})-(\d{3})-(\d{6})$/;
-
-				            let match = value.match(pattern);
-
-				            if (!match) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Invalid Trade License",
-				                    text: "Format must be XX-XXX-XXXXXX (Eg: 01-001-000062) Trade License No must be 11 Numbers ",
-				                    allowOutsideClick: false
-				                });
-
-				                $("#editTradeLicenseNo").focus();
-				                return false;
-				            }
-
-				            let licenseZone = match[1];   // 01
-				            let licenseWard = match[2];   // 001
-
-				            // Existing validation
-				            let part1 = parseInt(licenseZone, 10);
-				            let part2 = parseInt(licenseWard, 10);
-
-				            if (part1 < 1 || part1 > 15) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Invalid Zone Code",
-				                    text: "First part must be between 01 and 15",
-				                    allowOutsideClick: false
-				                });
-
-				                $("#editTradeLicenseNo").focus();
-				                return false;
-				            }
-
-				            if (part2 < 1 || part2 > 200) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Invalid Ward Code",
-				                    text: "Second part must be between 001 and 200",
-				                    allowOutsideClick: false
-				                });
-
-				                $("#editTradeLicenseNo").focus();
-				                return false;
-				            }
-
-				            // ===========================
-				            // Match Selected Zone
-				            // ===========================
-
-				            let selectedZone = $("#editZoneId option:selected").text().trim(); // 01
-
-				            if (licenseZone !== selectedZone) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Zone Mismatch",
-				                    text: "Trade License Zone (" + licenseZone +
-				                          ") does not match the selected Zone (" +
-				                          selectedZone + ").",
-				                    allowOutsideClick: false
-				                });
-
-				                $("#editTradeLicenseNo").focus();
-				                return false;
-				            }
-
-				            // ===========================
-				            // Match Selected Ward
-				            // ===========================
-
-				            let selectedWard = $("#editWardId option:selected").text().trim(); // 001
-
-				            if (licenseWard !== selectedWard) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Ward Mismatch",
-				                    text: "Trade License Ward (" + licenseWard +
-				                          ") does not match the selected Ward (" +
-				                          selectedWard + ").",
-				                    allowOutsideClick: false
-				                });
-
-				                $("#editTradeLicenseNo").focus();
-				                return false;
-				            }
-
-				            return true;
-				        }
-
-				     
-			
-				        /* ================= GST VALIDATION ================= */
-
-				        $("#editGstNo").on("input", function () {
-
-				            let value = $(this).val().toUpperCase();
-
-				            // Remove invalid characters silently
-				            value = value.replace(/[^0-9A-Z]/g, "");
-
-				            // Limit to 15 characters
-				            if (value.length > 15) {
-				                value = value.substring(0, 15);
-				            }
-
-				            $(this).val(value);
-				        });
-
-				        function validateGST() {
-
-				            let gst = $("#editGstNo").val().trim().toUpperCase();
-				            $("#editGstNo").val(gst);
-
-				            // ✅ If empty → allowed (because optional)
-				            if (gst === "") {
-				                return true;
-				            }
-
-				            // ✅ If entered → must be exactly 15 alphanumeric
-				            if (!/^[0-9A-Z]{15}$/.test(gst)) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Invalid GST",
-				                    text: "GST must be exactly 15 characters (letters and numbers only)",
-	                                allowOutsideClick: false
-				                });
-
-				                return false;
-				            }
-
-				            return true;
-				        }
-				        
-				        
-				        /* ================= Techonlogy Used ================= */
-				        function validateTechnology(){
-
-				            if(!$("input[name='editWetWasteProcessed']:checked").val() ||
-				               $("input[name='editWetWasteProcessed']:checked").val()!="Yes"){
-				                return true;
-				            }
-
-				            if(!$(".technologyChk:checked").length){
-
-				                Swal.fire({
-				                    icon:"warning",
-				                    title:"Validation",
-				                    text:"Please select Technology Used.",
-	                                allowOutsideClick: false
-				                });
-
-				                return false;
-				            }
-
-				            if($("#editOtherTechnology").is(":checked") &&
-				               $("#editOtherTechnologyText").val().trim()==""){
-
-				                Swal.fire({
-				                    icon:"warning",
-				                    title:"Validation",
-				                    text:"Please enter Other Technology.",
-	                                allowOutsideClick: false
-				                });
-
-				                $("#editOtherTechnologyText").focus();
-
-				                return false;
-				            }
-
-				            return true;
-				        }
-				        
-				        /* ================= Validation Required for Installed Unit Photo  ================= */
-				        function validateInstalledPhoto() {
-
-				            // New selected file
-				            var hasNewFile = $("#editInstalledPhoto")[0].files.length > 0;
-
-				            // Existing uploaded file
-				            var hasOldFile = $("#oldInstalledPhoto").find("a").length > 0;
-
-				            if (!hasNewFile && !hasOldFile) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Validation",
-				                    text: "Installed Unit Photo is required.",
-				                    allowOutsideClick: false
-				                });
-
-				                $("#editInstalledPhoto").focus();
-				                return false;
-				            }
-
-				            return true;
-				        }
-				        
-				        /* ================= Validation Required for should not allow zero  ================= */
-				        function validateGreaterThanZero(inputId, fieldName) {
-
-				            let value = $(inputId).val().trim();
-
-				            if (value === "") {
-				                return true; // Required validation already handles empty values
-				            }
-
-				            if (parseFloat(value) <= 0) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Invalid " + fieldName,
-				                    text: fieldName + " must be greater than 0.",
-				                    allowOutsideClick: false
-				                });
-
-				                $(inputId).focus();
-				                return false;
-				            }
-
-				            return true;
-				        }
-				        
-				        /* ================= Validation Required for lon and lat  ================= */
-
-				        function validateCoordinate(inputId, fieldName) {
-
-				            let value = $(inputId).val().trim();
-
-				            // Required validation is handled separately
-				            if (value === "") {
-				                return true;
-				            }
-
-				            // Length should be between 7 and 12
-				            if (value.length < 9 || value.length > 12) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Invalid " + fieldName,
-				                    text: fieldName + " must contain between 9 and 12 characters.",
-				                    allowOutsideClick: false
-				                });
-
-				                $(inputId).focus();
-				                return false;
-				            }
-
-				            // Zero is not allowed
-				            if (parseFloat(value) == 0) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Invalid " + fieldName,
-				                    text: fieldName + " cannot be 0.",
-				                    allowOutsideClick: false
-				                });
-
-				                $(inputId).focus();
-				                return false;
-				            }
-
-				            return true;
-				        }
-					
-				        /* ================= Validation Required ================= */
-				        function validateRequired(inputId, fieldName) {
-
-				            if ($(inputId).val().trim() == "") {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Validation",
-				                    text: fieldName + " is required.",
-	                                allowOutsideClick: false
-				                });
-
-				                $(inputId).focus();
-				                return false;
-				            }
-
-				            return true;
-				        }
-				        
-				        
-				        $("#updateBulkWasteBtn").click(function (e) {
-
-				            e.preventDefault();
-				            
-				         // ================= Basic Details =================
-				        	 
-				        	 if (!validateRequired("#editEstablishmentName", "Name of Establishment")) return;
-						  	 if (!validateRequired("#editPersonName", "Person Name")) return;
-							 if (!validateRequired("#editEmailId", "Email ID")) return;
-							 if (!validateRequired("#editMobileNo", "Mobile Number")) return;
-							 if (!validateMobileLength("#editMobileNo")) return;
-							 if (!validateRequired("#editAddress", "Address")) return;
-							
-							 if (!validateRequired("#editCategoryId", "Category")) return;
-							 if (!validateRequired("#editZoneId", "Zone")) return;
-							 if (!validateRequired("#editWardId", "Ward")) return;
-							 
-							 if (!validateTradeLicense()) { return;}
-							 
-							 if (!validateGST()) {return; }
-							 
-
-				     
-				            
-				         // ================= Establishment Details =================
-
-				            if (!validateRequired("#editBuiltupArea", "Total Built-up Area")) return;
-				            if (!validateGreaterThanZero("#editBuiltupArea", "Total Built-up Area")) return;
-
-
-				            var establishmentType = $("input[name='editEstablishmentType']:checked").val();
-				            
-				            if (!establishmentType) {
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Validation",
-				                    text: "Please select Establishment Type.",
-	                                allowOutsideClick: false
-				                });
-				                return;
-				            }
-
-				            if (establishmentType == "Commercial") {
-				                if (!validateRequired("#editDailyFootfall", "Average Daily Footfall")) return;
-				                if (!validateGreaterThanZero("#editDailyFootfall", "Average Daily Footfall")) return;
-
-				            } else {
-				                if (!validateRequired("#editDwellingUnits", "Number of Dwelling Units")) return;
-				                if (!validateGreaterThanZero("#editDwellingUnits", "Number of Dwelling Units")) return;
-				            }
-
-				            if (!validateRequired("#editTotalEmployees", "Total Occupants / Employees")) return;
-				            if (!validateGreaterThanZero("#editTotalEmployees", "Total Occupants / Employees")) return;
-
-
-
-				            // ================= Waste Generation =================
-
-				            if (!validateRequired("#editWetWaste", "Wet Waste")) return;
-				            if (!validateGreaterThanZero("#editWetWaste", "Wet Waste")) return;
-				            
-				            if (!validateRequired("#editDryWaste", "Dry Waste")) return;
-				            if (!validateGreaterThanZero("#editDryWaste", "Dry Waste")) return;
-				            
-				            if (!validateRequired("#editDomesticWaste", "Domestic Hazardous Waste")) return;
-				            if (!validateGreaterThanZero("#editDomesticWaste", "Domestic Hazardous Waste")) return;
-
-				            if (!validateRequired("#editSanitaryWaste", "Sanitary Waste")) return;
-				            if (!validateGreaterThanZero("#editSanitaryWaste", "Sanitary Waste")) return;
-
-				            if (!validateGreaterThanZero("#editCdWaste", "C&D Waste")) return;
-
-				            // ================= Waste Processing =================
-
-				            var wetWasteProcessed = $("input[name='editWetWasteProcessed']:checked").val();
-
-				            if (!wetWasteProcessed) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Validation",
-				                    text: "Please select Is Wet Waste Processed On-site.",
-	                                allowOutsideClick: false
-				                });
-				                return;
-				            }
-				            
-				            var technologyUsed = "";
-				            var otherTechnology = "";
-
-				            if (wetWasteProcessed == "Yes") {
-
-				                if(!validateTechnology()) return;
-				                
-				                if (!validateRequired("#editInstalledCapacity", "Installed Capacity")) return;
-				                if (!validateGreaterThanZero("#editInstalledCapacity", "Installed Capacity")) return;
-
-				                if (!validateRequired("#editInstallationYear", "Year of Installation")) return;
-				                if (!validateInstallationYear("#editInstallationYear")) return;
-				                if (!validateRequired("#editVendorName", "Vendor Name")) return;
-
-				                if (!$("input[name='editUnitFunctional']:checked").val()) {
-
-				                    Swal.fire({
-				                        icon: "warning",
-				                        title: "Validation",
-				                        text: "Please select Unit Functional Status.",
-		                                allowOutsideClick: false
-				                    });
-
-				                    return;
-				                }
-				                
-				                if (!validateInstalledPhoto()) return;
-
-				                if (!validateRequired("#editLongitude", "Longitude")) return;
-				                if (!validateCoordinate("#editLongitude", "Longitude")) return;
-
-				                if (!validateRequired("#editLatitude", "Latitude")) return;
-				                if (!validateCoordinate("#editLatitude", "Latitude")) return;				                
-				                
-
-				                if($("#editComposting").is(":checked")){
-				                    technologyUsed = "Composting";
-				                }
-				                else if($("#editBioMeth").is(":checked")){
-				                    technologyUsed = "Bio-Methanation";
-				                }
-				                else if($("#editOWC").is(":checked")){
-				                    technologyUsed = "Organic Waste Converter";
-				                }
-				                else if($("#editOtherTechnology").is(":checked")){
-				                    technologyUsed = "Other";
-				                }
-
-				                otherTechnology = $("#editOtherTechnologyText").val().trim();
-				            }
-
-				        
-				            // ================= Dry Waste =================
-
-				            var dryWasteRecycler = $("input[name='editDryWasteRecycler']:checked").val();
-
-				            if (!dryWasteRecycler) {
-
-				                Swal.fire({
-				                    icon: "warning",
-				                    title: "Validation",
-				                    text: "Please select Dry Waste Recycler.",
-	                                allowOutsideClick: false
-				                });
-
-				                return;
-				            }
-
-				            if (dryWasteRecycler == "Yes") {
-				                if (!validateRequired("#editRecyclerName", "Recycler Name")) return;
-				                if (!validateRequired("#editRecyclerAuthorization", "Recycler Authorization Number")) return;
-				                if (!validateGreaterThanZero("#editRecyclerAuthorization", "Recycler Authorization Number")) return;
-				            }
-
-
-				            // ================= Residual Waste =================
-
-				            if (!validateRequired("#editResidualWaste", "Residual Waste Quantity")) return;
-				            if (!validateGreaterThanZero("#editResidualWaste", "Residual Waste Quantity")) return;
-
-				            if (!validateRequired("#editCollectionFrequency", "Collection Frequency")) return;
-				            if (!validateGreaterThanZero("#editCollectionFrequency", "Collection Frequency")) return;
-				            
-				            if (!validateRequired("#editVehicleType", "Vehicle Type")) return;
-
-
-				            // ================= All validations passed =================
-
-				            // Call your AJAX update here
-				            
-				            //===================== AJAX UPDATE =====================//
-							
-							var formData = new FormData();
-							
-							formData.append("requestId", $("#editRequestId").val());
-							
-							formData.append("name_of_establishment", $("#editEstablishmentName").val());
-							formData.append("category_id", $("#editCategoryId").val());
-							formData.append("zone_id", $("#editZoneId").val());
-							formData.append("ward_id", $("#editWardId").val());
-							
-							formData.append("trade_license_No", $("#editTradeLicenseNo").val());
-							
-							formData.append("person_name", $("#editPersonName").val());
-							formData.append("email_id", $("#editEmailId").val());
-							formData.append("mobile_no", $("#editMobileNo").val());
-							
-							formData.append("gst_No", $("#editGstNo").val());
-							formData.append("address", $("#editAddress").val());
-							
-							
-							//================ Establishment =================//
-							
-							formData.append("total_builtup_area_sqmt", $("#editBuiltupArea").val());
-							formData.append("establishment_type", establishmentType);
-							
-							formData.append("dwelling_units", $("#editDwellingUnits").val());
-							formData.append("avg_daily_footfall", $("#editDailyFootfall").val());
-							
-							formData.append("totalEmployees", $("#editTotalEmployees").val());
-							
-							
-							//================ Waste Generation =================//
-							
-							formData.append("wet_waste", $("#editWetWaste").val());
-							formData.append("dry_waste", $("#editDryWaste").val());
-							
-							formData.append("domestic_hazardous_waste", $("#editDomesticWaste").val());
-							formData.append("sanitary_waste", $("#editSanitaryWaste").val());
-							
-							formData.append("cd_waste", $("#editCdWaste").val());
-							
-							
-							//================ Files =================//
-							
-							if ($("#editWasteAuditFile")[0].files.length > 0) {
-							
-							    formData.append(
-							        "wasteAuditFile",
-							        $("#editWasteAuditFile")[0].files[0]
-							    );
-							
-							}
-							
-							if ($("#editInstalledPhoto")[0].files.length > 0) {
-							
-							    formData.append(
-							        "installedUnitPhoto",
-							        $("#editInstalledPhoto")[0].files[0]
-							    );
-							
-							}
-							
-							
-							//================ Waste Processing =================//
-							
-							//================ Waste Processing =================//
-							
-							formData.append("wet_waste_processed", wetWasteProcessed);
-							
-							if (wetWasteProcessed == "Yes") {
-							
-							    formData.append("technology_used", technologyUsed);
-							    formData.append("other_technology", otherTechnology);
-							
-							    formData.append("installed_capacity_kg", $("#editInstalledCapacity").val());
-							    formData.append("installation_year", $("#editInstallationYear").val());
-							    formData.append("vendor_name", $("#editVendorName").val());
-							
-							    formData.append(
-							        "unit_functional_status",
-							        $("input[name='editUnitFunctional']:checked").val() || ""
-							    );
-							
-							    formData.append("longitude", $("#editLongitude").val());
-							    formData.append("latitude", $("#editLatitude").val());
-							
-							    if ($("#editInstalledPhoto")[0].files.length > 0) {
-							        formData.append(
-							            "installedUnitPhoto",
-							            $("#editInstalledPhoto")[0].files[0]
-							        );
-							    }
-							
-							} else {
-							
-							    // Clear all processing values in DB
-							    formData.append("technology_used", "");
-							    formData.append("other_technology", "");
-							    formData.append("installed_capacity_kg", "");
-							    formData.append("installation_year", "");
-							    formData.append("vendor_name", "");
-							    formData.append("unit_functional_status", "");
-							    formData.append("longitude", "");
-							    formData.append("latitude", "");
-							
-							    // Tell service to remove old photo
-							    formData.append("removeInstalledPhoto", "true");
-							}
-							
-							
-							
-							//================ Dry Waste =================//
-							
-							formData.append("dry_waste_recycler", dryWasteRecycler);
-							
-							formData.append("recycler_name", $("#editRecyclerName").val());
-							
-							formData.append(
-							    "recycler_authorization_no",
-							    $("#editRecyclerAuthorization").val()
-							);
-							
-							
-							//================ Residual Waste =================//
-							
-							formData.append(
-							    "residual_waste_quantity",
-							    $("#editResidualWaste").val()
-							);
-							
-							formData.append(
-							    "collection_frequency",
-							    $("#editCollectionFrequency").val()
-							);
-							
-							formData.append(
-							    "vehicle_type",
-							    $("#editVehicleType").val()
-							);
-							
-							
-							//================ Login User =================//
-							
-							formData.append("update_by", userId);
-							
-							
-							//================ AJAX =================//
-							
-							$.ajax({
-							
-							    url: "/gcc/api/bulkwaste/updateBulkWasteRequest",
-							
-							    type: "POST",
-							
-							    data: formData,
-							
-							    processData: false,
-							
-							    contentType: false,
-							
-							    success: function(response){
-							
-							        if(response.status){
-							
-							            Swal.fire({
-							
-							                icon:"success",
-							                title:"Success",
-							                text:response.description,
-			                                allowOutsideClick: false
-							
-							            }).then(function(){
-							
-							                $("#editBulkWasteModal").modal("hide");
-							
-							               // loadBulkWasteList();      // Your DataTable Reload Method
-							               
-							                let fromDate = $("#fromDate").val();
-							                let toDate = $("#toDate").val();
-							                let categoryType = $("#categoryType").val();
-							                let zoneType = $("#zoneType").val();
-							                let wardType = $("#wardType").val();
-
-							                loadReportData(fromDate, toDate, categoryType, zoneType, wardType);
-							
-							            });
-							
-							        }
-							        
-							        else if(response.message === "duplicate") {
-
-							            Swal.fire({
-							                icon: "warning",
-							                title: "Validation",
-							                text: response.description,
-							                allowOutsideClick: false
-							            });
-
-							        } 
-							        
-							        else{
-							
-							            Swal.fire({
-							
-							                icon:"error",
-							                title:"Failed",
-							                text:response.description,
-			                                allowOutsideClick: false
-							
-							            });
-							
-							        }
-							
-							    },
-							
-							    error:function(){
-							
-							        Swal.fire({
-							
-							            icon:"error",
-							            title:"Error",
-							            text:"Unable to update Bulk Waste Request.",
-		                                allowOutsideClick: false
-							
-							        });
-							
-							    }
-							
-							});
-
-				            // Continue AJAX Update
-
-				        });
-				        
-				        
-				        
-				        
-					
-					
-					
-					
-					$(document).ready(function () {
-
-			            // Only integers
-			           // allowOnlyNumbers("editMobileNo");
-			          // allowOnlyNumbers("editInstallationYear");
-			          
-				        allowIntegerWithLimit("editMobileNo",10);
-						allowIntegerWithLimit("editInstallationYear",4);
-
-			            allowIntegerWithLimit("editCollectionFrequency", 5);
-			            allowIntegerWithLimit("editDwellingUnits", 5);
-			            allowIntegerWithLimit("editDailyFootfall", 5);
-			            allowIntegerWithLimit("editTotalEmployees", 5);
-			            allowIntegerWithLimit("editRecyclerAuthorization", 5);
-
-
-			            // 7 digit limit with decimal
-			            allowDecimalWithLimit("editWetWaste", 7);
-			            allowDecimalWithLimit("editDryWaste", 7);
-			            allowDecimalWithLimit("editDomesticWaste", 7);
-			            allowDecimalWithLimit("editSanitaryWaste", 7);
-			            allowDecimalWithLimit("editInstalledCapacity", 7);
-			            allowDecimalWithLimit("editResidualWaste", 7);
-			            allowDecimalWithLimit("editBuiltupArea", 8);
-			            allowDecimalWithLimit("editCdWaste", 8);
-
-			            // 12 digit limit for coordinates
-			            allowCoordinate("editLongitude", 12);
-			            allowCoordinate("editLatitude", 12);
-
-			        });
-					
-					
-					function allowIntegerWithLimit(id, maxLength) {
-
-					    $("#" + id).on("input", function () {
-					        this.value = this.value.replace(/\D/g, "");
-					        if (this.value.length > maxLength) {
-					            this.value = this.value.substring(0, maxLength);
-					        }
-					    });
-					}
-
-					function allowDecimalWithLimit(id, maxLength) {
-
-					    $("#" + id).on("input", function () {
-					        let value = this.value;
-					        value = value.replace(/[^0-9.]/g, "");
-
-					        let parts = value.split(".");
-
-					        if (parts.length > 2) {
-					            value = parts[0] + "." + parts.slice(1).join("");
-					        }
-
-					        if (parts[0].length > maxLength) {
-					            parts[0] = parts[0].substring(0, maxLength);
-					        }
-
-					        this.value = parts.join(".");
-
-					    });
-
-					}
-					
-					function allowCoordinate(id) {
-
-					    $("#" + id).on("input", function () {
-
-					        let value = this.value.replace(/[^0-9.]/g, "");
-
-					        let parts = value.split(".");
-
-					        // Allow only one decimal point
-					        if (parts.length > 2) {
-					            value = parts[0] + "." + parts.slice(1).join("");
-					            parts = value.split(".");
-					        }
-
-					        // Maximum 3 digits before decimal
-					        if (parts[0].length > 3) {
-					            parts[0] = parts[0].substring(0, 3);
-					        }
-
-					        // Maximum 10 digits after decimal
-					        if (parts.length > 1 && parts[1].length > 10) {
-					            parts[1] = parts[1].substring(0, 10);
-					        }
-
-					        this.value = parts.join(".");
-
-					    });
-
-					}
-					
-					
-				 
-				 
-				
-
-				 // Delete
-				 
-				  //========================================
-        // Delete  Details
-        //========================================
-
-
-        $(document).on("click", ".deleteBtn", function () {
-
-            let requestId = $(this).data("id");
-
-            Swal.fire({
-
-                title: "Delete Bulk Waste Request?",
-                text: "Do you want to delete this request?",
-                icon: "warning",
-                showCancelButton: true,
-                confirmButtonColor: "#d33",
-                cancelButtonColor: "#6c757d",
-                confirmButtonText: "Delete",
-                cancelButtonText: "Cancel",
-                allowOutsideClick:false
-
-            }).then((result) => {
-
-                if (result.isConfirmed) {
-
-                    $.ajax({
-
-                        url: "/gcc/api/bulkwaste/deactivatebulk",
-                        type: "POST",
-
-                        data: {
-                            requestId: requestId,
-                            update_by:userId
-                            
-                        },
-                        
-                        
-
-                        success: function (response) {
-
-                            if (response.status) {
-
-                                Swal.fire({
-                                    icon: "success",
-                                    title: response.title,
-                                    text: response.message,
-                                    confirmButtonText: "OK",
-                                    allowOutsideClick:false
-                                }).then(function () {
-
-                                    location.reload();
-
-                                });
-
-                            } else {
-
-                                Swal.fire({
-                                    icon: "error",
-                                    title: "Error",
-                                    text: response.description,
-                                    allowOutsideClick:false
-                                });
-
-                            }
-
-                        },
-
-                        error: function () {
-
-                            Swal.fire({
-                                icon: "error",
-                                title: "Error",
-                                text: "Something went wrong."
-                            });
-                        }
-                    });
-                }
-            });
-        });
-				 
-
-	 
-	
-	 
-
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/c_petition/complaint_list.html b/src/main/resources/templates/modules/c_petition/complaint_list.html
deleted file mode 100644
index 1854c806..00000000
--- a/src/main/resources/templates/modules/c_petition/complaint_list.html
+++ /dev/null
@@ -1,789 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Complaint List</h5>
-                                            <span>Councillor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Councillor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Complaint List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="complaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Address&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-													</tr>
-                                                </tfoot>
-                                                 
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/c_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/c_petition/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_complaint_data(){
-	        	var apiUrl = '/gcc/api/c_petition/getComplaintList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-	        
-	        /* Get Complaints List */
-	        function get_complaint_list(){
-	        	get_complaint_data().then(function(complaintList) {
-	    		    // Handle the complaint list
-	    		    generate_table(complaintList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching complaint list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching complaint list:', error);
-			        }
-	    		});
-			}
-	        
-	        function viewPetitionSummary(petitionNo){
-	        	$("#viewpetition").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				var url = '/gcc/c_petition/view-petition-modal?petitionNo='+petitionNo;
-				$.ajax({
-				    url: url,
-				    type: 'GET',
-				    dataType: 'html',
-				    success: function(data) {
-				      $('#viewPetitionBoxBody').html(data); // Inject content into modal body
-				    },
-				    error: function(xhr, status, error) {
-				      console.error("Error loading URL:", error);
-				      // Handle error, display a message, etc.
-				    }
-				  });
-				
-				return false;
-			}
-	        
-	        function updateStatus(mapId){
-	        	$("#ComplaintStatusBox").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				callComplaintDetails(mapId);
-				return false;
-			}
-	        
-	        function callComplaintDetails(mapId){
-	        	loading_text_msg = getLoadingMessage(); // get Loading random text
-	        	var loading=searchinfo("<b>"+loading_text_msg+"</b>");
-	    		var complaintContentHTML=`
-	    							<div class="row">
-	    							    <div class="col-lg-6">
-	    						        <div class="block block-rounded">
-	    						           
-	    						                <div id="leftContainer">${loading}</div>
-	    						            
-	    						        </div>
-	    						    </div>
-	    						    
-	    						    <div class="col-lg-6 printack2">
-	    						        <div class="block block-rounded">
-	    						            
-	    						                <div id="rightContainer">${loading}</div>
-	    						           
-	    						        </div>
-	    						    </div>
-	    						    <!--<div class="col-lg-12 text-center block-options pt-10">
-	    						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-	    						    </div>-->
-	    						</div>`;
-	    		
-	    		$('#ComplaintStatusBoxBody').html(complaintContentHTML); // Box content (Body)
-	    		
-	    		getComplaintData(mapId);
-			}
-	        
-	        function getComplaintData(mapId){
-	        	get_complaint_details_byId(mapId).then(function(complaintDetails) {
-	        		
-	        		var complaintStatus = complaintDetails[0].status;
-					
-	        		var statusBadge = complaintStatus.charAt(0).toUpperCase() + complaintStatus.slice(1);
-	        		var refRibben = `<div class="card-header-right" style="top:auto;">
-	        							Ref ID: ${mapId}
-				              	      </div>`;
-           	        var statusRibben = ""; 
-	        		if(complaintStatus=='pending'){
-	        			statusRibben = `<div class="ribbon">
-		              	      <div class="wrap">
-		              	        <span class="ribbon6 bg-danger"><div styel="color:#fff;">${statusBadge}</div></span>
-		              	      </div>
-		              	    </div>`;
-		              	statusRibben = "";    
-	        			statusBadge = `<span class="badge badge-danger" style="font-size:10px;padding:0.25em 0.4em;">${statusBadge}</span>`;
-	        			
-					}
-	        		else if(complaintStatus=='close'){   
-	        			statusBadge = `<span class="badge badge-success" style="font-size:10px;padding:0.25em 0.4em;">${statusBadge}</span>`;
-					}
-	        		var complaintRightBody = "";
-	        		
-	        		var fileType_c = complaintDetails[0].file_type;
-					fileType_c = fileType_c.split("/").pop();
-					var filetypeico_c = "file-lines";
-					if(fileType_c=='pdf'){
-						filetypeico_c = "file-pdf";
-					}
-					else{
-						filetypeico_c = "file-image";
-					}
-					
-					var complaintLeftBody = `<div class="card mb-0">
-								             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                	<h3>Complaint Details</h3>
-								                	${statusRibben}
-								                </div>
-								                <div class="card-body">
-									                <table class="table table-borderless table-vcenter mb-0" style="font-size:12px;">
-												      <tbody>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${convertdate(complaintDetails[0].cdate)}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petition_no}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petitioner_name}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petitioner_mobile}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th colspan="2" style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:<br><p class="fw-semibold mb-0" style="font-weight:normal;">${complaintDetails[0].complaint_nature}</p></th>
-												        </tr>
-												        <tr>
-												        	<td colspan="2" style="padding: 0.45rem 0.45rem;">
-												        	<div class="like-comm mt-20 mb-0"> 
-				                                        	<b>ஆவணப் பதிவேற்றம் / Document Upload:</b><br>
-				                                        	
-					                                        	<table class="table table-bordered table-vcenter mb-0">
-													                <thead>
-													                  <tr>
-													                    <th>S.no</th>
-													                    <th>File Name</th>
-													                    <th>Size</th>
-													                    <th>Type</th>
-													                    <th><i class="ik ik-more-horizontal"></i></th>
-													                  </tr>
-													                </thead>
-												                	<tbody>
-												                 		<tr>
-															            	<td class="fw-semibold">1</td>
-															            	<td class="fw-semibold">${complaintDetails[0].file_name}</td>
-															            	<td class="fw-semibold">${formatFileSize(complaintDetails[0].file_size)}</td>
-															            	<td class="fw-semibold">${fileType_c}</td>
-															            	<td class="fw-semibold">
-															            		<a href="javascript:void(0)" class="link mr-10" onclick="downloadFile('petition','${complaintDetails[0].file_name}','${complaintDetails[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Download File"><i class="fa fa-fw fa-download" style="font-size: 18px;"></i></a>
-															            		<a href="javascript:void(0)" class="link mr-10" onclick="viewFile('petition','${complaintDetails[0].file_name}','${complaintDetails[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View File"><i class="far fa-3x fa-${filetypeico_c}" style="font-size: 18px;"></i></a>
-															            	</td>
-													                  	</tr>
-												                	</tbody>
-												              	</table>
-				                                   			</div>
-													        	<table class="table table-bordered table-vcenter mb-0">
-													                <thead>
-													                  <tr>
-													                    <th>Complaint <i class="fa fa-arrow-right"></i> Status</th>
-													                    <th class="text-right" id="complaint_forward_link"><a href="javascript:void(0);" onclick="return forward_compliant(${complaintDetails[0].mapid}, '${complaintDetails[0].complaint_type}');" class="link" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Click here to forward this complaint to another department officer."><i class="far fa-share-square"></i> Click to forward </a></th>
-													                  </tr>
-													                </thead>
-												                	<tbody>
-												                 		<tr>
-															            	<td colspan="2" class="fw-semibold">
-															            	${complaintDetails[0].complaint_type} <i class="fa fa-arrow-right"></i> ${statusBadge} <i class="fa fa-arrow-right"></i> ${complaintDetails[0].off_nm}
-														                    </td>
-													                  	</tr>
-												                	</tbody>
-												              	</table>
-												        	</td>
-												        </tr>
-												      </tbody>
-												    </table>
-								                </div>
-								            </div>`;
-					
-					$('#leftContainer').html(complaintLeftBody);
-					
-					if(complaintStatus!='close'){
-						complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-												<div class="card mb-0">
-							                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-							                    		<h3>Complaint Update Details</h3>
-							                    	    ${refRibben}
-							                		</div>
-							                		<div class="card-body">
-								                		<div class="form-group">
-					                                    	<label for="complaintActionText">நடவடிக்கை / Action:</label>
-									   						<textarea class="form-control" id="complaintActionText" name="complaintActionText" rows="6" maxlength="250" placeholder="புகாரின் தன்மை..." required></textarea>
-									   					</div>
-									   					<div class="form-group">
-									                       <label for="action_san_page1">ஆவணப் பதிவேற்றம் / Document Upload:</label>
-														   <input name="action_san_page1" id="action_san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*" required>
-														 </div>
-														 <div class="form-group mb-0 text-center">
-														 	<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveandclose(${mapId},${complaintDetails[0].petition_id},'${complaintDetails[0].petition_no}');" id="updatebtn"><i class="ik ik-save"></i> Save and Close </button>
-														 </div>
-							                		</div>
-							            		</div>
-						            		</form>`;
-						$('#rightContainer').html(complaintRightBody);
-					}
-					else{
-						// first remove forward link
-						$("#complaint_forward_link").html("");
-						
-						get_complaint_action_byId(mapId).then(function(complaintAction) {
-							var fileType = complaintAction[0].file_type;
-							fileType = fileType.split("/").pop();
-							var filetypeico = "file-lines";
-							if(fileType=='pdf'){
-								filetypeico = "file-pdf";
-							}
-							else{
-								filetypeico = "file-image";
-							}
-							
-							complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-													<div class="card mb-0">
-								                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                    		<h3>Complaint Update Details</h3>
-								                    	    ${refRibben}
-								                		</div>
-								                		<div class="card-body">
-									                		<div>
-									                			<b>நடவடிக்கை தேதி / Action Date:</b> ${convertdate(complaintAction[0].cdate)}
-					                                            <hr>
-					                                            <b>நடவடிக்கை / Action:</b><br>
-					                                            <p class="mt-10">${complaintAction[0].comments}</p>
-					                                        </div>
-					                                        	<hr>
-					                                        <div class="like-comm mt-20 mb-0"> 
-					                                        	<b>ஆவணப் பதிவேற்றம் / Document Upload:</b><br>
-					                                        	
-						                                        	<table class="table table-bordered table-vcenter mb-0">
-														                <thead>
-														                  <tr>
-														                    <th>S.no</th>
-														                    <th>File Name</th>
-														                    <th>Size</th>
-														                    <th>Type</th>
-														                    <th><i class="ik ik-more-horizontal"></i></th>
-														                  </tr>
-														                </thead>
-													                	<tbody>
-													                 		<tr>
-																            	<td class="fw-semibold">1</td>
-																            	<td class="fw-semibold">${complaintAction[0].file_name}</td>
-																            	<td class="fw-semibold">${formatFileSize(complaintAction[0].file_size)}</td>
-																            	<td class="fw-semibold">${fileType}</td>
-																            	<td class="fw-semibold">
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="downloadFile('action','${complaintAction[0].file_name}','${complaintAction[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Download File"><i class="fa fa-fw fa-download" style="font-size: 18px;"></i></a>
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="viewFile('action','${complaintAction[0].file_name}','${complaintAction[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View File"><i class="far fa-3x fa-${filetypeico}" style="font-size: 18px;"></i></a>
-																            	</td>
-														                  	</tr>
-													                	</tbody>
-													              	</table>
-					                                   		</div>
-								                		</div>
-								            		</div>
-							            		</form>`;
-							$('#rightContainer').html(complaintRightBody);
-							// Enable tooltips for all elements with data-toggle="tooltip"
-				            $('[data-toggle="tooltip"]').tooltip();
-						}).catch(function(error) {
-			    		    // Handle errors
-			    		    console.error('Error fetching action details ('+mapId+'):', error);
-			    		});	 
-						
-					}
-					// Enable tooltips for all elements with data-toggle="tooltip"
-		            $('[data-toggle="tooltip"]').tooltip();
-	        	}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching Complaint details ('+mapId+'):', error);
-	    		});	            
-	        	
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#complaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        /*scrollY: '50vh',*/
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	            	var complaint_status=row["status"];
-					complaint_status=complaint_status.charAt(0).toUpperCase() + complaint_status.slice(1);
-					
-					actionHTML = `<div class="dropdown d-inline-block show">
-			                        <!--<a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="ik ik-more-horizontal"></i></a>
-			                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-			                        Action for: `+row['petition_no']+` 
-			                        	<a class="dropdown-item" href="" onclick="return viewAck('`+row['petition_no']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Acknowledgement"><i class="ik ik-eye"></i> Acknowledgement</a>
-			                        	<a class="dropdown-item" href="/gcc/c_petition/petition-ack/`+row['petition_no']+`" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Print Acknowledgement"><i class="ik ik-printer"></i> Acknowledgement</a>
-			                        </div>-->
-			                    </div>`
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="#" onclick="return viewPetitionSummary(\''+row['petitionNoEncode']+'\');">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    row['petitioner_address'],
-	                    row['petitioner_pincode'],
-	                    row['complaint_type'],
-	                    convertdate(row['cdate']),
-	                    '<a href="#" onclick="return updateStatus('+row['mapid']+');" style="text-transform: capitalize;"">'+complaint_status+'</a>',
-	                    row['off_nm'],
-	                    actionHTML
-	                ]).draw(false);
-	            });
-	            
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-	            onSearchComplete();
-			}
-			
-	     // Save New Action  
-			function saveandclose(mapId,petitionId,petitionNo){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var comments = $('#complaintActionText');
-				var textLength = comments.val().length;
-				comments.removeClass('is-invalid');
-				
-				var fileInput = $("#action_san_page1");
-				fileInput.removeClass('is-invalid');
-				var selectedFile = fileInput.val();
-				
-				if (textLength>=10 && selectedFile) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#action-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        formData.append('mapId',mapId);
-			        formData.append('petitionId',petitionId);
-			        formData.append('petitionNo',petitionNo);
-			        formData.append('complaintStatus','close');
-			        
-			        saveActionFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Complaint action saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					$("#ComplaintStatusBox").modal('hide');
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save complaint action. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					if(textLength<10){
-						comments.addClass('is-invalid');
-					}
-					
-					if (!selectedFile) {
-						fileInput.addClass('is-invalid');
-					}
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveActionFormData(formData){
-				var apiUrl = '/gcc/api/c_petition/saveComplanitStatus';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#updatebtn").prop("disabled", false);
-				$("#updatebtn").html('<i class="ik ik-save"></i> Save and Close ');
-			}
-			
-			function form_btn_disable(){
-				$("#updatebtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#updatebtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			// For Complient Map Select HTML 
-			function calloffice(val,id){
-				if(val==1){ // Intenal
-					var officeSelectHTML = `<div class="mb-4">
-	                							<label for="office${id}">Select Office</label>
-	                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-									                <option value="0">Select Office</option>
-									                <option value="1">HQ</option>
-									                <option value="2">Zonal Office</option>
-							                	</select>
-						                	</div>`;
-					$("#officedata"+id).html(officeSelectHTML);
-				}
-				else if(val==2){ // External
-					$("#officers"+id).html('');
-					var ExSelectHTML = getselect(id,"ExSelect");
-					var departmentSelectHTML = `<div class="mb-4">
-													<label for="dept3">Select Department</label>
-													${ExSelectHTML}
-											 	</div>`;
-					$("#officedata"+id).html(departmentSelectHTML);
-				}
-				else{
-					$("#officedata"+id).html('');
-					$("#officers"+id).html('');
-				}
-				$("#officers"+id).html('');
-			}
-			
-			function callofficers(val,id){
-				
-				if(val==1){
-					// HQ
-					var HQSelectHTML = getselect(id,"HQSelect");
-				 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-				}
-				else if(val==2){
-					// Zone Office
-					var ZoneSelectHTML = getselect(id,"ZoneSelect");
-					$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-				}
-				else{
-					$("#officers"+id).html('');
-				}
-				
-			}
-			
-			function getselect(comid,type){
-		  	  var HQSelect = '';
-		  	  var ZoneSelect = '';
-		  	  var ExSelect = '';
-		  
-		  	  for (var i = 0; i < officerMasterList.length; i++) {
-		  		  if(officerMasterList[i].zone_id=="HQ"){
-		  			  HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else if(officerMasterList[i].zone_id=="99"){
-		  			  ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else{
-		  			  ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  	  }
-		  	  
-		  	// Forward Save Button
-			  var forward_Btn = `<div class="col-12 pt-3 mb-0 pb-0" id="submitdiv">
-									<label class="form-label" for="forwardcomp">Forward Comments</label>
-									<textarea class="js-maxlength form-control" id="forwardcomp" name="forwardcomp" rows="6" maxlength="250" placeholder="கருத்துகள்..." data-always-show="true" data-placement="right" th:utext="" required></textarea>
-			  						<div class="text-center pt-3">
-									<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveForward(${comid});" id="updatebtn"><i class="si si-rocket me-1"></i> Save and Forward</button>
-			  						<div id="forwardFormError" class="text-danger"></div>
-			  						</div>
-								</div>`;
-								
-		  	  if(type=="HQSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ZoneSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ExSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  return '';
-			}
-			$(document).ready(function() {
-				call_loading();
-				get_officer_master_data();
-				get_complaint_list();
-				
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/c_petition/new_petition.html b/src/main/resources/templates/modules/c_petition/new_petition.html
deleted file mode 100644
index 59b29c0b..00000000
--- a/src/main/resources/templates/modules/c_petition/new_petition.html
+++ /dev/null
@@ -1,267 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Add New Petition</h5>
-                                            <span>Councillor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Councillor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Add Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-                        	<div class="col-md-2"></div>
-							<div class="col-md-8">
-                                <div class="card">
-									<form class="request-form" id="request-form" onsubmit="return saveRequest();" enctype="multipart/form-data">
-	                                    <div class="card-header"><h3>New Petition Form</h3></div>
-	                               		<div class="card-body">
-											<div class="form-group">
-	                                            <label for="petitionerName">Petitioner's Name / மனுதாரரின் பெயர்</label>
-	                                            <input type="text" class="form-control" name="petitionerName" id="petitionerName" autocomplete="off" placeholder="மனுதாரரின் பெயர்"  maxlength="250" required>
-	                                        </div>
-	                                        <div class="form-group">
-	                                            <label for="petitionerMobile">Mobile NO / கைபேசி எண்</label>
-			                       				<input type="text" class="js-maxlength form-control" id="petitionerMobile" name="petitionerMobile" autocomplete="off" placeholder="கைபேசி எண்" maxlength="10" data-always-show="true" data-placement="top" required>
-	                                        </div>
-											<div class="form-group">
-                                          		<label for="complaintType">Type of complaint / புகார் வகை (பலவற்றை தேர்ந்தெடு..) </label>
-												<select class="select2" id="complaintType" name="complaintType" style="width: 100%;" data-placeholder="பலவற்றை தேர்ந்தெடு.." multiple required>
-													<option th:each="complaintType : ${complaintTypesList}" th:value="${complaintType.complaintTypeId}" th:text="${complaintType.complaintType}"></option>
-												</select>
-											</div>
-	                                        <div class="row">
-												 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page1">Petition Page 1 / மனு பக்கம் 1</label>
-													   <input name="san_page1" id="san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*">
-													 </div>
-												 </div>
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page2">Petition Page 2 / மனு பக்கம் 2</label>
-													   <input name="san_page2" id="san_page2" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-												 
-											</div>	 
-											<div class="row">	 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page3">Petition Page 3 / மனு பக்கம் 3</label>
-													   <input name="san_page3" id="san_page3" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-												 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page4">Petition Page 4 / மனு பக்கம் 4</label>
-													   <input name="san_page4" id="san_page4" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-											</div>
-										 	
-	                                  	</div>
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-							<div class="col-md-2"></div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/c_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var complaintTypeList = "";
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(complaintTypeList, function(index, complaintType) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: complaintType.complaint_typeid, // case-sensitive as per object
-	    	                text: complaintType.complaint_type
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#complaintType').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-			// Save New petition 
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null && mobileFormatRegex.test(mobileNo) && mobileNo.length == 10) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#request-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        saveFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Petition data saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					// Reload the current page
-		        					//location.reload();
-		        					// Navigate to a Ack page
-		        					window.location = "/gcc/c_petition/petition-ack/"+response;
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save petition data. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveFormData(formData){
-				var apiUrl = '/gcc/api/c_petition/savePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#resetFormBtn").prop("disabled", false);
-				$("#requestSubmitBtn").prop("disabled", false);
-				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-			}
-			
-			function form_btn_disable(){
-				$("#resetFormBtn").prop("disabled", true);
-				$("#requestSubmitBtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			$(document).ready(function() {
-				get_complaint_type_data();
-				$('#petitionerMobile').mask('0000000000');
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/c_petition/petition_ack.html b/src/main/resources/templates/modules/c_petition/petition_ack.html
deleted file mode 100644
index b6f44bd0..00000000
--- a/src/main/resources/templates/modules/c_petition/petition_ack.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5 th:utext="'Petition Acknowledgement ('+${petitionNo}+')'">Petition Acknowledgement</h5>
-                                            <span>Councillor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Councillor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition Acknowledgement</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr class="print_no">
-                        <!-- 
-                        <div class="row">
-                        	<div class="col-lg-6">
-								<div class="block block-rounded ack ack-container">
-									<div id="ack1table" style="border: 1px solid black;">
-										<div id="ack1"></div>
-									</div>
-								</div>
-							</div>
-						 
-							<div class="col-lg-6">
-								<div class="block block-rounded ack ack-container">
-									<div id="ack2table" style="border: 1px solid black;">
-										<div id="ack2"></div>
-									</div>
-								</div>
-							</div>
-		   	 	            <div class="col-lg-12 text-center block-options pt-10">
-		   	 					<button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-		   	 	            </div>
-                        </div>
-                         -->
-                        <div class="row">
-						    <div class="col-lg-6">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack1table" class="ack-content">
-						                <div id="ack1">This is ack1</div>
-						            </div>
-						        </div>
-						    </div>
-						    
-						    <div class="col-lg-6 printack2">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack2table" class="ack-content">
-						                <div id="ack2">This is ack2</div>
-						            </div>
-						        </div>
-						    </div>
-						    <div class="col-lg-12 text-center block-options pt-10">
-						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-						    </div>
-						</div>
-						                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/c_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var complaintTypeList = "";
-			
-			 /* Get Complaint Type Data */
-			function get_complaint_type_data(){
-			
-				get_complaint_type_list().then(function(complaintTypes) {
-				    // Handle the Complaint list
-				    complaintTypeList = complaintTypes;
-					
-				    // After Complaint Type list created we call petition details
-				    get_petition_data();
-				    
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching complaint type list:', error);
-				});
-			}
-			
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint_txt;
-					
-					var complaintArray = complaint.split(',');
-					
-					for(j = 0; j < complaintArray.length; j++){
-						if(j>0){
-							complaintHTML+="<br>";
-						}
-						complaintHTML+= (j+1)+') '+complaintArray[j];
-					}
-					var ack =`
-					<table class="table table-borderless table-vcenter p-0 m-0">
-					  <tbody>
-					    <tr>
-					      <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-					      <td class="fw-semibold text-center">
-								<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-								மக்களை தேடி மேயர் திட்டம்<br>
-								ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-						  </td>
-						  <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-					    </tr>
-					</tbody>
-					</table>
-					<hr style="margin:0px">
-					  <div class="block-content p-0 m-0">
-					    <table class="table table-borderless table-vcenter" style="font-size:12px;">
-					      <tbody>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${convertdate(petitionDetails[0].cdate)}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petition_no}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petitioner_name}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petitioner_mobile}
-					          </td>
-					        </tr>
-					        <tr style="font-size:12px;">
-					          <th style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${complaintHTML}
-							</td>
-					        </tr>
-					        <tr>
-					          <td scope="row" colspan="2" style="font-size:10px">இம்மனுவின் ஒப்புகைச் சீட்டு எண் மனு தாரரின் கைபேசி எண்ணிற்கு குறுஞ்செய்தி மூலம் அனுப்பி வைக்கப்படும் . இம்மனுவின் நிலை குறித்து https://chennaicorporation.gov.in/MTM/ என்ற இணையதளத்தில் மனுவின் எண்ணை குறிப்பிட்டு அறிந்துகொள்ளலாம்</th>
-					        </tr>
-					        <tr style="text-align: right;">
-					          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-					        </tr>
-					      </tbody>
-					    </table>
-					  `;
-				    
-					$("#ack1").html(ack);
-					$("#ack2").html(ack);
-					  
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition details ('+petitionNo+'):', error);
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/c_petition/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                resolve(jsonResponse);
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			$(document).ready(function() {
-				get_complaint_type_data();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/c_petition/petition_list.html b/src/main/resources/templates/modules/c_petition/petition_list.html
deleted file mode 100644
index 83685a25..00000000
--- a/src/main/resources/templates/modules/c_petition/petition_list.html
+++ /dev/null
@@ -1,282 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Petition List</h5>
-                                            <span>Councillor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Councillor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="petitionDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/c_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/c_petition/script :: script}"></script>
-        <script th:inline="javascript">
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_petitions_data(){
-	        	var apiUrl = '/gcc/api/c_petition/getPetitionList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_petitions_list(){
-	        	get_petitions_data().then(function(petitionList) {
-	    		    // Handle the department list
-	    		    generate_table(petitionList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching petition list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching petition list:', error);
-			        }
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#petitionDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-
-	            	//View Acknowledgement: View the acknowledgement for petition MP10000001.
-					//Print Acknowledgement: Print the acknowledgement for petition MP10000001.
-					//View Petition Details: View the details of petition MP10000001.
-					//View Uploaded Files: View the files uploaded for petition MP10000001.
-
-					actionHTML = `<div class="dropdown d-inline-block show">
-			                        <a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="ik ik-more-horizontal"></i></a>
-			                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-			                        
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the acknowledgement for petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Acknowledgement</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Print the acknowledgement for petition `+row['petition_no']+`."><i class="ik ik-printer"></i> Print Acknowledgement</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the details of petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Petition Details</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the files uploaded for petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Uploaded Files</a>
-			                        </div>
-			                    </div>`
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/c_petition/update-petition?petitionNo='+row['petitionNoEncode']+'">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    row['petitioner_address'],
-	                    row['petitioner_pincode'],
-	                    row['petitioner_complaint_txt'],
-	                    convertdate(row['cdate']),
-	                    row['status'],
-	                    row['created_by'],
-	                    actionHTML
-	                ]).draw(false);
-	            });
-	            
-	           // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-	            get_petitions_list();
-	            
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/c_petition/petition_not_mapped_list.html b/src/main/resources/templates/modules/c_petition/petition_not_mapped_list.html
deleted file mode 100644
index 706c8092..00000000
--- a/src/main/resources/templates/modules/c_petition/petition_not_mapped_list.html
+++ /dev/null
@@ -1,267 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Unmapped Petition List</h5>
-                                            <span>Councillor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Councillor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Unmapped Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                	<div class="card-header">
-                                        <h3>These are the petitions that are currently not assigned to any department officer:</h3>
-                                    </div>
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="petitionDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/c_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/c_petition/script :: script}"></script>
-        <script th:inline="javascript">
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_petitions_data(){
-	        	var apiUrl = '/gcc/api/c_petition/getUnmapPetitionList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_petitions_list(){
-	        	get_petitions_data().then(function(petitionList) {
-	    		    // Handle the department list
-	    		    generate_table(petitionList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching petition list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching petition list:', error);
-			        }
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#petitionDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-				        	{ targets: 'no-sort', "orderable": false },
-							{ targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/c_petition/update-petition?petitionNo='+row['petitionNoEncode']+'">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    row['petitioner_address'],
-	                    row['petitioner_pincode'],
-	                    row['petitioner_complaint_txt'],
-	                    convertdate(row['cdate']),
-	                    row['status'],
-	                    row['created_by'],
-	                    '<a href="" onclick="return viewAck(\''+row['petition_no']+'\');"data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Ack"><i class="far fa-handshake"></i></a>',
-	                ]).draw(false);
-	            });
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-	            get_petitions_list();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/c_petition/petition_update.html b/src/main/resources/templates/modules/c_petition/petition_update.html
deleted file mode 100644
index 3665fad8..00000000
--- a/src/main/resources/templates/modules/c_petition/petition_update.html
+++ /dev/null
@@ -1,719 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Edit / Update Petition</h5>
-                                            <span>Councillor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Councillor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Edit/Update Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card" id="petitionUpdateForm">
-									<form class="update-request-form" id="update-request-form" onsubmit="return updateRequest();">
-										<div class="card-header">
-		                                    <h3>Edit / Update Petition Form</h3>
-		                                    <div class="card-header-right">
-	                                            <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-	                                        </div>
-	                                    </div>
-	                               		<div class="card-body">
-	                               			<div class="row">
-												<div class="col-6">
-													<div class="form-group">
-			                                            <label for="petitionerName">Petitioner's Name / மனுதாரரின் பெயர்</label>
-			                                            <input type="text" class="form-control" name="petitionerName" id="petitionerName" autocomplete="off" placeholder="மனுதாரரின் பெயர்"  maxlength="250" required>
-			                                        </div>
-			                                        <div class="form-group">
-			                                            <label for="petitionerMobile">Mobile NO / கைபேசி எண்</label>
-					                       				<input type="text" class="form-control" id="petitionerMobile" name="petitionerMobile" autocomplete="off" placeholder="கைபேசி எண்" maxlength="10" required>
-			                                        </div>
-			                                        <div class="form-group">
-			                                        	<label for="complaintNature">புகாரின் தன்மை / Nature Of Complaint</label>
-								   						<textarea class="form-control" id="complaintNature" name="complaintNature" rows="6" maxlength="250" placeholder="புகாரின் தன்மை..."></textarea>
-								   					</div>
-												</div>
-												<div class="col-6">
-													<div class="form-group">
-														<label for="petitionerAddress">Address of petitioner / மனுதாரரின் முகவரி</label>
-									   					<textarea class="form-control" id="petitionerAddress" name="petitionerAddress" rows="6" maxlength="250" placeholder="மனுதாரரின் முகவரி..."></textarea>
-													</div>
-													<div class="form-group">
-														<label for="petitionerPincode">Postal code / தபால் குறியீடு</label>
-	   			                       					<input type="text" class="form-control" id="petitionerPincode" name="petitionerPincode" placeholder="தபால் குறியீடு" maxlength="6" required>
-													</div>
-													<div class="form-group">
-		                                          		<label for="complaintType">Type of complaint / புகார் வகை (பலவற்றை தேர்ந்தெடு..) </label>
-														<select class="select2" id="complaintType" name="complaintType" style="width: 100%;" data-placeholder="பலவற்றை தேர்ந்தெடு.." multiple required onchange="javascript:load_mapper();">
-															<option></option>
-														</select>
-													</div>
-												</div>
-												<div class="col-12">
-													<div class="block-content" id="userinfo2">
-														<div id="comp_mapping_to_officers" class="row"></div>
-													</div>
-											 	</div>
-											</div>
-	                                  	</div>
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/c_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Iterate through the Master Complanint Type and add options to the select element
-	    		    $.each(complaintTypeList, function(index, complaintType) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: complaintType.complaint_typeid, // case-sensitive as per object
-	    	                text: complaintType.complaint_type
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#complaintType').append(option);
-	    	        });
-	    		    // Call Petition function to fetch the data
-	    		    get_petition_data();
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-			 
-	     	// Function to get complaint_type and complaint_typeid by complaint_typeid
-	        function getComplaintTypeById(complaintTypeId) {
-	            for (var i = 0; i < complaintTypeList.length; i++) {
-	                if (complaintTypeList[i].complaint_typeid == complaintTypeId) {
-	                    return {
-	                        complaint_type: complaintTypeList[i].complaint_type,
-	                        complaint_typeid: complaintTypeList[i].complaint_typeid
-	                    };
-	                }
-	            }
-	            return null; // Return null if no matching complaint_typeid is found
-	        }
-	     
-			// Save New petition 
-			function updateRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null && mobileFormatRegex.test(mobileNo) && mobileNo.length == 10) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#update-request-form')[0]);
-			        formData.append('petitionNo',petitionNo);
-			        formData.append('createdBy',createdBy);
-			        formData.append('petitionId',petitionId);
-			        updateFormData(formData).then(function(response) {
-		    		    // Handle the response
-		    		    if(response==true){
-							// Delete Old data in Petition Mapping table
-		    		    	savePetitionMapData(formData).then(function(response) {
-		    		    		if(response==true){
-		    		    			Swal.fire({
-				        				title: 'Petition updated successfully!',
-				        				customClass: {
-				        			        title: 'swal-title-custom' // Add a custom class for the title
-				        			    },
-				        				//text: "Error",
-				        				icon: 'success',
-				        				showCancelButton: false,
-				        				confirmButtonColor: '#3085d6',
-				        				cancelButtonColor: '#d33',
-				        				confirmButtonText: 'Ok',
-				        				}).then(function(result) {
-				        				if (result.isConfirmed) {
-				        					form_btn_enable();
-				        				}
-				        			});
-		    		    		}
-		    		    		else{
-		    		    			Swal.fire({
-				        				title: 'Petition details have been updated, but mapping the complaint to the officer has failed.',
-				        				customClass: {
-				        			        title: 'swal-title-custom' // Add a custom class for the title
-				        			    },
-				        				//text: "Error",
-				        				icon: 'warning',
-				        				showCancelButton: false,
-				        				confirmButtonColor: '#3085d6',
-				        				cancelButtonColor: '#d33',
-				        				confirmButtonText: 'Ok',
-				        				}).then(function(result) {
-				        				if (result.isConfirmed) {
-				        					form_btn_enable();
-				        				}
-				        			});
-								}
-		    		    	}).catch(function(error) {
-		    	    		    // Handle errors
-		    	    		    console.error('Error fetching offcier master data:', error);
-		    	    		    form_btn_enable();
-		    	    		});
-		    		    	
-						}
-		    		    else{
-		    		    	Swal.fire({
-		        				title: 'Failed to update petition details!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-	    		    	
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function updateFormData(formData){
-				var apiUrl = '/gcc/api/c_petition/updatePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function savePetitionMapData(formData){
-				var apiUrl = '/gcc/api/c_petition/mapComplientToOfficer';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint;
-					petitionId = petitionDetails[0].petition_id;
-					var complaintArray = complaint.split(",");
-					$("#complaintType").val(complaintArray);
-					
-					$('#complaintType').trigger('change');
-					
-					closedComplaintsList = complaintArray;
-					
-					$("#petitionerName").val(petitionDetails[0].petitioner_name);
-					$("#petitionerMobile").val(petitionDetails[0].petitioner_mobile);
-					$("#petitionerAddress").val(petitionDetails[0].petitioner_address);
-					$("#petitionerPincode").val(petitionDetails[0].petitioner_pincode);
-					
-					$("#complaintNature").val(petitionDetails[0].complaint_nature);
-					
-					//load_mapper(); // Call for Complaint Mapping Form
-					
-					// IDs of the values you want to prevent from being deselected
-					var valuesToPreventDeselection = closedComplaintsList;//['value1', 'value2', 'value3'];
-
-					$('#complaintType').on('select2:unselect', function (e) {
-					    var deselectedValue = e.params.data.id;
-					    
-					    // Check if the deselected value should be prevented from being deselected
-					    if (valuesToPreventDeselection.includes(deselectedValue)) {
-					        // Prevent the deselection
-					        e.preventDefault();
-					    	// Re-select the deselected value to prevent it from being deselected
-					        $(this).val(valuesToPreventDeselection).trigger('change.select2');
-					        // Optionally, you can display a message or perform any other action
-					        console.log('Deselection of value ' + deselectedValue + ' prevented');
-					        alert('Deselection of value ' + deselectedValue + ' prevented');
-					    }
-					});
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition Data ('+petitionNo+'):', error.message);
-				    call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/c_petition/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			function load_mapper(){
-			  	var complaintArray = $("#complaintType").val();
-			  	//var complaintArray = complaint.split(',');
-				var compPetitionNo = petitionNo;
-				var compPetitionId = petitionId;
-				
-				var compmapHTML='';
-				for(j = 0; j < complaintArray.length; j++){
-					var complaintTypeDetails = getComplaintTypeById(complaintArray[j]); // Pass the complaint_typeid
-					var title=(j+1)+') '+ complaintTypeDetails.complaint_type; // Map form title
-					var compID="comp"+j;
-					var complaintTypeId = complaintTypeDetails.complaint_typeid;
-					
-					getMappingByComplaintsID(complaintTypeId);
-					
-					compmapHTML+=`<div class="col-lg-6" id="comp${complaintArray[j]}">
-										
-										<div class="widget">
-					                        <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                            <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-					                        </div>
-					                        <div class="widget-body">
-					                        	<div class="form-group">
-						                        	<label for="dept${complaintArray[j]}">Select Department Type</label>
-													<select name="dept[]" id="dept${complaintArray[j]}" class="form-control" onchange="javascript:calloffice(this.value,${complaintArray[j]})">
-														<option value="0">Select Department</option>
-														<option value="1">GCC Department</option>
-														<option value="2">External Department</option>
-												    </select>
-												</div>
-												<div id="officedata${complaintArray[j]}"></div>
-												<div id="officers${complaintArray[j]}"></div>
-					                        </div>
-					                    </div>
-									
-								  </div>`;
-						
-				}
-				$('#comp_mapping_to_officers').html(compmapHTML);
-				
-			  }
-			
-		</script>
-		
-		<script>
-		// For Complient Map Select HTML 
-		function calloffice(val,id){
-			if(val==1){ // Intenal
-				var officeSelectHTML = `<div class="mb-4">
-                							<label for="office${id}">Select Office</label>
-                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-								                <option value="0">Select Office</option>
-								                <option value="1">HQ</option>
-								                <option value="2">Zonal Office</option>
-						                	</select>
-					                	</div>`;
-				$("#officedata"+id).html(officeSelectHTML);
-			}
-			else if(val==2){ // External
-				$("#officers"+id).html('');
-				var ExSelectHTML = getselect(id,"ExSelect");
-				var departmentSelectHTML = `<div class="mb-4">
-												<label for="dept3">Select Department</label>
-												${ExSelectHTML}
-										 	</div>`;
-				$("#officedata"+id).html(departmentSelectHTML);
-			}
-			else{
-				$("#officedata"+id).html('');
-				$("#officers"+id).html('');
-			}
-			$("#officers"+id).html('');
-		}
-		
-		function callofficers(val,id){
-			
-			if(val==1){
-				// HQ
-				var HQSelectHTML = getselect(id,"HQSelect");
-			 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-			}
-			else if(val==2){
-				// Zone Office
-				var ZoneSelectHTML = getselect(id,"ZoneSelect");
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-			}
-			else{
-				$("#officers"+id).html('');
-			}
-			
-		}
-		
-		function getselect(comid,type){
-	  	  var HQSelect = '';
-	  	  var ZoneSelect = '';
-	  	  var ExSelect = '';
-	  
-	  	  for (var i = 0; i < officerMasterList.length; i++) {
-	  		  if(officerMasterList[i].zone_id=="HQ"){
-	  			  HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  		  else if(officerMasterList[i].zone_id=="99"){
-	  			  ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  		  else{
-	  			  ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  	  }
-	  	  
-	  	  if(type=="HQSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>`;
-	  	  }
-	  	  if(type=="ZoneSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>`;
-	  	  }
-	  	  if(type=="ExSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>`;
-	  	  }
-	  	  return '';
-		}
-		
-		function form_btn_enable(){
-			$("#resetFormBtn").prop("disabled", false);
-			$("#requestSubmitBtn").prop("disabled", false);
-			$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-		}
-		
-		function form_btn_disable(){
-			$("#resetFormBtn").prop("disabled", true);
-			$("#requestSubmitBtn").prop("disabled", true);
-			// Show the loading icon on the button
-			$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-		}
-		
-		function getMappingByComplaintsID(complaintTypeId){
-				
-				$.ajax({
-				    type: "GET",
-				    url: '/gcc/api/c_petition/getComplaintMappingDetails',
-				    data: {
-				        'petitionId': petitionId,
-						'petitionNo': petitionNo,
-						'complaintTypeId': complaintTypeId
-				    },
-					dataType: 'json',
-				}).done(function(response) {
-					
-					//console.log(response);
-					
-					if(response.length>0){
-						var comid = response[0]["complaint_typeid"];
-						var offid = response[0]["off_id"];
-						var mapid = response[0]["mapid"];
-						loadSelectforUpdate(comid,offid,comid);
-					}
-					
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-						
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-					    
-				});
-		}
-		
-		function loadSelectforUpdate(comid,offid,id){
-			var type ="NULL";
-	  	  	var HQSelect = '';
-	  	  	var ZoneSelect = '';
-	  	  	var ExSelect = '';
-	  
-			for (var i = 0; i < officerMasterList.length; i++) {
-		  		//console.log(officerMasterList[i]);
-				if(officerMasterList[i].zone_id=="HQ"){
-			  
-				  	if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "HQSelect";
-				  		HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-				  	}
-				  	else{
-				  		HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-				  	}
-					  
-				}
-				else if(officerMasterList[i].zone_id=="99"){
-					if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "ExSelect";
-						ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-		  			}
-		  			else{
-		  				ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  			}
-				}
-				else{
-					if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "ZoneSelect";
-						//console.log(type + " === "+ officerMasterList[i].offId +" == "+ offid);
-						ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-				  	}
-				  	else{
-				  		ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-				  	}  
-				}
-			}  
-			
-			//console.log("comid : "+comid +",\noffid : "+offid+",\nid : "+id+",\ntype : "+type);
-			
-			if(type=="HQSelect"){
-				//console.log("I am from HQSelect: \n #officers"+id);
-				$("#officedata"+id).html('<div class="mb-4">' +
-				           '<label for="office$'+id+'">Select Office</label>' +
-				           '<select name="office[]" id="office$'+id+'" class="form-control" onchange="javascript:callofficers(this.value,'+id+')">' +
-				           '<option value="0">Select Office</option>' +
-				           '<option value="1" Selected>HQ</option>' +
-				           '<option value="2">Zonal Office</option>' +
-				           '</select>' +
-				           '</div>');
-			  	 HQSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>`;
-		 		$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${HQSelectHTML}</div>`);
-		 
-			}
-			if(type=="ZoneSelect"){
-				//console.log("I am from ZoneSelect: \n #officers"+id);
-				$("#officedata"+id).html('<div class="mb-4">' +
-				           '<label for="office$'+id+'">Select Office</label>' +
-				           '<select name="office[]" id="office$'+id+'" class="form-control" onchange="javascript:callofficers(this.value,'+id+')">' +
-				           '<option value="0">Select Office</option>' +
-				           '<option value="1">HQ</option>' +
-				           '<option value="2" Selected>Zonal Office</option>' +
-				           '</select>' +
-				           '</div>');
-				  
-				ZoneSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>`;
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${ZoneSelectHTML}</div>`);
-			}
-			if(type=="ExSelect"){
-				//console.log("I am from ExSelect: \n #officers"+id);
-				ExSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>`;
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${ExSelectHTML}</div>`);
-			}
-		 
-		}
-		
-		function call_petition_search_from(errorTXT){
-			var errorHTML = "";
-			if(errorTXT!=""){
-				errorHTML = `<div class="form-group text-center text-danger">${errorTXT}</div>`;
-			}
-			var searchFormHTML = `<form class="search-form" id="search-form" onsubmit="return searchRequest();">
-										<div class="card-header">
-						                <h3>Edit / Update Petition Form</h3>
-						                <div class="card-header-right">
-						                    <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-						                </div>
-						            </div>
-						       		<div class="card-body">
-						       			<div class="row">
-											<div class="col-12 text-center">
-												${errorHTML}
-												<div class="form-group">
-						                            <label for="petitionNoSearch">Petition No / மனு எண் </label>
-						                            <input type="text" class="form-control text-center" name="petitionNoSearch" id="petitionNoSearch" autocomplete="off" placeholder="CP00000000" maxlength="10" required>
-						                        </div>
-						                        
-											</div>
-											<div class="col-12">
-												<div class="block-content" id="userinfo2">
-													<div id="comp_mapping_to_officers" class="row"></div>
-												</div>
-										 	</div>
-										</div>
-						          	</div>
-						          	<div class="card-footer text-center">
-										<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            	<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						        	</div>
-						    	</form>`;
-			
-			$("#petitionUpdateForm").html(searchFormHTML);
-			$('#petitionNoSearch').mask('MP00000000');
-		}
-		
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/c_petition/update-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			
-			if(petitionNo!=null && petitionNo!="error"){
-				get_complaint_type_data();
-				get_officer_master_data();
-			}
-			else{
-				if(petitionNo=="error"){
-					call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				}
-				else{
-					call_petition_search_from("");
-				}
-			}
-			
-		});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/c_petition/petition_view.html b/src/main/resources/templates/modules/c_petition/petition_view.html
deleted file mode 100644
index 2d786f84..00000000
--- a/src/main/resources/templates/modules/c_petition/petition_view.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>View Petition</h5>
-                                            <span>Councillor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Councillor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">View Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Petition Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="window.print()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">நாள் / Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="cdate_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petition_no_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_name_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_mobile_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Address of petitioner / மனுதாரரின் முகவரி:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_address_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">புகாரின் தன்மை / Nature of complaint:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="complaint_nature_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											      	<tr>
-											          <th style="padding: 0.45rem 0.45rem;">Petition Status: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_status_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total number of complaints in this petition: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Completed:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_completed_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Pending:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_pending_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-												
-												
-												<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th id="petition_summary_title">Pending Summary</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-									                	<tr style="background-color:#fbffe0;">
-												          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_summary_html"></td>
-												        </tr>
-								                	</tbody>
-								              	</table>
-								              	
-											</div>
-										</div>
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/c_petition/script :: script}"></script>
-        <script th:replace="~{fragments/modules/c_petition/petition_view_script :: script}"></script>
-       	
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/c_petition/petition_view_modal_page.html b/src/main/resources/templates/modules/c_petition/petition_view_modal_page.html
deleted file mode 100644
index e3eb1b59..00000000
--- a/src/main/resources/templates/modules/c_petition/petition_view_modal_page.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Petition Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="window.print()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">நாள் / Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="cdate_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petition_no_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_name_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_mobile_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">மனுதாரரின் முகவரி / Address of petitioner:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_address_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">புகாரின் தன்மை / Nature of complaint:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="complaint_nature_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											      	<tr>
-											          <th style="padding: 0.45rem 0.45rem;">Petition Status: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_status_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total number of complaints in this petition: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Completed:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_completed_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Pending:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_pending_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-												
-												
-												<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th id="petition_summary_title">Pending Summary</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-									                	<tr style="background-color:#fbffe0;">
-												          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_summary_html"></td>
-												        </tr>
-								                	</tbody>
-								              	</table>
-								              	
-											</div>
-										</div>
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/c_petition/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/c_petition/petition_view_script :: script}"></script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/callcenter/addcategory.html b/src/main/resources/templates/modules/callcenter/addcategory.html
deleted file mode 100644
index f2694ec7..00000000
--- a/src/main/resources/templates/modules/callcenter/addcategory.html
+++ /dev/null
@@ -1,974 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-	color: red;
-}
-
-/* Custom CSS for SweetAlert2 */
-.swal-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.swal-popup {
-    width: 80% !important; /* Adjust width as needed */
-    max-width: 600px; /* Max width for larger screens */
-    border-radius: 8px; /* Optional: round the corners */
-    padding: 2rem; /* Optional: adjust padding */
-}
-
-.swal-confirm-button {
-    background-color: #dc3545; /* Example: red background for delete button */
-    border: none;
-    color: #fff;
-}
-
-.swal-cancel-button {
-    background-color: #6c757d; /* Example: gray background for cancel button */
-    border: none;
-    color: #fff;
-}
-
-#addcategoryform .modal-body {
-    max-height: 500px; /* Set max height */
-    overflow-y: auto; /* Enable vertical scrolling when content overflows */
-}
-
-#editCategoryModal .modal-body {
-    max-height: 500px; /* Set max height */
-    overflow-y: auto; /* Enable vertical scrolling when content overflows */
-}
-
-
-
-</style>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fas fa-th-large bg-blue"></i>
-									<div class="d-inline">	
-										<h5>Add Category</h5>
-										<span>1913 Add Category</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 Campaign</li>
-										<li class="breadcrumb-item active" aria-current="page">Add Category</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-                    <h4 class="h4 text-right text-mute" style="font-size: 12px;">
-						Auot refresh in <font id="refresh-countdown">00</font> seconds
-					</h4>    
-                      
-                      <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                    <div class="page-header-title" >
-										<h5 style="margin: 0;font-weight: bold;">Category List</h5><hr>
-								   </div> 
-                                        <div>
-											<table id="categoryDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-													    <tr role="row">
-													        <th class="text-center no-sort">S.No</th>
-													        <th class="text-center">Category</th>
-													        <th class="text-center no-sort">Action</th>
-													    </tr>
-													</thead>
-													<tbody>
-													    <tr th:each="category, iterStat : ${categories}">
-													        <td class="text-center" th:text="${iterStat.index + 1}"></td>
-													        <td class="text-center" th:text="${category.category_name}"></td>
-													        <td class="text-center">
-													            <a href="#" th:onclick="return callEdit([[${category.category_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Edit" data-original-title="Edit">
-													                <i class="ik ik-edit f-16 mr-15 text-green"></i>
-													            </a>
-													                       <!-- Delete button -->
-													            <a href="javascript:void(0);" th:onclick="return openDeleteModal([[${category.category_id}]])" title="Delete">
-													                <i class="ik ik-trash-2 f-16 text-red ml-4"></i>
-													            </a>
-													        </td>
-													    </tr>
-													</tbody>
-
-
-													<tfoot class="thead-dark">
-													    <tr>
-													        <th class="text-center no-sort">S.No</th>
-													        <th class="text-center">Category</th>
-													        <th class="text-center no-sort">Action</th>
-													    </tr>
-													</tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	<!-- Category Modal Form -->
-	<div class="modal fade" id="addcategoryform" tabindex="-1" role="dialog">
-	    <div class="modal-dialog modal-lg" role="document">
-	        <div class="modal-content">
-	            <div class="modal-header">
-	                <h5 class="modal-title">Category Form</h5>
-	                <button type="button" class="close" data-dismiss="modal">&times;</button>
-	            </div>
-	            <div class="modal-body">
-	            <form id="addCategoryForm">
-				    <div class="form-group">
-				        <label>Category Name <span class="required">*</span></label>
-				        <input type="text" class="form-control" id="categoryname" name="categoryname" placeholder="Enter Category Name" required>
-				    </div>
-				
-				    <div id="columnInputs">
-				    
-				    
-				     <label>Column Name <span class="required">*</span></label>
-				        <div class="form-group row column-group">
-				       
-				            <div class="col-sm-10">
-				                <input type="text" class="form-control columnname" name="columns[]" placeholder="Column Name" required>
-				            </div>
-				            <div class="col-sm-2">
-				                <button type="button" class="btn btn-danger remove-column">&times;</button>
-				            </div>
-				        </div>
-				    </div>
-					<button type="button" class="btn btn-primary" id="addMoreColumn">+ Add Column</button>
-				    <button type="button" class="btn btn-success" id="createCategoryBtn">Save Category</button>			
-				    
-				</form>
-	
-	            </div>
-	        </div>
-	    </div>
-	</div>
-
-
-	<!-- Edit Category Modal -->
-	<div class="modal fade" id="editCategoryModal" tabindex="-1" role="dialog" aria-labelledby="editCategoryModalLabel" aria-hidden="true">
-	    <div class="modal-dialog modal-lg" role="document">
-	        <div class="modal-content">
-	            <div class="modal-header">
-	                <h5 class="modal-title" id="editCategoryModalLabel">Edit Category</h5>
-	                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-	                    <span aria-hidden="true">&times;</span>
-	                </button>
-	            </div>
-	            <div class="modal-body">
-	                <form id="editCategoryForm">
-	                    <input type="hidden" id="categoryId" name="categoryId">
-	                    
-	                    <div class="form-group">
-	                        <label for="showcategoryName">Category Name <span class="required">*</span></label>
-	                        <input type="text" class="form-control" id="showcategoryName" name="showcategoryName" required readonly="readonly">
-	                    </div>
-	
-	                    <div id="editColumnInputs"></div>
-	                    <div id="editaddColumnInputs"></div>
-						<hr>
-	                    <button type="button" class="btn btn-success" id="addMoreEditColumn">+ Add Column</button>	                    
-	                    <button type="button" class="btn btn-primary" id="updateCategoryButton">Save Changes</button>
-	                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-	                </form>
-	            </div>
-	        </div>
-	    </div>
-	</div>
-
-
-		
-	<!-- Delete Confirmation Modal -->
-	<div class="modal fade" id="deleteCategoryModal" tabindex="-1" role="dialog" aria-labelledby="deleteCategoryModalLabel" aria-hidden="true">
-	    <div class="modal-dialog modal-lg" role="document"> <!-- Add modal-lg here -->
-	        <div class="modal-content">
-	            <div class="modal-header">
-	                <h5 class="modal-title" id="deleteCategoryModalLabel">Confirm Deletion</h5>
-	                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-	                    <span aria-hidden="true">&times;</span>
-	                </button>
-	            </div>
-	            <div class="modal-body">
-	                <p>Are you sure you want to delete this category?</p>
-	            </div>
-	            <div class="modal-footer">
-	                <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-	                <button type="button" class="btn btn-danger" id="confirmDeleteButton">Delete</button>
-	            </div>
-	        </div>
-	    </div>
-	</div>
-
-        
-             
-             
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-        
-        <script>
-        $(document).ready(function () {
-            // Initialize DataTables with export buttons
-            var 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'
-                },
-                {
-                	
-                	    text: '<i class="far fa-plus-square"></i> Add New Category',
-                	    className: 'btn btn-warning',
-                	    action: function () {
-                	        callAdd(); // Now it will work
-                	    }
-                	
-
-                }
-            ]; 
-
-            $('#categoryDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { targets: 'no-sort', orderable: false }
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-                ],
-                scrollY: '30vh',
-                fixedColumns: {
-                    left: 1,
-                    right: 1
-                },
-                buttons: buttons,
-                fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false,
-            });
-            
-
-                // Show Modal
-                function callAdd() {
-                    resetForm();
-                    $('#addcategoryform').modal({ backdrop: 'static', keyboard: false });
-                    $('#addcategoryform').modal('show');
-                }
-
-                // Reset Form
-                function resetForm() {
-                    $('#addCategoryForm')[0].reset();
-                    $("#columnInputs .column-group:not(:first)").remove();
-                    $(".remove-column").hide();
-                }
-                
-                //validateColumns
-                function validateColumns(columns) {
-    let columnSet = new Set();
-    let regex = /^[A-Za-z0-9_ ]+$/; // Allow alphabets, numbers, underscores, and spaces
-    let invalidRegex = /^[_ ]+$/; // Match column names with only underscores and/or spaces
-
-    for (let col of columns) {
-        if (!regex.test(col)) {
-            Swal.fire({
-                title: "Validation Error",
-                text: "Column names must contain only alphabets (A-Z, a-z), numbers (0-9), underscores (_), and spaces.",
-                icon: "warning",
-                confirmButtonText: "OK"
-            });
-            return false;
-        }
-        if (invalidRegex.test(col)) {
-            Swal.fire({
-                title: "Validation Error",
-                text: "Column names cannot contain only spaces and underscores (_).",
-                icon: "warning",
-                confirmButtonText: "OK"
-            });
-            return false;
-        }
-        let trimmedCol = col.trim().toLowerCase(); // Trim spaces for uniqueness check
-        if (columnSet.has(trimmedCol)) {
-            Swal.fire({
-                title: "Validation Error",
-                text: "Duplicate column names are not allowed.",
-                icon: "warning",
-                confirmButtonText: "OK"
-            });
-            return false;
-        }
-        columnSet.add(trimmedCol);
-    }
-    return true;
-}
-                
-                
-
-
-
-              // Add default fields on page load
-                /* var defaultFields = `
-                    <div class="form-group row column-group">
-                        <div class="col-sm-10">
-                            <input type="text" class="form-control" name="columns[]" value="name" readonly>
-                            <input type="text" class="form-control" name="columns[]" value="mobilenumber" readonly>
-                            <input type="text" class="form-control" name="columns[]" value="address" readonly>
-                        </div>
-                    </div>`;
-                $('#columnInputs').append(defaultFields); */
-                
-                
-                var defaultFields = `
-                    <div class="form-group row column-group">
-                        <div class="col-sm-10">
-                            <input type="text" class="form-control" name="columns[]" value="Name" >
-                        </div>
-                    </div>
-                    <div class="form-group row column-group">
-                        <div class="col-sm-10">
-                            <input type="text" class="form-control" name="columns[]" value="Mobilenumber" >
-                        </div>
-                    </div>
-
-                    </div>`;
-
-                $('#columnInputs').append(defaultFields);
-
-                $('#addcategoryform').on('shown.bs.modal', function () {
-                    $('#columnInputs').html(''); // Clear existing columns
-                    $('#columnInputs').append(defaultFields); // Append default values
-                });
-
-
-                $('#addcategoryform').on('hidden.bs.modal', function () {
-                    $('#categoryname').val("");  // Reset category name
-                    $('#columnInputs').html(""); // Clear all columns
-                });
-                $('#editCategoryModal').on('hidden.bs.modal', function () {
-                    $('#editColumnInputs').html('');  // Clear all columns when modal is closed
-                    $('#editaddColumnInputs').html(''); // Clear additional columns if applicable
-                });
-
-                // Add More Column Fields
-                $('#addMoreColumn').click(function () {
-                	
-                	
-                    var newColumnField = `
-                        <div class="form-group row column-group">
-                            <div class="col-sm-10">
-                                <input type="text" class="form-control columnname" name="columns[]" placeholder="Column Name" required>
-                            </div>
-                            <div class="col-sm-2">
-                                <button type="button" class="btn btn-danger remove-column">&times;</button>
-                            </div>
-                        </div>`;
-                    $('#columnInputs').append(newColumnField);
-                    $('.remove-column').show();
-                });
-
-                // Remove Column Field
-                $(document).on('click', '.remove-column', function () {
-                    $(this).closest('.column-group').remove();
-                    if ($('.column-group').length === 1) {
-                        $('.remove-column').hide();
-                    }
-                }); 
-                
-                $('#createCategoryBtn').click(function () {
-                    var categoryName = $('#categoryname').val().trim();
-                    //var columnNames = $('.columnname').map(function () {
-                    var columnNames = $('input[name="columns[]"]').map(function () {
-                        return $(this).val().trim();
-                    }).get().filter(name => name !== "");
-
-                    console.log("categoryName=", categoryName);
-                    console.log("columnNames=", columnNames);
-
-                    if (categoryName === "") {
-                        Swal.fire({
-                            title: "Validation Error",
-                            text: "Please enter a category name.",
-                            icon: "warning",
-                            confirmButtonText: "OK"
-                        });
-                        return;
-                    }
-
-                    if (columnNames.length < 2) {
-                        Swal.fire({
-                            title: "Validation Error",
-                            text: "Please enter at least two column names.",
-                            icon: "warning",
-                            confirmButtonText: "OK"
-                        });
-                        return;
-                    }
-
-                    if (!validateColumns(columnNames)) {
-                        return;
-                    }
-                    
-                    $('#createCategoryBtn').prop('disabled', true).text('Processing...');
-
-                     $.ajax({
-                        url: '/gcc/api/category/save',
-                        type: 'POST',
-                        contentType: 'application/json',
-                        data: JSON.stringify({ categoryname: categoryName, columns: columnNames }),
-                        success: function (response) {
-                        	$('#createCategoryBtn').prop('disabled', false).text('Save Category');
-                            Swal.fire({
-                                title: "Success",
-                                text: "Category saved successfully!",
-                                icon: "success",
-                                confirmButtonText: "OK"
-                            }).then(function () {
-                                $('#addcategoryform').modal('hide');
-                                $('#createCategoryBtn').prop('disabled', false).text('Save Category');
-                                location.reload();
-                            });
-                        },
-                        error: function (error) {
-                        	$('#createCategoryBtn').prop('disabled', false).text('Save Category');
-                            Swal.fire({
-                                title: "Error",
-                                text: error.responseText,
-                                icon: "error",
-                                confirmButtonText: "OK"
-                            });
-                        }
-                    }); 
-                });
-                
-/*                 $('#createCategoryBtn').click(function () {
-                    var categoryName = $('#categoryname').val().trim();
-                    var columnNames = $('.columnname').map(function () {
-                        return $(this).val().trim();
-                    }).get().filter(name => name !== "");
-                    console.log("categoryName=========="+categoryName);
-                    console.log("columnNames=========="+columnNames);
-                    // Validation: Ensure category name is not empty and at least two columns are provided
-                    if (categoryName === "") {
-                        Swal.fire({
-                            title: 'Validation Error',
-                            text: 'Please enter a category name.',
-                            icon: 'warning',
-                            confirmButtonText: 'OK'
-                        });
-                        return;
-                    }
-
-                    if (columnNames.length < 2) {
-                        Swal.fire({
-                            title: 'Validation Error',
-                            text: 'Please enter at least two column names.',
-                            icon: 'warning',
-                            confirmButtonText: 'OK'
-                        });
-                        return;
-                    }
-                    
-                   
-                    // Proceed with AJAX request if validation passes
-                    $.ajax({
-                        url: '/gcc/api/category/save',
-                        type: 'POST',
-                        contentType: 'application/json',
-                        data: JSON.stringify({ categoryname: categoryName, columns: columnNames }),
-                        success: function (response) {
-                            Swal.fire({
-                                title: 'Success',
-                                text: 'Category saved successfully!',
-                                icon: 'success',
-                                confirmButtonText: 'OK'
-                            }).then(function () {
-                                $('#addcategoryform').modal('hide');
-                                location.reload();
-                            });
-                        },
-                        error: function (error) {
-                            Swal.fire({
-                                title: 'Error',
-                                text: error.responseText,
-                                icon: 'error',
-                                confirmButtonText: 'OK'
-                            });
-                        }
-                    });
-                }); */
- 
-             // Function to fetch category details and populate the edit modal
-                window.callEdit = function (categoryId) {
-                    fetchCategoryDetails(categoryId);
-                    return false;
-                };
-
-                function fetchCategoryDetails(categoryId) {
-                    $.ajax({
-                        url: '/gcc/api/category/showcategoryId',
-                        type: 'GET',
-                        data: { category_id: categoryId },
-                        success: function (response) {
-                            if (response) {
-                                $('#categoryId').val(response.category_id);
-                                $('#showcategoryName').val(response.category_name);
-
-                                $('#editColumnInputs').empty();
-                                
-                                $('#editaddColumnInputs').empty();
-                                
-                                if (response.columns && response.columns.length > 0) {
-                                    response.columns.forEach(col => addEditColumnField(col.id, col.column_name));
-                                } else {
-                                    addEditColumnField();
-                                }
-
-                                $('#editCategoryModal').modal({ backdrop: 'static', keyboard: false });
-                            } else {
-                                Swal.fire('Error', 'Category not found.', 'error');
-                            }
-                        },
-                        error: function (xhr) {
-                            Swal.fire('Error', 'Error fetching category details: ' + xhr.responseText, 'error');
-                        }
-                    });
-                }
-
-                
-                
-                function addEditColumnField(id = "", value = "", containerId = "editColumnInputs") {
-                    let removeButton = containerId === "editColumnInputs"
-                        ? `<button type="button" class="btn btn-danger" onclick="removeColumn(this, '${id}')">&times;</button>`
-                        : `<button type="button" class="btn btn-danger remove-column">&times;</button>`;
-
-                    let columnField = `
-                        <div class="form-group row column-group">
-                            <input type="hidden" class="showcolumnId" value="${id}">
-                            <div class="col-sm-10">
-                                <input type="text" class="form-control showcolumnname" name="columns[]" placeholder="Column Name" value="${value}" required>
-                            </div>
-                            <div class="col-sm-2">
-                                ${removeButton}
-                            </div>
-                        </div>`;
-                    $('#' + containerId).append(columnField);
-                }
-
-
-                $('#addMoreEditColumn').click(function () {
-                    addEditColumnField("", "", "editaddColumnInputs");
-                });
-                
-                $(document).ready(function () {
-                    window.removeColumn = function (button, columnId) {
-                        if (columnId) {
-                            Swal.fire({
-                                title: "Are you sure?",
-                                text: "This column will be permanently deleted!",
-                                icon: "warning",
-                                showCancelButton: true,
-                                confirmButtonColor: "#d33",
-                                cancelButtonColor: "#3085d6",
-                                confirmButtonText: "Yes, delete it!"
-                            }).then((result) => {
-                                if (result.isConfirmed) {
-                                    $.ajax({
-                                        url: '/gcc/api/category/deleteColumnById',
-                                        type: 'POST',
-                                        data: { columnId: columnId },
-                                        success: function (response) {
-                                        	if (response.success) {
-                                                $(button).closest('.column-group').remove();
-                                                Swal.fire({
-                                                    title: "Deleted!",
-                                                    text: "Column has been removed.",
-                                                    icon: "success",
-                                                    timer: 2000,  // Auto-close after 2 seconds
-                                                    showConfirmButton: false
-                                                });
-                                            } else {
-                                                Swal.fire({
-                                                    title: "Error",
-                                                    text: "Unable to delete column. Try again.",
-                                                    icon: "error",
-                                                    timer: 2000,  // Auto-close after 2 seconds
-                                                    showConfirmButton: false
-                                                });
-                                            }
-                                        },
-                                        error: function (xhr) {
-                                            Swal.fire("Error", "Something went wrong: " + xhr.responseText, "error");
-                                        }
-                                    });
-                                }
-                            });
-                        } else {
-                            console.log("columnId=" + columnId);
-                            Swal.fire("Error!", "Problem in columnId", "error");
-                        }
-                    };
-                });
-
-
-
-                // Event to remove column input dynamically
-                $(document).on('click', '.remove-column', function () {
-                    $(this).closest('.column-group').remove();
-                });
-               
-                $('#updateCategoryButton').click(function () {
-                    let categoryId = parseInt($('#categoryId').val(), 10);
-
-                    let existingColumns = [];
-                    $('#editColumnInputs .column-group').each(function () {
-                        let columnId = parseInt($(this).find('.showcolumnId').val(), 10);
-                        let columnName = $(this).find('.showcolumnname').val();
-                        if (columnName.trim() !== "") {
-                            existingColumns.push({ id: columnId, name: columnName });
-                        }
-                    });
-
-                    let newColumns = [];
-                    $('#editaddColumnInputs .column-group').each(function () {
-                        let columnName = $(this).find('.showcolumnname').val();
-                        if (columnName.trim() !== "") {
-                            newColumns.push({ name: columnName });
-                        }
-                    });
-
-                    console.log("Category ID:", categoryId);
-                    console.log("Existing Columns:", existingColumns);
-                    console.log("New Columns:", newColumns);
-
-                    let allColumnNames = [...existingColumns.map(col => col.name), ...newColumns.map(col => col.name)];
-
-                    console.log("allColumnNames="+allColumnNames);
-                    
-                    if ((existingColumns.length + newColumns.length) < 2) {
-                        Swal.fire({
-                            title: "Info",
-                            text: "You must have at least 2 columns!",
-                            icon: "info",
-                            confirmButtonText: "OK"
-                        });
-                        return;
-                    }
-
-                    if (!validateColumns(allColumnNames)) {
-                        return;
-                    }
-                    
-                    $('#updateCategoryButton').prop('disabled', true).text('Processing');
-
-                    $.ajax({
-                        url: '/gcc/api/category/updateCategoryColumns',
-                        type: 'POST',
-                        contentType: 'application/json',
-                        data: JSON.stringify({ categoryId: categoryId, columns: existingColumns }),
-                        success: function (response) {
-                        	$('#updateCategoryButton').prop('disabled', false).text('Save Changes');
-                            if (response.success) {
-                                Swal.fire({
-                                    title: "Success!",
-                                    text: "Category updated successfully!",
-                                    icon: "success",
-                                    showConfirmButton: false,
-                                    timer: 2000
-                                }).then(() => {
-                                	$('#updateCategoryButton').prop('disabled', false).text('Save Changes');
-                                    location.reload();
-                                });
-                            } else {
-                            	$('#updateCategoryButton').prop('disabled', false).text('Save Changes');
-                                Swal.fire({
-                                    title: "Error",
-                                    text: "Unable to update column. Try again.",
-                                    icon: "error",
-                                    showConfirmButton: true
-                                });
-                            }
-                        },
-                        error: function (xhr) {
-                        	$('#updateCategoryButton').prop('disabled', false).text('Save Changes');
-                            Swal.fire("Error", "Failed to update category: " + xhr.responseText, "error");
-                        }
-                    });
-
-                    if (newColumns.length > 0) {
-                    	$('#updateCategoryButton').prop('disabled', true).text('Processing');
-                        $.ajax({
-                            url: '/gcc/api/category/addNewColumns',
-                            type: 'POST',
-                            contentType: 'application/json',
-                            data: JSON.stringify({ categoryId: categoryId, columns: newColumns }),
-                            success: function (response) {
-                            	$('#updateCategoryButton').prop('disabled', false).text('Save Changes');
-                                if (response.success) {
-                                    Swal.fire({
-                                        title: "Success!",
-                                        text: "Category updated successfully!",
-                                        icon: "success",
-                                        showConfirmButton: false,
-                                        timer: 2000
-                                    }).then(() => {
-                                    	$('#updateCategoryButton').prop('disabled', false).text('Save Changes');
-                                        location.reload();
-                                    });
-                                } else {
-                                	$('#updateCategoryButton').prop('disabled', false).text('Save Changes');
-                                    Swal.fire({
-                                        title: "Error",
-                                        text: "Unable to update column. Try again.",
-                                        icon: "error",
-                                        showConfirmButton: true
-                                    });
-                                }
-                            },
-                            error: function (xhr) {
-                            	$('#updateCategoryButton').prop('disabled', false).text('Save Changes');
-                                Swal.fire("Error", "Failed to add new columns: " + xhr.responseText, "error");
-                            }
-                        });
-                        $('#updateCategoryButton').prop('disabled', false).text('Save Changes');
-                    }
-                });
-                
-                
-/*                 $('#updateCategoryButton').click(function () {
-                	 let categoryId = parseInt($('#categoryId').val(), 10);
-                    
-                    // Collect existing columns
-                    let existingColumns = [];
-                    $('#editColumnInputs .column-group').each(function () {
-                        let columnId = parseInt($(this).find('.showcolumnId').val(), 10);
-                        let columnName = $(this).find('.showcolumnname').val();
-                        if (columnName.trim() !== "") {
-                            existingColumns.push({ id: columnId, name: columnName });
-                        }
-                    });
-
-                    // Collect new columns
-                    let newColumns = [];
-                    $('#editaddColumnInputs .column-group').each(function () {
-                        let columnName = $(this).find('.showcolumnname').val();
-                        if (columnName.trim() !== "") {
-                            newColumns.push({ name: columnName });
-                        }
-                    });
-                    
-                 // Debugging: Log values before AJAX calls
-                    console.log("Category ID:", categoryId);
-                    console.log("Existing Columns:", existingColumns);
-                    console.log("New Columns:", newColumns);
-
-                    if ((existingColumns.length + newColumns.length) < 2) {
-                        Swal.fire({
-                            title: "Info",
-                            text: "You must have at least 2 columns!",
-                            icon: "info",
-                            confirmButtonText: "OK"
-                        });
-                        return; // Stop execution if condition fails
-                    }
-
-                    // 1️⃣ Send existing columns update AJAX
-                     $.ajax({
-                        url: '/gcc/api/category/updateCategoryColumns',
-                        type: 'POST',
-                        contentType: 'application/json',
-                        data: JSON.stringify({ categoryId: categoryId, columns: existingColumns }),
-                        success: function (response) {
-                            
-                            if (response.success) {
-                               
-                                Swal.fire({
-                                    title: "Success!",
-                                    text: "Category updated successfully!",
-                                    icon: "success",                                   
-                                    showConfirmButton: false,
-                                    timer: 2000 // Show message for 2 seconds
-                                }).then(() => {
-                                    location.reload(); // Reload the page after SweetAlert closes
-                                });
-                            } else {
-                                Swal.fire({
-                                    title: "Error",
-                                    text: "Unable to update column. Try again.",
-                                    icon: "error",
-                                    showConfirmButton: true
-                                });
-                            }
-                        },
-                        error: function (xhr) {
-                            Swal.fire("Error", "Failed to update category: " + xhr.responseText, "error");
-                        }
-                    }); 
-
-                    // 2️⃣ Send new columns addition AJAX (only if there are new columns)
-                     if (newColumns.length > 0) {
-                        $.ajax({
-                            url: '/gcc/api/category/addNewColumns',
-                            type: 'POST',
-                            contentType: 'application/json',
-                            data: JSON.stringify({ categoryId: categoryId, columns: newColumns }),
-                            success: function (response) {
-                            	 if (response.success) {
-                                     
-                            		 Swal.fire({
-                                         title: "Success!",
-                                         text: "Category updated successfully!",
-                                         icon: "success",                                   
-                                         showConfirmButton: false,
-                                         timer: 2000 // Show message for 2 seconds
-                                     }).then(() => {
-                                         location.reload(); // Reload the page after SweetAlert closes
-                                     });
-                                 } else {
-                                     Swal.fire({
-                                         title: "Error",
-                                         text: "Unable to update column. Try again.",
-                                         icon: "error",
-                                         showConfirmButton: true
-                                     });
-                                 }
-                            },
-                            error: function (xhr) {
-                                Swal.fire("Error", "Failed to add new columns: " + xhr.responseText, "error");
-                            }
-                        });
-                    } 
-                }); */
-
-                
-               
-
-     
-          window.openDeleteModal = function (categoryId) {
-        	    $('#categoryId').val(categoryId); // Set the categoryId before showing the modal
-        	    fetchDeleteCategoryDetails();
-        	    return false; // Prevent default anchor click behavior
-        	};
-       
-		    function fetchDeleteCategoryDetails() {
-		        Swal.fire({
-		            title: 'Confirm Deletion',
-		            text: 'Are you sure you want to delete this category?',
-		            icon: 'warning',
-		            showCancelButton: true,
-		            confirmButtonText: 'Delete',
-		            cancelButtonText: 'Cancel',
-		            customClass: {
-		                container: 'swal-container',
-		                popup: 'swal-popup',
-		                confirmButton: 'swal-confirm-button',
-		                cancelButton: 'swal-cancel-button'
-		            },
-		            width: '80%',
-		            padding: '3rem',
-		            heightAuto: false
-		        }).then((result) => {
-		            if (result.isConfirmed) {
-		                // Call the function to delete the category
-		                deleteCategory();
-		            }
-		        });
-		    }
-
-		    function deleteCategory() {
-		        var categoryId = $('#categoryId').val(); // Ensure this is correctly set
-		        console.log("Deleting category with ID: " + categoryId); // Debugging line
-		        $.ajax({
-		            url: '/gcc/api/category/delete/' + categoryId,
-		            type: 'DELETE',
-		            success: function (response) {
-		                Swal.fire({
-		                    title: 'Deleted!',
-		                    text: 'Category has been deleted.',
-		                    icon: 'success'
-		                }).then(() => {
-		                    location.reload(); // Refresh the page or update the UI as needed
-		                });
-		            },
-		            error: function (xhr, status, error) {
-		                Swal.fire({
-		                    title: 'Error',
-		                    text: 'Error deleting category: ' + xhr.responseText,
-		                    icon: 'error'
-		                });
-		            }
-		        });
-		    }
-
-        });
-
-            
-				
-		</script>
-        
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenter/agentscampaign.html b/src/main/resources/templates/modules/callcenter/agentscampaign.html
deleted file mode 100644
index 1964e62f..00000000
--- a/src/main/resources/templates/modules/callcenter/agentscampaign.html
+++ /dev/null
@@ -1,1807 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.custom-width1 {
-	width: 140px; /* Adjust the width as needed */
-}
-
-.custom-width2 {
-	width: 200px; /* Adjust the width as needed */
-}
-
-.custom-width3 {
-	width: 100px;
-}
-
-table td {
-	text-align: center;
-}
-
-#campaignTable {
-	display: none;
-}
-
-.modal-body {
-	max-height: 70vh;
-	overflow-y: auto; /* Enables vertical scrolling */
-	overflow-x: hidden; /* Hides horizontal scrolling */
-	padding-right: 15px; /* Prevents content cutoff */
-}
-</style>
-<body>
-
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fas fa-headset bg-blue"></i>
-									<div class="d-inline">
-										<h5>Agent's Campaign</h5>
-										<span>1913 Agent's Campaign</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913
-											Campaign</li>
-										<li class="breadcrumb-item active" aria-current="page">Agents
-											Campaign</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<h4 class="h4 text-right text-mute" style="font-size: 12px;">
-						Auto refresh in <font id="refresh-countdown">00</font> seconds
-					</h4>
-
-					<div class="row">
-						<div class="col-md-12 mt-2">
-							<div class="card">
-								<div class="card-block">
-									<div class="page-header-title">
-										<h4 style="margin: 0; font-weight: bold;" class="text-center">
-											<span th:text="${agent_name}"></span>' s Campaign
-										</h4>
-										<div
-											class="mt-2 d-flex justify-content-between align-items-center">
-											<h5 style="margin: 0; font-weight: bold; font-style: italic;">Campaign
-												List</h5>
-											<button type="button" class="btn btn-primary" id="refresh">
-												<i class="ik ik-refresh-ccw"></i>Refresh
-											</button>
-										</div>
-										<hr>
-									</div>
-									<div>
-										<table id="Agenttask"
-											class="table table-striped table-bordered table-hover dataTable"
-											role="grid" style="width: 99%;">
-											<thead class="thead-dark">
-												<tr role="row">
-													<th class="text-center no-sort">S.No</th>
-													<th class="text-center">Category</th>
-													<th class="text-center">CampaignName</th>
-													<th class="text-center">Calls Assigned</th>
-													<th class="text-center">Calls Completed</th>
-													<th class="text-center">Calls Pending</th>
-													<!-- <th class="text-center">C Date</th> -->
-												</tr>
-											</thead>
-											<tbody>
-
-												<tr th:each="agentsCampaign, iterStat : ${agentsCampaigns}">
-													<td th:text="${iterStat.index + 1}" class="text-center"></td>
-													<!-- Serial number -->
-													<td th:text="${agentsCampaign['category_name']}"
-														class="text-center"></td>
-													<!-- Category name -->
-													<td th:text="${agentsCampaign['campaign_name']}"
-														class="text-center"></td>
-													<!-- Campaign name -->
-													<td th:text="${agentsCampaign['calls_assigned']}"
-														class="text-center"></td>
-													<td th:text="${agentsCampaign['complete_count']}"
-														class="text-center"></td>
-													<td th:text="${agentsCampaign['pending_count']}"
-														class="text-center"></td>
-													<!--  <td th:text="${agentsCampaign['created_date']}" class="text-center"></td> -->
-
-
-												</tr>
-
-											</tbody>
-
-
-										</table>
-									</div>
-								</div>
-							</div>
-						</div>
-
-						<div class="col-md-12" id="tablesforcalls" style="display: block;">
-							<div class="card">
-								<div class="card-block">
-
-
-
-									<div class="page-header-title">
-
-
-										<div class="col-md-12">
-											<div class="row">
-												<button id="primaryButton" class="btn btn-success">Non-Processed
-													Calls</button>
-												<button id="secondaryButton"
-													class="btn btn-secondary btn-custom ml-3">Processed
-													Calls</button>
-											</div>
-										</div>
-
-										<hr>
-
-									</div>
-
-									<div>
-										<div class="table-responsive" id="primaryTable"
-											style="display: block;">
-											<table id="AgentDatatable"
-												class="table  table-bordered table-hover  dataTable"
-												role="grid">
-												<thead class="thead-dark">
-													<tr role="row">
-														<th>S.No</th>
-
-														<th class="text-center">Name</th>
-														<th class="text-center">MobileNumber</th>
-
-														<th class="text-center">ViewDetails</th>
-
-														<th class="text-center custom-width1">Callstatus</th>
-
-														<th class="text-center custom-width2">Remarks</th>
-														<th class="text-center">Submit</th>
-
-													</tr>
-												</thead>
-												<tbody>
-													<!-- Loop through the agentsCampaignsList -->
-													<th:block th:each="item, stat : ${agentsCampaignsList}">
-														<tr>
-															<td th:text="${stat.index + 1}"></td>
-															<!-- S.No (Index + 1) -->
-															<td class="text-center" th:text="${item.field_1}"></td>
-															<!-- Name -->
-															<td class="text-center" th:text="${item.field_2}"></td>
-															<!-- Address -->
-
-															<!-- View Details Button -->
-															<!--   <td class="text-center">
-                <button class="btn btn-primary">View</button>
-            </td>-->
-															<!-- View Details Button -->
-															<td class="text-center">
-																<button class="btn btn-primary view-details"
-																	th:data-categoryid="${item.category_id}"
-																	th:data-campaignid="${item.campaign_id}"
-																	th:data-agentid="${item.agent_id}"
-																	th:data-dataid="${item.data_id}" data-toggle="modal"
-																	data-target="#campaignModal">View</button>
-															</td>
-
-															<!--  <td class="text-center">
-    <button class="btn btn-primary questionview-details" 
-            th:data-categoryid="${item.category_id}" 
-            th:data-cmpaignid="${item.campaign_id}" 
-              th:data-agentid="${item.agent_id}" 
-            
-            th:data-dataid="${item.data_id}" 
-            data-toggle="modal" 
-            data-target="#questionCampaignView">
-        View
-    </button>
-</td>-->
-
-
-
-															<!-- Action Dropdown -->
-															<td class="text-center"><select
-																class="form-control action-dropdown"
-																th:id="'callStatusDropdown-' + ${stat.index}"
-																name="action">
-																	<option value="">Select Call Status</option>
-															</select></td>
-
-															<!-- <td class="text-center"><select
-class="form-control form-control-sm action-select action-dropdown">
-	<option value="Select Call Status" selected>Select Call Status</option>
-	<option th:each="status : ${CampActions}"
-		th:value="${status.call_status}"
-		th:text="${status.call_status}"></option>
-</select>
-</td> -->
-
-
-
-
-															<!-- Remarks Textarea -->
-															<td class="text-center"><textarea
-																	class="form-control" name="remarks" id="remarks"
-																	th:text="${item.remarks}"></textarea></td>
-															<td class="text-center">
-																<button class="btn btn-primary submit-button submitid"
-																	th:id="'submit-btn-' + ${stat.index}"
-																	th:data-categoryid="${item.category_id}"
-																	th:data-campaignid="${item.campaign_id}"
-																	th:data-agentid="${item.agent_id}"
-																	th:data-dataid="${item.data_id}"
-																	th:onclick="|submitAction('${item.data_id}', '${stat.index}', '${item.agent_id}', '${item.campaign_id}')|">
-
-																	Submit</button>
-															</td>
-
-
-														</tr>
-													</th:block>
-												</tbody>
-
-
-											</table>
-										</div>
-									</div>
-									<div class="table-responsive" id="secondaryTable"
-										style="display: none;">
-										<table id="AgentDatatable1"
-											class="table  table-bordered table-hover  dataTable"
-											role="grid">
-											<thead class="thead-dark">
-												<tr role="row">
-													<th>S.No</th>
-
-													<th class="text-center">Name</th>
-													<th class="text-center">MobileNumber</th>
-
-													<th class="text-center">ViewDetails</th>
-
-													<th class="text-center custom-width1">Callstatus</th>
-
-													<th class="text-center custom-width2">Remarks</th>
-
-
-												</tr>
-											</thead>
-											<tbody>
-												<!-- Loop through the agentsCampaignsList -->
-												<th:block th:each="item, stat : ${agentsCampaignsList1}">
-													<tr>
-														<td th:text="${stat.index + 1}"></td>
-														<!-- S.No (Index + 1) -->
-														<td class="text-center" th:text="${item.field_1}"></td>
-														<!-- Name -->
-														<td class="text-center" th:text="${item.field_2}"></td>
-														<!-- Address -->
-
-
-														<td class="text-center">
-															<button class="btn btn-primary view-details1"
-																th:data-categoryid="${item.category_id}"
-																th:data-campaignid="${item.campaign_id}"
-																th:data-agentid="${item.agent_id}"
-																th:data-dataid="${item.data_id}" data-toggle="modal"
-																data-target="#campaignModal2">View</button>
-														</td>
-
-
-														<td th:text="${item.call_status}"></td>
-
-
-														<!-- Remarks Textarea -->
-														<td class="text-center"><textarea
-																class="form-control" name="remarks" id="remarks"
-																th:text="${item.remarks}" readonly></textarea></td>
-
-
-													</tr>
-												</th:block>
-											</tbody>
-
-
-										</table>
-									</div>
-
-
-								</div>
-
-							</div>
-						</div>
-
-
-						<div class="col-md-12" id="tablesforpendingcalls"
-							style="display: none;">
-							<div class="card">
-								<div class="card-block">
-									<div class="page-header-title">
-										<h5 style="margin: 0; font-weight: bold;">
-											<span id="campaign-names-display"
-												style="font-weight: bold; color: blue; margin-right: 5px;"></span>-
-											Further Calls List
-										</h5>
-										<hr>
-									</div>
-									<div>
-										<table id="Pendingtasktable"
-											class="table table-bordered table-hover dataTable"
-											role="grid">
-											<thead class="thead-dark">
-												<tr role="row">
-													<th>S.No</th>
-
-													<th class="text-center">Name</th>
-
-													<th class="text-center">Mobile number</th>
-													<th class="text-center">ViewDetails</th>
-													<th class="text-center custom-width1">Callstatus</th>
-													<th class="text-center custom-width2">Remarks</th>
-													<th class="text-center">Send Message</th>
-													<th class="text-center">Status</th>
-												</tr>
-											</thead>
-											<tbody>
-
-											</tbody>
-
-										</table>
-									</div>
-
-
-								</div>
-
-							</div>
-						</div>
-
-
-
-					</div>
-
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-		<!-- <div class="modal fade" id="CampaignView" tabindex="-1"
-    role="dialog" aria-labelledby="CampaignView"
-    aria-hidden="true" data-backdrop="static" data-keyboard="false">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">Campaign Details</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div id="CampaignViewContent">Loading...</div>
-            </div>
-        </div>
-    </div>
-</div>
-   <div class="modal fade" id="questionCampaignView" tabindex="-1"
-    role="dialog" aria-labelledby="CampaignView"
-    aria-hidden="true" data-backdrop="static" data-keyboard="false">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">Campaign Details</h5>
-               <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-    <button type="button" class="btn btn-primary" id="submitAnswers">Submit</button>
-                    
-            </div>
-            <div class="modal-body">
-                <div id="questionsCampaignView">Loading...</div>
-            </div>
-        </div>
-    </div>
-</div> -->
-		<div class="modal fade" id="campaignModal" tabindex="-1" role="dialog"
-			aria-labelledby="campaignModalLabel" aria-hidden="true"
-			data-backdrop="static" data-keyboard="false">
-			<div class="modal-dialog modal-lg modal-dialog-scrollable"
-				role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">Details & Questions</h5>
-						<button type="button" class="close" data-dismiss="modal"
-							aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-					<div class="modal-body">
-						<!-- Section for Campaign Details -->
-						<div id="campaignDetails">
-							<h5>Details</h5>
-							<div id="CampaignViewContent">Loading...</div>
-						</div>
-
-						<hr>
-
-						<!-- Section for Questions and Answers -->
-						<div id="campaignQuestions">
-							<h5>Questions</h5>
-							<div id="questionsCampaignView">Loading...</div>
-						</div>
-					</div>
-					<div class="modal-footer d-flex justify-content-center">
-
-						<button type="button" class="btn btn-primary" id="submitAnswers">Submit
-							Answers</button>
-						<button type="button" class="btn btn-secondary"
-							data-dismiss="modal">Close</button>
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		
-		<div class="modal fade" id="campaignModal2" tabindex="-1" role="dialog"
-			aria-labelledby="campaignModalLabel" aria-hidden="true"
-			data-backdrop="static" data-keyboard="false">
-			<div class="modal-dialog modal-lg modal-dialog-scrollable"
-				role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">Details & Questions</h5>
-						<button type="button" class="close" data-dismiss="modal"
-							aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-					<div class="modal-body">
-						<!-- Section for Campaign Details -->
-						<div id="campaignDetails1">
-							<h5>Details</h5>
-							<div id="CampaignViewContent1">Loading...</div>
-						</div>
-
-						<hr>
-
-						<!-- Section for Questions and Answers -->
-						<div id="campaignQuestions1">
-							<h5>Questions</h5>
-							<div id="questionsCampaignView1">Loading...</div>
-						</div>
-					</div>
-					<div class="modal-footer d-flex justify-content-center">
-
-						<!-- <button type="button" class="btn btn-primary" id="submitAnswers">Submit
-							Answers</button> -->
-						<button type="button" class="btn btn-secondary"
-							data-dismiss="modal">Close</button>
-					</div>
-				</div>
-			</div>
-		</div>
-
-
-
-	</div>
-
-
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script
-		src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-
-
-
-	<script>
-       
-        	  $(document).ready(function() {
-        		  
-        		  $(".view-details1").click(function () {
-      			    let categoryId = $(this).data("categoryid");
-      			    let campaignId = $(this).data("campaignid");
-      			    let agentId = $(this).attr("data-agentid");
-      			    let dataId = $(this).attr("data-dataid");     			   
-
-      			    console.log("Fetching details for categoryId:", categoryId);
-      			    console.log("Fetching questions for campaignId:", campaignId);
-
-      			    // Fetch campaign details
-
-				$.ajax({
-				    url: "/gcc/api/agents/Campaignview",
-				    type: "GET",
-				    data: { categoryId, agentId, dataId },
-				    success: function (response) {
-				        console.log(response);
-				        let modalContent = `<div class="container-fluid">
-				            <table class="table table-bordered">
-				                <tbody>`;
-				
-				        if (response.length > 0) {
-				            let item = response[0];
-				            let keys = Object.keys(item);
-				            
-				            for (let i = 0; i < keys.length; i += 3) {
-				                modalContent += `<tr>`;
-				
-				                // Loop through 3 items per row
-				                for (let j = 0; j < 3; j++) {
-				                    if (i + j < keys.length) {
-				                        let key = keys[i + j];
-				                        let value = item[key] ? item[key] : "-";
-				                        
-				                        /* modalContent += `
-				                            <th class="bg-light text-dark p-2 text-center">${key.replace(/_/g, " ")}</th>
-				                            <td style="word-wrap: break-word; white-space: normal; max-width: 200px;">${value}</td>`;
-				                    }  */
-				                    
-				                        let displayValue = (typeof value === "string" && value.startsWith("http")) 
-			                            ? `<a href="${value}" target="_blank" style="text-decoration: none; color: blue;">${value}</a>`
-			                            : value;
-
-			                        modalContent += `
-			                            <th class="bg-light text-dark p-2 text-center">${key.replace(/_/g, " ")}</th>
-			                            <td style="word-wrap: break-word; white-space: normal; max-width: 200px;">${displayValue}</td>`;
-			                    }
-				                }
-				
-				                modalContent += `</tr>`;
-				            }
-				        } else {
-				            modalContent += `<tr><td colspan="6" class="text-center">No data available</td></tr>`;
-				        }
-				
-				        modalContent += `</tbody></table></div>`;
-				        
-				        $("#CampaignViewContent1").html(modalContent);
-				    },
-				    error: function () {
-				        
-				        $("#CampaignViewContent1").html("<p>Error fetching campaign details.</p>");
-				    }
-				});
-
-      			    // Fetch related questions
-      			    $.ajax({
-      			        url: "/gcc/api/agents/questions",
-      			        type: "GET",
-      			        data: { categoryId, campaignId },
-      			        success: function (response) {
-      			            console.log(response);
-      			            renderQuestions1(response, campaignId, agentId, dataId);
-      			        },
-      			        error: function () {
-      			           
-      			            $("#questionsCampaignView1").html("<p>Error fetching questions.</p>");
-      			        }
-      			    });
-
-      			    // Show modal after fetching details
-      			    
-      			    $("#campaignModal1").modal("show");
-      			});
-        		 
-        			$(".view-details").click(function () {
-        			    let categoryId = $(this).data("categoryid");
-        			    let campaignId = $(this).data("campaignid");
-        			    let agentId = $(this).attr("data-agentid");
-        			    let dataId = $(this).attr("data-dataid");
-
-        			    $("#submitAnswers").attr("data-categoryid", categoryId);
-        			    $("#submitAnswers").attr("data-campaignid", campaignId);
-        			    $("#submitAnswers").attr("data-agentid", agentId);
-        			    $("#submitAnswers").attr("data-dataid", dataId);
-
-        			    console.log("Fetching details for categoryId:", categoryId);
-        			    console.log("Fetching questions for campaignId:", campaignId);
-
-        			    // Fetch campaign details
- 
-				$.ajax({
-				    url: "/gcc/api/agents/Campaignview",
-				    type: "GET",
-				    data: { categoryId, agentId, dataId },
-				    success: function (response) {
-				        console.log(response);
-				        let modalContent = `<div class="container-fluid">
-				            <table class="table table-bordered">
-				                <tbody>`;
-				
-				        if (response.length > 0) {
-				            let item = response[0];
-				            let keys = Object.keys(item);
-				            
-				            for (let i = 0; i < keys.length; i += 3) {
-				                modalContent += `<tr>`;
-				
-				                // Loop through 3 items per row
-				                for (let j = 0; j < 3; j++) {
-				                    if (i + j < keys.length) {
-				                        let key = keys[i + j];
-				                        let value = item[key] ? item[key] : "-";
-				                        
-				                        /* modalContent += `
-				                            <th class="bg-light text-dark p-2 text-center">${key.replace(/_/g, " ")}</th>
-				                            <td style="word-wrap: break-word; white-space: normal; max-width: 200px;">${value}</td>`;
-				                    }  */
-				                    
-				                        let displayValue = (typeof value === "string" && value.startsWith("http")) 
-			                            ? `<a href="${value}" target="_blank" style="text-decoration: none; color: blue;">${value}</a>`
-			                            : value;
-
-			                        modalContent += `
-			                            <th class="bg-light text-dark p-2 text-center">${key.replace(/_/g, " ")}</th>
-			                            <td style="word-wrap: break-word; white-space: normal; max-width: 200px;">${displayValue}</td>`;
-			                    }
-				                }
-				
-				                modalContent += `</tr>`;
-				            }
-				        } else {
-				            modalContent += `<tr><td colspan="6" class="text-center">No data available</td></tr>`;
-				        }
-				
-				        modalContent += `</tbody></table></div>`;
-				        $("#CampaignViewContent").html(modalContent);
-				       
-				    },
-				    error: function () {
-				        $("#CampaignViewContent").html("<p>Error fetching campaign details.</p>");
-				        
-				    }
-				});
-
-        			    // Fetch related questions
-        			    $.ajax({
-        			        url: "/gcc/api/agents/questions",
-        			        type: "GET",
-        			        data: { categoryId, campaignId },
-        			        success: function (response) {
-        			            console.log(response);
-        			            renderQuestions(response, campaignId, agentId, dataId);
-        			        },
-        			        error: function () {
-        			            $("#questionsCampaignView").html("<p>Error fetching questions.</p>");
-        			            
-        			        }
-        			    });
-
-        			    // Show modal after fetching details
-        			    $("#campaignModal").modal("show");
-        			    
-        			});
-        			
-        			function renderQuestions1(data, campaignId, agentId, dataId) {
-        			    let html = `<div class="container">`;
-        			    let allAnswered = true; // Track if all answers exist
-
-        			    data.forEach(question => {
-        			        let questionId = question.question_id;
-        			        let inputField = "";
-
-        			        // Fetch existing answer
-        			        $.ajax({
-        			            url: "/gcc/api/agents/fetchAnswer",
-        			            type: "GET",
-        			            data: { campaignId, agentId, questionId, dataId },
-        			            async: false, // Ensure answer is fetched before rendering
-        			            success: function (answerResponse) {
-        			                let existingAnswer = (answerResponse.length > 0) ? answerResponse[0].campaign_answer : null;
-        			                let isReadOnly = existingAnswer ? "readonly" : "";
-
-        			                inputField = generateInputField2(question, existingAnswer, isReadOnly);
-
-        			                // If any question does not have an answer, allow form submission
-        			                if (!existingAnswer) {
-        			                    allAnswered = false;
-        			                }
-        			            }
-        			        });
-
-        			        html += `
-        			        <div class="row align-items-center mb-3">
-        			            <div class="col-md-8">
-        			                <label class="font-weight-bold">${question.questions}<span class="text-danger">*</span></label>
-        			            </div>
-        			            <div class="col-md-4">${inputField}</div>
-        			        </div>`;
-        			    });
-
-        			    html += `</div>`;
-        			    
-        			    $("#questionsCampaignView1").html(html);
-
-        			    // Hide submit button if all questions have answers
-        			    /* if (allAnswered) {
-        			        $("#submitAnswers").hide();
-        			    } else {
-        			        $("#submitAnswers").show();
-        			    } */
-        			}
-        			
-        			function renderQuestions(data, campaignId, agentId, dataId) {
-        			    let html = `<div class="container">`;
-        			    let allAnswered = true; // Track if all answers exist
-
-        			    data.forEach(question => {
-        			        let questionId = question.question_id;
-        			        let inputField = "";
-
-        			        // Fetch existing answer
-        			        $.ajax({
-        			            url: "/gcc/api/agents/fetchAnswer",
-        			            type: "GET",
-        			            data: { campaignId, agentId, questionId, dataId },
-        			            async: false, // Ensure answer is fetched before rendering
-        			            success: function (answerResponse) {
-        			                let existingAnswer = (answerResponse.length > 0) ? answerResponse[0].campaign_answer : null;
-        			                let isReadOnly = existingAnswer ? "readonly" : "";
-
-        			                inputField = generateInputField(question, existingAnswer, isReadOnly);
-
-        			                // If any question does not have an answer, allow form submission
-        			                if (!existingAnswer) {
-        			                    allAnswered = false;
-        			                }
-        			            }
-        			        });
-
-        			        html += `
-        			        <div class="row align-items-center mb-3">
-        			            <div class="col-md-8">
-        			                <label class="font-weight-bold">${question.questions}<span class="text-danger">*</span></label>
-        			            </div>
-        			            <div class="col-md-4">${inputField}</div>
-        			        </div>`;
-        			    });
-
-        			    html += `</div>`;
-        			    $("#questionsCampaignView").html(html);
-        			   
-
-        			    // Hide submit button if all questions have answers
-        			    if (allAnswered) {
-        			        $("#submitAnswers").hide();
-        			    } else {
-        			        $("#submitAnswers").show();
-        			    }
-        			}
-        			
-        			function generateInputField2(question, existingAnswer, isReadOnly) {
-        			    let html = "";
-        			  
-
-        			    if (question.answer_type_id == 1) { // Text Input
-        			        html = `<input type="text" class="form-control answer-input" 
-        			                data-questionid="${question.question_id}" 
-        			                value="${existingAnswer || ''}" 
-        			                readonly
-        			                ${isReadOnly}/>`;
-        			    } 
-        			    else if (question.answer_type_id == 2) { // Radio Buttons
-        			        question.answers.forEach(ans => {
-        			            let checked = (existingAnswer === ans) ? "checked" : "disabled";
-        			            let isReadOnlyAttr = existingAnswer ? 'onclick="return false;"' : ""; // Prevent change
-        			            html += `
-        			            <div class="form-check form-check-inline">
-        			                <input class="form-check-input answer-input" type="radio" 
-        			                    name="q_${question.question_id}" value="${ans}" 
-        			                    data-questionid="${question.question_id}" 
-        			                    ${checked} ${isReadOnlyAttr}>
-        			                <label class="form-check-label">${ans}</label>
-        			            </div>`;
-        			        });
-        			    } 
-        			    else if (question.answer_type_id == 3) { // Dropdown (Select)
-        			        let isDisabled = existingAnswer ? 'disabled' : 'disabled'; // Disable only when an answer exists
-
-        			        html = `<select class="form-control answer-input" 
-        			                data-questionid="${question.question_id}" ${isDisabled}>
-        			                    <option value="" disabled ${!existingAnswer ? "selected" : ""}>
-        			                        Select an option
-        			                    </option>`; // Show "Select an option" only if no answer exists
-
-        			        question.answers.forEach(ans => {
-        			            let selected = (existingAnswer === ans) ? "selected" : "";
-        			            html += `<option value="${ans}" ${selected}>${ans}</option>`;
-        			        });
-
-        			        html += `</select>`;
-        			    } 
-        			    else if (question.answer_type_id == 4) { // Checkbox
-        			        question.answers.forEach(ans => {
-        			            let checked = (existingAnswer && existingAnswer.includes(ans)) ? "checked" : "disabled";
-        			            let isReadOnlyAttr = existingAnswer ? 'onclick="return false;"' : ""; // Prevent change
-        			            html += `
-        			            <div class="form-check">
-        			                <input class="form-check-input answer-input" type="checkbox" 
-        			                    value="${ans}" data-questionid="${question.question_id}" 
-        			                    ${checked} ${isReadOnlyAttr}>
-        			                <label class="form-check-label">${ans}</label>
-        			            </div>`;
-        			        });
-        			    
-        			    }
-
-        			    return html;
-        			}
-
-        			function generateInputField(question, existingAnswer, isReadOnly) {
-        			    let html = "";
-        			  
-
-        			    if (question.answer_type_id == 1) { // Text Input
-        			        html = `<input type="text" class="form-control answer-input" 
-        			                data-questionid="${question.question_id}" 
-        			                value="${existingAnswer || ''}" 
-        			                ${isReadOnly}/>`;
-        			    } 
-        			    else if (question.answer_type_id == 2) { // Radio Buttons
-        			        question.answers.forEach(ans => {
-        			            let checked = (existingAnswer === ans) ? "checked" : "";
-        			            let isReadOnlyAttr = existingAnswer ? 'onclick="return false;"' : ""; // Prevent change
-        			            html += `
-        			            <div class="form-check form-check-inline">
-        			                <input class="form-check-input answer-input" type="radio" 
-        			                    name="q_${question.question_id}" value="${ans}" 
-        			                    data-questionid="${question.question_id}" 
-        			                    ${checked} ${isReadOnlyAttr}>
-        			                <label class="form-check-label">${ans}</label>
-        			            </div>`;
-        			        });
-        			    } 
-        			    else if (question.answer_type_id == 3) { // Dropdown (Select)
-        			        let isDisabled = existingAnswer ? 'disabled' : ''; // Disable only when an answer exists
-
-        			        html = `<select class="form-control answer-input" 
-        			                data-questionid="${question.question_id}" ${isDisabled}>
-        			                    <option value="" disabled ${!existingAnswer ? "selected" : ""}>
-        			                        Select an option
-        			                    </option>`; // Show "Select an option" only if no answer exists
-
-        			        question.answers.forEach(ans => {
-        			            let selected = (existingAnswer === ans) ? "selected" : "";
-        			            html += `<option value="${ans}" ${selected}>${ans}</option>`;
-        			        });
-
-        			        html += `</select>`;
-        			    } 
-        			    else if (question.answer_type_id == 4) { // Checkbox
-        			        question.answers.forEach(ans => {
-        			            let checked = (existingAnswer && existingAnswer.includes(ans)) ? "checked" : "";
-        			            let isReadOnlyAttr = existingAnswer ? 'onclick="return false;"' : ""; // Prevent change
-        			            html += `
-        			            <div class="form-check">
-        			                <input class="form-check-input answer-input" type="checkbox" 
-        			                    value="${ans}" data-questionid="${question.question_id}" 
-        			                    ${checked} ${isReadOnlyAttr}>
-        			                <label class="form-check-label">${ans}</label>
-        			            </div>`;
-        			        });
-        			    
-        			    }
-
-        			    return html;
-        			}
-
-
-        			// Submit only new answers
-        			 $("#submitAnswers").off('click').on('click', function () {
-        			    let answersArray = [];
-        			    let allAnswered = true; // Flag to check if all required fields are answered
-        			    let categoryId = $(this).attr("data-categoryid");
-        			    let campaignId = $(this).attr("data-campaignid");
-        			    let agentId = $(this).attr("data-agentid");
-        			    let dataId = $(this).attr("data-dataid");
-
-        			    let processedQuestions = new Set(); // To prevent duplicate question processing
-
-        			    $(".answer-input").each(function () {
-        			        let questionId = $(this).data("questionid");
-        			        let answerValue = null;
-
-        			        if (processedQuestions.has(questionId)) {
-        			            return; // Skip duplicate question IDs
-        			        }
-
-        			        if ($(this).is(":radio")) {
-        			            answerValue = $(`input[name="q_${questionId}"]:checked`).val();
-        			        
-        			        } else if ($(this).is("select")) {
-        			            answerValue = $(this).val();
-        			        } else if ($(this).is(":checkbox")) {
-        			            answerValue = $(`input[data-questionid="${questionId}"]:checked`).map(function () {
-        			                return $(this).val();
-        			            }).get().join(", ");
-        			        } else {
-        			            answerValue = $(this).val();
-        			        }
-
-        			        if (!answerValue || answerValue.trim() === "") {
-        			            allAnswered = false;
-        			            //$(this).addClass("is-invalid");
-        			        } else {
-        			            $(this).removeClass("is-invalid");
-        			            processedQuestions.add(questionId);
-        			            answersArray.push({
-        			                campaign_id: campaignId,
-        			                data_id: dataId,
-        			                agent_id: agentId,
-        			                question_id: questionId,
-        			                campaign_answer: answerValue
-        			            });
-        			        }
-        			    });
-
-        			    if (!allAnswered) {
-        			        Swal.fire({
-        			            icon: "warning",
-        			            title: "Missing Fields!",
-        			            text: "Please fill in all required fields before submitting.",
-        			            confirmButtonText: "OK"
-        			        });
-        			        return;
-        			    }
-
-        			    console.log("Submitting Answers:", answersArray);
-
-        			    $('#submitAnswers').attr('disabled', true).text('Processing');
-        			     $.ajax({
-        			        url: "/gcc/api/agents/submitAnswers",
-        			        type: "POST",
-        			        contentType: "application/json",
-        			        data: JSON.stringify({ answers: answersArray }),
-        			        success: function (response) {
-        			        	$('#submitAnswers').attr('disabled', false).text('Submit Answers');
-        			            Swal.fire({
-        			                title: 'Success!',
-        			                text: response,
-        			                icon: 'success',
-        			                allowOutsideClick: false, // Disable clicking outside the modal to close it
-        			                 allowEscapeKey: false, // Disable escape key to close the modal
-        			                 allowEnterKey: false, // Disable enter key to close the modal	 
-        			                confirmButtonText: "OK"
-        			            }).then(() => {
-        			            	$('#submitAnswers').attr('disabled', false).text('Submit Answers');
-        			                $('#campaignModal').modal('hide');
-        			            });
-        			        },
-        			        error: function (xhr) {
-        			        	$('#submitAnswers').attr('disabled', false).text('Submit Answers');
-        			        	let errorMessage = "";
-        			            if (xhr.responseText) {
-        			                errorMessage = xhr.responseText; // Use backend message if available
-        			            }
-        			            Swal.fire({
-        			                icon: "error",
-        			                title: "Submission Failed!",
-        			                text: errorMessage,
-        			                confirmButtonText: "OK"
-        			            });
-        			        }
-        			    }); 
-        			});
-        			
-        			
-        			
-        			 let option_val = '';
-         			
-        			 $.ajax({
-     	                url: "/gcc/api/agents/callstatus",
-     	                type: "GET",
-     	                success: function (data) {
-     	                    //dropdown.empty();
-     	                    //dropdown.append('<option value="">Select Call Status</option>');
-     	                    $.each(data, function (index, item) {
-     	                    	option_val = option_val + '<option value="' + item.id + '">' + item.call_status + '</option>';
-     	                    	//console.log(option_val);
-     	                    });
-     	                   add_data();
-     	                }
-        			 
-     	            });
-
-        			 function add_data(){
-        				
-	        			 $(".action-dropdown").each(function () {
-	        				 //alert($(this));
-	         	            let dropdown = $(this);
-	         	           //if (!dropdown.find("option[value='']").length) {
-	         	            dropdown.empty();
-	  	                    dropdown.append('<option value="">Select Call Status</option>');
-	         	            dropdown.append(option_val);
-	         	          // }
-	         	        });
-        			 
-        			 }
-        			
-
-
-        		  
-        	         /* $(".action-dropdown").each(function () {
-        	            let dropdown = $(this);
-        	            $.ajax({
-        	                url: "/gcc/api/agents/callstatus",
-        	                type: "GET",
-        	                success: function (data) {
-        	                    dropdown.empty();
-        	                    dropdown.append('<option value="">Select Call Status</option>');
-        	                    $.each(data, function (index, item) {
-        	                    	 dropdown.append('<option value="' + item.id + '">' + item.call_status + '</option>');
-        	                    });
-        	                }
-        	            });
-        	        }); */ 
-        	      /*  function submitAction(dataId, index,agentId,campaignId) {
-        	        	let row = $(`#submit-btn-${index}`).closest("tr");
-        	            // Get selected dropdown value and textarea value
-        	              let callStatus = row.find(".action-dropdown").val(); // Ensure you're getting the correct value
-        	              let remarks = row.find("textarea[name='remarks']").val() || "N/A";
-        	            console.log("sxdnx",remarks);
-
-        	            
-        	            // Make an AJAX POST request to submit the data
-        	            $.ajax({
-        	                url: '/gcc/api/agents/savecall', // URL to your Spring Boot controller for handling POST
-        	                type: 'POST',
-        	                contentType: 'application/json',
-        	                data: JSON.stringify({
-        	                    data_id: dataId,
-        	                    agent_id: agentId,
-        	                    campaign_id:campaignId,
-        	                    call_status: callStatus,  // Use "call_status" as the key to match the controller parameter name
-        	                    remarks: remarks
-        	                }),
-        	                success: function(response) {
-        	                    console.log('Data Updated successfully:', response);                   
-        	                    // Update the button and form fields after successful submission                    
-        	                    Swal.fire({
-        	                                title: 'Success!',
-        	                                text: 'Data Updated successfully!',
-        	                                icon: 'success',
-        	                                timer: 2000,
-        	                                showConfirmButton: false
-        	                            })
-        	                            let button = $(`#submit-btn-${index}`);
-        	                    button.text('Submitted').removeClass('btn-primary').addClass('btn-primary').prop('disabled', true);
-        	                    $(`#AgentDatatable tbody .action-dropdown[data-index="${index}"]`).prop('disabled', true);
-        	                    $(`#AgentDatatable tbody textarea[name="remarks"]`).eq(index).prop('disabled', true);
-        	                },
-        	                error: function(xhr, status, error) {
-        	                    console.error('Error submitting data:', error);
-        	                }
-        	            });
-        	        }*/
-        	      
-        	       
-
-        	var 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'
-                }
-                
-            ];
-            
-            
-            $('#Agenttask').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    {targets: 'no-sort', orderable: false}
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-                ],
-                scrollY: '20vh',
-                fixedColumns: {
-                    left: 1,
-                    right: 1
-                },
-                buttons: buttons,
-                fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
-                searching: true,
-                select: false,
-                processing: false,
-            });
-           var table= $('#AgentDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    {targets: 'no-sort', orderable: false}
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-                ],
-                scrollY: '50vh',
-                fixedColumns: {
-                    left: 1,
-                    right: 1
-                },
-                buttons: buttons,
-                fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
-                searching: true,
-                select: false,
-                processing: true,
-            });
-            
-            table.on('draw', function () {
-                var pageInfo = table.page.info();
-                //console.log('User navigated to page: ' + (pageInfo.page + 1)); // Page numbers are zero-based
-                add_data();
-            });
-            
-            $('#AgentDatatable1').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    {targets: 'no-sort', orderable: false}
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-                ],
-                scrollY: '50vh',
-                fixedColumns: {
-                    left: 1,
-                    right: 1
-                },
-                buttons: buttons,
-                fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
-                searching: true,
-                select: false,
-                processing: false,
-            });
-        });
-            $('#primaryButton').addClass('btn-success').removeClass('btn-secondary');
-            $('#secondaryButton').addClass('btn-secondary').removeClass('btn-success');
-    		
-            
-            $('#primaryButton').click(function () {
-    	        $('#primaryTable').show();
-    	        $('#secondaryTable').hide();
-    	        
-    	        $(this).addClass('btn-success').removeClass('btn-secondary');
-                $('#secondaryButton').addClass('btn-secondary').removeClass('btn-success');
-    	        $('#AgentDatatable').DataTable().columns.adjust().draw();
-    	    });
-
-    	    $('#secondaryButton').click(function () {
-    	        $('#primaryTable').hide();
-    	        $('#secondaryTable').show();
-    	        
-    	        $(this).addClass('btn-success').removeClass('btn-secondary');
-                $('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
-    	        $('#AgentDatatable1').DataTable().columns.adjust().draw();
-
-    	    });
-            
-              
-        document.getElementById("refresh").addEventListener("click", function() {
-            location.reload(); // Reloads the current page
-        });
-     
-        
-        
-        function submitAction(dataId, index, agentId, campaignId) {
-            let row = $(`#submit-btn-${index}`).closest("tr");
-
-            
-            
-            // Get selected dropdown value and textarea value
-           
-            let callStatusDropdown = row.find(".action-dropdown"); // Get the dropdown element
-            let callStatus = callStatusDropdown.find("option:selected").text().trim(); // Get selected text
-		    //let callStatus = callStatusDropdown.val();
-            
-            let remarks = row.find("textarea[name='remarks']").val() || "N/A"; // Default to "N/A" if empty
-
-            console.log("Data ID:", dataId);
-            console.log("Agent ID:", agentId);
-            console.log("Campaign ID:", campaignId);
-            console.log("Call Status:", callStatus);
-            console.log("Remarks:", remarks);
-            
-            
-            if (!callStatus || callStatus === "Select Call Status") {
-                console.log("❌ Call status is required.");
-                Swal.fire({
-                    title: 'Validation Error!',
-                    text: 'Please select a Call Status before submitting.',
-                    icon: 'warning',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            if (remarks === "" || remarks === "N/A") {
-                console.log("❌ Remarks cannot be empty.");
-                Swal.fire({
-                    title: 'Validation Error!',
-                    text: 'Please enter remarks before submitting.',
-                    icon: 'warning',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            // If call status is not "INFORMATION GIVEN", submit immediately
-            if (callStatus !== "INFORMATION GIVEN") {
-                submitData(dataId, agentId, campaignId, callStatus, remarks, row, index);
-                return;
-            }
-
-            // If call status is "INFORMATION GIVEN", check database counts first
-            $.ajax({
-                url: `/gcc/api/agents/checkCounts?dataId=${dataId}&campaignId=${campaignId}`,
-                type: 'GET',
-               
-                success: function(response) {
-                    console.log("DB Count Check Response:", response);
-                    
-                    if (response.length > 0) {  // ✅ Ensure response contains data
-                        let answersCount = response[0].answersCount || 0;
-                        let questionsCount = response[0].questionsCount || 0;
-
-                        console.log("Answers Count:", answersCount);
-                        console.log("Questions Count:", questionsCount);
-
-                        // ✅ If call status is NOT "INFORMATION GIVEN", allow submission directly
-					                      if (callStatus === "INFORMATION GIVEN" && questionsCount !== answersCount) {  
-					    console.log("❌ Counts do not match! Submission blocked.");
-					    Swal.fire({
-					        title: 'Incomplete!',
-					        text: `You have answered only ${answersCount} out of ${questionsCount} required questions.`,
-					        icon: 'error',
-					        confirmButtonText: 'OK'
-					    });
-					} else {
-					    console.log("✅ Proceeding with submission.");
-					    submitData(dataId, agentId, campaignId, callStatus, remarks, row, index);
-					}
-                    } else {
-                        console.log("❌ No count data received. Blocking submission.");
-                        Swal.fire({
-                            title: 'Error!',
-                            text: 'Could not retrieve question counts. Please try again later.',
-                            icon: 'error'
-                        });
-                    }
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error fetching count data:', error);
-                    Swal.fire({
-                        title: 'Error!',
-                        text: 'Failed to check question counts. Please contact support.',
-                        icon: 'error'
-                    });
-                }
-            });
-        }
-
-        // Function to submit data
-         function submitData(dataId, agentId, campaignId, callStatus, remarks, row, index) {
-        	
-        	 $('.submitid').prop('disabled', true).text('Submitting');
-        	
-            $.ajax({
-                url: '/gcc/api/agents/savecall',
-                type: 'POST',
-                contentType: 'application/json',
-                data: JSON.stringify({
-                    data_id: dataId,
-                    agent_id: agentId,
-                    campaign_id: campaignId,
-                    call_status: callStatus,
-                    remarks: remarks
-                }),
-                success: function(response) {
-                	 $('.submitid').prop('disabled', false).text('Submit');
-                    console.log('Data Updated successfully:', response);
-                    
-                    Swal.fire({
-                        title: 'Success!',
-                        text: 'Data Updated successfully!',
-                        icon: 'success',
-                        allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                    allowEscapeKey: false, // Disable escape key to close the modal
-	                    allowEnterKey: false, // Disable enter key to close the modal	                   
-                        showConfirmButton: true
-                    }).then((result) => {
-                        if (result.isConfirmed) {
-                            //console.log("ok button clicked");
-                            $('.submitid').prop('disabled', false).text('Submit');
-
-                            const table = $('#AgentDatatable').DataTable();
-
-                            // Remove the row from the table
-                            table.row(row).remove().draw(false);
-
-                            // Recalculate and update S.No column
-                            table.rows().every(function(index) {
-                                $(this.node()).find('td:first-child').text(index + 1);
-                            });
-
-                            table.draw(false);
-                        }
-                    });
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error submitting data:', error);
-                }
-            });
-        } 
-
-    	               
-    	               
-        
-        // Make an AJAX POST request to submit the data
-       
-//working
-   
-
-       /* function submitAction(dataId, index,agentId,campaignId) {
-            // Get selected dropdown value and textarea value
-            	let row = $(`#submit-btn-${index}`).closest("tr");
-        	            // Get selected dropdown value and textarea value
-        	               let callStatusDropdown = row.find(".action-dropdown"); // Ensure you're getting the correct value
-        	               let callStatus = callStatusDropdown.find("option:selected").text();
-        	               let remarks = row.find("textarea[name='remarks']").val() || "N/A";
-        	               console.log(dataId);
-        	               console.log(agentId);
-        	               console.log(campaignId);
-        	               console.log(callStatus);
-        	               console.log(remarks);
-        	               
-        	               
-            
-            // Make an AJAX POST request to submit the data
-            $.ajax({
-                url: '/gcc/api/agents/savecall', // URL to your Spring Boot controller for handling POST
-                type: 'POST',
-                contentType: 'application/json',
-                data: JSON.stringify({
-                    data_id: dataId,
-                    agent_id: agentId,
-                    campaign_id:campaignId,
-                    call_status: callStatus,  // Use "call_status" as the key to match the controller parameter name
-                    remarks: remarks
-                }),
-               
-                success: function(response) {
-                    console.log('Data Updated successfully:', response);                   
-                    // Update the button and form fields after successful submission                    
-                    Swal.fire({
-                                title: 'Success!',
-                                text: 'Data Updated successfully!',
-                                icon: 'success',
-                                timer: 2000,
-                                showConfirmButton: true
-                            }).then((result) => {
-        	                    if (result.isConfirmed) {
-        	                    	console.log("ok button");
-        	                    	$('.submitid').prop('disabled', false).text('Submit');
-                            	
-        	                    	const table = $('#AgentDatatable').DataTable();
-        	                        
-        	                        // Remove the row
-        	                        table.row($(row)).remove();
-
-        	                        // Reorder S.No column
-        	                        table.rows().every(function (index) {
-        	                            const row = this.node();
-        	                            $(row).find('td:first-child').text(index + 1); // Update S.No
-        	                        });
-
-        	                        // Redraw the table
-        	                        table.draw(false);
-        	                	    
-        	                    }
-        	                });
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error submitting data:', error);
-                }
-            });
-        }*/
-        
-        /* function PendingCampaignDetails(campaignId, callsPerAgent, agentId) {
-            console.log('Calling PendingCampaignDetails with:', {
-                callsPerAgent: callsPerAgent,
-                campaignId: campaignId, 
-                agentId: agentId
-            });
-            
-            $.ajax({
-	            url: `/gcc/api/campaign/getCampaignDetailsbyId?campaign_id=${campaignId}`,
-	            type: 'GET',
-	            success: function (response) {
-					console.log(response);
-	                if (response) {
-	                    // Populate modal fields with data
-	                    //$('#campaign_id').val(response.campaign_id);
-	                    $('#campaign_names').val(response.campaign_name); // Assuming the key in the response is 'campaign_name'
-	                 // Display the campaign name near the h5 element
-	                    $('#campaign-names-display').text(response.campaign_name); // Add text dynamically to the element
-
-	                } else {
-	                	console.error('Error fetching campaign details:', error);
-	                }
-	            },
-	            error: function (xhr, status, error) {
-	                console.error('Error fetching campaign details:', error);
-	                alert('An error occurred while fetching campaign details.');
-	            }
-	        });
-            
-         // Get the card element by its ID (e.g., 'tablesforcalls')
-            var cardElement = document.getElementById('tablesforpendingcalls');
-
-            // Toggle the display property based on current state
-            if (cardElement.style.display === 'block') {
-                cardElement.style.display = 'none'; // Hide the card if it's currently displayed
-            } else {
-                cardElement.style.display = 'block'; // Show the card if it's hidden
-            }
-            
-            $.ajax({					
-                url: '/gcc/api/campaign/startcampaign?campaign_id=' + campaignId + '&calls_per_agent=' + callsPerAgent, // URL to your Spring Boot controller
-                type: 'GET', // GET request
-                contentType: 'application/json',
-                success: function(response) {
-                    console.log('Campaign started successfully:', response); 
-                    
-                    // We are focusing on matching the agent_id since campaign_id is constant (24)
-                    let dataIds = [];
-                    response.forEach(function(item) {
-                        console.log('Checking agent_id:', item.agent_id, 'against passed agent_id:', agentId);
-                        
-                        if (item.agent_id === agentId) {
-                            dataIds = item.data_ids; // Get the corresponding data_ids
-                            console.log('Match found. Data IDs:', dataIds);
-                        }
-                    });
-
-                    if (dataIds.length > 0) {
-                        console.log('Data IDs for Agent ID ' + agentId + ':', dataIds);
-                        
-                        // Fetch the data for the matched data IDs
-                        $.ajax({
-                            url: '/gcc/api/agents/getPendingDataByIds?ids=' + dataIds.join(','), // dataIds is the array [6, 7]
-                            type: 'GET',
-                            contentType: 'application/json',
-                            success: function(response) {
-                                console.log('Data retrieved successfully:', response);
-                                
-                                // Initialize DataTable if not already done
-                                let table = $('#Pendingtasktable').DataTable();
-                                
-                                // Clear existing rows in the table
-                                table.clear();
-                                
-                                // Process and append the new data to the DataTable
-                                let rows = [];
-                                response.forEach(function(item, index) {
-                                    let row = [
-                                        index + 1,  // S.No
-                                        item.id,    // ID
-                                        item.name,  // Name
-                                        item.address,  // Address
-                                        item.dues,     // Dues
-                                        item.cellnumber,  // Mobile Number
-                                        
-                                        `<div class="text-center">
-                                        <button class="btn btn-primary" onclick="ViewDetails('${item.viewdetails}')">View</button>
-                                    	</div>`,
-                                        
-                                        // Dropdown for Action
-                                        `<div class="text-center">
-					                        <select class="form-control action-dropdown2" name="action" data-index="${index}">
-					                            <option value="NONE" ${item.call_status === "NONE" ? "selected" : ""}>Call Status</option>
-					                            <option value="INFORMATION_GIVEN" ${item.call_status === "INFORMATION_GIVEN" ? "selected" : ""}>INFORMATION GIVEN</option>
-					                            <option value="UNATTENDED" ${item.call_status === "UNATTENDED" ? "selected" : ""}>UNATTENDED</option>
-					                            <option value="CALL_BACK_LATER" ${item.call_status === "CALL_BACK_LATER" ? "selected" : ""}>CALL BACK LATER</option>
-					                            <option value="SWITCH_OFF" ${item.call_status === "SWITCH_OFF" ? "selected" : ""}>SWITCH OFF</option>
-					                            <option value="WRONG_NUMBER" ${item.call_status === "WRONG_NUMBER" ? "selected" : ""}>WRONG NUMBER</option>
-					                        </select>
-					                    </div>`,
-                                        
-									     // Textarea for Remarks (populate saved remarks)
-									        `<div class="text-center">
-					                        <textarea class="form-control" name="remarks">${item.remarks ? item.remarks : ""}</textarea>
-					                    </div>`,
-					                    
-					                    
-					                 // WhatsApp Message Button
-					                    `<div class="text-center">
-					                        <button class="btn btn-success" onclick="sendWhatsAppMessage('${item.cellnumber}', '${item.id}', '${item.viewdetails}')">Send</button>
-					                    </div>`,
-					                                        
-					                  // Centered Button for Submit Action (Initially disabled)
-					                    `<div class="text-center">
-					                    <button class="btn btn-primary submit-button" id="submitt-btn-${index}" disabled onclick="editAction(${item.data_id}, ${index}, ${agentId},${campaignId})">${item.call_status && item.call_status !== 'NONE' ? 'Update' : 'Update'}</button>
-					                    
-					                </div>`
-                                    ];
-                                    
-                                    rows.push(row);
-                                });
-                                
-                                // Append the rows to your table
-                                $('#Pendingtasktable').DataTable().rows.add(rows).draw();
-                             
-                                
-                             // Add event listener to each dropdown to enable/disable the button
-                                 $('.action-dropdown2').on('change', function() {
-                                    let selectedValue = $(this).val();
-                                    let index = $(this).data('index');
-                                    let button = $('#submitt-btn-' + index);
-                                    
-                                    
-                                    // Enable the button if a valid option is selected, otherwise keep it disabled
-                                    if (selectedValue === 'NONE') {
-                                        button.prop('disabled', true);
-                                        button.text('Update');
-                                        button.removeClass('btn-primary').addClass('btn-primary');
-                                    } else {
-                                        button.prop('disabled', false);
-                                        button.text('Update');
-                                        button.removeClass('btn-primary').addClass('btn-primary');
-                                    }
-                                }); 
-                             
-                                 $('.action-dropdown2').on('change', function () {
-                                    let selectedValue = $(this).val(); // Dropdown value
-                                    let index = $(this).data('index'); // Index of the row
-                                    let button = $('#submit-btn-' + index); // The submit button
-                                    let remarksField = $('textarea[name="remarks"]').eq(index); // The remarks textarea
-
-                                    // Function to check if the button should be enabled
-                                    function toggleButtonState() {
-                                        let remarksValue = remarksField.val().trim(); // Trimmed value of remarks
-                                        if (selectedValue !== 'NONE' && remarksValue !== '') {
-                                            button.prop('disabled', false);
-                                            button.text('Update');
-                                            button.removeClass('btn-primary').addClass('btn-primary');
-                                        } else {
-                                            button.prop('disabled', true);
-                                            button.text('Update');
-                                            button.removeClass('btn-primary').addClass('btn-primary');
-                                        }
-                                    }
-
-                                    // Toggle button state based on the current conditions
-                                    toggleButtonState();
-
-                                    // Add an event listener to the remarks field to recheck conditions
-                                    remarksField.on('input', function () {
-                                        toggleButtonState();
-                                    });
-                                }); 
-
-                                
-                            },
-                            error: function(xhr, status, error) {
-                                console.error('Error retrieving data:', error);
-                            }
-                        });
-                    }
-                    else {
-                        console.log('No matching data found for Agent ID ' + agentId);
-                    }
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error starting campaign:', error);
-                }
-            });
-            
-            initializeAgentsDataTable();
-            // Show the #tablesforcalls div
-            //document.getElementById('tablesforpendingcalls').style.display = 'block';
-        } */
-        
-        /* function editAction(dataId, index,agentId,campaignId) {
-            // Get selected dropdown value and textarea value
-            let action = $('.action-dropdown2[data-index="' + index + '"]').val(); // Ensure you're getting the correct value
-            let remarks = $(`#Pendingtasktable tbody textarea[name="remarks"]`).eq(index).val();
-            
-            // Make an AJAX POST request to submit the data
-            $.ajax({
-                url: '/gcc/api/agents/savecall', // URL to your Spring Boot controller for handling POST
-                type: 'POST',
-                contentType: 'application/json',
-                data: JSON.stringify({
-                    data_id: dataId,
-                    agent_id: agentId,
-                    campaign_id:campaignId,
-                    call_status: action,  // Use "call_status" as the key to match the controller parameter name
-                    remarks: remarks
-                }),
-                success: function(response) {
-                    console.log('Data Updated successfully:', response);
-                    
-                    // Update the button and form fields after successful submission
-                    
-                    Swal.fire({
-                                title: 'Success!',
-                                text: 'Data Updated successfully!',
-                                icon: 'success',
-                                timer: 2000,
-                                showConfirmButton: false
-                            })
-                    
-                    
-                    
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error submitting data:', error);
-                }
-            });
-        } */
-        
-        
-        function initializeAgentsDataTable() {
-            if (!$.fn.DataTable.isDataTable('#AgentDatatable')) {
-                $('#AgentDatatable').DataTable({
-                    dom: 'Bftip',
-                    columnDefs: [{ targets: 'no-sort', orderable: false }],
-                    lengthMenu: [
-                        [50, 100, 200, 500, -1],
-                        ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-                    ],
-                    scrollY: '60vh',
-                    fixedColumns: { left: 1, right: 1 },
-                    buttons: [
-                        { extend: 'pageLength', className: 'btn btn-warning' },
-                        { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-                        { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-                        { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-                        { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-                    ],
-                    fixedHeader: true,
-                    autoWidth: true,
-                    responsive: true,
-                    searching: true,
-                    select: false,
-                    processing: false
-                });
-            }
-            
-         // Initialize the Pendingtasktable if it is not already initialized
-            if (!$.fn.DataTable.isDataTable('#Pendingtasktable')) {
-                $('#Pendingtasktable').DataTable({
-                    dom: 'Bftip',
-                    columnDefs: [{ targets: 'no-sort', orderable: false }],
-                    lengthMenu: [
-                        [50, 100, 200, 500, -1],
-                        ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-                    ],
-                    scrollY: '60vh',
-                    fixedColumns: { left: 1, right: 1 },
-                    buttons: [
-                        { extend: 'pageLength', className: 'btn btn-warning' },
-                        { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-                        { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-                        { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-                        { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-                    ],
-                    fixedHeader: true,
-                    autoWidth: true,
-                    responsive: true,
-                    searching: true,
-                    select: false,
-                    processing: false
-                });
-            }
-        }
-        //view url for specific id details
-        function ViewDetails(url) {
-    		if(url)
-                {
-    				window.open( url,'_blank');
-    			}
-    		else
-    		{	 Swal.fire({
-           		 title: 'Error!',
-            	 text: 'NO Data Available!',
-             	 icon: 'error',
-            	 timer: 2000,
-            	 showConfirmButton: false
-      			  })
-    			}
-            }
-        
-        
-      	//whatsapp message function
-        /* function sendWhatsAppMessage(cellnumber, billNo, viewdetailsUrl) {
-            // Build the dynamic WhatsApp message URL
-        let msgUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${cellnumber}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=Greetings+from+Greater+Chennai+Corporation%2C%0A%0AProperty+Bill+No+${billNo}%0A%0ASkip+the+hassle+and+pay+your+property+tax+easily+on+WhatsApp.+It%E2%80%99s+quick%2C+stress-free%2C+and+just+a+few+taps+away%21+%F0%9F%93%B2%0A%0ASimply+click+the+button+below+to+view+your+payment+details+and+complete+your+payment+today%21+%F0%9F%92%B8&media_url=https%3A%2F%2Fres.cloudinary.com%2Fdpub5muar%2Fimage%2Fupload%2Fv1727080053%2Fang8tqjqdcxuqoeiuvjl.jpg&isTemplate=true&cta_button_url=${encodeURIComponent(viewdetailsUrl)}`;
-
-            // Send the WhatsApp message
-            $.ajax({
-                url: '/gcc/api/whatsapp/send-whatsapp-message', // Replace with your service path
-                type: 'POST',
-                data: { msgUrl: msgUrl },
-                success: function(response) {
-                    console.log('WhatsApp message sent successfully', response);
-                    //alert('WhatsApp message sent!');
-                    Swal.fire({
-                                title: 'Success!',
-                                text: 'Message sent successfully!',
-                                icon: 'success',
-                                timer: 2000,
-                                showConfirmButton: false
-                            })
-                    
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error sending WhatsApp message:', error);
-                    //alert('Failed to send WhatsApp message.');
-                    
-                    Swal.fire({
-                                title: 'Error!',
-                                text: 'Message Not sent!',
-                                icon: 'error',
-                                timer: 2000,
-                                showConfirmButton: false
-                            })
-                }
-            });
-        } */
-        
-        
-        </script>
-
-
-</body>
-</html>
diff --git a/src/main/resources/templates/modules/callcenter/attendancereport.html b/src/main/resources/templates/modules/callcenter/attendancereport.html
deleted file mode 100644
index 5601ef73..00000000
--- a/src/main/resources/templates/modules/callcenter/attendancereport.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
- <style>
-        
-</style>
-</head>
-<body>
-    <div class="wrapper">
-        <!-- Header -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-        <div class="page-wrap">
-            <!-- Left Menu -->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>1913 Attendance Reports</h5>
-                                        <span>List of 1913 Agents Attendance</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item">
-                                            <a href="/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">1913 Attendance</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Attendance Report</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                 <hr>
-                 
-                 <div id="pageLoader"
-				    style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-                 
-				<div class ="card-body">
-					<form th:action="@{/gcc/callcenterattendance/attendancereport}" method="get" onsubmit="showLoader()">
-						<div class="row">
-						
-							<div class="col-sm-6 mb-3">
-								<label for="fromDate"
-									style="font-size: medium;; margin-bottom: 0px;">From
-									Date:</label> <input type="date" id="fromDate" name="fromDate"
-									th:value="${fromDate}" class="form-control" required>
-							</div>
-							<div class="col-sm-6  mb-3">
-								<label for="toDate"
-									style="font-size: medium; margin-bottom: 0px;">To
-									Date:</label> <input type="date" id="toDate" name="toDate"
-									th:value="${toDate}" class="form-control" required>
-							</div>
-							</div>
-
-						<div class="row">
-							<div class="col-12 d-flex justify-content-center">
-								<button type="submit" id="filterButton"
-									class="btn btn-primary mx-2">Filter</button>
-
-								<button class="btn btn-danger mx-2" onclick="resetDate()"
-									name="reset">Reset</button>
-							</div>
-						</div>
-						</form>
-					  
-					</div>
-
-                  
-					  <!--  Agents Attendance report -->
-					 <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                    <div class="page-header-title" >
-										<h5 style="margin: 0;font-weight: bold;">Attendance Reports</h5><hr>
-								   </div> 
-                                        <div>
-											<table id="AttendanceDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%" height="100%">
-                                                <thead class="thead-dark">
-													    <tr role="row">
-													        <th class="text-center">S.No</th>
-													        <!-- <th class="text-center">Zone</th>
-													        <th class="text-center">Division</th> -->
-													        <th class="text-center">Employee Id</th>
-													        <th class="text-center">Employee Name</th>
-													        <!-- <th class="text-center">Department Name</th> -->
-													        <th class="text-center">Designation</th>
-													        <th class="text-center">Device Location</th> 
-													        <th class="text-center">Punch Date</th>
-													        <th class="text-center">Punch In</th>
-													        <th class="text-center">Punch Out</th>
-													        <th class="text-center">Total Working hours</th>
-													        
-													    </tr>
-													</thead>
-													<tbody>
-															<tr th:each="row,sno : ${attendanceData}">
-															<td th:text="${sno.index + 1}" class="text-center"></td>
-											                <!-- <td th:text="${row.zone}" class="text-center"></td>
-											                <td th:text="${row.division}" class="text-center"></td> -->
-											                <td th:text="${row.user_id}" class="text-center"></td>
-											                <td th:text="${row.user_name}" class="text-center"></td>
-											                <!-- <td th:text="${row.departmentname}" class="text-center"></td> -->
-											                <td th:text="${row.designation}" class="text-center"></td>
-											                <td th:text="${row.device_name}" class="text-center"></td>
-											                <td th:text="${row.punch_date}" class="text-center"></td>
-											                <td th:text="${row.PUNCHIN}" class="text-center"></td>
-											                <td th:text="${row.PUNCHOUT}" class="text-center"></td>
-											                <td th:text="${row.total_working_hours}" class="text-center"></td>
-											            </tr>
-													
-													</tbody>
-
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>                            
-					  
-					</div>
-
-        </div>
-   
-     <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-      </div>
-</div>
-
-   
-    <!-- Include jQuery and Bootstrap JavaScript -->
-
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <!--  sweet alert -->
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-   <script type="text/javascript">
-
-// Initialize DataTables with export buttons
-$(document).ready(function () {
-    var 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' },
-    ];
-
-    $('#AttendanceDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        fixedColumns: { left: 1, right: 1 },
-        buttons: buttons,
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false,
-    });
-});
-
-$("#fromDate").on("change", function() {
-    const startDate = $(this).val();  // Get the selected start date
-    // Set the min value for To Date to be the selected From Date
-    $("#toDate").attr("min", startDate);
-});
-
-// Event listener for To Date selection
-$("#toDate").on("change", function() {
-    const endDate = $(this).val();  // Get the selected end date
-    // Set the max value for From Date to be the selected To Date
-    $("#fromDate").attr("max", endDate);
-});
-
-//Function to reset the date fields and reload the page with cleared data
-function resetDate() {
-    // Clear the date inputs
-    document.getElementById("fromDate").value = "";
-    document.getElementById("toDate").value = "";
-
-    // Redirect to the endpoint without parameters to reset the page
-    window.location.href = "/gcc/callcenterattendance/attendancereport";
-}
-
-//Function to show the loader when the form is submitted
-function showLoader() {
-	document.getElementById('pageLoader').style.display = 'block';
-}
-
-// Function to hide the loader after the page has loaded
-window.onload = function () {
-	document.getElementById('pageLoader').style.display = 'none';
-};
-   
-</script>
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenter/campaignlist.html b/src/main/resources/templates/modules/callcenter/campaignlist.html
deleted file mode 100644
index 2eb04325..00000000
--- a/src/main/resources/templates/modules/callcenter/campaignlist.html
+++ /dev/null
@@ -1,1256 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"  xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-
-/* .modal-body {
-    max-height: 70vh; 
-    overflow-y: auto; 
-    overflow-x: hidden; 
-    padding-right: 15px; 
-} */
-.edit-campaign{
-
- max-height: 70vh; 
-    overflow-y: auto; /* Enables vertical scrolling */
-    overflow-x: hidden; /* Hides horizontal scrolling */
-    padding-right: 15px; /* Prevents content cutoff */
-}
-
-</style>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Campaign List</h5>
-										<span>1913 Campaign List</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 Campaign</li>
-										<li class="breadcrumb-item active" aria-current="page">Campaign List</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-                    <h4 class="h4 text-right text-mute" style="font-size: 12px;">
-						Auot refresh in <font id="refresh-countdown">00</font> seconds
-					</h4>
-                        
-                    <div class="row">
-                    	
-                    	<div class="col-md-12">
-							<div class="card">
-							
-								<div class="card-body">
-								<div class="page-header-title" >
-									<h5 style="margin: 0;font-weight: bold;">Campaigns List</h5><hr>
-							   </div> 
-							   
-							   			<table id="StartCampaigntable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-                                            <thead class="thead-dark">
-                                                <tr role="row">
-                                                    <th>S.No</th>    
-                                                    <th class="text-center">Campaign</th>                                              
-                                                    <th class="text-center">Category</th>
-                                                    <th class="text-center">Date</th>                                                                                                                                                                                                                                    
-                                                    <th class="text-center">Action</th>                                                                                                                                                     
-                                                </tr>                                               
-                                            </thead>
-                                             <tbody>
-										          <tr th:each="campaign, iterStat : ${campaigns}">
-											            <td th:text="${iterStat.index + 1}" class="text-center"></td> <!-- Serial number -->
-											            <td th:text="${campaign['campaign_name']}" class="text-center"></td> <!-- Campaign name -->
-											            <td th:text="${campaign['category_name']}" class="text-center"></td> <!-- Category name -->
-											            <td th:text="${campaign['start_date']}" class="text-center"></td> <!-- Total calls -->
-											            <td class="text-center">
-											            <button type="button" class="btn btn-success"  
-														        th:onclick="return callCampEdit([[${campaign.campaign_id}]], [[${campaign.category_id}]])" 
-														        data-animation="true" 
-														        data-toggle="tooltip" 
-														        data-placement="top" 
-														        title="Edit">
-														    View
-														</button>
-											            </td>
-											        </tr>
-											    
-										    </tbody>
-                                            <tfoot class="thead-dark">
-                                                <tr role="row">
-                                                    <th>S.No</th>
-                                                    <th class="text-center">Campaign</th>                                                  
-                                                    <th class="text-center">Category</th>
-                                                    <th class="text-center">Date</th>                                                                                                                                                                                            
-                                                    <th class="text-center">Action</th>                                                                                                  
-                                                </tr>                                              
-                                            </tfoot>
-                                        </table>
-							   
-
-								</div>
-							</div>
-						</div>
-                    	
-                    	<div class="col-md-12">
-							<div class="card">
-							
-									<div class="card-block">
-									<div class="page-header-title" >
-								<h5 style="margin: 0;font-weight: bold;">Campaign Status List</h5><hr>
-						   </div> 
-                                    <div>
-                                        <table id="CampaignDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-                                            <thead class="thead-dark">
-                                                <tr role="row">
-                                                    <th>S.No</th>                                                  
-                                                    <th class="text-center">Name</th>
-                                                    <th  class="text-center">Category</th>                                                
-                                                    <th  class="text-center">Event Date</th>
-                                                    <th  class="text-center">Description</th>
-                                                    <th  class="text-center">Status</th> 
-                                                    <th  class="text-center">Action</th>                                                
-                                                                                                    
-                                                </tr>
-                                                
-                                            </thead>
-                                             <tbody>
-										         <tr th:each="activeCampaign, iterStat : ${activeCampaigns}">
-											            <td th:text="${iterStat.index + 1}" class="text-center"></td> <!-- Serial number -->
-											            <td th:text="${activeCampaign['campaign_name']}" class="text-center"></td> 
-											            <td th:text="${activeCampaign['category_name']}" class="text-center"></td> 
-											            <td th:text="${activeCampaign['start_date']} + ' - ' + ${activeCampaign['end_date']}" class="text-center"></td>
-											            <td th:text="${activeCampaign['description']}" class="text-center"></td> <!-- Calls per agent -->
-											            <td class="text-center">
-															<th:block th:switch="${activeCampaign['campaign_status']}">
-															<th:block th:case="'ONGOING'">
-																<button type="button" class="status-button btn btn-danger" 
-																th:data-id="${activeCampaign['campaign_id']}">Ongoing</button>
-															</th:block>
-																<th:block th:case="'CLOSED'">
-																 <span class="text-success">Closed</span>
-																</th:block>
-															</th:block>
-														</td>
-														
-														<td class="text-center">
-														    <th:block th:switch="${activeCampaign['campaign_status']}">
-														        <th:block th:case="'ONGOING'">
-														            <a href="#" th:onclick="return callEdit([[${activeCampaign.campaign_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Edit" data-original-title="Edit">
-														                <i class="ik ik-edit f-16 mr-15 text-green"></i>
-														            </a>
-														        </th:block>
-														        <th:block th:case="'CLOSED'">
-														            <button type="button" class="btn btn-primary"  th:onclick="return callEdit([[${activeCampaign.campaign_id}]])">View</button>
-														        </th:block>
-														    </th:block>
-														
-														</td>
-											        </tr>											    
-										    </tbody>
-
-                                        </table>
-                                    </div>
-                                </div>
-							</div>
-						</div>
-                    	
-                    </div>  
-                        
-                     </div>
-                </div>
-                
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-               
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-				</div>
-				
-            
-		</div>
-		
-		
-       
-       <!-- Edit campaign Category List Modal -->
-<div class="modal fade" id="editcampaignModal" tabindex="-1" role="dialog" aria-labelledby="editcampaignModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="editModalLabel">Details of Campaign</h5>
-                <button type="button" class="close"  data-bs-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                
-                    <input type="hidden" name="modal_campaign_id" id="modal_campaign_id" />
-
-                    <!-- Row 1: Total Count, Completed, Pending -->
-                    <div class="form-group row">
-                        <div class="col-md-3">
-                            <label for="totalCount">Overall Data</label>
-                            <input type="text" class="form-control" id="totalCount" readonly>
-                        </div>
-                        <div class="col-md-3">
-                            <label for="overallpendingCount">Overall Pending</label>
-                            <input type="text" class="form-control" id="overallpendingCount" readonly>
-                        </div>
-                        <div class="col-md-3">
-                            <label for="completedCount">Assigned Completed</label>
-                            <input type="text" class="form-control" id="completedCount" readonly>
-                        </div>
-                        <div class="col-md-3">
-                            <label for="pendingCount">Assigned Pending</label>
-                            <input type="text" class="form-control" id="pendingCount" readonly>
-                        </div>                    
-                    </div>
-
-                    <!-- Row 2: Call Per Agent, Select Agents, Count -->
-                    <div class="form-group">
-                        <label><b><u>Today Assign:</u></b></label>
-                        <div class="row">
-                            <div class="col-md-4">
-                                <label for="call_per_agent">Call Per Agent<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="call_per_agent" required>
-                            </div>
-                            
-                            <div class="col-md-4">
-                            	<label for="agentDropdown" class="form-label fw-bold">Agent Selection <span class="text-danger">*</span></label> 
-								    <div class="dropdown">
-								        <button class="btn btn-light border rounded w-100 text-start" 
-								                type="button" 
-								                id="agentDropdownBtn" 
-								                data-bs-toggle="dropdown" 
-								                aria-expanded="false">
-								            Select Agent(s)
-								        </button>
-								        <ul class="dropdown-menu p-3" 
-								            aria-labelledby="agentDropdownBtn" 
-								            style="max-height: 250px; overflow-y: auto; width: 100%;">
-								            <div id="agentCheckboxContainer">
-								                <!-- Checkboxes will be loaded here -->
-								            </div>
-								        </ul>
-								    </div>												   
-							 </div>
-
-                            <div class="col-md-4">
-                                <label for="call_count">Today calls Count</label>
-                                <input type="text" class="form-control" id="call_count" readonly>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <input type="hidden" name="modal_category_id" class="form-control" id="modal_category_id" readonly>
-                    </div>                   
-
-                    <div class="form-group text-center">
-                        <button type="button" class="btn btn-primary" id="furtherAssign">Click to Assign</button>
-                    </div>
-               
-            </div>
-        </div>
-    </div>
-</div>
-       
-       
- 
-<!-- Edit campaign Modal -->
- <div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="editModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="editModalLabel">Edit Campaign</h5>
-                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close" onclick="location.reload();">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-              <div class="edit-campaign">
-                <form id="editForm" onsubmit="submitForm(event)">
-                    <input type="hidden" name="campaign_id" id="campaign_id" />
-                    
-                    <div class="form-group">
-                        <label for="campaign_name">Name<span class="text-danger">*</span></label>
-                        <input type="text" class="form-control" id="campaign_name" readonly>
-                    </div>
-                    
-                    <div class="form-group">
-                        <input type="hidden" name ="category_id" class="form-control" id="category_id" readonly>
-                    </div>
-                    
-                    <div class="form-group">
-                        <label><b><u>Event Date:</u></b></label>
-                        <div class="row">
-                            <div class="col">
-                                <label for="start_date">From Date<span class="text-danger">*</span></label>
-                                <input type="date" class="form-control" id="start_date" readonly>
-                            </div>
-                            <div class="col">
-                                <label for="end_date">To Date<span class="text-danger">*</span></label>
-                                <input type="date" class="form-control" id="end_date" required>
-                            </div>
-                        </div>
-                    </div>
-                    
-
-                    
-                    <div class="form-group">
-                        <label for="description_modal">Description<span class="text-danger">*</span></label>
-                        <textarea class="form-control" id="description_modal" rows="2" readonly></textarea>
-                    </div>
-                    
-                    <!-- Questions & Answers Section -->
-                    <h5><b>Questions & Answers</b></h5>
-                    <div class="table-responsive">
-                        <table class="table table-bordered" id="questionTable">
-                            <thead>
-                                <tr>
-                                    <th>Question</th>
-                                    <th>Answers</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <!-- Dynamic content will be inserted here -->
-                            </tbody>
-                        </table>
-                    </div>
-                    
-              		<div class="card" id="campaignaddquestion">
-				        <div class="card-header justify-content-between align-items-center">
-				            <h3><b>Add Questions</b></h3>
-				        </div>
-				        <div class="card-body">
-				            <div id="questionsContainer">
-				                <!-- Dynamic questions will be added here -->
-				            </div>
-				            <button type="button" class="btn btn-success mt-3" id="addQuestionBtn">+ Add Question</button>
-				        </div>
-				    </div>
-                    
-                    <div class="form-group text-center" id="savebuttonhide">
-                        <button type="submit" class="btn btn-primary" id="editsubmit">Save changes</button>
-                    </div>
-                </form>
-            </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-		
-                      
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-        
-        <script type="text/javascript">
-
-        
-    $(document).ready(function () {
-
-    	
-    	
-        // Define buttons for DataTables
-        var 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'
-            }
-        ];
-
-        // DataTables initialization for #StartCampaigntable
-        $('#StartCampaigntable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [
-                {targets: 'no-sort', orderable: false}
-            ],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-            ],
-            scrollY: '30vh',
-            fixedColumns: {
-                left: 1,
-                right: 1
-            },
-            buttons: buttons,
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false,
-        });
-
-        // DataTables initialization for #CampaignDatatable
-        $('#CampaignDatatable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [
-                {targets: 'no-sort', orderable: false}
-            ],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-            ],
-            scrollY: '50vh',
-            fixedColumns: {
-                left: 1,
-                right: 1
-            },
-            buttons: buttons,
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false,
-        });
-        
-  
-       /*  const rows = document.querySelectorAll("#CampaignDatatable tbody tr");
-        rows.forEach(row => {
-            const eventDateText = row.querySelector('td:nth-child(4)').innerText; // Get the event date text
-            const statusButton = row.querySelector('.status-button'); // Select the status button
-            // Parse start and end dates
-            const dates = eventDateText.split(' - ');
-            const endDate = new Date(dates[1].trim()); // Extract the end date          
-            // Get the current date
-            const currentDate = new Date();
-            currentDate.setHours(0, 0, 0, 0); // Reset time to compare dates only
-            // Compare dates and update button text and class
-            if (endDate >= currentDate) {
-
-                statusButton.classList.remove('btn-success');
-
-                statusButton.classList.add('btn-danger');
-
-                statusButton.innerText = 'Ongoing';
-
-            } else {
-
-                statusButton.classList.remove('btn-danger');
-
-                statusButton.classList.add('btn-success');
-
-                statusButton.innerText = 'Completed';
-
-            }
-
-        });  */
-     
-    });
-    
-
-
-
- 
- // Start campaign function
-    function startCampaign(callsPerAgent, campaignId) {
-        $.ajax({
-            url: '/gcc/api/campaign/startcampaign?campaign_id=' + campaignId + '&calls_per_agent=' + callsPerAgent, // URL to your Spring Boot controller
-            type: 'GET', // GET request
-            contentType: 'application/json',
-            success: function (response) {
-            	if (response && response.length > 0 && response != 0) {
-                    // If the response contains values
-                    console.log('Campaign started successfully:', response);
-					
-                    
-                    Swal.fire({
-                    	allowOutsideClick: false, 
-	                    allowEscapeKey: false, 
-	                    allowEnterKey: false, 
-                        title: 'Success!',
-                        text: 'Data transferred successfully!',
-                        icon: 'success',
-                        timer: 2000,
-                        showConfirmButton: false
-                    }).then(() => {
-                        location.reload(); // Reload after success
-                    });
-
-                } else {
-                    // If the response is empty, null, or 0
-                    Swal.fire({
-                        title: 'Error!',
-                        text: 'No data was transferred ,Please check Agents are assigned!.',
-                        icon: 'error',
-                        timer: 3000,
-                        showConfirmButton: true
-                    });
-                }
-            },
-            error: function (xhr, status, error) {
-                // Handle error scenario here
-                console.error('Error starting campaign:', error);
-                // You can show an error message to the user
-                Swal.fire({
-                    title: 'Error!',
-                    text: 'An error occurred while transferring data.',
-                    icon: 'error',
-                    timer: 3000,
-                    showConfirmButton: true
-                });
-            }
-        });
-    }
- 
-    $(document).ready(function () {
-        window.callCampEdit = function (campaignId,categoryId) {
-            fetchCampaignStatistics(campaignId,categoryId);
-            return false; // Prevent default anchor click behavior
-        };
-
-        function fetchCampaignStatistics(campaignId,categoryId) {
-            $.ajax({
-                url: `/gcc/api/campaign/statistics?campaignId=${campaignId}`,
-                type: 'GET',
-                dataType: 'json',
-                success: function (response) {
-                    if (response) {
-                        $('#totalCount').val(response.totalCount || 0);
-                        $('#completedCount').val(response.completedCount || 0);
-                        $('#pendingCount').val(response.pendingCount || 0);
-                        
-                        // Set values in the modal
-                        $('#modal_campaign_id').val(campaignId);
-                        $('#modal_category_id').val(categoryId);
-
-                        // Correctly calculate and display Overall Pending Count
-                        let overallPendingCount = (response.totalCount || 0) - (response.completedCount || 0);
-                        $('#overallpendingCount').val(overallPendingCount);
-                        
-                        // Show the modal after populating the fields
-                        $('#editcampaignModal').modal('show');
-                    } else {
-                        console.error('No data returned');
-                    }
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching campaign statistics:', error);
-                }
-            });
-        }
-        
-        $(document).ready(function () {
-            function loadAgents() {
-                $.ajax({
-                    url: "/gcc/api/campaign/assignagentid",
-                    type: "GET",
-                    dataType: "json",
-                    success: function (response) {
-                        console.log("Agents:", response);
-                        $("#agentCheckboxContainer").empty(); // Clear previous checkboxes
-
-                        // Append "Select All" checkbox
-                        $("#agentCheckboxContainer").append(`
-                            <li>
-                                <label class="dropdown-item">
-                                    <input type="checkbox" id="selectAllAgents"> Select All
-                                </label>
-                            </li>
-                        `);
-
-                        // Append individual agent checkboxes
-                        response.forEach(agent => {
-                            $("#agentCheckboxContainer").append(`
-                                <li>
-                                    <label class="dropdown-item">
-                                        <input type="checkbox" class="agentCheckbox" value="${agent.agent_id}" data-name="${agent.agent_name}"> 
-                                        ${agent.agent_name}
-                                    </label>
-                                </li>
-                            `);
-                        });
-
-                        // "Select All" checkbox logic
-                        $("#selectAllAgents").change(function () {
-                            $(".agentCheckbox").prop("checked", this.checked);
-                            calculateCallCount(); // Recalculate count when selecting all
-                        });
-
-                        // If any individual checkbox is unchecked, uncheck "Select All"
-                        $(document).on("change", ".agentCheckbox", function () {
-                            let allChecked = $(".agentCheckbox").length === $(".agentCheckbox:checked").length;
-                            $("#selectAllAgents").prop("checked", allChecked);
-                            calculateCallCount(); // Recalculate count on checkbox change
-                        });
-
-                        console.log("Agents Loaded...");
-                    },
-                    error: function (xhr) {
-                        console.error("AJAX Error:", xhr.status, xhr.responseText);
-                        Swal.fire({
-                            icon: "error",
-                            title: "Error Fetching Data",
-                            text: "Failed to load agents. Please try again.",
-                        });
-                    }
-                });
-            }
-
-            // Function to calculate Count = Call Per Agent * Selected Agents
-            function calculateCallCount() {
-                let callPerAgent = parseInt($("#call_per_agent").val()) || 0;
-                let selectedAgentsCount = $(".agentCheckbox:checked").length;
-                let totalCount = callPerAgent * selectedAgentsCount;
-
-                let totalCountValue = parseInt($("#totalCount").val()) || 0;
-                let completedCountValue = parseInt($("#completedCount").val()) || 0;
-                let pendingCount = totalCountValue - completedCountValue; // Pending count calculation
-
-                if (totalCount > pendingCount) {
-                    Swal.fire({
-                        icon: "warning",
-                        title: "Warning",
-                        text: "you can't assign more than overall pending count, now you can assign.",
-
-                        //text: `Assigned Pending count (${totalCount}) cannot exceed the today calls count (${pendingCount}).`,
-                    });
-                    totalCount = pendingCount; // Restrict value to pending count
-                }
-
-                $("#call_count").val(totalCount); // Update the Count field
-            }
-
-            // Load agents when the page loads
-            loadAgents();
-
-            // Update count when Call Per Agent changes
-            $("#call_per_agent").on("input", function () {
-                calculateCallCount();
-            });
-
-            // Update count when agents are selected/deselected
-            $(document).on("change", ".agentCheckbox", function () {
-                calculateCallCount();
-            });
-        });
-        
-        
-     // On 'Save Changes' button click
-        $('#furtherAssign').click(function () {
-            let campaign_id = $('#modal_campaign_id').val();
-            let category_id = $('#modal_category_id').val();
-            let call_per_agent = $('#call_per_agent').val();
-            
-            // Get selected agent IDs
-            let fselectedAgents = [];
-            $(".agentCheckbox:checked").each(function () {
-                fselectedAgents.push($(this).val());
-            });
-
-            // Validation check
-            if (!call_per_agent) {
-                Swal.fire({
-                    icon: "info",
-                    title: "Missing Information",
-                    text: "Please fill in 'Call Per Agent'.",
-                });
-                return; // Stop further execution
-            }
-            
-            if (fselectedAgents.length === 0) {
-                Swal.fire({
-                    icon: "info",
-                    title: "Missing Information",
-                    text: "Select at least one agent.",
-                });
-                return; // Stop further execution
-            }
-            
-            console.log("campaign_id=",campaign_id);
-            console.log("category_id=",category_id);
-            console.log("call_per_agent=",call_per_agent);
-            console.log("fselectedAgents=",fselectedAgents);
-
-            $('#furtherAssign').prop('disabled', true).text('Processing');//Click to Assign
-            $('#pageLoader').show();
-            // AJAX POST request to submit data
-             $.ajax({
-                url: "/gcc/api/agents/furtherAssignedAgents",
-                type: "POST",
-                contentType: "application/json",
-                data: JSON.stringify({
-                    campaign_id: campaign_id,
-                    category_id: category_id,
-                    call_per_agent: call_per_agent,
-                    selected_agents: fselectedAgents // Ensure key matches your controller parameter
-                }),
-                success: function (response) {
-                	$('#pageLoader').hide();
-                	$('#furtherAssign').prop('disabled', false).text('Click to Assign');
-                	if(response.status ==='success'){
-                    Swal.fire({
-                    	allowOutsideClick: false, 
-	                    allowEscapeKey: false,
-	                    allowEnterKey: false,
-                        icon: "success",
-                        title: "Success",
-                        text: "Agents successfully assigned to the campaign.",
-                    }).then((result) => {
-		                if (result.isConfirmed) {
-		                	$('#furtherAssign').prop('disabled', false).text('Click to Assign');
-		                	$('#editcampaignModal').modal('hide'); // Close modal on success
-		                    location.reload();
-		                }
-		            });
-                    
-                	} 
-                	if(response.status ==='error'){
-                		
-                		$('#furtherAssign').prop('disabled', false).text('Click to Assign');
-                		 Swal.fire({
-			                    icon: 'error',
-			                    title: 'Error',
-			                    text: response.message
-			           });
-                	}
-                },
-                error: function (xhr) {
-                	$('#pageLoader').hide();
-                    console.error("AJAX Error:", xhr.status, xhr.responseText);
-                    $('#furtherAssign').prop('disabled', false).text('Click to Assign');
-                    Swal.fire({
-                        icon: "error",
-                        title: "Error",
-                        text: "Failed to assign agents. Please try again.",
-                    });
-                }
-            }); 
-            
-        });
-
-    });  
-
- 
- 
-  //Update request form details 
-	 $(document).ready(function () {
-		    // Function to open the edit modal and populate data
-		    window.callEdit = function (campaignId) {
-		        fetchCampaignDetails(campaignId);
-		      
-		        return false; // Prevent default anchor click behavior
-		    };
-		    
-		    
-		    
-	        function setEndDateMin() {
-
-	            var fromDate = document.getElementById('start_date').value;
-
-	            document.getElementById('end_date').min = fromDate;
-
-	        }
-		
-
-		    
-			 // Function to load answer types dynamically
-			  function loadAnswerTypes(callback) {
-			      $.ajax({
-			          url: "/gcc/api/getAnswerTypes",
-			          type: "GET",
-			          success: function(data) {
-			              callback(data);
-			          },
-			          error: function() {
-			              console.log("Error loading answer types.");
-			          }
-			      });
-			  }
-
-
-		    
-		    
-		    function fetchCampaignDetails(campaignId) {
-		        $.ajax({
-		            url: `/gcc/api/campaign/getCampaignDetailsById?campaign_id=${campaignId}`,
-		            type: 'GET',
-		            success: function (response) {
-		                console.log("API Response:", response); // Debugging output
-
-		                if (!response) {
-		                    console.log("Response is null or undefined");
-		                    alert("API returned an empty response.");
-		                    return;
-		                }
-
-		                if (Array.isArray(response)) {
-		                    console.log("Response is an array with length:", response.length);
-		                } else {
-		                    console.log("Response is not an array, type:", typeof response);
-		                }
-
-		                if (Array.isArray(response) && response.length > 0) {
-		                    let campaign = response[0]; // Extract first object for campaign details
-
-		                 // Ensure category_id is set
-		                    if (campaign.category_id) {
-		                        $('#category_id').val(campaign.category_id);
-		                        console.log("Category ID set:", campaign.category_id);
-		                    } else {
-		                        console.warn("Category ID is missing in API response");
-		                    }
-		                    
-		                    
-		                    
-		                	// Campaign status check
-		                	if (campaign.campaign_status === "CLOSED") {
-		                		$('#campaignaddquestion, #savebuttonhide').hide();
-		                		$('#end_date').prop('readonly', true);
-		                	} else {
-		                		$('#campaignaddquestion, #savebuttonhide').show();
-		                	}
-		                    
-		                    
-		                    let campaignid = campaign.campaign_id;
-		                    console.log("campaignid ",campaignid);
-		                    // Populate campaign details in the modal
-		                    $('#campaign_id').val(campaign.campaign_id);
-		                    
-		                    $('#campaign_name').val(campaign.campaign_name);
-		                    $('#start_date').val(campaign.start_date);
-		                    $('#end_date').val(campaign.end_date);
-		                    $('#no_of_agents').val(campaign.no_of_agents);
-		                    $('#calls_per_agent').val(campaign.calls_per_agent);
-		                    $('#description_modal').val(campaign.description);
-
-		                    // Handle questions and answers dynamically
-		                    let questionHtml = "";
-		                    response.forEach(q => {
-		                        let answers = Array.isArray(q.campaign_answer) ? q.campaign_answer.join(", ") : "No Answers";
-		                        questionHtml += `<tr>
-		                            <td>${q.questions}</td>
-		                            <td>${answers}</td>
-		                        </tr>`;
-		                    });
-
-		                    // Populate table inside the modal
-		                    $('#questionTable tbody').html(questionHtml);
-		                    
-		                    
-		                	/////////////this is for adding questions and answers dynamically //////////////
-		                	let questionCount = 0;
-
-		                    
-		              	    let validAnswerTypeIds = [];
-		      			  // Function to generate answer type dropdown dynamically
-		      			  function generateAnswerTypeDropdown(questionId, answerTypes) {
-		      			      let dropdownHtml = `<label for="answerType${questionId}">Select Answer Type<span class="text-danger">*</span></label>
-		      			                          <select class="form-control answer-type" data-question-id="${questionId}">
-		      			                              <option value="">--Select--</option>`;
-
-		      			      $.each(answerTypes, function(index, entry) {
-		      			          dropdownHtml += `<option value="${entry.answer_type_id}">${entry.type_name}</option>`;
-		      			          if (!validAnswerTypeIds.includes(entry.answer_type_id.toString())) {
-		      			              validAnswerTypeIds.push(entry.answer_type_id.toString()); // Store as string
-		      			          }
-		      			      });
-
-		      			      dropdownHtml += `</select>`;
-		      			      return dropdownHtml;
-		      			  }
-
-		      			  // Add question button
-		      			  $('#addQuestionBtn').click(function() {
-		      				  
-		      		        if ($('#questionsContainer').is(':hidden')) {
-		      		            $('#questionsContainer').show(); // Show container on first click
-		      		        }
-		      				  
-		      			      questionCount++; 
-		      			      loadAnswerTypes(function(answerTypes) {
-		      			          let questionHtml = `
-		      			              <div class="question-block border p-3 mb-3" data-question-id="${questionCount}">
-		      			                  <label for="question${questionCount}">Enter Question <span class="text-danger">*</span></label>
-		      			                  <input type="text" class="form-control mb-2 question-input" name="question[]" placeholder="Type your question" required>
-		      			                  ${generateAnswerTypeDropdown(questionCount, answerTypes)}
-		      			                  <div class="answers-container mt-3" id="answersContainer${questionCount}"></div>
-		      			                  <button type="button" class="btn btn-danger btn-sm mt-2 remove-question">Remove Question</button>
-		      			              </div>`;
-		      			          $('#questionsContainer').append(questionHtml);
-		      			      });
-		      			  });
-
-		      			  // Handle answer type selection
-		      			  $(document).on('change', '.answer-type', function() {
-		      			      let questionId = $(this).data('question-id');
-		      			      let selectedType = $(this).val(); // Keep as string
-		      			      let answersContainer = $(`#answersContainer${questionId}`);
-		      			      answersContainer.html('');
-
-		      			   
-		      			   // Check if selected type is valid
-		      			      if (validAnswerTypeIds.includes(selectedType)) {
-		      			          let answerBlock = `
-		      			              <div class="answer-block">
-		      			                  <label>Answers:</label>
-		      			                  <div class="answer-list"></div>
-		      			                  ${selectedType === "1" ? "" : `<button type="button" class="btn btn-info btn-sm add-answer mt-2" data-question-id="${questionId}">+ Add Answer</button>`}
-		      			              </div>`;
-		      			          answersContainer.append(answerBlock);
-		      			      }
-		      			  });
-
-		      			  // Add answer dynamically
-		      			  $(document).on('click', '.add-answer', function() {
-		      			      let questionId = $(this).data('question-id');
-		      			      let answerList = $(`#answersContainer${questionId} .answer-list`);
-		      			      let answerInput = `
-		      			          <div class="answer-input d-flex align-items-center mb-2">
-		      			              <input type="text" class="form-control answer-text" placeholder="Enter answer" required>
-		      			              <button type="button" class="btn btn-danger btn-sm remove-answer ms-2">X</button>
-		      			          </div>`;
-		      			      answerList.append(answerInput);
-		      			  });
-		      			  
-		      			  
-		      			// Load answer types on page load for the first question
-		      			  loadAnswerTypes(function(answerTypes) {
-		      			      let initialDropdown = generateAnswerTypeDropdown(0, answerTypes);
-		      			      $('#questionsContainer').append(`
-		      			          <div class="question-block border p-3 mb-3" data-question-id="0">
-		      			              <label for="question0">Enter Question <span class="text-danger">*</span></label>
-		      			              <input type="text" class="form-control mb-2 question-input" name="question[]" placeholder="Type your question" required>
-		      			              ${initialDropdown}
-		      			              <div class="answers-container mt-3" id="answersContainer0"></div>
-		      			              <button type="button" class="btn btn-danger btn-sm mt-2 remove-question">Remove Question</button>
-		      			          </div>`);
-		      			  }); 
-
-		      			  // Remove question
-		      			  $(document).on('click', '.remove-question', function() {
-		      			      $(this).closest('.question-block').remove();
-		      			  });
-
-		      			  // Remove answer
-		      			  $(document).on('click', '.remove-answer', function() {
-		      			      $(this).closest('.answer-input').remove();
-		      			  });
-		                    
-
-		                    // Ensure modal is displayed
-		                    setEndDateMin();
-		                    $('#editModal').modal('show');
-		                } else {
-		                    alert('Campaign details not found.');
-		                }
-		            },
-		            error: function (xhr, status, error) {
-		                console.error('Error fetching campaign details:', error);
-		                alert('An error occurred while fetching campaign details.');
-		            }
-		        });
-		   
-
-
-				    $('#editsubmit').click(function (event) {
-				        event.preventDefault(); // Prevent default form submission
-
-				        let campaignId = $('#campaign_id').val();
-				        if (!campaignId) {
-				            Swal.fire({
-				                icon: 'warning',
-				                title: 'Validation Error',
-				                text: 'Campaign ID is required.'
-				            });
-				            return;
-				        }
-
-				        var campaignData = {
-				            campaign_id: parseInt(campaignId), // Ensure it's converted to a number		
-
-				            end_date: $('#end_date').val().trim(),
-				            questionsData: []
-				        };
-			            console.log("campaignData ",campaignData);
-				        let isValid = true; // Validation flag
-
-				        // Validate campaign details
-				        if ( !campaignData.end_date) {
-				            Swal.fire({
-				                icon: 'warning',
-				                title: 'Validation Error',
-				                text: 'Please select enddate.'
-				            });
-				            return;
-				        }
-
-				        // Validate questions and answers
-				        $('.question-block').each(function () {
-				        	
-				        	let category = $('#category_id').val()?.trim();
-				        	if (!category) {
-				        	    console.warn("Category ID is empty or undefined!");
-				        	} else {
-				        	    console.log("Captured Category ID:", category);
-				        	}
-
-				        	// Keep as string for comparison
-				            let questionText = $(this).find('.question-input').val().trim();
-				            let answerType = $(this).find('.answer-type').val();
-				            let selectedType = answerType.toString(); 
-				            let answers = [];
-
-				            
-				            // Validate question text
-				            if (!questionText) {
-				                Swal.fire({
-				                    icon: 'info',
-				                    title: 'Info',
-				                    text: 'Please enter a question before submitting.'
-				                });
-				                isValid = false;
-				                return false; // Exit loop
-				            }
-
-				            // Validate answer type selection
-				            if (!answerType) {
-				                Swal.fire({
-				                    icon: 'info',
-				                    title: 'Info',
-				                    text: 'Please select an answer type for each question.'
-				                });
-				                isValid = false;
-				                return false; // Exit loop
-				            }
-					
-
-					        // Skip answer validation for "Text" answer type (ID = 1)
-					        let answersContainer = $(this).find('.answer-list');
-					        if (answerType !== "1" && answersContainer.children().length === 1) {
-					            Swal.fire({
-					                icon: 'info',
-					                title: 'Info',
-					                text: 'Each question must have at least two answer (except for Text type).'
-					            });
-					            isValid = false;
-					            return false; // Exit loop
-					        }
-					        
-					        // Validate answers (only if not Text type)
-					        if (selectedType !== "1") {
-					            let hasEmptyAnswer = false;
-
-					            $(this).find('.answer-text').each(function () {
-					                let answer = $(this).val().trim();
-					                if (answer) {
-					                    answers.push(answer);
-					                } else {
-					                    hasEmptyAnswer = true;
-					                }
-					            });
-
-					            if (hasEmptyAnswer || answers.length === 0) {
-					                Swal.fire({
-					                    icon: 'info',
-					                    title: 'Info',
-					                    text: 'Please fill in all answer fields before submitting.',
-					                });
-					                isValid = false;
-					                return false; // Stop processing further
-					            }
-					        }
-
-				            campaignData.questionsData.push({ category: category, question: questionText, answerType: answerType, answers: answers });
-				        });
-
-				        if (!isValid) return;
-
-				        // Disable submit button to prevent duplicate submissions
-				        $('#editsubmit').prop('disabled', true).text('Saving...');
-
-				        // Send data via AJAX
-				        $.ajax({
-				            url: '/gcc/api/campaign/updateCampaign',
-				            type: 'POST',
-				            contentType: 'application/json',
-				            data: JSON.stringify(campaignData),
-				            success: function (response) {
-				            	$('#editsubmit').prop('disabled', false).text('Save changes');
-				                Swal.fire({
-				                	allowOutsideClick: false,
-		    	                    allowEscapeKey: false, 
-		    	                    allowEnterKey: false,
-				                    title: 'Success!',
-				                    text: response,
-				                    icon: 'success',
-				                    confirmButtonText: 'OK'
-				                }).then(() => {
-				                	$('#editsubmit').prop('disabled', false).text('Save changes');
-				                    $('#editModal').modal('hide');
-				                    location.reload();
-				                });
-				            },
-				            error: function (xhr) {
-				                Swal.fire({ title: 'Error!', text: xhr.responseText, icon: 'error' });
-				                $('#editsubmit').prop('disabled', false).text('Save Changes');
-				            }
-				        });
-				    });
-
-			  }
-
-	}); 
-  
-  
-  
-  
-  /////////////dizo///////////////
-  
-  $(document).ready(function () {
-    	
-       /*  function checkExpiredCampaigns() {
-            $(".status-button").each(function () {
-                let button = $(this);
-                let campaignId = button.data("id");
-                let endDate = button.closest("tr").find("td:nth-child(4)").text().split(" - ")[1].trim(); // Extracting end_date
-
-                let today = new Date().toISOString().split("T")[0]; // Get current date in YYYY-MM-DD format
-
-                if (endDate < today) {
-                    $.ajax({
-                        url: "/gcc/api/campaign/auto-close",
-                        type: "POST",
-                        data: { campaignId: campaignId },
-                        success: function (response) {
-                            console.log("Campaign ID " + campaignId + " auto-closed.");
-                            button.replaceWith('<span class="text-success">Closed</span>'); // Update UI
-                        },
-                        error: function (xhr) {
-                            console.error("Error closing campaign:", xhr.responseText);
-                        }
-                    });
-                }
-            });
-        }
-
-        checkExpiredCampaigns(); // Run on page load */
-    	
-    $(document).on("click", ".status-button", function () {
-        let button = $(this);
-        let campaignId = button.data("id"); // Get campaign ID from data attribute
-
-        if (!campaignId) {
-            Swal.fire("Error!", "Campaign ID is missing.", "error");
-            return;
-        }
-
-        if (button.text().trim() === "Close") {
-            return;
-        }
-
-        Swal.fire({
-            title: "Are you sure?",
-            text: "Do you want to close the Campaign?",
-            icon: "warning",
-            showCancelButton: true,
-            confirmButtonText: "Yes",
-            cancelButtonText: "No",
-            confirmButtonColor: "#007bff",
-            cancelButtonColor: "#dc3545",
-            allowOutsideClick: false,
-            allowEscapeKey: false, 
-            allowEnterKey: false
-        }).then((result) => {
-            if (result.isConfirmed) {
-                console.log("Closing campaign with ID:", campaignId); // Debugging log
-
-                $.ajax({
-                    url: "/gcc/api/campaign/close?campaignId=" + campaignId, // ✅ Ensure query parameter
-                    type: "POST",
-                    success: function (response) {
-                        console.log("Success Response:", response);
-                        Swal.fire({
-                        	allowOutsideClick: false,
-    	                    allowEscapeKey: false, 
-    	                    allowEnterKey: false,
-                            title: "Success!",
-                            text: "Campaign has been closed.",
-                            icon: "success",
-                            allowOutsideClick: false,
-                            allowEscapeKey: false
-                        }).then((result) => {
-                        	 if (result.isConfirmed) {                       		 
-                        		 location.reload();
-                        	}
-                        });
-                       
-                    },
-                    error: function (xhr, status, error) {
-                        console.error("Error Details:", xhr.responseText);
-                        Swal.fire("Error!", "Failed to close campaign.", "error");
-                    }
-                });
-                        
-            }
-            
-        });
-    });
-});
- 
- 
-</script>
-
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenter/campaignreport.html b/src/main/resources/templates/modules/callcenter/campaignreport.html
deleted file mode 100644
index 83b41b0c..00000000
--- a/src/main/resources/templates/modules/callcenter/campaignreport.html
+++ /dev/null
@@ -1,973 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style> 
- .required{
-	color: red;
-}
-.card-box {
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-       	
-    }
-    
-@media (max-width: 768px) {
-    .card-box {
-        text-align: center;
-    }
-
-}
-
-
-/* #questionDatatable {
-    table-layout: fixed !important;  
-    width: 100% !important; 
-}
-
-#questionDatatable th, 
-#questionDatatable td {
-    white-space: nowrap !important;
-    text-align: center; 
-    vertical-align: middle; 
-}
-
-#questionDatatable td:nth-child(2) {
-    text-align: left !important;
-} */
-.table-responsive {
-    min-width: 100%;
-    overflow-x: auto;
-}
-		
-		
-/* Active tab color */
-.nav-tabs .nav-link.active {
-    background-color: rgb(40, 185, 123) !important;
-    color: white !important;
-    border-color: rgb(40, 185, 123) !important;
-}
-
-/* Inactive tab color */
-.nav-tabs .nav-link {
-    background-color: #f8f9fa;
-    color: black;
-    border-color: #ddd;
-}
-
-/* Hover effect */
-.nav-tabs .nav-link:hover {
-    background-color: rgba(40, 185, 123, 0.8);
-    color: white;
-}
-
-
-.modal-body {
-    max-height: 70vh; 
-    overflow-y: auto; /* Enables vertical scrolling */
-    overflow-x: hidden; /* Hides horizontal scrolling */
-    padding-right: 15px; /* Prevents content cutoff */
-}
-
-		
-</style>
-<body>
-    <div class="wrapper">
-        <!-- Header -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-        <div class="page-wrap">
-            <!-- Left Menu -->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-6">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Campaign Report</h5>
-                                        <span>1913 Campaign Report</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-6">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item">
-                                            <a href="/gcc/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">1913 Campaign</li>																		
-                                        <li class="breadcrumb-item active" aria-current="page">Campaign Report</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-					
-	                <div class="row mt-4">
-	                	
-	                	<div class="col-md-12">
-                             <div class="card">
-                             	<div class="card-header">
-                             		<h3>Task Details</h3>
-                             	</div>
-                             	
-                          	<div class="row mt-3 ml-2">
-									    <div class="col-md-3">
-									    	<label for="startDate" class="form-label" style="font-size: medium;">From Date:</label>
-									        <input type="date" id="startDate" class="form-control" placeholder="Start Date" onclick="this.showPicker()">
-									    </div>
-									    <div class="col-md-3">
-									    	<label for="endDate" class="form-label" style="font-size: medium;">To Date:</label>
-									        <input type="date" id="endDate" class="form-control" placeholder="End Date" onclick="this.showPicker()">
-									    </div>
-									    <div class="col-md-3" style="margin-top: 30px;">
-									        <button id="searchBtn" class="btn btn-primary">Search</button>
-									        <button id="resetBtn" class="btn btn-secondary">Reset</button>
-									    </div>
-									</div>
-					   				
-					   				<div class="card-body">
-						
-                 							<table id="QaqcDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-							                    <thead class="thead-dark">
-											        <tr role="row">
-							                            <th rowspan="2" class="text-center" width="1%;">S.No</th>
-							                     
-							                            <th colspan="3" class="text-center">Campaign</th>
-							                            <th colspan="3" class="text-center">Performance</th>
-							                            <th colspan="5" class="text-center">Call Results</th>
-							                            <th rowspan="2" class="text-center">Action</th>
-							                            
-							                        </tr>
-							                        <tr role="row">           
-					                            
-							                            <th class="text-center no-sort" style="text-align: center;">Campaign Name</th>
-							                            <th class="text-center no-sort" style="text-align: center;">Date</th>
-							                            <th class="text-center no-sort" style="text-align: center;">Category</th>
-							                            <th class="text-center no-sort" style="text-align: center;">Total Data</th>							                            
-							                            <th class="text-center no-sort" style="text-align: center;">Assigned Calls</th>
-							                            <th class="text-center no-sort" style="text-align: center;">Not Assigned Calls</th>
-							                            <!-- <th class="text-center no-sort">Completion(%)</th> -->
-							                            <th class="no-sort" style="text-align: center;">Information Given</th> 
-							                            <th class="no-sort" style="text-align: center;">Call Back Later</th>
-							                            <th class="no-sort" style="text-align: center;">Unattended</th>
-							                            <th class="no-sort" style="text-align: center;">Switch Off</th>
-							                            <th class="no-sort" style="text-align: center;">Wrong Number</th>
-							                            
-							                        </tr>
-							                    </thead>
-							                    <tbody>
-							                        
-							                    </tbody>
-							                </table>
-
-							 </div>
-                         </div> 
-					</div>	               	
-             						 					  
-			</div> 
-        </div>
-   
-  
-      </div>
-      
-      
-      <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-      
-         <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-</div>
-</div>
-
-<!--agentperformance Modal -->
-	<div class="modal fade" id="agentperformance" tabindex="-1"
-		role="dialog" aria-labelledby="exampleModalCenterLabel"
-		aria-hidden="true">
-		<div class="modal-dialog modal-xl modal-dialog-scrollable"
-			role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="exampleModalCenterLabel">Task
-						Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-
-
-				<div class="modal-body">
-					<form id="editForm" onsubmit="submitForm(event)">
-						<input type="hidden" name="campaign_id" id="campaign_id" />
-
-						<div class="form-group">
-							<input type="hidden" name="category_id" class="form-control"
-								id="category_id" readonly>
-						</div>
-
-						<div class="mt-1" style="font-size: 14px;">
-							<div class="row pb-2">
-								<div class="col-md-6">
-									<strong>From Date:</strong> <span id="start_date">N/A</span>
-								</div>
-								<div class="col-md-6">
-									<strong>To Date:</strong> <span id="end_date">N/A</span>
-								</div>
-							</div>
-							<div class="row pb-2">
-								<div class="col-md-6">
-									<strong>Description:</strong> <span id="description_modal">N/A</span>
-								</div>
-								<div class="col-md-6">
-									<strong>Campaign Category:</strong> <span id="category">N/A</span>
-								</div>
-							</div>
-						</div>
-
-					</form>
-
-
-					<!-- Bootstrap Tabs for Switching Tables -->
-					<ul class="nav nav-tabs" id="tableTabs" role="tablist"
-						style="margin-bottom: 10px;">
-						<li class="nav-item"><a class="nav-link active mr-2"
-							id="performance-tab" data-toggle="tab" href="#performanceTable"
-							role="tab" aria-controls="performanceTable" aria-selected="true">Agent
-								With Report</a></li>
-						<li class="nav-item"><a class="nav-link" id="question-tab"
-							data-toggle="tab" href="#questionTable" role="tab"
-							aria-controls="questionTable" aria-selected="false">Feedback
-								Report</a></li>
-					</ul>				
-
-					<!-- <div class="modal-body"> -->
-					<div class="tab-content">
-						<!-- Performance Table -->
-						<div class="tab-pane fade show active" id="performanceTable"
-							role="tabpanel" aria-labelledby="performance-tab">
-							<div class="table-responsive">
-								<table id="agentperformanceDatatable"
-									class="table table-striped table-bordered table-hover dataTable"
-									role="grid">
-									<thead class="thead-dark">
-										<tr role="row">
-											<th rowspan="2" class="text-center">S.No</th>
-											<th rowspan="2" class="text-center">Agent Name</th>
-											<th colspan="4" class="text-center">Performance</th>
-											<th colspan="5" class="text-center">Call Results</th>
-										</tr>
-										<tr role="row">
-											<th class="text-center">Assigned Calls</th>
-											<th class="text-center">Finished</th>
-											<th class="text-center">Pending Calls</th>
-											<th class="text-center">Completion (%)</th>
-											<th class="text-center">Information Given</th>
-											<th class="text-center">Call Back</th>
-											<th class="text-center">Unattended</th>
-											<th class="text-center">Switch Off</th>
-											<th class="text-center">Wrong Number</th>
-										</tr>
-									</thead>
-									<tbody>
-									</tbody>
-								</table>
-							</div>
-						</div>
-
-						<!-- Questions Table -->
-						<div class="tab-pane fade" id="questionTable" role="tabpanel"
-							aria-labelledby="question-tab">
-
-							<table id="questionDatatable"
-								class="table table-striped table-bordered table-hover dataTable"
-								role="grid">
-
-								<thead class="thead-dark">
-									<tr role="row">
-										<th class="text-center ">S.No</th>
-										<th class="text-center no-sort">Question</th>
-										<th class="text-center no-sort">Answers</th>
-									</tr>
-
-								</thead>
-								<tbody>
-
-								</tbody>
-							</table>
-
-
-						</div>
-					</div>
-					<!--  </div> -->
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary"
-						data-dismiss="modal">Cancel</button>
-
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">	
- 	 $(document).ready(function() {
- 		 
- 		 $('#agentperformance').on('shown.bs.modal', function () {
-
- 	    	 let 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'
- 	             }
- 	         ];
- 	        
- 	    	 if (!$.fn.DataTable.isDataTable('#agentperformanceDatatable')) {
- 	            $('#agentperformanceDatatable').DataTable({
- 	                dom: 'Bftip',               
- 	                columnDefs: [
- 	                    { targets: 'no-sort', orderable: false }
- 	                ],
- 	                lengthMenu: [
- 	                    [50, 100, 200, 500, -1],
- 	                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
- 	                ],
- 	                scrollY: '30vh',
- 	                scrollX: true,  // Enable horizontal scrolling	
- 	                
- 	                buttons: buttons,
- 	                fixedHeader: false,
- 	                autoWidth: true, 
- 	                responsive: false,
-              		searching: true,
- 	                select: false,
- 	                processing: false,
- 	            });
- 	        }
- 	    	
- 	    });
-
-     	var table = $('#QaqcDatatable').DataTable({
-     		
-     		
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '50vh',
-             scrollX: true,
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: false,
-             responsive: false,
-             searching:true,
-             select: false,
-             processing: false
-         });
-
-     	
-      	/* var questiontable = $('#questionDatatable').DataTable({
-
-            dom: 'Bftip',	
-            columnDefs: [
-                { targets: 'no-sort', orderable: false }
-            ],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', 'Show all']
-            ],
-            scrollY: '50vh',
-            fixedColumns: {
-                left: 1,
-                right: 1
-            },
-            buttons: [
-                {
-                    extend: 'pageLength',
-                    className: 'btn btn-warning'
-                },
-                {
-                    title: 'Data export',
-                    extend: 'copyHtml5',
-                    text: 'Copy',
-                    className: 'btn btn-secondary',
-                    id: 'copyBtn'
-                },
-                {
-                    extend: 'excelHtml5',
-                    text: 'Excel',
-                    className: 'btn btn-secondary',
-                    id: 'excelBtn'
-                },
-                {
-                    extend: 'csvHtml5',
-                    text: 'CSV',
-                    className: 'btn btn-secondary',
-                    id: 'csvBtn'
-                },
-                {
-                    extend: 'pdfHtml5',
-                    text: 'PDF',
-                    className: 'btn btn-secondary',
-                    id: 'pdfBtn'
-                }
-            ],
-            fixedHeader: false,
-            autoWidth: true,
-            responsive: false,
-            searching:true,
-            select: false,
-            processing: false
-        }); */
-      	
-     // Ensure DataTable columns adjust when modal is shown
-      	/* $('#agentperformance').on('shown.bs.modal', function () {
-    if ($.fn.DataTable.isDataTable('#questionDatatable')) { 
-        let questionDatatable = $('#questionDatatable').DataTable();
-        questionDatatable.columns.adjust().draw();
-    }
-}); */
-    	
-     	 // Initialize DataTable with export buttons
-
-            //const overallcountapiUrl = "/gcc/api/callcenterqaqc/qaqctasklist/overalltaskcount"; // Replace with your API endpoint
-            
-		    const tableApiUrl = "/gcc/api/campaignreport/getcampaignData";
-            const agentApiUrl = "/gcc/api/campaignreport/getagentdatacount";
-            const excelurl = "/gcc/api/campaign/getCampaignQuestionData";
-		   
-		    //const dataTableElement = $("#QaqcDatatable").DataTable(); // Initialize DataTable
-		    //const questionTableElement = $("#questionDatatable").DataTable(); // Initialize DataTable
-
-		    // Fetch Data Function
-
-		    
-
-    // Fetch and Populate Table Data Function
-    
-     const fetchTableData = async (startDate = "", endDate = "") => {
-    	 $('#pageLoader').show();
-        try {
-            const params = new URLSearchParams();
-            if (startDate) params.append("startDate", startDate);
-            if (endDate) params.append("endDate", endDate);
-
-            const response = await fetch(`${tableApiUrl}?${params.toString()}`);
-            const tableData = await response.json();
-
-            // Update DataTable with new data
-            table.clear(); // Clear existing data
-            tableData.forEach((row, index) => {
-                table.row.add([
-                	
-                	`<div style="text-align: center;">${index + 1}</div>`,
-                	`<button class="btn btn-success" data-campaign_id="${row.campaign_id}" 
-                    onclick="handleTaskButtonClick('${row.campaign_id}')">${row.campaign_name}</button>`,
-                    `<div style="text-align: center;"> ${row.start_date} - ${row.end_date}</div>`,
-                    `<div style="text-align: center;">${row.category_name}</div>`,
-                    `<div style="text-align: center;">${row.assigned_count}</div>`,
-                    `<div style="text-align: center;">${row.total_count}</div>`,
-                    `<div style="text-align: center;">${row.not_assigned_count}</div>`,
-                    `<div style="text-align: center;">${row.informationgiven_count}</div>`,
-                    `<div style="text-align: center;">${row.callback_count}</div>`,
-                    `<div style="text-align: center;">${row.unattended_count}</div>`,
-                    `<div style="text-align: center;">${row.switchoff_count}</div>`,
-                    `<div style="text-align: center;">${row.wrongnumber_count}</div>`,
-                    `<button class="btn btn-primary downloadExcelBtn"
-                    data-categoryid="${row.category_id}" 
-                    data-campaignid="${row.campaign_id}" 
-                    
-                    >
-                    Download Excel
-                </button>`
-
-                ]);
-                
-            });
-            table.draw(); // Redraw the DataTable with the updated data
-      
-        } catch (error) {
-            console.error("Error fetching table data:", error);
-        }finally {
-            $('#pageLoader').hide(); // Hide loader in both success or error
-        }
-           
-    };
-    
-    $(document).on("click", ".downloadExcelBtn", function () {
-        let categoryId = $(this).data("categoryid");
-        let campaignId = $(this).data("campaignid");
-       
-        
-        console.log("dfd",categoryId);
-        console.log("d",campaignId);
-        //console.log("Row Data:", row);
-     
-
-        window.location.href = `/gcc/api/campaignreport/download-excel?categoryId=${categoryId}&campaignId=${campaignId}`;
-    });
-    
-    let today = new Date();
-
-	// Get the first day of the current month (this should give 2024-11-01 for November)
-	let firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
-
-	// Manually format the date as yyyy-mm-dd without relying on toISOString
-	let formattedFirstDay = firstDayOfMonth.getFullYear() + '-' + 
-	                        (firstDayOfMonth.getMonth() + 1).toString().padStart(2, '0') + '-' + 
-	                        firstDayOfMonth.getDate().toString().padStart(2, '0');
-
-	let formattedToday = today.getFullYear() + '-' + 
-	                     (today.getMonth() + 1).toString().padStart(2, '0') + '-' + 
-	                     today.getDate().toString().padStart(2, '0');
-	
-	// Set the date input values
-    $('#startDate').val(formattedFirstDay);
-    $('#endDate').val(formattedToday);
-
-    // Example: Fetch Data initially without filters
-    fetchTableData(formattedFirstDay,formattedToday);
-
-
-// Function to Download Campaign Excel
-
-
-
-    
- // Event listener for From Date selection
-	   $("#startDate").on("change", function() {
-	       const startDate = $(this).val();  // Get the selected start date
-	       // Set the min value for To Date to be the selected From Date
-	       $("#endDate").attr("min", startDate);
-	   });
-
-	   // Event listener for To Date selection
-	   $("#endDate").on("change", function() {
-	       const endDate = $(this).val();  // Get the selected end date
-	       // Set the max value for From Date to be the selected To Date
-	       $("#startDate").attr("max", endDate);
-	   });
-
-		    // Search Button Click
-		   document.getElementById("searchBtn").addEventListener("click", () => {
-    const startDate = document.getElementById("startDate").value;
-    const endDate = document.getElementById("endDate").value;
-
-    //console.log("xsnskjx");
-    console.log(startDate);
-
-    // Check if startDate or endDate is empty
-    if (!startDate || !endDate) {
-        Swal.fire({
-            icon: "warning",
-            title: "Incomplete Search",
-            text: "Please select the Date Before searching",
-            confirmButtonText: "OK",
-        });
-    } else {
-        // Call fetchTableData if dates are provided
-        fetchTableData(startDate, endDate);
-    }
-});
-
-
-		    // Reset Button Click
-		    document.getElementById("resetBtn").addEventListener("click", () => {
-		        /* document.getElementById("startDate").value = "";
-		        document.getElementById("endDate").value = "";
-		        fetchData(); // Fetch data without date filters
-		        fetchTableData(); */
- 		        window.location.reload();		        
-		    });
-
-		    // Initial Load
-		    //fetchData(); // Load overall data initially
-            //fetchTableData();
-		});
- 	 
-  	 
- 	/* function downloadCampaignExcel(campaignId) {
- 	    const excelurl = `/gcc/api/campaign/exportCampaignData?campaign_id=${campaignId}`;
-
- 	    $.ajax({
- 	        url: excelurl,
- 	        type: 'GET',
- 	        xhrFields: {
- 	            responseType: 'blob' // Ensure response is treated as a Blob (binary file)
- 	        },
- 	        success: function (data, status, xhr) {
- 	            const blob = new Blob([data], { type: xhr.getResponseHeader('Content-Type') });
-
- 	            // Extract filename from Content-Disposition header
- 	            let filename = "campaign_data.xlsx"; // Default filename
- 	            const disposition = xhr.getResponseHeader('Content-Disposition');
- 	            if (disposition && disposition.includes('filename=')) {
- 	                filename = disposition.split('filename=')[1].trim().replace(/['"]/g, ''); // Clean up filename
- 	            }
-
- 	            const downloadUrl = URL.createObjectURL(blob);
- 	            const link = document.createElement("a");
- 	            link.href = downloadUrl;
- 	            link.setAttribute("download", filename); // Set dynamic filename
- 	            document.body.appendChild(link);
- 	            link.click();
- 	            document.body.removeChild(link);
- 	            URL.revokeObjectURL(downloadUrl); // Clean up memory
- 	        },
- 	        error: function (xhr, status, error) {
- 	            console.error("Error downloading Excel file:", error);
- 	            alert("Failed to download the file. Please try again.");
- 	        }
- 	    });
- 	} */
-
-
- 	 
- 	 function handleTaskButtonClick(CampaignId)
- 	 {
- 		 //console.log("CampaignId",CampaignId);
- 		 		 
- 		 
- 		$('#agentperformance').modal({
-            backdrop: 'static',
-            keyboard: false
-        });
-        $('#agentperformance').modal('show');
-        
-     	// Set default active tab
-        $('#performance-tab').tab('show');
- 		 
-        $.ajax({
-            url: '/gcc/api/campaignreport/getReportCampaignid?campaign_id='+CampaignId,
-            type: 'GET',
-            contentType: 'application/json',
-            success: function (response) {
-                if (response && response.length > 0) {
-                    const campaign = response[0];
-
-                    // Populate form fields with response data
-                    $('#campaign_id').val(campaign.campaign_id);
-                    $('#category_id').val(campaign.category_id);
-
-
-                    $('#start_date').text(campaign.start_date || 'N/A');
-                    $('#end_date').text(campaign.end_date || 'N/A');
-                    $('#description_modal').text(campaign.description || 'N/A');
-                    $('#category').text(campaign.category_name || 'N/A');
-                    
-                    // Update modal title dynamically
-                    $('#exampleModalCenterLabel').html(
-                        `<b>Campaign ID:</b> ${campaign.campaign_id} and 
-                      
-                         <b>Created Date:</b> ${campaign.created_date}`
-                    );
-                    
-                    // Open modal
-                    $('#agentperformance').modal('show');
-                } else {
-                    console.warn('No data found for the given campaign ID');
-                    $('#exampleModalCenterLabel').html('<b>No data found</b>');
-                }
-            },
-            error: function (xhr, status, error) {
-                console.error('Error fetching campaign details:', error);
-                $('#exampleModalCenterLabel').html('<b class="text-danger">Failed to load campaign details</b>');
-            }
-        });
-        
-        if ($.fn.DataTable.isDataTable('#agentperformanceDatatable')) {
- 	        $('#agentperformanceDatatable').DataTable().clear().destroy();
- 	    }
-        
-        $.ajax({
-            url: '/gcc/api/campaignreport/getagentdatacount?campaign_id='+CampaignId,
-            type: 'GET',
-            contentType: 'application/json',
-            success: function (response) {
-            	//console.log("response",response);
-            	if (response && response.length > 0) {
-            		
-	            	let CtableBody = $('#agentperformanceDatatable tbody');
-	            	CtableBody.empty();
-            	response.forEach((item, index) => {
-            		let row = `
-            			<tr>
-                        <td class="text-center">${index + 1}</td>
-                        <td class="text-center">${item.agent_name}</td>
-                        <td class="text-center">${item.assigned_count || 0}</td>
-                        <td class="text-center">${item.completed_count || 0}</td>
-                        <td class="text-center">${item.pending_count || 0}</td>
-                        <td class="text-center">${item.completed_percentage || 0}%</td> 
-                        <td class="text-center">${item.informationgiven_count || 0}</td>
-                        <td class="text-center">${item.callback_count || 0}</td>
-                        <td class="text-center">${item.unattended_count || 0}</td>
-                        <td class="text-center">${item.switchoff_count || 0}</td>
-                        <td class="text-center">${item.wrongnumber_count || 0}</td>
-                    </tr>
-                `;
-            		CtableBody.append(row); 
-            	});
-            	}
-            	else {
-                    $('#agentperformanceDatatable tbody').html(`
-                        <tr>
-                            <td colspan="10" class="text-center">No data available</td>
-                        </tr>
-                    `);
-                }
-            	 
-            },
-            error: function (xhr, status, error) {
-                console.error('Error in Fetching Task:', error);
-                $('#agentperformanceDatatable tbody').html(`
-                        <tr>
-                            <td colspan="10" class="text-center text-danger">Failed to load data</td>
-                        </tr>
-                    `);
-            }
-        });
-        
-        if ($.fn.DataTable.isDataTable('#questionDatatable')) {
- 	        $('#questionDatatable').DataTable().clear().destroy();
- 	    }
-        
-       
-               
-        $.ajax({
-            url: '/gcc/api/campaignreport/question-answers?campaign_id=' + CampaignId,
-            type: 'GET',
-            contentType: 'application/json',
-            success: function (response) {
-                if (response && response.length > 0) {
-                	
-                	let Qtable = $('#questionDatatable tbody');
-                    Qtable.empty(); // Clear existing data
-                    
-
-                    response.forEach((item, index) => {
-                        let answerColumn = item.answers.map(ans => `${ans.campaign_answer} - ${ans.answer_percentage}%`).join('<br>');
-
-                        let row = `
-                			<tr>
-                            <td class="text-center">${index + 1}</td>
-                            <td class="text-center">${item.questions}</td>
-                            <td class="text-center">${answerColumn}</td>
-                        </tr>
-                    `;
-                        Qtable.append(row); 
-                    });
-                } else {
-                	$('#questionDatatable tbody').html(`
-                            <tr>
-                                <td colspan="1" class="text-center">No data available</td>
-                            </tr>
-                        `);
-                }
-            },
-            error: function (xhr, status, error) {
-                console.error('Error fetching question answers:', error);
-                console.error('Error in Fetching Task:', error);
-                $('#questionDatatable tbody').html(`
-                        <tr>
-                            <td colspan="1" class="text-center text-danger">Failed to load data</td>
-                        </tr>
-                    `);
-            }
-        });
-
-        
- 	   /*  $.ajax({
- 	        url: '/gcc/api/campaignreport/question-answers?campaign_id='+CampaignId,
- 	        type: 'GET',
- 	        contentType: 'application/json',
- 	        success: function (response) {
- 	            let QtableBody = $('#questionDatatable tbody');
- 	            QtableBody.empty();
-
- 	            if (response && response.length > 0) {
- 	                response.forEach((item, index) => {
- 	                    // Extract Yes and No answers from the array
- 	                   let yesAnswer = item.answers.find(ans => ans.campaign_answer.toLowerCase() === "yes") || { answer_percentage: 0 };
-				       let noAnswer = item.answers.find(ans => ans.campaign_answer.toLowerCase() === "no") || { answer_percentage: 0 };
-				
-				        // Create the table row with percentage values
-				        let row = `
-				            <tr>
-				                <td >${index + 1}</td>
-				                <td >${item.questions}</td>
-				                <td >${yesAnswer.answer_percentage}%</td> 
-				                <td >${noAnswer.answer_percentage}%</td>
-				            </tr>
-				        `;
- 	                    QtableBody.append(row);
- 	                });
- 	            } else {
- 	                QtableBody.html(`
- 	                    <tr>
- 	                        <td colspan="4" class="text-center">No data available</td>
- 	                    </tr>
- 	                `);
- 	            }
- 	        },
- 	        error: function (xhr, status, error) {
- 	            console.error('Error fetching question answers:', error);
- 	            $('#questionDatatable tbody').html(`
- 	                <tr>
- 	                    <td colspan="4" class="text-center text-danger">Failed to load data</td>
- 	                </tr>
- 	            `);
- 	        }
- 	    }); */
- 		 
- 	 }
- 	
- 	$(document).ready(function() {
-		 
-		 $('#agentperformance').on('shown.bs.modal', function () {
-			 
-			 $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-		            let target = $(e.target).attr("href"); // Get the active tab
-
-		            if (target === "#questionTable") {
-		                if ($.fn.DataTable.isDataTable('#questionDatatable')) {
-		                	$('#questionDatatable').DataTable().clear().destroy();
-		                    
-		                }
-		            }
-		        });
-			 
-			 let 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'
- 	             }
- 	         ];
-			 
-			 if (!$.fn.DataTable.isDataTable('#questionDatatable')) {
-	 	            $('#questionDatatable').DataTable({
-	 	                dom: 'Bftip',               
-	 	                columnDefs: [
-	 	                    { targets: 'no-sort', orderable: false }
-	 	                ],
-	 	                lengthMenu: [
-	 	                    [50, 100, 200, 500, -1],
-	 	                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-	 	                ],
-	 	                scrollY: '30vh',
-	 	                scrollX: true,  // Enable horizontal scrolling		 	                
-	 	                buttons: buttons,
-	 	                fixedHeader: true,
-	 	                autoWidth: false,
-	 	                responsive: false,
-	 	                searching: true,
-	 	                select: false,
-	 	                processing: false,
-	 	            });
-	 	        }
-			 
-		 });
-		 
-		 
- 	});
-
-    
-	</script>
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenter/createcampaign.html b/src/main/resources/templates/modules/callcenter/createcampaign.html
deleted file mode 100644
index 8c2e9627..00000000
--- a/src/main/resources/templates/modules/callcenter/createcampaign.html
+++ /dev/null
@@ -1,1956 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-	color: red;
-}
-/* Mobile screens - targeting devices with a max width of 767px */
-@media (max-width: 767px) 
-{
-	#campaignrequestform label{
-		margin-top: 10px;
-	} 
-}
-</style>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="far fa-calendar-plus bg-blue"></i>
-									<div class="d-inline">
-										<h5>Create Campaign</h5>
-										<span>1913 Campaign creation</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 Campaign</li>
-										<li class="breadcrumb-item active" aria-current="page">Create Campaign</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<h4 class="h4 text-right text-mute" style="font-size: 12px;">
-						Auto refresh in <font id="refresh-countdown">00</font> seconds
-					</h4>
-					
-					<div class="row">
-					
-						<div class="col-md-12">
-							<div class="card" style="margin-top: 0px;">
-								<div class="card-header justify-content-between align-items-center">
-									<h3><b>Campaign uploading excel Form</b></h3>
-								</div>
-								<div class="card-body">
-								
-									 <form id="campaignrequestform">
-					                    <div class="form-group">
-					                    	<div class="row">
-					                            <div class="col-sm-12 col-md-6">
-							                        <label for="name">Campaign Name<span class="required">*</span></label>
-							                        <input type="text" class="form-control" id="name" placeholder="Enter Name">
-					                    		</div>
-					                    
-					                    
-								           <!-- Category Selection -->
-											<div class="col-sm-12 col-md-6">
-												<label for="category">Category<span class="required">*</span></label>
-													<select class="form-control" id="category">
-													<option selected value="0">Select category</option>
-													</select>
-												<!-- Download Button (Initially Hidden) -->
-												<div class="mt-2">
-													<button type="button" class="btn btn-warning btn-sm" id="downloadcategoryExcel" style="display: none;">
-													<i class="ik ik-download f-16 mr-2"></i>Template Download
-													</button>
-												</div>
-											</div>
-
-
-					                    	</div>
-					                    </div>
-
-					                     <div class="form-group">
-					                     	<label for="upload">Upload Excelsheet:<span class="required">*</span></label>
-					                     	<input type="file" class="form-control" id="fileInput">
-					                     	<small id="fileError" class="text-danger" style="display:none;">Only Excel files (.xlsx, .xls) are allowed.</small>
-								       </div>
-
-					                    <div class="form-group text-center">
-					                        <button type="submit" class="btn btn-primary " id="excelsubmit">Submit</button>
-					                        <button type="reset" class="btn btn-secondary ml-2" onclick="resetForm()">Reset</button>
-					                    </div>
-					                </form>
-
-								
-								</div>
-
-							</div>
-						</div>
-						
-								 <!--  card 2-->						
-						<div class="col-md-12">
-								<div class="card" style="margin-top: 0px;">
-								   <div class="card-header justify-content-between align-items-center">
-									<h3><b>Campaign Details Form</b></h3>
-								</div>
-
-								<div class="card-body">
-								
-									 <form id="campaignrequestform">
-				      <!-- Dropdown for Category -->
-								      <div class="row">
-									      <div class="form-group col-md-6 col-sm-12">
-									        <label for="campaigncategory">Select Category<span class="required">*</span></label>
-									        <select id="campaigncategory" class="form-control">
-									          
-									        </select>
-									      </div>
-								
-									      <!-- Dropdown for Campaigns -->
-									      <div class="form-group col-md-6 col-sm-12">
-									        <label for="campaign">Select Campaign<span class="required">*</span></label>
-									        <select id="campaign" class="form-control" disabled>						          
-									        </select>
-									      </div>
-									      
-									      
-									      <div class="form-group col-12 d-flex justify-content-center align-items-center">
-										        <!-- Centered button between the dropdowns -->
-<!-- 										        <button id="searchBtn" class="btn btn-primary">Search</button>
-										        <button id="resetBtn" class="btn btn-secondary ml-3">Reset</button> -->
-										   </div>
-								     </div>
-								                    
-								       <div id="campaignDetailsCard">        
-					                    <div class="form-group">
-					                    	<label><b><u>Event Date:</u></b></label>
-					                        <div class="row">
-					                            <div class="col-sm-12 col-md-6">
-					                                <label for="eventstartdate">From Date<span class="required">*</span></label>
-					                               <input type="date" class="form-control" id="eventstartdate" onclick="this.showPicker()">
-					                            </div>
-					                            <div class="col-sm-12 col-md-6">
-					                                <label for="eventenddate">To Date<span class="required">*</span></label>
-					                                <input type="date" class="form-control" id="eventenddate" onclick="this.showPicker()">
-					                            </div>
-					                        </div>
-					                    </div>
-					                   
-					                    
-
-					                    
-					                    <div class="form-group">
-					                        <label for="description">Description<span class="required">*</span></label>
-					                        <textarea class="form-control" id="description" rows="2"></textarea>
-					                    </div>
-										<!-- <div class="container mt-4"> -->
-										    <div class="card">
-										        <div class="card-header justify-content-between align-items-center">
-										            <h3><b>Add Questions and Answers</b></h3>
-										        </div>
-										        <div class="card-body">
-										            <div id="questionsContainer">
-										                <!-- Dynamic questions will be added here -->
-										            </div>
-										            <button type="button" class="btn btn-success mt-3" id="addQuestionBtn">+ Add Question</button>
-<!-- 										            <button type="button" class="btn btn-primary mt-3" id="saveDataBtn">Save</button> -->
-										        </div>
-										    </div>
-										    
-										<div class="form-group">
-										
-															                    	
-					                        <div class="row" style="padding: 10px;border: groove; border-left: 6px solid black;">
-					                        
-					                        <div class="col-sm-6 col-md-4">
-					                                <label for="no_of_calls">Total No Data</label>
-					                                <input type="number" class="form-control" id="total_no_of_data" readonly>
-					                            </div>
-					                            
-					                            <div class="col-sm-6 col-md-4">
-					                                <label for="no_of_calls">No of Agents<span class="required">*</span></label>
-					                                <input type="number" class="form-control" id="no_of_agents" >
-					                            </div>
-					                            
-					                            <div class="col-sm-6 col-md-4">
-					                                <label for="no_of_calls">Calls per Agent:</label>
-					                                <input type="number" class="form-control" id="no_of_agent_call" readonly>
-					                            </div>
-					                            
-					                            </div>
-					                            
-					                             <div class="row mt-2">
-					                        
-					                            <div class="col-sm-12 col-md-6">
-					                                <label for="no_of_calls">No of Calls to be Assigned (per Person)<span class="required">*</span></label>
-					                                <input type="number" class="form-control" id="no_of_calls">
-					                            </div>
-					                            <div class="col-sm-12 col-md-6">
-												    <label for="agentDropdown" class="form-label fw-bold">Agent Selection <span class="text-danger">*</span></label> 
-												    <div class="dropdown">
-												        <button class="btn btn-light border rounded w-100 text-start" 
-												                type="button" 
-												                id="agentDropdownBtn" 
-												                data-bs-toggle="dropdown" 
-												                aria-expanded="false">
-												            Select Agent(s)
-												        </button>
-												        <ul class="dropdown-menu p-3" 
-												            aria-labelledby="agentDropdownBtn" 
-												            style="max-height: 250px; overflow-y: auto; width: 100%;">
-												            <div id="agentCheckboxContainer">
-												                <!-- Checkboxes will be loaded here -->
-												            </div>
-												        </ul>
-												    </div>
-												</div>
-
-					                        </div>
-					                    </div>
-					                    
-					                    <div class="form-group text-center">
-					                        <button type="submit" class="btn btn-primary " id="requestsubmit">Submit</button>
-					                        <button type="reset" class="btn btn-secondary ml-2" onclick="resetForm()">Reset</button>
-					                    </div>
-					                   </div>   
-					                    
-					                </form>
-								
-								</div>
-						
-						</div>
-					</div>
-						
-						
-						
-						
-						
-						<div class="col-md-12" style="display:none;">
-						    <div class="card">
-						        <div class="card-block">
-						        <div class="page-header-title" >
-									<h5 style="margin: 0;font-weight: bold;">Campaign Details</h5><hr>
-							   </div> 
-						        
-						            <div>
-						                <table id="CampaignDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-						                    <thead class="thead-dark">
-						                        <tr role="row">
-						                            <th class="text-center">S.No</th>                                                  
-						                            <th class="text-center">Name</th>
-						                            <th class="text-center">Event Date</th>
-						                            <th class="text-center">Description</th>
-						                            <th class="text-center">Agents Assigned</th>
-						                            <th class="text-center">Calls per Person</th>
-						                            <th class="text-center">Total Calls</th>                                                                                                       
-						                            <th class="text-center no-sort" width="%2">Action</th> 
-						                        </tr>
-						                    </thead>
-						                    <tbody>
-						                        <tr th:each="campaign, i: ${campaigns}">
-						                            <td th:text="${i.count}">0</td>
-						                            <td th:text="${campaign.campaign_name}"></td>
-						                            <td th:text="${campaign.event_dates}"></td>
-						                            <td th:text="${campaign.description}"></td>
-						                            <td th:text="${campaign.no_of_agents}" class="text-center"></td>
-						                            <td th:text="${campaign.calls_per_agent}" class="text-center"></td> 
-						                            <td th:text="${campaign.total_calls}" class="text-center"></td> 
-						                            <td class="text-center">
-													    <a href="#" th:onclick="return callEdit([[${campaign.campaign_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Edit" data-original-title="Edit">
-													        <i class="ik ik-edit f-16 mr-15 text-green"></i>
-													    </a>
-													</td>
- 
-						                        </tr>
-						                    </tbody>
-						                    <tfoot class="thead-dark">
-						                        <tr>
-						                            <th class="text-center">S.No</th>                                                  
-						                            <th class="text-center">Name</th>
-						                            <th class="text-center">Event Date</th>
-						                            <th class="text-center">Description</th>
-						                            <th class="text-center">Agents Assigned</th>
-						                            <th class="text-center">Calls per Person</th> 
-						                            <th class="text-center">Total Calls</th>
-						                            <th class="text-center no-sort" width="%2">Action</th>                            
-						                        </tr>
-						                    </tfoot>
-						                </table>
-						            </div>
-						        </div>
-						    </div>
-						</div>
-
-						
-                      </div>
-                        
-                        
-                     </div>
-                </div>
-                
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-               
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-				</div>
-				
-               
-            
-		</div>
-		
-		<!-- The Modal -->
-		<div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="editModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		    <div class="modal-dialog modal-lg" role="document">
-		        <div class="modal-content">
-		            <div class="modal-header">
-		                <h5 class="modal-title" id="editModalLabel">Edit Campaign</h5>
-		                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-		            </div>
-		            <div class="modal-body">
-		                <!-- Your form or content for editing can go here -->
-		                <form id="editForm" onsubmit="submitForm(event)" >
-		                   <input type="hidden"  name="campaign_id" id="campaign_id" />
-		                    <div class="form-group">
-					                        <label for="campaign_name">Name<span class="required">*</span></label>
-					                        <input type="text" class="form-control" id="campaign_name" placeholder="Enter Name" readonly="readonly">
-					                    </div>
-					                    <div class="form-group">
-					                    	<label><b><u>Event Date:</u></b></label>
-					                        <div class="row">
-					                            <div class="col">
-					                                <label for="start_date">From Date<span class="required">*</span></label>
-					                                <input type="date" class="form-control" id="start_date" onchange="setEndDateMin()" readonly="readonly" >
-					                            </div>
-					                            <div class="col">
-					                                <label for="end_date">To Date<span class="required">*</span></label>
-					                                <input type="date" class="form-control" id="end_date" required>
-					                            </div>
-					                        </div>
-					                    </div>
-					                   
-					                    
-					                    <div class="form-group">
-					                    	
-					                        <div class="row">
-					                            <!-- <div class="col">
-					                                <label for="no_of_agents">No of Agents to be Assigned<span class="required">*</span></label>
-					                                <input type="number" class="form-control" id="no_of_agents" required>
-					                            </div> -->
-					                            <div class="col">
-					                                <label for="calls_per_agent">No of Calls to be Assigned (per Person)<span class="required">*</span></label>
-					                                <input type="number" class="form-control" id="calls_per_agent" required>
-					                            </div>
-					                        </div>
-					                    </div>
-					                    
-					                    <div class="form-group">
-					                        <label for="description_modal">Description<span class="required">*</span></label>
-					                        <textarea class="form-control" id="description_modal" rows="2" readonly="readonly"></textarea>
-					                    </div>
-					                    
-					                    <div class="form-group text-center">				                       
-		                					<button type="submit" class="btn btn-primary"   id="editsubmit">Save changes</button>
-					                    </div>
-		                    
-		                </form>
-		            </div>
-		          
-		        </div>
-		    </div>
-		</div>
-				
-		
-                      
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-        
-          <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-        
-        <script type="text/javascript">
-        $(document).ready(function() {
-
-        	var table = $('#CampaignDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { targets: 'no-sort', orderable: false }
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', 'Show all']
-                ],
-                scrollY: '50vh',
-                fixedColumns: {
-                    left: 1,
-                    right: 1
-                },
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false
-            });
-        });
-        
-        document.addEventListener('DOMContentLoaded', function() {
-            const fromDate = document.getElementById('eventstartdate');
-            const toDate = document.getElementById('eventenddate');
-
-            // Initially disable the "To Date" field
-            toDate.disabled = true;
-
-            fromDate.addEventListener('change', function() {
-                if (fromDate.value) {
-                    // Enable the "To Date" field when "From Date" is selected
-                    toDate.disabled = false;
-
-                    // Get the selected "From Date"
-                    const selectedFromDate = new Date(fromDate.value);
-
-                 // Set the "To Date" minimum to the same day as the "From Date"
-                    const sameDayString = selectedFromDate.toISOString().split('T')[0];
-                    toDate.setAttribute('min', sameDayString);
-
-                    // Set the "To Date" value to the next day by default
-                    toDate.value = sameDayString;
-
-                } else {
-                    // Disable the "To Date" field if "From Date" is cleared
-                    toDate.disabled = true;
-                    toDate.value = ''; // Clear the "To Date" input
-                }
-            });
-        });
-        
-        function resetForm() {
-            document.getElementById('campaignrequestform').reset(); // Built-in reset functionality
-        }
-        
-        function setEndDateMin() {
-
-            var fromDate = document.getElementById('start_date').value;
-
-            document.getElementById('end_date').min = fromDate;
-
-        }
-
- 	 	
-
-		
-		//Update request form details 
-		$(document).ready(function () {
-			    // Function to open the edit modal and populate data
-			    window.callEdit = function (campaignId) {
-			        fetchCampaignDetails(campaignId);
-			      
-			        return false; // Prevent default anchor click behavior
-			    };
-			
-			    function fetchCampaignDetails(campaignId) {
-			        $.ajax({
-			            url: `/gcc/api/campaign/getCampaignDetailsbyId?campaign_id=${campaignId}`,
-			            type: 'GET',
-			            success: function (response) {
-							console.log(response);
-			                if (response) {
-			                    // Populate modal fields with data
-			                    $('#campaign_id').val(response.campaign_id);
-			                    $('#campaign_name').val(response.campaign_name); // Assuming the key in the response is 'campaign_name'
-			                    $('#start_date').val(response.start_date);
-			                    $('#end_date').val(response.end_date);
-			                    $('#no_of_agents').val(response.no_of_agents);
-			                    $('#calls_per_agent').val(response.calls_per_agent);
-			                    $('#description_modal').val(response.description);
-			                    
-			                    setEndDateMin();
-			                    // Open the modal
-			                    $('#editModal').modal('show');
-			                } else {
-			                    alert('Campaign details not found.');
-			                }
-			            },
-			            error: function (xhr, status, error) {
-			                console.error('Error fetching campaign details:', error);
-			                alert('An error occurred while fetching campaign details.');
-			            }
-			        });
-			    }
-			     window.submitForm = function (event) {
-			         event.preventDefault(); // Prevent the default form submission
-			        
-			       
-
-			        var campaignId = $('#campaign_id').val();
-			        var campaignName = $('#campaign_name').val();
-			        var startDate = $('#start_date').val();
-			        var endDate = $('#end_date').val();
-			        var noOfAgents = $('#no_of_agents').val();
-			        var callsPerAgent = $('#calls_per_agent').val();
-			        var description = $('#description_modal').val();
-
-
-
-			        $.ajax({
-			            url: '/gcc/api/campaign/updateCampaign',  // Endpoint without query parameters
-			            type: 'POST',
-			            data:  {
-			                campaign_id: campaignId,
-			                campaign_name: campaignName,
-			                start_date: startDate,
-			                end_date: endDate,
-			                no_of_agents: noOfAgents,
-			                calls_per_agent: callsPerAgent,
-			                description: description
-			            },  // Send all data as JSON
-			            success: function (response) {
-			                console.log('Campaign ID:',campaign_id);
-			                Swal.fire({
-			                    title: 'Success!',
-			                    text: response,  // Show the success message from the API response
-			                    icon: 'success',
-			                    confirmButtonText: 'OK'
-			                }).then((result) => {
-			                    if (result.isConfirmed) {
-			                        $('#editModal').modal('hide'); // Hide the modal
-			                        location.reload(); // Optionally reload the page to refresh the data
-			                    }
-			                });
-			            },
-			            error: function (xhr, status, error) {
-			                console.error('Error updating campaign details:', error);
-			                Swal.fire({
-			                    title: 'Error!',
-			                    text: 'An error occurred while updating campaign details.',
-			                    icon: 'error',
-			                    confirmButtonText: 'OK'
-			                });
-			            }
-			        });
-			    }
- 
-		});
-		
-		///////////////////////For Dropdown excel download/////////////////
-		
-		
-
-		// Function to fetch categories and populate dropdown
-		function fetchCategories() {
-		    $.ajax({
-		        url: '/gcc/api/category/getcategory',
-		        method: 'GET',
-		        success: function (response) {
-		            if (response && response.length > 0) {
-		                console.log("Categories Loaded:", response);
-		                var $categorySelect = $('#category');
-		                $categorySelect.empty().append('<option value="0">Select Category</option>'); // Default option
-
-		                $.each(response, function (index, category) {
-		                    $categorySelect.append(
-		                        $('<option>', {
-		                            value: category.category_id,
-		                            text: category.category_name
-		                        })
-		                    );
-		                });
-		            }
-		        },
-		        error: function (xhr, status, error) {
-		            console.error('Error fetching categories:', error);
-		        }
-		    });
-		}
-
-		// Function to handle category selection
-		function handleCategorySelection(categoryId) {
-		    console.log("Selected Category ID:", categoryId);
-
-		    if (categoryId === "0") {
-		        $('#downloadcategoryExcel').hide(); // Hide button if "Select Category" is chosen
-		        return;
-		    }
-
-		    // Fetch column titles for selected category
-		    fetchCategoryColumns(categoryId);
-		}
-
-		// Function to fetch category columns based on selected category
-		function fetchCategoryColumns(categoryId) {
-		    $.ajax({
-		        url: '/gcc/api/category/getCategoryColumns?category_id=' + categoryId,
-		        method: 'GET',
-		        success: function (response) {
-		            console.log("Columns API Response:", response);
-
-		            if (response && response.length > 0) {
-		                window.categoryColumns = response.map(item => item.column_name);  // Correct field name
-		                console.log("Columns Fetched:", window.categoryColumns);
-		                $('#downloadcategoryExcel').show(); // Show button when columns exist
-		            } else {
-		                window.categoryColumns = [];
-		                $('#downloadcategoryExcel').hide(); // Hide button if no columns exist
-		            }
-		        },
-		        error: function (xhr, status, error) {
-		            console.error('Error fetching category columns:', error);
-		            window.categoryColumns = [];
-		            $('#downloadcategoryExcel').hide(); // Hide button if API fails
-		        }
-		    });
-		}
-
-		// Function to handle Excel download
-		function downloadExcel() {
-		    console.log("Download button clicked!");
-
-		    if (!window.categoryColumns || window.categoryColumns.length === 0) {
-		        alert("No columns available for the selected category.");
-		        return;
-		    }
-
-		    // Get selected category name
-		    var categoryName = $("#category option:selected").text().trim();
-		    if (categoryName === "Select Category") {
-		        categoryName = "Category_Template"; // Fallback name if no category selected
-		    }
-
-		    var wb = XLSX.utils.book_new();
-		    var ws_data = [window.categoryColumns]; // Column titles
-
-		    var ws = XLSX.utils.aoa_to_sheet(ws_data);
-
-		    // Set column widths dynamically
-		    ws['!cols'] = window.categoryColumns.map(col => ({ wch: col.length + 5 }));
-
-		    XLSX.utils.book_append_sheet(wb, ws, 'Category Data');
-
-		    // Generate file name dynamically based on category
-		    var fileName = categoryName.replace(/\s+/g, "_") + "_Template.xlsx"; // Replace spaces with underscores
-
-		    XLSX.writeFile(wb, fileName);
-		}
-
-
-		
-		
-		
-		
-		/////////campaign and category dropdowns/////////////////
-		
-
-		
-		// Function to fetch category dropdown
-	function fetchCategoryDropdown() {
-	    $.ajax({
-	        url: '/gcc/api/callcenter/admin/getcategory',
-	        type: 'GET',
-	        dataType: 'json'
-	    })
-	    .done(function (data) {
-	        let categoryDropdown = $('#campaigncategory');
-	        categoryDropdown.empty();
-	        categoryDropdown.append($('<option selected value="0"></option>').text('Select a category'));
-	        $.each(data, function (index, category) {
-	            categoryDropdown.append($('<option></option>').attr('value', category.category_id).text(category.category_name));
-	        });
-	    })
-	    .fail(function (xhr, status, error) {
-	        console.error('Error fetching category:', error);
-	    });
-	}
-	
-	// Function to fetch campaigns based on selected category
-	function fetchCampaignDropdown(categoryId) {
-	    $('#campaign').prop('disabled', false);
-	    $.ajax({
-	        url: '/gcc/api/callcenter/admin/getcampaignbycategory?id=' + categoryId,
-	        type: 'GET',
-	        dataType: 'json'
-	    })
-	    .done(function (data) {
-	        let campaignDropdown = $('#campaign');
-	        campaignDropdown.empty();
-	        campaignDropdown.append($('<option selected value="0"></option>').text('Select a campaign'));
-	        $.each(data, function (index, campaign) {
-	            campaignDropdown.append($('<option></option>').attr('value', campaign.campaign_id).text(campaign.campaign_name));
-	        });
-	    })
-	    .fail(function (xhr, status, error) {
-	        console.error('Error fetching campaign:', error);
-	    });
-	}
-
-	
-	
-    // Fetch category dropdown on page load
-    fetchCategoryDropdown();
-
-	    // Handle category change event to fetch campaigns
-	    $(document).on('change', '#campaigncategory', function() {
-	    let selectedCategoryId = $(this).val();
-	    if (selectedCategoryId != '0') {
-	        fetchCampaignDropdown(selectedCategoryId);
-	       
-	        
-	    } else {
-	        $('#campaign').empty().prop('disabled', true);
-	        hideAllDetails();
-	    }
-	});
-   
-	  
-
-/* $("#searchBtn").click(function () {
-	let selectedCampaignId = $('#campaign').val();
-	
-	
-    if(selectedCampaignId == null || selectedCampaignId=='0'){
-    	 Swal.fire({
-             title: 'Info!',
-             text: 'Please Select Category and Campaign!',
-             icon: 'info',
-             timer: 2000,
-             //timerProgressBar: true,
-             showConfirmButton: false
-         })
-         hideCampaignAndAgentDetails();
-    }
-    else if (selectedCampaignId != '0') {
-        //fetchCampaignDetails(selectedCampaignId);
-        fetchCampaignQuestionDetails(selectedCampaignId);
-        checkCampaignInAssigned(selectedCampaignId);
-        
-     // Disable the category and campaign dropdowns after search
-        $('#campaigncategory').prop('disabled', true);
-        $('#campaign').prop('disabled', true);
-    } 
-    else {
-    	
-        hideCampaignAndAgentDetails();
-        
-    }
-}); */
-
-/* $("#resetBtn").click(function () {
-	hideAllDetails()  // Reloads the current page
-});
-	 */
-	
-//Function to hide all details initially
-function hideAllDetails() {
-
-
-    // Hide additional form fields
-document.getElementById('campaignDetailsCard').style.display = 'none';
-
-}
-	 
-	 
-	// Function to validate selected agents count
-	 function validateAgentSelection() {
-	     let noOfAgents = parseInt($('#no_of_agents').val()) || 0;
-	     let selectedAgentsCount = $('.agentCheckbox:checked').length;
-
-	     if (noOfAgents !== selectedAgentsCount) {
-	         Swal.fire({
-	             icon: 'warning',
-	             title: 'Mismatch in Agent Selection',
-	             text: `You must select exactly ${noOfAgents} agents.`,
-	         });
-	         return false;
-	     }
-	     return true;
-	 }
-	
-	// Handle form submission or further processing
-	 $('#assignTaskBtn').on('click', function (e) {
-	     if (!validateAgentSelection()) {
-	         e.preventDefault(); // Prevent form submission if validation fails
-	     }
-	 });
-	 
-	 $('#no_of_agents').on('input', function () {
-		    let noOfAgents = parseInt($(this).val()) || 0;
-		    let allAgents = $('.agentCheckbox');
-
-		    // Ensure the number is within limits
-		    if (noOfAgents > allAgents.length) {
-		        Swal.fire({
-		            icon: 'error',
-		            title: 'Too Many Agents',
-		            text: `Only ${allAgents.length} agents are available.`,
-		             allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                 allowEscapeKey: false, // Disable escape key to close the modal
-	                 allowEnterKey: false, // Disable enter key to close the modal	                   
-	                 showConfirmButton: true
-		        });
-		        $(this).val(allAgents.length);
-		        noOfAgents = allAgents.length;
-		    }
-
-		    // Auto-select the first N agents based on input
-		    allAgents.prop('checked', false);
-		    allAgents.slice(0, noOfAgents).prop('checked', true);
-		});
-
-	// Function to fetch campaign statistics
-	 function fetchCampaignStatistics(campaignId) {
-	     $.ajax({
-	         url: `/gcc/api/campaign/statistics?campaignId=${campaignId}`,
-	         type: 'GET',
-	         dataType: 'json',
-	         success: function (response) {
-	             if (response) {
-	                 // Populate total_no_of_data field
-	                 $('#total_no_of_data').val(response.totalCount || 0);
-	                 
-	                 // Handle input event for no_of_agents
-	                 $('#no_of_agents').on('input', function () {
-	                     let totalData = parseInt($('#total_no_of_data').val()) || 0;
-	                     let agents = parseInt($('#no_of_agents').val());
-
-	                     // Ensure agents value is not negative
-	                     if (agents < 0 || isNaN(agents)) {
-	                         $('#no_of_agents').val(''); // Reset input if negative or NaN
-	                         $('#no_of_agent_call').val('');
-	                         return;
-	                     }
-
-	                     // If no_of_agents is empty, set no_of_agent_call to empty
-	                     if (!agents) {
-	                         $('#no_of_agent_call').val('');
-	                     } else {
-	                         let perAgentData = Math.floor(totalData / agents); // Round down
-	                         $('#no_of_agent_call').val(perAgentData);
-	                     }
-	                 });
-	             } else {
-	                 console.error('No data returned');
-	             }
-	         },
-	         error: function (xhr, status, error) {
-	             console.error('Error fetching campaign statistics:', error);
-	         }
-	     });
-	 }
-
-// Function to show details when category and campaign are selected
-function showDetails() {
-    const categoryValue = document.getElementById('category').value;
-    const campaignValue = document.getElementById('campaign').value;
-
-    if (categoryValue && campaignValue) {
-        document.getElementById('campaignDetailsCard').style.display = 'block';
-
-        fetchCampaignStatistics(campaignValue);
-
-        // Show additional form fields
-        document.getElementById('eventstartdate').closest('.form-group').style.display = 'block';
-        //document.getElementById('no_of_agent').closest('.form-group').style.display = 'block';
-        document.getElementById('no_of_calls').closest('.form-group').style.display = 'block';
-        document.getElementById('description').closest('.form-group').style.display = 'block';
-    } else {
-        hideAllDetails(); // Keep everything hidden if conditions are not met
-    }
-}
-
-// Initialize hiding the fields on page load
-window.onload = function() {
-    hideAllDetails();
-    
-    // Add event listeners for category and campaign selection
-    document.getElementById('category').addEventListener('change', showDetails);
-    document.getElementById('campaign').addEventListener('change', showDetails);
-}
-
-	
-
-    ///////new function for saving method//////
-
-
-    $(document).ready(function() {
-    	
-    	console.log("Document Ready!");
-    	
-    	
-    	
-    	//////////agents loading script /////////////
-    	
-    	
-    	// Fetch available agents
-		  function loadAgents() {
-		    $.ajax({
-		        url: "/gcc/api/campaign/availableAgents",
-		        type: "GET",
-		        dataType: "json",
-		        success: function (response) {
-		            console.log("Agents:", response);
-		            $("#agentCheckboxContainer").empty(); // Clear previous checkboxes
-		
-		            
-		            if(!response || response.length === 0){
-		            	 $("#agentCheckboxContainer").append(`
-		 		                <li>
-		 		                    <label class="dropdown-item">
-		 		                      no available agents to assign task
-		 		                    </label>
-		 		                </li>
-		 		            `);
-		            }else{
-		            	 $("#agentCheckboxContainer").append(`
-		 		                <li>
-		 		                    <label class="dropdown-item">
-		 		                        <input type="checkbox" id="selectAllAgents"> Select All
-		 		                    </label>
-		 		                </li>
-		 		            `);
-		            }
-		            // Append "Select All" checkbox
-		           
-		            
-		            
-		
-		            // Append individual agent checkboxes
-		            response.forEach(agent => {
-		                $("#agentCheckboxContainer").append(`
-		                    <li>
-		                        <label class="dropdown-item">
-		                            <input type="checkbox" class="agentCheckbox" value="${agent.agent_id}"> ${agent.agent_name}
-		                        </label>
-		                    </li>
-		                `);
-		            });
-		console.log("okkk...");
-		            
-		            // "Select All" logic
-		            $("#selectAllAgents").change(function () {
-		                $(".agentCheckbox").prop("checked", this.checked); // Check/uncheck all
-		            });
-		
-		            // If any individual checkbox is unchecked, uncheck "Select All"
- 		            $(document).on("change", ".agentCheckbox", function () {
-		                if ($(".agentCheckbox:checked").length === $(".agentCheckbox").length) {
-		                    $("#selectAllAgents").prop("checked", true);
-		                } else {
-		                    $("#selectAllAgents").prop("checked", false);
-		                }
-		            }); 
-		        },
-		        error: function (xhr) {
-		            console.error("AJAX Error:", xhr.status, xhr.responseText);
-		            Swal.fire({
-		                icon: "error",
-		                title: "Error Fetching Data",
-		                text: "Failed to load agents. Please try again.",
-		            });
-		        }
-		    });
-		}
-		
-		// Load agents on page load
-		loadAgents();
-
-    	
-    	
-    	
-    
-    	let questionCount = 0;
-
-        
-  	    let validAnswerTypeIds = [];
-
-	    // Initially hide the download button
-	    $('#downloadcategoryExcel').hide();
-
-	    // Load categories into dropdown
-	    fetchCategories();
-
-	    // Handle category selection change
-	    $('#category').on('change', function () {
-	        var categoryId = $(this).val();
-	        handleCategorySelection(categoryId);
-	    });
-
-	    // Handle download button click
-	    $('#downloadcategoryExcel').on('click', function () {
-	        downloadExcel();
-	    });
-	    
-	    
-
-
-/* 	    // Modify form submission logic
-	    $('#requestsubmit').on('click', function (event) {
-	        event.preventDefault(); // Prevent default form submission
-
-	        $('#requestsubmit').attr('disabled', true).text('Submitting...');
-
-
-
-	        // Proceed with form submission logic if validation passes...
-	    }); */
-
-	    
-	 // Function to load answer types dynamically
-		  function loadAnswerTypes(callback) {
-		      $.ajax({
-		          url: "/gcc/api/getAnswerTypes",
-		          type: "GET",
-		          success: function(data) {
-		              callback(data);
-		          },
-		          error: function() {
-		              console.log("Error loading answer types.");
-		          }
-		      });
-		  }
-
-		  // Function to generate answer type dropdown dynamically
-		  function generateAnswerTypeDropdown(questionId, answerTypes) {
-		      let dropdownHtml = `<label for="answerType${questionId}">Select Answer Type<span class="required">*</span></label>
-		                          <select class="form-control answer-type" data-question-id="${questionId}">
-		                              <option value="">--Select--</option>`;
-
-		      $.each(answerTypes, function(index, entry) {
-		          dropdownHtml += `<option value="${entry.answer_type_id}">${entry.type_name}</option>`;
-		          if (!validAnswerTypeIds.includes(entry.answer_type_id.toString())) {
-		              validAnswerTypeIds.push(entry.answer_type_id.toString()); // Store as string
-		          }
-		      });
-
-		      dropdownHtml += `</select>`;
-		      return dropdownHtml;
-		  }
-
-		  // Add question button
-		  $('#addQuestionBtn').click(function() {
-		      questionCount++; 
-		      loadAnswerTypes(function(answerTypes) {
-		          let questionHtml = `
-		              <div class="question-block border p-3 mb-3" data-question-id="${questionCount}">
-		                  <label for="question${questionCount}">Enter Question <span class="required">*</span></label>
-		                  <input type="text" class="form-control mb-2 question-input" name="question[]" placeholder="Type your question" required>
-		                  ${generateAnswerTypeDropdown(questionCount, answerTypes)}
-		                  <div class="answers-container mt-3" id="answersContainer${questionCount}"></div>
-		                  <button type="button" class="btn btn-danger btn-sm mt-2 remove-question">Remove Question</button>
-		              </div>`;
-		          $('#questionsContainer').append(questionHtml);
-		      });
-		  });
-
-		  // Handle answer type selection
-		  $(document).on('change', '.answer-type', function() {
-		      let questionId = $(this).data('question-id');
-		      let selectedType = $(this).val(); // Keep as string
-		      let answersContainer = $(`#answersContainer${questionId}`);
-		      answersContainer.html('');
-
-		     /*  if (validAnswerTypeIds.includes(selectedType)) {
-		          let answerBlock = `
-		              <div class="answer-block">
-		                  <label>Answers:</label>
-		                  <div class="answer-list"></div>
-		                  <button type="button" class="btn btn-info btn-sm add-answer mt-2" data-question-id="${questionId}">+ Add Answer</button>
-		              </div>`;
-		          answersContainer.append(answerBlock);
-		      } */
-		      
-		   // Check if selected type is valid
-		      if (validAnswerTypeIds.includes(selectedType)) {
-		          let answerBlock = `
-		              <div class="answer-block">
-		                  <label>Answers:</label>
-		                  <div class="answer-list"></div>
-		                  ${selectedType === "1" ? "" : `<button type="button" class="btn btn-info btn-sm add-answer mt-2" data-question-id="${questionId}">+ Add Answer</button>`}
-		              </div>`;
-		          answersContainer.append(answerBlock);
-		      }
-		  });
-
-		  // Add answer dynamically
-		  $(document).on('click', '.add-answer', function() {
-		      let questionId = $(this).data('question-id');
-		      let answerList = $(`#answersContainer${questionId} .answer-list`);
-		      let answerInput = `
-		          <div class="answer-input d-flex align-items-center mb-2">
-		              <input type="text" class="form-control answer-text" placeholder="Enter answer" required>
-		              <button type="button" class="btn btn-danger btn-sm remove-answer ms-2">X</button>
-		          </div>`;
-		      answerList.append(answerInput);
-		  });
-		  
-		  
-		// Load answer types on page load for the first question
-		  loadAnswerTypes(function(answerTypes) {
-		      let initialDropdown = generateAnswerTypeDropdown(0, answerTypes);
-		      $('#questionsContainer').append(`
-		          <div class="question-block border p-3 mb-3" data-question-id="0">
-		              <label for="question0">Enter Question <span class="required">*</span></label>
-		              <input type="text" class="form-control mb-2 question-input" name="question[]" placeholder="Type your question" required>
-		              ${initialDropdown}
-		              <div class="answers-container mt-3" id="answersContainer0"></div>
-		              <button type="button" class="btn btn-danger btn-sm mt-2 remove-question">Remove Question</button>
-		          </div>`);
-		  }); 
-
-		  // Remove question
-		  $(document).on('click', '.remove-question', function() {
-		      $(this).closest('.question-block').remove();
-		  });
-
-		  // Remove answer
-		  $(document).on('click', '.remove-answer', function() {
-		      $(this).closest('.answer-input').remove();
-		  });
-		  
-/* 		  document.getElementById('fileInput').addEventListener('change', function (event) {
-		        var fileInput = event.target;
-		        var filePath = fileInput.value;
-		        var allowedExtensions = /(\.xlsx|\.xls)$/i;
-
-		        if (!allowedExtensions.exec(filePath)) {
-		            document.getElementById('fileError').style.display = 'block'; // Show error message
-		            fileInput.value = ''; // Clear the input
-		        } else {
-		            document.getElementById('fileError').style.display = 'none'; // Hide error message
-		        }
-		    });
-		  
-		  //excelsubmit funtion
-			$('#excelsubmit').on('click', function(event) {
-			    event.preventDefault(); // Prevent form from submitting the traditional way
-			
-			    $('#excelsubmit').attr('disabled', true).text('Submitting...');
-			
-			    // Get form values
-			    var name = $('#name').val();
-			    var category = $('#category').val();
-			    var fileInput = $('#fileInput')[0].files[0]; // Get the file from the input
-
-			    if(!name){
-		    	 Swal.fire({
-			            icon: 'info',
-			            title: 'Missing Data',
-			            text: 'Please fill the Campaign name.'
-			        });
-			        $('#excelsubmit').attr('disabled', false).text('Submit');
-			        return;
-			    }
-			    
-			    
-			 // Validation for 'Category'
-			    if (!category || category === "0") {
-			        Swal.fire({
-			            icon: 'info',
-			            title: 'Missing Data',
-			            text: 'Please select a valid category.'
-			        });
-			        $('#excelsubmit').attr('disabled', false).text('Submit');
-			        return;
-			    }
-
-			
-			    if(!fileInput){
-			    	 Swal.fire({
-				            icon: 'info',
-				            title: 'Missing Data',
-				            text: 'Please upload the file.'
-				        });
-				        $('#excelsubmit').attr('disabled', false).text('Submit');
-				        return;
-				    }
-			    
-			    var formData = new FormData();
-			    formData.append('name', name);
-			    formData.append('category', category);
-			    formData.append('file', fileInput);
-			
-			    $('#pageLoader').show();
-			
-			    $.ajax({
-			        url: '/gcc/api/campaign/saveexcelcampaign',
-			        type: 'POST',
-			        data: formData,
-			        processData: false,
-			        contentType: false,
-			        success: function(response) {
-			            $('#pageLoader').hide();
-			            
-			            if (response.status === 'column_mismatch') {
-			                Swal.fire({
-			                    icon: 'error',
-			                    title: 'Need more columns',
-			                    text: response.message
-			                }).then(() => {
-			                    $('#excelsubmit').attr('disabled', false).text('Submit');
-			                });
-			                return; // Stop further execution
-			            }
-
-			            if (response.status === 'header_mismatch') {
-			                Swal.fire({
-			                    icon: 'error',
-			                    title: 'Header Mismatch',
-			                    text: response.message
-			                }).then(() => {
-			                    $('#excelsubmit').attr('disabled', false).text('Submit');
-			                });
-			                return; // Stop further execution
-			            }
-
-			            if (response.status === 'error') {
-			                Swal.fire({
-			                    icon: 'error',
-			                    title: 'Error',
-			                    text: response.message
-			                }).then(() => {
-			                    $('#excelsubmit').attr('disabled', false).text('Submit');
-			                });
-			                return; // Stop further execution
-			            }
-			
-			            if(response.status === 'success'){
-			            	
-			            	
-			            	Swal.fire({
-				                icon: 'success',
-				                allowOutsideClick: false, 
-			                    allowEscapeKey: false, 
-			                    allowEnterKey: false, 
-				                title: 'Success',
-				                text: 'Campaign data saved successfully!'
-				            }).then((result) => {
-				                if (result.isConfirmed) {
-				                    $('#excelsubmit').attr('disabled', false).text('Submit');
-				                    location.reload();
-				                }
-				            });
-			            }
-			            
-			        },
-			        error: function(xhr) {
-			            $('#pageLoader').hide();
-			            Swal.fire({
-			                icon: 'error',
-			                title: 'Error',
-			                text: 'Failed to save campaign details. Please try again.'
-			            });
-			            $('#excelsubmit').attr('disabled', false).text('Submit');
-			        }
-			    });
-			}); */
-			
-			
-			document.getElementById('fileInput').addEventListener('change', function (event) {
-			    var fileInput = event.target;
-			    var filePath = fileInput.value;
-			    var allowedExtensions = /(\.xlsx|\.xls)$/i;
-
-			    if (!allowedExtensions.exec(filePath)) {
-			        document.getElementById('fileError').style.display = 'block'; // Show error message
-			        fileInput.value = ''; // Clear the input
-			    } else {
-			        document.getElementById('fileError').style.display = 'none'; // Hide error message
-			    }
-			});
-
-			// Function to read Excel file and count rows
-/* 			function readExcelFile(file) {
-			    return new Promise((resolve, reject) => {
-			        var reader = new FileReader();
-			        reader.onload = function (e) {
-			            var data = new Uint8Array(e.target.result);
-			            var workbook = XLSX.read(data, { type: 'array' });
-			            var sheet = workbook.Sheets[workbook.SheetNames[0]];
-			            var jsonData = XLSX.utils.sheet_to_json(sheet, { header: 1 });
-
-			            if (jsonData.length <= 1) {
-			                reject('Excel file is empty or does not contain valid data.');
-			            } else {
-			                resolve(jsonData.length - 1); // Exclude header row
-			            }
-			        };
-			        reader.onerror = function () {
-			            reject('Error reading the file. Please try again.');
-			        };
-			        reader.readAsArrayBuffer(file);
-			    });
-			} */
-			
-			function readExcelFile(file) {
-			    return new Promise((resolve, reject) => {
-			        var reader = new FileReader();
-			        reader.onload = function (e) {
-			            var data = new Uint8Array(e.target.result);
-			            var workbook = XLSX.read(data, { type: 'array' });
-			            var sheet = workbook.Sheets[workbook.SheetNames[0]];
-			            var jsonData = XLSX.utils.sheet_to_json(sheet, { header: 1, raw: false, defval: "" }); // Ensure empty cells are not skipped
-
-			            if (jsonData.length <= 1) {
-			                reject('Excel file is empty or does not contain valid data.');
-			                return;
-			            }
-
-			            let emptyCells = 0;
-
-			            // Loop through rows and columns to check for empty cells
-			            for (let i = 1; i < jsonData.length; i++) { // Start from 1 to exclude header
-			                for (let j = 0; j < jsonData[0].length; j++) { // Ensure checking all expected columns
-			                    let cellValue = jsonData[i][j];
-
-			                    if (cellValue === "" || cellValue === undefined || cellValue === null) {
-			                        emptyCells++;
-			                    }
-			                }
-			            }
-
-			            if (emptyCells > 0) {
-			                reject(`The uploaded Excel file contains ${emptyCells} empty cells. Please fill them before proceeding.`);
-			            } else {
-			                resolve(jsonData.length - 1); // Exclude header row
-			            }
-			        };
-
-			        reader.onerror = function () {
-			            reject('Error reading the file. Please try again.');
-			        };
-
-			        reader.readAsArrayBuffer(file);
-			    });
-			}
-
-			// Excel submit function
-			$('#excelsubmit').on('click', function (event) {
-			    event.preventDefault(); // Prevent traditional form submission
-
-			    $('#excelsubmit').attr('disabled', true).text('Reading file...');
-
-			    var name = $('#name').val();
-			    var category = $('#category').val();
-			    var fileInput = $('#fileInput')[0].files[0]; // Get the file
-
-			    if (!name) {
-			        Swal.fire({
-			            icon: 'info',
-			            title: 'Missing Data',
-			            text: 'Please fill in the campaign name.'
-			        });
-			        $('#excelsubmit').attr('disabled', false).text('Submit');
-			        return;
-			    }
-
-			    if (!category || category === "0") {
-			        Swal.fire({
-			            icon: 'info',
-			            title: 'Missing Data',
-			            text: 'Please select a valid category.'
-			        });
-			        $('#excelsubmit').attr('disabled', false).text('Submit');
-			        return;
-			    }
-
-			    if (!fileInput) {
-			        Swal.fire({
-			            icon: 'info',
-			            title: 'Missing Data',
-			            text: 'Please upload a file.'
-			        });
-			        $('#excelsubmit').attr('disabled', false).text('Submit');
-			        return;
-			    }
-				
-			    $('#pageLoader').show();
-			    // Read the Excel file
-			    readExcelFile(fileInput).then((recordCount) => {
-			    	$('#pageLoader').hide();
-			        Swal.fire({
-			            icon: 'question',
-			            title: 'Confirm Submission',
-			            text: `The uploaded Excel file contains ${recordCount} records. Do you want to proceed?`,
-			            allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                    allowEscapeKey: false, // Disable escape key to close the modal
-	                    allowEnterKey: false, // Disable enter key to close the modal
-			            showCancelButton: true,
-			            confirmButtonText: 'Yes, Submit',
-			            cancelButtonText: 'No, Cancel'
-			        }).then((result) => {
-			            if (result.isConfirmed) {
-			                // Proceed with submission
-			                submitExcelData(name, category, fileInput);
-			            } else {
-			                $('#excelsubmit').attr('disabled', false).text('Submit');
-			            }
-			        });
-			    }).catch((error) => {
-			    	$('#pageLoader').hide();
-			        Swal.fire({
-			            icon: 'info',
-			            title: 'Validation Error',
-			            text: error,
-			            allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                    allowEscapeKey: false, // Disable escape key to close the modal
-	                    allowEnterKey: false, // Disable enter key to close the modal
-			        });
-			        $('#excelsubmit').attr('disabled', false).text('Submit');
-			    });
-			});
-
-			// Function to submit the form data
-			function submitExcelData(name, category, fileInput) {
-			    var formData = new FormData();
-			    formData.append('name', name);
-			    formData.append('category', category);
-			    formData.append('file', fileInput);
-
-			    $('#pageLoader').show();
-
-			    $.ajax({
-			        url: '/gcc/api/campaign/saveexcelcampaign',
-			        type: 'POST',
-			        data: formData,
-			        processData: false,
-			        contentType: false,
-			        success: function (response) {
-			            $('#pageLoader').hide();
-
-			            if (response.status === 'column_mismatch') {
-			                Swal.fire({
-			                    icon: 'error',
-			                    title: 'Need more columns',
-			                    text: response.message
-			                }).then(() => {
-			                    $('#excelsubmit').attr('disabled', false).text('Submit');
-			                });
-			                return;
-			            }
-
-			            if (response.status === 'header_mismatch') {
-			                Swal.fire({
-			                    icon: 'error',
-			                    title: 'Header Mismatch',
-			                    text: response.message
-			                }).then(() => {
-			                    $('#excelsubmit').attr('disabled', false).text('Submit');
-			                });
-			                return;
-			            }
-
-			            if (response.status === 'error') {
-			                Swal.fire({
-			                    icon: 'error',
-			                    title: 'Error',
-			                    text: response.message
-			                }).then(() => {
-			                    $('#excelsubmit').attr('disabled', false).text('Submit');
-			                });
-			                return;
-			            }
-
-			            Swal.fire({
-			                icon: 'success',
-			                title: 'Success',
-			                allowOutsideClick: false, 
-		                    allowEscapeKey: false, 
-		                    allowEnterKey: false,
-		                    showConfirmButton: true,
-			                text: 'Campaign data saved successfully!'
-			            }).then((result) => {
-			                if (result.isConfirmed) {
-			                    $('#excelsubmit').attr('disabled', false).text('Submit');
-			                    location.reload();
-			                }
-			            });
-			        },
-			        error: function () {
-			            $('#pageLoader').hide();
-			            Swal.fire({
-			                icon: 'error',
-			                title: 'Error',
-			                text: 'Failed to save campaign details. Please try again.'
-			            });
-			            $('#excelsubmit').attr('disabled', false).text('Submit');
-			        }
-			    });
-			}
-
-		  
-		  
-		  
-		/////// Campaign request question and answers function  ////////
-			$('#requestsubmit').on('click', function(event) {
-			    event.preventDefault(); // Prevent traditional form submission
-
-			    $('#requestsubmit').attr('disabled', true).text('Submitting...');
-
-			    // Get form values
- 			    var campaignId = $('#campaign').val();
-			    var categoryId = $('#campaigncategory').val(); 
-			    var eventStartDate = $('#eventstartdate').val();
-			    var eventEndDate = $('#eventenddate').val();
-			    var noOfCalls = $('#no_of_calls').val();
-			    var description = $('#description').val();
-
-			    console.log("campaign ",campaignId);
-			    console.log("category ",categoryId);
-			    
-			    // Check for empty values
-			    if (!eventStartDate || !eventEndDate  || !noOfCalls || !description || !campaignId || !categoryId || campaignId === "0" || categoryId==="0") {
-			        Swal.fire({
-			            icon: 'info',
-			            title: 'Info',
-			            text: 'Please fill in all mandatory fields before submitting.',
-			        });
-			        $('#requestsubmit').attr('disabled', false).text('Submit');
-			        return;
-			    }
-			    
-			    
-			    // // Collect selected agent IDs
-/* 			    let selectedAgents = [];
-			    $('.agentCheckbox:checked').each(function () {
-			        selectedAgents.push($(this).val());
-			        console.log("selectedagents",selectedAgents);
-			    });
-			
-			    // Ensure at least one agent is selected
-			    if (selectedAgents.length === 0) {
-			        Swal.fire({
-			            icon: 'info',
-			            title: 'Info',
-			            text: 'Please select at least one agent before submitting.'
-			        });
-			        $('#requestsubmit').attr('disabled', false).text('Submit');
-			        return;
-			    } */
-			    
-			    let noOfAgents = parseInt($('#no_of_agents').val()) || 0;
-		        let selectedAgents = $('.agentCheckbox:checked').map(function () {
-		            return $(this).val();
-		        }).get();
-
-		        if (noOfAgents !== selectedAgents.length) {
-		            Swal.fire({
-		                icon: 'warning',
-		                title: 'Mismatch in Agent Selection',
-		                text: `You must select exactly ${noOfAgents} agents.`,
-		   	             allowOutsideClick: false, // Disable clicking outside the modal to close it
-		                 allowEscapeKey: false, // Disable escape key to close the modal
-		                 allowEnterKey: false, // Disable enter key to close the modal	                   
-		                 showConfirmButton: true
-		            });
-		            $('#requestsubmit').attr('disabled', false).text('Submit');
-		            return;
-		        }
-
-			    
-			    
-
-			    let questionsData = [];
-			    let isValid = true;
-
-			    $('.question-block').each(function() {
-			        let questionText = $(this).find('.question-input').val().trim();
-			        let answerType = $(this).find('.answer-type').val();
-			        let selectedType = answerType.toString(); // Keep as string for comparison
-			        let answers = [];
-
-			        // Validate question text
-		            if (!questionText) {
-		                Swal.fire({
-		                    icon: 'info',
-		                    title: 'Info',
-		                    text: 'Please enter a question before submitting.'
-		                });
-		                isValid = false;
-		                return false; // Exit loop
-		            }
-
-		         // Validate answer type selection
-		            if (!answerType) {
-		                Swal.fire({
-		                    icon: 'info',
-		                    title: 'Info',
-		                    text: 'Please select an answer type for each question.'
-		                });
-		                isValid = false;
-		                return false; // Exit loop
-		            }
-			
-
-			        // Skip answer validation for "Text" answer type (ID = 1)
-			        let answersContainer = $(this).find('.answer-list');
-			        if (answerType !== "1" && answersContainer.children().length === 1) {
-			            Swal.fire({
-			                icon: 'info',
-			                title: 'Info',
-			                text: 'Each question must have at least two answer (except for Text type).'
-			            });
-			            isValid = false;
-			            return false; // Exit loop
-			        }
-			        
-			        // Validate answers (only if not Text type)
-			        if (selectedType !== "1") {
-			            let hasEmptyAnswer = false;
-
-			            $(this).find('.answer-text').each(function () {
-			                let answer = $(this).val().trim();
-			                if (answer) {
-			                    answers.push(answer);
-			                } else {
-			                    hasEmptyAnswer = true;
-			                }
-			            });
-
-			            if (hasEmptyAnswer || answers.length < 2) {
-			                Swal.fire({
-			                    icon: 'info',
-			                    title: 'Info',
-			                    text: 'Please fill in all answer fields before submitting.',
-			                    //text: 'Each question must have at least two valid answers (except for Text type).',
-			                });
-			                isValid = false;
-			                return false; // Stop processing further
-			            }
-			        }
-
-			        questionsData.push({
-			            question: questionText,
-			            answerType: answerType,
-			            answers: answers
-			        });
-			    });
-			    
-			    
-
-
-			    console.log("questionsData ",questionsData);
-			    console.log("isvalid outside",isValid);
-			    if (!isValid) {
-			        $('#requestsubmit').attr('disabled', false).text('Submit');
-			        console.log("isvalid inside",isValid);
-			        return;
-			    }
-
-			    let questionsJson = JSON.stringify(questionsData);
-
-			    // Create FormData object
-			    var formData = new FormData();
-			    
-			   
-				formData.append('categoryId',categoryId);
-				formData.append('campaignId',campaignId);
-				formData.append('eventStartDate',eventStartDate);
-				formData.append('eventEndDate',eventEndDate);
-				formData.append('noOfCalls',noOfCalls);
-				formData.append('description',description);
-				formData.append('questionsData', questionsJson);
-				formData.append('selectedAgents', JSON.stringify(selectedAgents));
-
-				//formData.append('questionsData', new Blob([questionsJson], { type: 'application/json' }));
-				//formData.append('selectedAgents', new Blob([JSON.stringify(selectedAgents)], { type: 'application/json' }));
-
-
-			    // Append agent IDs as JSON array
-			    //formData.append('selectedAgents', JSON.stringify(selectedAgents));
-			    console.log("formdata "+ formData);
-			    $('#pageLoader').show();
-
-			    $.ajax({
-			        //url: `/gcc/api/campaign/savecampaign?categoryId=${encodeURIComponent(categoryId)}&campaignId=${encodeURIComponent(campaignId)}&eventStartDate=${encodeURIComponent(eventStartDate)}&eventEndDate=${encodeURIComponent(eventEndDate)}&noOfCalls=${encodeURIComponent(noOfCalls)}&description=${encodeURIComponent(description)}`,
-			        url: '/gcc/api/campaign/savecampaign',
-
-			        type: 'POST',
-			        data: formData,
-			        processData: false,
-			        contentType: false,
-			        success: function(response) {
-			            $('#pageLoader').hide();
-			           if(response.status==='success'){ 
-			            Swal.fire({
-			                icon: 'success',
-			                title: 'Success',
-			                allowOutsideClick: false, 
-		                    allowEscapeKey: false, 
-		                    allowEnterKey: false, 
-			                text: response.message
-			            }).then((result) => {
-			                if (result.isConfirmed) {
-			                    $('#requestsubmit').attr('disabled', false).text('Submit');
-			                    location.reload();
-			                }
-			            });
-			            
-			           }  
-			           else{
-			        	   $('#requestsubmit').attr('disabled', false).text('Submit');
-			        	   Swal.fire({
-				                icon: 'error',
-				                title: 'Error',
-				                text: response.message
-				            });
-			           }
-			        },
-			        error: function(xhr) {
-			            $('#pageLoader').hide();
-			            Swal.fire({
-			                icon: 'error',
-			                title: 'Error',
-			                text: 'Something went wrong. Please try again later.'
-			            });
-			            $('#requestsubmit').attr('disabled', false).text('Submit');
-			        }
-			    });
-			});
-
-		  
-    	
-		  
-		/*   //campaign request question and answers function
-    	 $('#requestsubmit').on('click', function(event) {
-		        event.preventDefault(); // Prevent form from submitting the traditional way
-		        
-		        
-		        $('#requestsubmit').attr('disabled', true).text('Submitting...');
-
-
-			     // Get form values
-			        //var name = $('#name').val();
-			        //var category = $('#category').val();
-			        var eventStartDate = $('#eventstartdate').val();
-			        var eventEndDate = $('#eventenddate').val();
-			        var noOfAgent = $('#no_of_agent').val();
-			        var noOfCalls = $('#no_of_calls').val();
-			        var description = $('#description').val();
-			         //var fileInput = $('#fileInput')[0].files[0]; // Get the file from the input
-
-			         
-			        // Check for empty values and trigger Swal error
-			        if ( !eventStartDate || !eventEndDate || !noOfAgent || !noOfCalls || !description) {
-			            Swal.fire({
-			                icon: 'info',
-			                title: 'Info',
-			                text: 'Please fill in all mandatory fields and upload a file before submitting.',
-			            });
-			            $('#requestsubmit').attr('disabled', false).text('Submit');
-			            return; // Stop form submission if any field is empty
-			        } 
-
-			  	 
-			        let questionsData = [];
-				    let isValid = true; // Validation flag
-				    
-				    $('.question-block').each(function() {
-				        let questionText = $(this).find('.question-input').val().trim();
-				        let answerType = $(this).find('.answer-type').val();
-				        let selectedType = answerType.toString(); // Keep as string for comparison
-				        let answers = [];
-				
-				        // Validate question text
-			            if (!questionText) {
-			                Swal.fire({
-			                    icon: 'info',
-			                    title: 'Info',
-			                    text: 'Please enter a question before submitting.'
-			                });
-			                isValid = false;
-			                return false; // Exit loop
-			            }
-
-			            // Validate answer type selection
-			            if (!answerType) {
-			                Swal.fire({
-			                    icon: 'info',
-			                    title: 'Info',
-			                    text: 'Please select an answer type for each question.'
-			                });
-			                isValid = false;
-			                return false; // Exit loop
-			            }
-				
-
-				        // Skip answer validation for "Text" answer type (ID = 1)
-				        let answersContainer = $(this).find('.answer-list');
-				        if (answerType !== "1" && answersContainer.children().length === 0) {
-				            Swal.fire({
-				                icon: 'info',
-				                title: 'Info',
-				                text: 'Each question must have at least one answer (except for Text type).'
-				            });
-				            isValid = false;
-				            return false; // Exit loop
-				        }
-				        
-				        // Validate answers (only if not Text type)
-				        if (selectedType !== "1") {
-				            let hasEmptyAnswer = false;
-
-				            $(this).find('.answer-text').each(function () {
-				                let answer = $(this).val().trim();
-				                if (answer) {
-				                    answers.push(answer);
-				                } else {
-				                    hasEmptyAnswer = true;
-				                }
-				            });
-
-				            if (hasEmptyAnswer || answers.length === 0) {
-				                Swal.fire({
-				                    icon: 'info',
-				                    title: 'Info',
-				                    text: 'Please fill in all answer fields before submitting.',
-				                });
-				                isValid = false;
-				                return false; // Stop processing further
-				            }
-				        }
-				        
- 				        
-				        let questionObj = {
-				            question: questionText,
-				            answerType: answerType,
-				            answers: answers,
-
-				        };
-							
-				        questionsData.push(questionObj);
-				    }); 
-				    
-				    if (!isValid) {
-				        $('#requestsubmit').attr('disabled', false).text('Submit');
-				        return; // Stop AJAX call if validation fails
-				    }
-				  
-				 // Convert questionsData array to JSON string
-				    let questionsJson = JSON.stringify(questionsData);
-				 
-				 console.log("Q&A data:",questionsJson);
-				    
-				 // Create FormData object
-				    var formData = new FormData();
-				    formData.append('file', fileInput);
-				    formData.append('questionsData', new Blob([questionsJson], { type: 'application/json' }));
-
-   				    console.log("formdata",formData);
-
-				    
-				    $('#pageLoader').show();
-				 // Send the AJAX request with query parameters and multipart data
-				    $.ajax({
-				        url: `/gcc/api/campaign/savecampaign?name=${encodeURIComponent(name)}&category=${encodeURIComponent(category)}&eventStartDate=${encodeURIComponent(eventStartDate)}&eventEndDate=${encodeURIComponent(eventEndDate)}&noOfAgent=${encodeURIComponent(noOfAgent)}&noOfCalls=${encodeURIComponent(noOfCalls)}&description=${encodeURIComponent(description)}`,
-				        type: 'POST',
-				        data: formData,
-				        processData: false,
-				        contentType: false,
-				        success: function(response) {
-				        	
-				        	
-				        	$('#pageLoader').hide();
-				        	
-				        	if (response.status === "error") {
-				                Swal.fire({
-				                    icon: 'error',
-				                    title: 'Column Mismatch ',
-				                    text: response.message // Displays error message for column mismatch
-				                }).then(() => {
-				                    $('#requestsubmit').attr('disabled', false).text('Submit');
-				                });
-				                return; // Stop further execution
-				            }
-				        	
-				            console.log("Response:", response);
-				            Swal.fire({
-				                icon: 'success',
-				                title: 'Success',
-				                text: 'Campaign data saved successfully!',
-				            }).then((result) => {
-		 		                if (result.isConfirmed) {
-		 		                    $('#requestsubmit').attr('disabled', false).text('Submit');
-		 		                    location.reload();
-		 		                }
-		 		            });
-				            
-				        },
-				        error: function(xhr) {
-				            $('#pageLoader').hide();
-
-				        }
-				    });
-
-    	 }); */
-    });
-    
-    
-		
-        </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/.DS_Store b/src/main/resources/templates/modules/callcenterqaqc/.DS_Store
deleted file mode 100644
index 2dd4572b4bc67d491fd6b00cc810609a2eac043a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeI1U2fAr5XWbs50#J*<)aFeNag~SxIw7O1J7K5d=Vnj+O?DNhWySQxB@rh3h<lR
zP1wY7)AE3*x*P4zdhPvt_UEzPaYe+PEJm+IIwG=9Rr}}x&6cA3wKmGVFmix(%omx<
zL`s>;SS}k!r-4Ku5l93QfkYq?_#X)H&epQu^4|A*Q=14R0(X*tJ|8lw+Fr1=xAy3u
zu@nHi$FLRp<N-D(3$_<*?X68k(`OGZOm!i}aDF=bGd&#J3%2&wPZ#H>iwkFVAwzL?
zcIIVvxVWCTsZ9hDfhGaX-Cs(dynQU^Yx#Sh?IEKh_Ez#q29nb&**<1#E@v`(H_L~E
zSw28RZ@V|t<6l<ji9CsPFX&&OH^k2PRjn#NHdKzbsC>j1RmtUxETq`2>be`M-7Tt9
zR$Q>c+`eLr@v*vw^0y7;S6h?|yd2=~6ule!Zd|`dT%V$n!@oeWkEUL?irS|xc94yA
z9;0%}6)u^nG)wvgV<kE**Vs6&YZOLnn@4RLN-WkmBr<$-^og!BTTz8CbAGzI$rWoN
z=G?=G&GSfW8PkQWQMs3>FXOt!J0bqo6rZgWH?N#tPvzdCq^#DIj#f&4zLG7yx%OS=
zptq*lS*dCSRPvd2xpLjE@Nxph7B4lr+}DWUK|^oHI*nMY@Pc#Z#OM@HW)RnBi1u$1
zBg!t;?C#Xmc+oTM@YeXn%7@%D=Xj^lrq95UsSMG{jh)8dRqTF7><H{s5`kMn;J){>
zqxt{a_V53<WHrgnL?99P8v<_c^!@1xGed6O(9m2vqkf=j(c@}wZ3>O0<5)|_v8#U=
f($6?l=k$WDy=8>*&p!m{-%siNZ|qZZcM1Fk7WsHZ

diff --git a/src/main/resources/templates/modules/callcenterqaqc/agentgrievancedashboard.html b/src/main/resources/templates/modules/callcenterqaqc/agentgrievancedashboard.html
deleted file mode 100644
index 7906d316..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/agentgrievancedashboard.html
+++ /dev/null
@@ -1,416 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-.required {
-	color: red;
-}
-
-.card-box {
-	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-}
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="far fa-calendar-plus bg-blue"></i>
-									<div class="d-inline">
-										<h5>Dashboard QAQC</h5>
-										<span>1913 QAQC Dashboard</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 QAQC</li>
-										<li class="breadcrumb-item" aria-current="page">Agents
-											QAQC</li>
-										<li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-
-
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div
-									class="card-header d-flex justify-content-between align-items-center">
-									<h3 class="mb-0" style="font-weight: bold;font-size: large;"><span th:text="${agent[0]['agent_name']}" style="font-weight: bold;font-size: large;"></span>'s Task Dashboard</h3>
-									
-									
-
-									<form id="dateForm" method="POST"
-										action="/gcc/callcenterqaqc/agent/agentgrievancedashboard">
-										<div class="d-flex">
-											<!-- Date input fields for start and end dates -->
-
-											<input type="date" class="form-control mr-2" id="startDate"
-												name="startDate" placeholder="Start Date"> <input
-												type="date" class="form-control mr-2" id="endDate"
-												name="endDate" placeholder="Start Date">
-
-											<!-- Hidden form to submit the selected dates -->
-
-											<!-- 								        <input type="hidden" id="hiddenStartDate" name="startDate">
-								        <input type="hidden" id="hiddenEndDate" name="endDate"> -->
-											<button type="submit" class="btn btn-primary" id="searchBtn">Search</button>
-											<button type="button" class="btn btn-secondary ml-2"
-												id="resetBtn">Reset</button>
-										</div>
-									</form>
-
-
-
-								</div>
-								<div class="card-body">
-									<div class="row mt-2">
-										<!-- Total Calls Assigned -->
-										<div class="col-xl-3 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center h-100">
-												<h6 class="text-facebook mb-2">
-													<b>Total Calls Assigned</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.Total_Calls_assigned}">
-													<!-- Display Total Calls Assigned -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- QA&QC Calls -->
-										<div class="col-xl-3 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center h-100">
-												<h6 class="text-facebook mb-2">
-													<b>QA&QC Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text=" ${details[0]?.Closed_Call_count}">
-													<!-- Display Closed Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- In-progress Calls -->
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center h-100">
-												<h6 class="text-facebook mb-2">
-													<b>In-progress Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.Inprogress_Call_count}">
-													<!-- Display In-progress Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- Follow-up Calls -->
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center h-100">
-												<h6 class="text-facebook mb-2">
-													<b>Official Follow-up Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.Followup_Call_count}">
-													<!-- Display Follow-up Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center h-100">
-												<h6 class="text-facebook mb-2">
-													<b>Public Follow-up Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.PublicFollowup_Call_count}">
-													<!-- Display Follow-up Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-									</div>
-								</div>
-
-
-								<div class="card-block">
-									<div class="card-header">
-										<h3 style="font-weight: bold;">Your Performance Overview</h3>
-									</div>
-									<div class="card-body">
-										<div class="row mt-2">
-											<div class="col-xl-3 col-md-6 col-sm-12">
-												<div class="card card-box p-3 text-center h-100">
-													<h6 class="text-facebook mb-2">
-														<b>Total Assigned</b>
-													</h6>
-													<h4 class="text-twitter fw-700 mt-3"
-														th:text="${details2[0]?.total_data_count}"></h4>
-												</div>
-											</div>
-											<!-- QA&QC Calls -->
-											<div class="col-xl-3 col-md-6 col-sm-12">
-												<div class="card card-box p-3 text-center h-100">
-													<h6 class="text-facebook mb-2">
-														<b>Finished</b>
-													</h6>
-													<h4 class="text-twitter fw-700 mt-3"
-														th:text="${details2[0]?.completed_count}"></h4>
-												</div>
-											</div>
-											<!-- In-progress Calls -->
-											<div class="col-xl-3 col-md-6 col-sm-12">
-												<div class="card card-box p-3 text-center h-100">
-													<h6 class="text-facebook mb-2">
-														<b>Pending</b>
-													</h6>
-													<h4 class="text-twitter fw-700 mt-3"
-														th:text="${details2[0]?.pending_count}"></h4>
-												</div>
-											</div>
-											<!-- Follow-up Calls -->
-											<div class="col-xl-3 col-md-6 col-sm-12">
-												<div class="card card-box p-3 text-center h-100">
-													<h6 class="text-facebook mb-2">
-														<b>Completion (%)</b>
-													</h6>
-													<h4 class="text-twitter fw-700 mt-3"
-														th:text="${details2[0]?.completed_percentage}+ '%'"></h4>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-
-					<div class="row mt-4">
-						<div class="col-md-12">
-							<div class="card">
-							<div class="card-header"><h3><b>Your Task lists</b></h3></div>
-								<div class="card-body">
-									<div class="table-responsive">
-
-										<table id="AgentQaqcDatatable"
-											class="table table-striped table-bordered table-hover dataTable"
-											role="grid">
-											<thead class="thead-dark">
-												<tr>
-
-													<th rowspan="2" class="text-center">S.No</th>
-													<th rowspan="2" class="text-center">Task ID</th>
-													<th rowspan="2" class="text-center">Date</th>
-													<th rowspan="2" class="text-center">Type</th>
-													<th class="text-center" colspan="4">Performance</th>
-
-												</tr>
-												<tr>
-													<th class="text-center">Assigned</th>
-													<th class="text-center">Completed</th>
-													<th class="text-center">Pending</th>
-													<th class="text-center">Completion Percentage(%)</th>
-												</tr>
-											</thead>
-											<tbody>
-												<tr th:each="task, iterStat : ${tasks}">
-													<td class="text-center" th:text="${iterStat.count}"></td>
-													<td class="text-center" th:text="${task['taskid']}"></td>
-													<td class="text-center" th:text="${task['cdate']}"></td>
-													<td class="text-center" th:text="${task['call_category']}"></td>
-													<td class="text-center" th:text="${task['assigned']}"></td>
-													<td class="text-center" th:text="${task['callstaken']}"></td>
-													<td class="text-center" th:text="${task['pending']}"></td>
-													<td class="text-center"
-														th:text="${task['percentage'] + '%'}"></td>
-												</tr>
-											</tbody>
-										</table>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<!-- in the code use to show the download different type microsoft -->
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">	
-	 $(document).ready(function() {
-
-     	var table = $('#AgentQaqcDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '50vh',
-             fixedColumns: {
-                 left: 1,
-                 right: 1
-             },
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: true,
-             responsive: true,
-             searching: true,
-             select: false,
-             processing: false
-         });
-     	
-     	/* let startDate = new Date().toISOString().split('T')[0]; // Current date in 'yyyy-mm-dd' format
-     	let endDate = new Date().toISOString().split('T')[0];   // Current date in 'yyyy-mm-dd' format
-
-     	console.log("Start Date:", startDate);  // Logs the current date
-     	console.log("End Date:", endDate); */    // Logs the current date
-
-     	/* $.ajax({
-     	    url: '/gcc/api/callcenterqaqc/agent/getAgentDashboardData',
-     	    method: 'GET',
-     	    success: function(response) {
-     	        console.log("Response:", response);
-     	    },
-     	    error: function(xhr, status, error) {
-     	        console.error("Error occurred: ", error);
-     	    }
-     	}); */
-     	
-     	/* window.onload = function () {
-     	    // Get the current date in YYYY-MM-DD format
-     	    const today = new Date().toISOString().split('T')[0];
-     	    
-     	   //Set the hidden inputs with the current date
-     	    document.getElementById('hiddenStartDate').value = today;
-     	    document.getElementById('hiddenEndDate').value = today;
-     	    
-     	    // Set the date input fields to empty
-     	    document.getElementById('startDate').value = '';
-     	    document.getElementById('endDate').value = '';
-     	    
-     	    
-     	   // Retrieve stored start and end date from sessionStorage (only for the current session)
-     	    const storedStartDate = sessionStorage.getItem('startDate');
-     	    const storedEndDate = sessionStorage.getItem('endDate');
-
-     	    if (storedStartDate && storedEndDate) {
-     	        document.getElementById('startDate').value = storedStartDate;
-     	        document.getElementById('endDate').value = storedEndDate;
-     	    }
-     	}; */
-
-     	document.getElementById('resetBtn').addEventListener('click', function () {
-     	event.preventDefault();
-     	
-     	window.location.href="/gcc/callcenterqaqc/agent/agentgrievancedashboard";
-     	
-     	});
-     	
-     	
-     	document.getElementById('searchBtn').addEventListener('click', function (e) {
-     	    const startDate = document.getElementById('startDate').value;
-     	    const endDate = document.getElementById('endDate').value;
-
-     	    //console.log("startdate: ", startDate);
-     	    //console.log("enddate: ", endDate);
-
-     	    if (!startDate || !endDate) {
-     	        // Show SweetAlert if dates are missing
-     	        Swal.fire({
-     	            icon: 'warning', // Warning icon
-     	            title: 'Please select both start and end dates.',
-     	            showConfirmButton: true, // Show a confirmation button
-     	            timer: 3000 // Optional: Auto-close after 3 seconds
-     	        });
-
-     	        e.preventDefault(); // Prevent form submission if validation fails
-     	        return;
-     	    }
-     	   
-
-     	    // Submit the form to fetch the data based on the selected date range
-     	    document.getElementById('dateForm').submit(); // This will submit the form
-     	});
-
-     	
-     	
-     });
-	 
-	 
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html b/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html
deleted file mode 100644
index f77d8e70..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html
+++ /dev/null
@@ -1,1171 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-.required {
-	color: red;
-}
-
-.card-box {
-	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-	height: 140px;
-}
-
-@media ( max-width : 768px) {
-	.card-box {
-		text-align: center;
-	}
-}
-
-.custom-width1 {
-	width: 120px; /* Adjust the width as needed */
-}
-#modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-    
-</style>
-<body>
-	<div class="wrapper">
-		<!-- Header -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<!-- Left Menu -->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-layers bg-blue"></i>
-									<div class="d-inline">
-										<h5>Agent's QAQC Calls</h5>
-										<span>1913 QAQC Call List</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 QAQC</li>
-										<li class="breadcrumb-item" aria-current="page">Agents
-											QAQC</li>
-										<li class="breadcrumb-item active" aria-current="page">QAQC
-											Calls</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-				
-
-
-				<div class="row mt-4">
-
-					<div class="col-md-12">
-						<div class="card">
-
-							<div class="card-body">
-								<div class="page-header-title">
-									<h5 style="margin: 0; font-weight: bold;">Today Assigned
-										Calls</h5>
-								</div>
-								<div>
-									<div class="row mt-2">
-										<!-- Total Calls Assigned -->
-										<div class="col-xl-3 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-4">
-													<b>Total Calls Assigned</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text="${details[0]?.Total_Calls_assigned}">
-													<!-- Display Total Calls Assigned -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- QA&QC Calls -->
-										<div class="col-xl-3 col-md-6 col-sm-12"
-											style="background-color: aqua;">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-4">
-													<b>QA&QC Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text=" ${details[0]?.Closed_Call_count}">
-													<!-- Display Closed Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- In-progress Calls -->
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4 ">
-												<h6 class="text-facebook mb-4">
-													<b>In-progress Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text="${details[0]?.Inprogress_Call_count}">
-													<!-- Display In-progress Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- Follow-up Calls -->
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-2">
-													<b>Official Follow-up Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.Followup_Call_count}">
-													<!-- Display Follow-up Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-2">
-													<b>Public Follow-up Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.PublicFollowup_Call_count}">
-													<!-- Display Follow-up Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-									</div>
-
-
-
-									<div class="row mt-2">
-										<div class="col-md-12">
-											
-											<div class="card-header">
-												<h3 style="font-weight: bold;font-size: large;"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span><span th:text="${agent[0]['agent_name']}" style="font-weight: bold;font-size: large;"></span>'s QAQC Calls List</h3>
-
-											</div>
-
-											<div class="card-block">
-
-												<div class="col-md-12">
-													<div class="row">
-														<button id="primaryButton" class="btn btn-success">Non-Processed
-															Calls</button>
-														<button id="secondaryButton"
-															class="btn btn-secondary btn-custom ml-3">Processed
-															Calls</button>
-													</div>
-												</div>
-											</div>
-											<div class="card-body">
-
-												<div class="table-responsive" id="primaryTable"
-													style="display: block;">
-													<table id="QaqcDatatable"
-														class="table table-striped table-bordered table-hover dataTable"
-														role="grid">
-														<thead class="thead-dark">
-															<tr role="row">
-																<th class="text-center">S.No</th>
-																<th class="text-center">ID</th>
-																<th class="text-center">Complaint Date</th>
-																<th class="text-center">Public Name</th>
-																<th class="text-center">Public PhoneNo</th>
-																<th class="text-center">Complaint Type</th>
-																<th class="text-center">View Details</th>
-																<th class="text-center custom-width1">Actions</th>
-																<th class="text-center">Remarks</th>
-																<th class="text-center">Submit</th>
-															</tr>
-														</thead>
-														<tbody>
-
-															<!-- Thymeleaf loop for populating data -->
-															<tr th:each="call, iterStat : ${qaqcCallsLists}">
-																<td th:text="${iterStat.index + 1}" class="text-center"></td>
-																<td th:text="${call['complaint_number']}"
-																	class="text-center complaint-select"></td>
-																<td th:text="${call['complaint_date']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_person_name']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_mobilenumber']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_type']}"
-																	class="text-center"></td>
-																
-																<td class="text-center">
-
-																	<button type="button" class="btn btn-info"
-																		th:data-complaint-number="${call['complaint_number']}">
-																		View</button>
-																</td>
-																<td class="text-center"><select
-																	class="form-control form-control-sm action-select action-dropdown">
-																		<option value="" selected>Select</option>
-																		<option th:each="status : ${qaqcCallsActioin}"
-																			th:value="${status.call_status}"
-																			th:text="${status.call_status}"></option>
-																</select>
-																	<div class="schedule-call d-none mt-2">
-																		<input type="date" class="date-picker form-control"
-																			name="remainderDate">
-																	</div>            </td>
-
-																<td class="text-center"><input type="text"
-																	class="form-control form-control-sm "
-																	placeholder="Remarks"></td>
-
-																<td class="text-center">
-																	<button class="btn btn-primary btn-sm submit-btn submitid"
-																		th:data-id="${call['data_id']}"
-																		th:complaint-select="${call['complaint_number']}"
-																		th:data-name="${call['complaint_person_name']}"
-																		th:data-number="${call['complaint_mobilenumber']}"
-																		th:data-complaint-type="${call['complaint_type']}"
-																		onclick="submitComplaint(this)" disabled="disabled">
-																		Submit</button>
-																</td>
-															</tr>
-														</tbody>
-													</table>
-												</div>
-
-												<div class="table-responsive" id="secondaryTable"
-													style="display: none;">
-													<table id="SecondaryDatatable"
-														class="table table-striped table-bordered table-hover dataTable"
-														role="grid">
-														<thead class="thead-dark">
-															<tr role="row">
-																<th class="text-center">S.No</th>
-																<th class="text-center">ID</th>
-																<th class="text-center">Complaint Date</th>
-																<th class="text-center">Public Name</th>
-																<th class="text-center">Public PhoneNo</th>
-																<th class="text-center">Complaint Type</th>
-																<th class="text-center">View Details</th>
-																<th class="text-center custom-width1">Actions</th>
-																<th class="text-center">Remarks</th>
-															</tr>
-														</thead>
-														<tbody>
-															<!-- <tr th:each="call, iterStat : ${qaqcSubmitDetails}">
-																<td th:text="${iterStat.index + 1}" class="text-center"></td>
-																<td th:text="${call['complaint_number']}"
-																	class="text-center complaint-select"></td>
-																<td th:text="${call['complaint_date']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_person_name']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_mobilenumber']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_type']}"
-																	class="text-center"></td>
-																<td class="text-center">
-																	<button type="button" class="btn btn-info"
-																		th:data-complaint-number="${call['complaint_number']}">View</button>
-																</td>
-																<td th:text="${call['call_status']}" class="text-center"></td>
-																<td th:text="${call['remarks']}" class="text-center"></td>
-															</tr> -->
-														</tbody>
-													</table>
-												</div>
-
-
-											</div>
-											 </div>
-										</div>
-									</div>
-								</div>
-
-
-							</div>
-						</div>
-					</div>
-
-				</div>
-			</div>
-			
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-			
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-	<!-- Modal -->
-	<div class="modal fade" id="detailsModal" tabindex="-1" role="dialog"
-		aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="detailsModalLabel">Complaint
-						Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body" id="modalBody">
-					<!-- Details will be populated here -->
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary"
-						data-dismiss="modal">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-
-	<script type="text/javascript">
-	
-	
-	$(document).ready(function () {
-				
-		$(document).on('click', '.btn-info', function () {
-	        // Retrieve the complaint number from the data attribute
-	        var complaintNumber = $(this).data('complaint-number');
-	        
-	        // Call the viewDetails function with the complaint number
-	        viewDetails(complaintNumber);
-	    });
-		
-		$('#primaryButton').addClass('btn-success').removeClass('btn-secondary');
-        $('#secondaryButton').addClass('btn-secondary').removeClass('btn-success');
-		
-		// Toggle functionality for Primary and Secondary buttons
-	    $('#primaryButton').click(function () {
-	    	//location.reload();
-	        $('#primaryTable').show();
-	        $('#secondaryTable').hide();
-	        
-	        $(this).addClass('btn-success').removeClass('btn-secondary');
-            $('#secondaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        $('#QaqcDatatable').DataTable().columns.adjust().draw();
-	    });
-
-	    $('#secondaryButton').click(function () {
-	    	//location.reload();
-	        $('#primaryTable').hide();
-	        $('#secondaryTable').show();
-	        
-	        $(this).addClass('btn-success').removeClass('btn-secondary');
-            $('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        //$('#SecondaryDatatable').DataTable().columns.adjust().draw();
-
-	        
-	        let userId = document.getElementById('userIdSpan').textContent;
-	        
-	        
-	        // Destroy previous instance if exists
-	        if ($.fn.DataTable.isDataTable('#SecondaryDatatable')) {
-	            $('#SecondaryDatatable').DataTable().clear().destroy();
-	        }
-	        $('#pageLoader').show();
-	        // AJAX call to get data
-	        $.ajax({
-	            url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getqcsubmittedcalls', // Replace with your controller URL
-	            type: 'GET',
-	            data: { userId: userId },
-	            success: function (response) {
-	            	$('#pageLoader').hide();
-	                // Initialize DataTable with new data
-	                $('#SecondaryDatatable').DataTable({
-	                    data: response, // This should be an array of objects
-	                    columns: [
-	                        { data: null, render: function (data, type, row, meta) { return meta.row + 1; }, className: "text-center" },
-	                        { data: 'complaint_number', className: "text-center" },
-	                        { data: 'complaint_date', className: "text-center" },
-	                        { data: 'complaint_person_name', className: "text-center" },
-	                        { data: 'complaint_mobilenumber', className: "text-center" },
-	                        { data: 'complaint_type', className: "text-center" },
-	                        { 
-	                            data: 'complaint_number',
-	                            className: "text-center",
-	                            render: function (data, type, row) {
-	                                return `<button type="button" class="btn btn-info" data-complaint-number="${data}">View</button>`;
-	                            }
-	                        },
-	                        {
-	                            data: 'call_status',
-	                            className: "text-center"
-	                           
-	                        },
-	                        {
-	                            data: 'remarks',
-	                            className: "text-center"
-	                            
-	                        }
-	                    ],
-	                    dom: 'Bftip',
-	        	        columnDefs: [
-	        	            { targets: 'no-sort', orderable: false }
-	        	        ],
-	        	        lengthMenu: [
-	        	            [50, 100, 200, 500, -1],
-	        	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        	        ],
-	        	        scrollY: '50vh',
-	        	        scrollX:true,
-	        	        buttons: [
-	        	            {
-	        	                extend: 'pageLength',
-	        	                className: 'btn btn-warning'
-	        	            },
-	        	            {
-	        	                title: 'Data export',
-	        	                extend: 'copyHtml5',
-	        	                text: 'Copy',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'copyBtn'
-	        	            },
-	        	            {
-	        	                extend: 'excelHtml5',
-	        	                text: 'Excel',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'excelBtn'
-	        	            },
-	        	            {
-	        	                extend: 'csvHtml5',
-	        	                text: 'CSV',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'csvBtn'
-	        	            },
-	        	            {
-	        	                extend: 'pdfHtml5',
-	        	                text: 'PDF',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'pdfBtn'
-	        	            }
-	        	        ],
-	        	        fixedHeader: true,
-	        	        autoWidth: false,
-	        	        responsive: false,
-	        	        searching: true,
-	        	        select: false,
-	        	        processing: false
-	                });
-	            },
-	            error: function () {
-	            	$('#pageLoader').hide();
-	            	Swal.fire("Error", "Failed to get Finished complaints.", "error");
-	            }
-	        });
-	        
-	        
-	        
-	    });
-		
-	    var table = $('#QaqcDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        scrollX:true,
-	        buttons: [
-	            {
-	                extend: 'pageLength',
-	                className: 'btn btn-warning'
-	            },
-	            {
-	                title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn'
-	            }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: false,
-	        responsive: false,
-	        searching: true,
-	        select: false,
-	        processing: false
-	    });
-	    
-	    var table1 = $('#SecondaryDatatable').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',
-	        scrollX:true,
-	        buttons: [
-	            {
-	                extend: 'pageLength',
-	                className: 'btn btn-warning'
-	            },
-	            {
-	                title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn'
-	            }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: false,
-	        responsive: false,
-	        searching: true,
-	        select: false,
-	        processing: false
-	    });
-
-	    // Event listeners for changes in dropdown, remarks, and date picker
-	    $(document).on('change', '.action-dropdown', function () {
-	        const parentRow = $(this).closest('tr');
-	        const schedulerDiv = parentRow.find('.schedule-call');
-	        schedulerDiv.toggleClass('d-none', $(this).val() !== 'FOLLOWUP');
-	        validateFields(parentRow);
-	    });
-
-	    $(document).on('input', 'input[type="text"]', function () {
-	        const parentRow = $(this).closest('tr');
-	        validateFields(parentRow);
-	    });
-
-	    $(document).on('change', '.date-picker', function () {
-	        const parentRow = $(this).closest('tr');
-	        validateFields(parentRow);
-	    });
-
-	    // Validate function to check conditions for enabling/disabling submit button
-	    function validateFields(row) {
-	        const actionSelect = row.find('.action-select');
-	        const remarksInput = row.find('input[type="text"]');
-	        const submitButton = row.find('.submit-btn');
-	        const actionValue = actionSelect.val().trim();
-	        const remarksFilled = remarksInput.val().trim() !== "";
-
-	        const followUpSelected = actionValue === "FOLLOWUP";
-	        
-	        const remainderDateFilled = row.find('.date-picker').val()?.trim() !== ""; // Check if date is selected
-	        
-
-	     // Enable submit button based on conditions
-	        if (
-	            (followUpSelected && remainderDateFilled && remarksFilled) || (actionValue !== "FOLLOWUP" && actionValue !=="Select")|| (actionValue === "MOBILE_NUM"  && remarksFilled) // FOLLOWUP requires remainder date and remarks
-	        ) {
-	            submitButton.prop('disabled', false); // Enable submit button
-	        } else {
-	            submitButton.prop('disabled', true); // Disable submit button
-	        }
-	    }
-
-	 // Initial validation for all rows on page load
-		$("#QaqcDatatable tbody tr").each(function () {
-		    const row = $(this);
-		    const submitButton = row.find('.submit-btn');
-		    submitButton.prop('disabled', true); // Ensure submit button is initially disabled
-		    validateFields(row); // Validate fields for further interaction
-		});
-		
-		// Re-validate fields on input changes
-		$("#QaqcDatatable").on('input change', '.action-select, input[type="text"], .date-picker', function () {
-		    const row = $(this).closest('tr');
-		    validateFields(row);
-		});
-	});
-
-	
-	function submitComplaint(button) {
-		
-		
-		
-		// Access the userId from the hidden span
-	    var userId = document.getElementById('userIdSpan').textContent;
-
-	    // Log userId to the console
-	    //console.log('Inside submit button UserId=====:', userId);
-	    	    
-	    const row = button.parentNode.parentNode;
-
-	    // Fetch the values from the corresponding cells in the row
-	    const dataId = row.querySelector('.submit-btn').getAttribute('data-id'); // Fetch the data_id
-	    const action = row.querySelector('.action-select').value.trim(); // Fetch the action value
-	    const complaintNumber = row.querySelector('.complaint-select').innerText.trim(); // Fetch complaint number
-	    const remarks = row.querySelector('input[type="text"]').value.trim(); // Fetch the remarks value
-	    const remainderDate = row.querySelector('.date-picker')?.value.trim(); // Fetch the remainder date (if any) 
-	    
-	    
- 		//console.log(row);
-		//console.log(dataId);
-		//console.log(action);
-		//console.log(complaintNumber);
-		//console.log(remarks);
-		//console.log(remainderDate);
-		$('.submitid').prop('disabled', true).text('Submitting...');
-		const name = button.getAttribute('data-name')?.trim() || "N/A";
-	    const cellnumber = button.getAttribute('data-number');
-	    const complaintTypeName = button.getAttribute('data-complaint-type');
-	    
-	  	    
-	    // Validation
-	    if (!dataId || !action || action === "Select") {
-	        Swal.fire("Error", "Action is required!", "error");
-	        $('.submitid').prop('disabled', false).text('Submit');
-	        return;
-	    }
-	    
-	    if (action !== 'COMPLETED' && remarks === "") {
-	        Swal.fire("Error", "Fill Remarks", "error");
-	        $('.submitid').prop('disabled', false).text('Submit');
-	        return;
-	    }
-
-	    if (action === 'FOLLOWUP' && remarks === "" && (!remainderDate || remainderDate === "")) {
-	        Swal.fire("Error", "Schedule Date is required for Follow-Up!", "error");
-	        $('.submitid').prop('disabled', false).text('Submit');
-	        return;
-	    }
-	    
-	    $('#pageLoader').show();
-	    //console.log("outside ajax");
-	    // AJAX Request
-	     $.ajax({
-	        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/update',
-	        type: 'POST',
-	        data: {
-	            dataId: dataId,
-	            complaintNumber: complaintNumber,
-	            action: action,
-	            remarks: remarks,
-	            remainderDate: remainderDate,
-	            userId:userId
-	        },	        
-	        success: function (response) {
-	        	 $('#pageLoader').hide();
-	            if (response === "Success") {
-	            	//console.log("Success");
-	            	
-            	    //console.log("name:",name);
-            	    //console.log("cellnumber:",cellnumber);
-            	    //console.log("complaintTypeName:",complaintTypeName);
-            	    //console.log("complaintNumber:",complaintNumber);
-					
-            	 //Validate cellnumber
-            	    if (!isNaN(cellnumber) || !cellnumber.trim() === "") {
-            	    	//console.log("valid phone number");
-            	    	$('.submitid').prop('disabled', false).text('Submit');
-            	    	// Trigger WhatsApp message functions based on action
-           	               	              	    	
-                 	    if (action === "UNATTENDED" || action === "COMPLETED" ) {               	    	
-                	    	checkforUnattendedwhatsappmsg(complaintNumber,action,complaintTypeName,cellnumber,name);               	    	
-                	    }           	    	
-                	    
-            	    }            	   
-            	    else{
-            	    	console.log("not valid phone number,So message not sent");
-            	    }            	   
-	                Swal.fire({
-	                    icon: 'success',
-	                    title: 'Success',
-	                    text: 'Complaint updated successfully!',
-	                    allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                    allowEscapeKey: false, // Disable escape key to close the modal
-	                    allowEnterKey: false, // Disable enter key to close the modal
-	                    showConfirmButton: true, // Ensure the confirm button is visible
-	                }).then((result) => {
-	                    if (result.isConfirmed) {
-	                    	console.log("ok button");
-	                    	$('.submitid').prop('disabled', false).text('Submit');
-                    	
-	                    	const table = $('#QaqcDatatable').DataTable();
-	                        
-	                        // Remove the row
-	                        table.row($(row)).remove();
-
-	                        // Reorder S.No column
-	                        table.rows().every(function (index) {
-	                            const row = this.node();
-	                            $(row).find('td:first-child').text(index + 1); // Update S.No
-	                        });
-
-	                        // Redraw the table
-	                        table.draw(false);
-	                	    
-	                    }
-	                });
-	            } 
-	            else if (response === "error") {
-	            	$('.submitid').prop('disabled', false).text('Submit');
-	            	Swal.fire("Error", "Failed to update complaint. Please try again later.", "error");
-	            }
-	            else {
-	            	$('.submitid').prop('disabled', false).text('Submit');
-	                Swal.fire("Error", "Failed to update complaint. Please try again.", "error");
-	            }
-	        },
-	        error: function (xhr, status, error) {
-	        	$('#pageLoader').hide();
-	        	$('.submitid').prop('disabled', false).text('Submit');
-	            Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
-	        }
-	        
-	    });
-	    	    
-	    //$('.submitid').prop('disabled', false).text('Submit');
-	}
-	
-	function viewDetails(complaintNumber) {
- 	    document.getElementById('modalBody').innerHTML = '<p style="text-align:center;">Please wait, loading data...</p>';
- 	    $('#detailsModal').modal('show');
-
- 	    // Fetch the main complaint details
- 	    $.ajax({
- 	        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails',
- 	        type: 'GET',
-            data:{complaintNumber:complaintNumber},
- 	        success: function (data) {
- 	            //console.log('Complaint Data:', data);
-
- 	            // Fetch agent response details
- 	            $.ajax({
- 	                url: '/gcc/api/callcenterqaqc/agent/attendedcomplaintshistory',
- 	                type: 'GET',
- 	                data: { complaintNumber },
- 	                success: function (agentResponse) {
- 	                    //console.log('Agent Response:', agentResponse);
-
- 	                    // Use the logic for building complaint and agent details as HTML
- 	                    const detailsHtml = generateDetailsHtml(data, agentResponse);
-
- 	                    // Update modal content
- 	                    document.getElementById('modalBody').innerHTML = detailsHtml;
- 	                },
- 	                error: function () {
- 	                    document.getElementById('modalBody').innerHTML = '<p>Error loading agent details. Please try again later.</p>';
- 	                }
- 	            });
- 	        },
- 	        error: function () {
- 	            document.getElementById('modalBody').innerHTML = '<p>Error loading complaint details. Please try again later.</p>';
- 	        }
- 	    });
- 	}
-
- 	// Function to generate complaint and agent details HTML
-function generateDetailsHtml(data, agentResponse) {
- 		
- 	// Helper function to format date to yyyy-mm-dd
-         function formatDate(dateStr) {
-             if (!dateStr) return 'N/A';
-             const date = new Date(dateStr);
-             return date.toISOString().split('T')[0]; // Formats to yyyy-mm-dd
-         }
-// Format complaint messages
-let messagesHtml = '';
-if (data.comments && data.comments.length > 0) {
-    data.comments.forEach((comment) => {
-        const commentImageLink = comment.Comp_Image && comment.Comp_Image !== "No image available"
-            ? `<a href="${comment.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">View Image</a>`
-            : '<p style="color: red;">No image available for this comment.</p>';
-
-        messagesHtml += `
-            <div class="comment mb-4">
-                <div class="row">
-                    <div class="col-2 text-center">
-                        <p class="text-muted">${comment.comment_date}</p>
-                    </div>
-                    <div class="col-10">
-                        <p><strong>${comment.user || 'N/A'}</strong> Says:</p>
-                        <p>${comment.message || 'No message available'}</p>
-                        <div class="user-image">${commentImageLink}</div>
-                    </div>
-                </div>
-            </div>
-        `;
-    });
-} else {
-    messagesHtml = '<p>No comments available.</p>';
-}
-
-// Format agent responses
-let agentRepliedHtml = '';
-if (agentResponse.length > 0) {
-    agentResponse.forEach((agentItem) => {
-        agentRepliedHtml += `
-            <div class="comment mb-4">
-                <div class="row">
-                    <div class="col-2 text-center">
-                        <p class="text-muted"><strong>${formatDate(agentItem.created_date) || 'N/A'}</strong></p>
-                    </div>
-                    <div class="col-10">
-                        <p><strong>${agentItem.agent_name || 'N/A'}</strong>, Says: ${agentItem.call_status || 'N/A'}</p>
-                        <p><strong>Remarks: </strong>${agentItem.remarks || 'N/A'}</p>
-                        <p><strong>Remainder Date: </strong> ${formatDate(agentItem.remainder_date) || 'N/A'}</p>
-                    </div>
-                </div>
-            </div>
-        `;
-    });
-} else {
-    agentRepliedHtml = '<p>No agent replied messages available.</p>';
-}
-
-// Check for user images
-const userImages = data.userimages && data.userimages.length > 0 ? data.userimages[0] : {};
-const imageLink = userImages.Comp_Image && userImages.Comp_Image !== "null" && userImages.Comp_Image !== ""
-    ? `<a href="${userImages.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">UserImages: View Image</a>`
-    : '<p style="color: red;">UserImages: No image available.</p>';
-
-// Combine all sections into the final HTML
-const detailsHtml = `
-    <div class="row">
-        <div class="col-md-12">
-            <h4>Complaint Person's Details:</h4>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Complaint Number:</strong> ${data.complaintid || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Complaint Date:</strong> ${data.complaintdate}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Complainant's Name:</strong> ${data.complainantName || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Phone Number:</strong> ${data.mobileNumber || 'N/A'}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Zone:</strong> ${data.Zone || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Division:</strong> ${data.Division || 'N/A'}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Gender:</strong> ${data.gender || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Complainant's Address:</strong> ${data.Street || 'N/A'}, ${data.Area || 'N/A'}, ${data.Landmark || 'N/A'}, ${data.Location || 'N/A'}</p>
-                </div>
-            </div>
-        </div>
-    </div>
-    <hr>
-    <h4>Complaint Details:</h4>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Complaint Dept:</strong> ${data.deptname || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong>Complaint Mode:</strong> ${data.compmode || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Complaint Type:</strong> ${data.complaintType || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong>Details of Complaint:</strong> ${data.description || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Current Status:</strong> ${data.currentStatus || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong style="color:blue;">Official Mobile:</strong> ${data.OfficialMobile || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-    <div class="col-6">
-        <p><strong>Last Updated Date:</strong> ${data.greatestDate || 'N/A'}</p>
-    </div>
-    
-</div>
-    <hr>
-    <h4>Complaint Messages:</h4>
-    ${messagesHtml}
-    <hr>
-    <h4>Agent Replied Messages:</h4>
-    ${agentRepliedHtml}
-    <hr>
-    ${imageLink}
-`;
-
-return detailsHtml;
-}
-
-//checkforwhatsappmsg
-function checkforUnattendedwhatsappmsg(complaintNumber,action,complaintTypeName,cellnumber,name) {
-	
-	
-	console.log(complaintNumber);
-	       		    		        		  
-           $.ajax({
-               url: '/gcc/api/qaqc/whatsapp/checkforwhatsappmsg', 
-               type: 'GET',
-               data: { complaintNumber: complaintNumber,action:action,
-            	       complaintTypeName:complaintTypeName,mobnumber:cellnumber,
-            	       pname:name},
-               success: function(response) {
-                   //console.log('WhatsApp message sent successfully', response);
-                   console.log(response);                  
-                  
-               },
-               error: function(xhr, status, error) {
-                   console.error('Error sending WhatsApp message:', error);                   
-               }
-           });
-       }
-
-
-	
-	//whatsapp message function for REOPENED
-    function sendWhatsAppMessageReopened(name,complaintNumber,cellnumber,complaintTypeName) {
-
-        //console.log('whatsapp CustomerMobile:', cellnumber);
-        
-        //console.log('name:',name);
-        //console.log('id:',complaintNumber);
-        //console.log('complainttype',complaintTypeName)
-        let viewstatus = "pgr" ;
-           // Send the WhatsApp message pending
-
-			    let msgUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${encodeURIComponent(cellnumber)}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=Dear+Mr%2FMs+${encodeURIComponent(name)}%2C%0A%0AYour+complaint+regarding+${encodeURIComponent(complaintTypeName)}+with+complaint+number+%2A${encodeURIComponent(complaintNumber)}%2A+has+been+reopened+based+on+your+feedback.%0AThe+relevant+department+is+working+to+resolve+the+issue%2C+and+updates+will+be+provided+on+the+progress.%0A%0AClick+the+button+below+to+view+your+complaint+status%F0%9F%91%87&media_url=https%3A%2F%2Ferp.chennaicorporation.gov.in%2Fpgr%2Fimages%2Fpgr_whatsapp_banner.jpg&isTemplate=true&footer=-Greater+Chennai+Corporation&buttonUrlParam=${encodeURIComponent(viewstatus)}`         		 
-			
-
-
-                 let tamilmsgUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${encodeURIComponent(cellnumber)}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=%E0%AE%85%E0%AE%A9%E0%AF%8D%E0%AE%AA%E0%AE%BE%E0%AE%B0%E0%AF%8D%E0%AE%A8%E0%AF%8D%E0%AE%A4+%E0%AE%A4%E0%AE%BF%E0%AE%B0%E0%AF%81%2F%E0%AE%A4%E0%AE%BF%E0%AE%B0%E0%AF%81%E0%AE%AE%E0%AE%A4%E0%AE%BF+${encodeURIComponent(name)}%2C%0A%0A%E0%AE%89%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%8D+%2A${encodeURIComponent(complaintNumber)}%2A%2C+${encodeURIComponent(complaintTypeName)}+%E0%AE%A4%E0%AF%8A%E0%AE%9F%E0%AE%B0%E0%AF%8D%E0%AE%AA%E0%AE%BE%E0%AE%A9+%E0%AE%95%E0%AE%B0%E0%AF%81%E0%AE%A4%E0%AF%8D%E0%AE%A4%E0%AF%81%E0%AE%95%E0%AE%B3%E0%AE%BF%E0%AE%A9%E0%AF%8D+%E0%AE%85%E0%AE%9F%E0%AE%BF%E0%AE%AA%E0%AF%8D%E0%AE%AA%E0%AE%9F%E0%AF%88%E0%AE%AF%E0%AE%BF%E0%AE%B2%E0%AF%8D%2C+%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AF%8D+%E0%AE%AE%E0%AF%80%E0%AE%A3%E0%AF%8D%E0%AE%9F%E0%AF%81%E0%AE%AE%E0%AF%8D+%E0%AE%A4%E0%AE%BF%E0%AE%B1%E0%AE%95%E0%AF%8D%E0%AE%95%E0%AE%AA%E0%AF%8D%E0%AE%AA%E0%AE%9F%E0%AF%8D%E0%AE%9F%E0%AF%81%E0%AE%B3%E0%AF%8D%E0%AE%B3%E0%AE%A4%E0%AF%81.%0A%E0%AE%9A%E0%AE%AE%E0%AF%8D%E0%AE%AA%E0%AE%A8%E0%AF%8D%E0%AE%A4%E0%AE%AA%E0%AF%8D%E0%AE%AA%E0%AE%9F%E0%AF%8D%E0%AE%9F+%E0%AE%A4%E0%AF%81%E0%AE%B1%E0%AF%88+%E0%AE%85%E0%AE%A4%E0%AE%BF%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AE%BF%E0%AE%95%E0%AE%B3%E0%AF%8D+%E0%AE%87%E0%AE%A8%E0%AF%8D%E0%AE%A4+%E0%AE%AA%E0%AE%BF%E0%AE%B0%E0%AE%9A%E0%AF%8D%E0%AE%9A%E0%AE%BF%E0%AE%A9%E0%AF%88%E0%AE%AF%E0%AF%88+%E0%AE%A4%E0%AF%80%E0%AE%B0%E0%AF%8D%E0%AE%95%E0%AF%8D%E0%AE%95+%E0%AE%AA%E0%AE%A3%E0%AE%BF%E0%AE%AF%E0%AE%BE%E0%AE%B1%E0%AF%8D%E0%AE%B1%E0%AE%BF+%E0%AE%B5%E0%AE%B0%E0%AF%81%E0%AE%95%E0%AE%BF%E0%AE%A9%E0%AF%8D%E0%AE%B1%E0%AE%A9%E0%AE%B0%E0%AF%8D.%0A%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AE%BF%E0%AE%A9%E0%AF%8D+%E0%AE%A4%E0%AE%B1%E0%AF%8D%E0%AE%AA%E0%AF%8B%E0%AE%A4%E0%AF%88%E0%AE%AF+%E0%AE%A8%E0%AE%BF%E0%AE%B2%E0%AF%88+%E0%AE%95%E0%AF%81%E0%AE%B1%E0%AE%BF%E0%AE%A4%E0%AF%8D%E0%AE%A4+%E0%AE%A4%E0%AE%95%E0%AE%B5%E0%AE%B2%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%8D+%E0%AE%B5%E0%AE%BF%E0%AE%B0%E0%AF%88%E0%AE%B5%E0%AE%BF%E0%AE%B2%E0%AF%8D+%E0%AE%AE%E0%AF%87%E0%AE%B2%E0%AF%81%E0%AE%AE%E0%AF%8D+%E0%AE%B5%E0%AE%B4%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%AA%E0%AF%8D%E0%AE%AA%E0%AE%9F%E0%AF%81%E0%AE%AE%E0%AF%8D.%0A%0A%E0%AE%89%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%8D+%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AE%BF%E0%AE%A9%E0%AF%8D+%E0%AE%A8%E0%AE%BF%E0%AE%B2%E0%AF%88%E0%AE%AF%E0%AF%88%E0%AE%AA%E0%AF%8D+%E0%AE%AA%E0%AE%BE%E0%AE%B0%E0%AF%8D%E0%AE%95%E0%AF%8D%E0%AE%95+%E0%AE%95%E0%AF%80%E0%AE%B4%E0%AF%87+%E0%AE%89%E0%AE%B3%E0%AF%8D%E0%AE%B3+%E0%AE%AA%E0%AF%8A%E0%AE%A4%E0%AF%8D%E0%AE%A4%E0%AE%BE%E0%AE%A9%E0%AF%88%E0%AE%95%E0%AF%8D+%E0%AE%95%E0%AE%BF%E0%AE%B3%E0%AE%BF%E0%AE%95%E0%AF%8D+%E0%AE%9A%E0%AF%86%E0%AE%AF%E0%AF%8D%E0%AE%AF%E0%AE%B5%E0%AF%81%E0%AE%AE%E0%AF%8D%F0%9F%91%87&media_url=https%3A%2F%2Ferp.chennaicorporation.gov.in%2Fpgr%2Fimages%2Fpgr_whatsapp_banner.jpg&isTemplate=true&footer=-%E0%AE%AA%E0%AF%86%E0%AE%B0%E0%AF%81%E0%AE%A8%E0%AE%95%E0%AE%B0+%E0%AE%9A%E0%AF%86%E0%AE%A9%E0%AF%8D%E0%AE%A9%E0%AF%88+%E0%AE%AE%E0%AE%BE%E0%AE%A8%E0%AE%95%E0%AE%B0%E0%AE%BE%E0%AE%9F%E0%AF%8D%E0%AE%9A%E0%AE%BF.&buttonUrlParam=${encodeURIComponent(viewstatus)}`
-         		    		
-         		    		
-         		  
-           $.ajax({
-               url: '/gcc/qaqc/api/whatsapp/send-whatsapp-message', // Replace with your service path
-               type: 'POST',
-               data: { msgUrl: msgUrl,
-             	  tamilmsgUrl: tamilmsgUrl},
-               success: function(response) {
-                   //console.log('WhatsApp message sent successfully', response);
-                   console.log('success');
-                   //alert('WhatsApp message sent!');
-                  
-               },
-               error: function(xhr, status, error) {
-                   console.error('Error sending WhatsApp message:', error);
-                   //alert('Failed to send WhatsApp message.');
-                   
-                   Swal.fire({
-                               title: 'Error!',
-                               text: 'Message Not sent!',
-                               icon: 'error',
-                               timer: 2000,
-                               showConfirmButton: false
-                           })
-               }
-           });
-       }
-	
-
-    
-  //whatsapp message function for unattended
-    function sendWhatsAppMessageUnattended(name,complaintNumber,cellnumber,complaintTypeName) {
-
-        console.log('whatsapp CustomerMobile:', cellnumber);
-        
-        console.log('name:',name);
-        console.log('complaintNumber:',complaintNumber);
-        console.log('complainttype',complaintTypeName)
-        let viewstatus = "pgr" ;
-           // Send the WhatsApp message pending
-                    
-       		   
-              let msgUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${encodeURIComponent(cellnumber)}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=Dear+Mr%2FMs+${encodeURIComponent(name)}%2C%0A%0AAttempts+were+made+to+reach+you+by+phone+regarding+your+complaint+on+${encodeURIComponent(complaintTypeName)}+%28Complaint+ID%3A+%2A${encodeURIComponent(complaintNumber)}%2A%29+from+GCC%E2%80%99s+1913+helpline.+The+issue+has+been+addressed.+%0A%0AIf+you+are+satisfied+with+the+resolution%2C+please+reply+%2A%E2%80%98YES.%E2%80%99%2A+Otherwise%2C+reply+%2A%E2%80%98NO%2C%E2%80%99%2A+and+the+complaint+will+be+reopened.%0A%0AClick+the+button+below+to+view+your+complaint+status%F0%9F%91%87&media_url=https%3A%2F%2Ferp.chennaicorporation.gov.in%2Fpgr%2Fimages%2Fpgr_whatsapp_banner.jpg&isTemplate=true&footer=-Greater+Chennai+Corporation&buttonUrlParam=${encodeURIComponent(viewstatus)}`   		 
-             
-
-         		   
-              let tamilmsgUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${encodeURIComponent(cellnumber)}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=%E0%AE%85%E0%AE%A9%E0%AF%8D%E0%AE%AA%E0%AE%BE%E0%AE%B0%E0%AF%8D%E0%AE%A8%E0%AF%8D%E0%AE%A4+%E0%AE%A4%E0%AE%BF%E0%AE%B0%E0%AF%81%2F%E0%AE%A4%E0%AE%BF%E0%AE%B0%E0%AF%81%E0%AE%AE%E0%AE%A4%E0%AE%BF+${encodeURIComponent(name)}%2C%0A%0A%E0%AE%89%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%8D+%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AF%8D+%2A${encodeURIComponent(complaintNumber)}%2A+%E0%AE%A4%E0%AF%8A%E0%AE%9F%E0%AE%B0%E0%AF%8D%E0%AE%AA%E0%AE%BE%E0%AE%95+1913+%E0%AE%AE%E0%AE%BE%E0%AE%A8%E0%AE%95%E0%AE%B0%E0%AE%BE%E0%AE%9F%E0%AF%8D%E0%AE%9A%E0%AE%BF+%E0%AE%89%E0%AE%A4%E0%AE%B5%E0%AE%BF+%E0%AE%8E%E0%AE%A3%E0%AF%8D%E0%AE%A3%E0%AE%BF%E0%AE%B2%E0%AE%BF%E0%AE%B0%E0%AF%81%E0%AE%A8%E0%AF%8D%E0%AE%A4%E0%AF%81+%E0%AE%89%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%88+%E0%AE%A4%E0%AF%8A%E0%AE%9F%E0%AE%B0%E0%AF%8D%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AF%8A%E0%AE%B3%E0%AF%8D%E0%AE%B3+%E0%AE%AE%E0%AF%81%E0%AE%AF%E0%AE%B1%E0%AF%8D%E0%AE%9A%E0%AE%BF%E0%AE%A4%E0%AF%8D%E0%AE%A4%E0%AF%8B%E0%AE%AE%E0%AF%8D.%0A%E0%AE%A8%E0%AF%80%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%8D+%E0%AE%85%E0%AE%B3%E0%AE%BF%E0%AE%A4%E0%AF%8D%E0%AE%A4+%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AF%81%E0%AE%95%E0%AF%8D%E0%AE%95%E0%AE%BE%E0%AE%A9+%E0%AE%A4%E0%AF%80%E0%AE%B0%E0%AF%8D%E0%AE%B5%E0%AF%81+%E0%AE%A8%E0%AE%BF%E0%AE%B1%E0%AF%88%E0%AE%B5%E0%AF%87%E0%AE%B1%E0%AF%8D%E0%AE%B1%E0%AE%AA%E0%AF%8D%E0%AE%AA%E0%AE%9F%E0%AF%8D%E0%AE%9F%E0%AF%81%E0%AE%B3%E0%AF%8D%E0%AE%B3%E0%AE%A4%E0%AF%81.%0A%E0%AE%87%E0%AE%A8%E0%AF%8D%E0%AE%A4+%E0%AE%A4%E0%AF%80%E0%AE%B0%E0%AF%8D%E0%AE%B5%E0%AF%81+%E0%AE%89%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%81%E0%AE%95%E0%AF%8D%E0%AE%95%E0%AF%81+%E0%AE%A4%E0%AE%BF%E0%AE%B0%E0%AF%81%E0%AE%AA%E0%AF%8D%E0%AE%A4%E0%AE%BF%E0%AE%95%E0%AE%B0%E0%AE%AE%E0%AE%BE%E0%AE%95+%E0%AE%87%E0%AE%B0%E0%AF%81%E0%AE%A8%E0%AF%8D%E0%AE%A4%E0%AE%BE%E0%AE%B2%E0%AF%8D%2C+%2A%E2%80%98%E0%AE%86%E0%AE%AE%E0%AF%8D%E2%80%99%2A+%E0%AE%8E%E0%AE%A9+%E0%AE%AA%E0%AE%A4%E0%AE%BF%E0%AE%B2%E0%AE%B3%E0%AE%BF%E0%AE%95%E0%AF%8D%E0%AE%95%E0%AE%B5%E0%AF%81%E0%AE%AE%E0%AF%8D%3B+%E0%AE%87%E0%AE%B2%E0%AF%8D%E0%AE%B2%E0%AF%88%E0%AE%AF%E0%AF%86%E0%AE%A9%E0%AE%BF%E0%AE%B2%E0%AF%8D%2C+%2A%E2%80%98%E0%AE%87%E0%AE%B2%E0%AF%8D%E0%AE%B2%E0%AF%88%E2%80%99%2A+%E0%AE%8E%E0%AE%A9+%E0%AE%AA%E0%AE%A4%E0%AE%BF%E0%AE%B2%E0%AE%B3%E0%AE%BF%E0%AE%95%E0%AF%8D%E0%AE%95%E0%AE%B5%E0%AF%81%E0%AE%AE%E0%AF%8D.%0A%E0%AE%A8%E0%AF%80%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%8D+%E2%80%98%E0%AE%87%E0%AE%B2%E0%AF%8D%E0%AE%B2%E0%AF%88%E2%80%99+%E0%AE%8E%E0%AE%A9+%E0%AE%AA%E0%AE%A4%E0%AE%BF%E0%AE%B2%E0%AE%B3%E0%AE%BF%E0%AE%A4%E0%AF%8D%E0%AE%A4%E0%AE%BE%E0%AE%B2%E0%AF%8D%2C+%E0%AE%87%E0%AE%A8%E0%AF%8D%E0%AE%A4+%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AF%8D+%E0%AE%AE%E0%AF%80%E0%AE%A3%E0%AF%8D%E0%AE%9F%E0%AF%81%E0%AE%AE%E0%AF%8D+%E0%AE%A4%E0%AE%BF%E0%AE%B1%E0%AE%95%E0%AF%8D%E0%AE%95%E0%AE%AA%E0%AF%8D%E0%AE%AA%E0%AE%9F%E0%AF%81%E0%AE%AE%E0%AF%8D.%0A%0A%E0%AE%89%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%8D+%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AE%BF%E0%AE%A9%E0%AF%8D+%E0%AE%A8%E0%AE%BF%E0%AE%B2%E0%AF%88%E0%AE%AF%E0%AF%88%E0%AE%AA%E0%AF%8D+%E0%AE%AA%E0%AE%BE%E0%AE%B0%E0%AF%8D%E0%AE%95%E0%AF%8D%E0%AE%95+%E0%AE%95%E0%AF%80%E0%AE%B4%E0%AF%87+%E0%AE%89%E0%AE%B3%E0%AF%8D%E0%AE%B3+%E0%AE%AA%E0%AF%8A%E0%AE%A4%E0%AF%8D%E0%AE%A4%E0%AE%BE%E0%AE%A9%E0%AF%88%E0%AE%95%E0%AF%8D+%E0%AE%95%E0%AE%BF%E0%AE%B3%E0%AE%BF%E0%AE%95%E0%AF%8D+%E0%AE%9A%E0%AF%86%E0%AE%AF%E0%AF%8D%E0%AE%AF%E0%AE%B5%E0%AF%81%E0%AE%AE%E0%AF%8D%F0%9F%91%87&media_url=https%3A%2F%2Ferp.chennaicorporation.gov.in%2Fpgr%2Fimages%2Fpgr_whatsapp_banner.jpg&isTemplate=true&footer=-%E0%AE%AA%E0%AF%86%E0%AE%B0%E0%AF%81%E0%AE%A8%E0%AE%95%E0%AE%B0+%E0%AE%9A%E0%AF%86%E0%AE%A9%E0%AF%8D%E0%AE%A9%E0%AF%88+%E0%AE%AE%E0%AE%BE%E0%AE%A8%E0%AE%95%E0%AE%B0%E0%AE%BE%E0%AE%9F%E0%AF%8D%E0%AE%9A%E0%AE%BF.&buttonUrlParam=${encodeURIComponent(viewstatus)}`
-         		    		 
-         		    		
-           $.ajax({
-               url: '/gcc/qaqc/api/whatsapp/send-whatsapp-message', // Replace with your service path
-               type: 'POST',
-               data: { msgUrl: msgUrl,
-             	  tamilmsgUrl: tamilmsgUrl},
-               success: function(response) {
-                   console.log('WhatsApp message sent successfully', response);
-                   console.log('success');
-                   //alert('WhatsApp message sent!');
-                  
-               },
-               error: function(xhr, status, error) {
-                   console.error('Error sending WhatsApp message:', error);
-                   //alert('Failed to send WhatsApp message.');
-                   
-                   Swal.fire({
-                               title: 'Error!',
-                               text: 'Message Not sent!',
-                               icon: 'error',
-                               timer: 2000,
-                               showConfirmButton: false
-                           })
-               }
-           });
-       }
-	
-	</script>
-	
-	<script>
-    document.addEventListener("DOMContentLoaded", function () {
-        const today = new Date();
-        today.setDate(today.getDate() + 1); // Add 1 day to get tomorrow
-        const tomorrow = today.toISOString().split('T')[0];
-
-        document.querySelectorAll('.date-picker').forEach(function (input) {
-            input.setAttribute('min', tomorrow);
-        });
-    });
-</script>
-
-	<script>
-	//Swal.fire("Success", "Complaint updated successfully!", "success");
-
-    // Remove the row from the table dynamically
-    /* const table = $('#QaqcDatatable').DataTable();
-    table.row($(row)).remove().draw(false);
-    location.reload(); */
-	</script>
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcfollowupcalls.html b/src/main/resources/templates/modules/callcenterqaqc/agentqaqcfollowupcalls.html
deleted file mode 100644
index 9f7326fc..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcfollowupcalls.html
+++ /dev/null
@@ -1,1015 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-.required {
-	color: red;
-}
-
-.card-box {
-	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-	height: 140px;
-}
-
-@media ( max-width : 768px) {
-	.card-box {
-		text-align: center;
-	}
-}
-
-.custom-width1 {
-	width: 120px; /* Adjust the width as needed */
-}
-
-.custom-width2 {
-	width: 100px; /* Adjust the width as needed */
-}
-#modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-    
-</style>
-<body>
-	<div class="wrapper">
-		<!-- Header -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<!-- Left Menu -->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-layers bg-blue"></i>
-									<div class="d-inline">
-										<h5>Agent's Followup Calls</h5>
-										<span>1913 Followup Call List</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 QAQC</li>
-										<li class="breadcrumb-item" aria-current="page">Agents
-											QAQC</li>
-										<li class="breadcrumb-item active" aria-current="page">Official FollowUp Calls</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-				
-
-
-				<div class="row mt-4">
-
-					<div class="col-md-12">
-						<div class="card">
-
-							<div class="card-body">
-								<div class="page-header-title">
-									<h5 style="margin: 0; font-weight: bold;">Today Assigned
-										Calls</h5>
-								</div>
-								<div>
-									<div class="row mt-2">
-										<!-- Total Calls Assigned -->
-										<div class="col-xl-3 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-4">
-													<b>Total Calls Assigned</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text="${details[0]?.Total_Calls_assigned}">
-													<!-- Display Total Calls Assigned -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- QA&QC Calls -->
-										<div class="col-xl-3 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-4">
-													<b>QA&QC Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text=" ${details[0]?.Closed_Call_count}">
-													<!-- Display Closed Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- In-progress Calls -->
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4 ">
-												<h6 class="text-facebook mb-4">
-													<b>In-progress Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text="${details[0]?.Inprogress_Call_count}">
-													<!-- Display In-progress Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- Follow-up Calls -->
-										<div class="col-xl-2 col-md-6 col-sm-12" style="background-color: aqua;">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-2">
-													<b>Official Follow-up Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.Followup_Call_count}">
-													<!-- Display Follow-up Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-2">
-													<b>Public Follow-up Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.PublicFollowup_Call_count}">
-													<!-- Display Follow-up Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-									</div>
-
-
-									<div class="row mt-2">
-										<div class="col-md-12">
-
-											<div class="card-header">
-												<h3 style="font-weight: bold; font-size: large;"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-													<span th:text="${agent[0]['agent_name']}"
-														style="font-weight: bold; font-size: large;"></span>'s
-													Followup Calls List
-												</h3>
-											</div>
-
-											<div class="card-block">
-												<div class="col-md-12 ">
-													<div class="row">
-														<button id="primaryButton" class="btn btn-success">Non-Processed
-															Calls</button>
-														<button id="secondaryButton"
-															class="btn btn-secondary btn-custom ml-3">Processed
-															Calls</button>
-													</div>
-												</div>
-											</div>
-
-											<div class="card-body">
-
-												<div class="table-responsive" id="primaryTable"
-													style="display: block;">
-													<table id="QaqcDatatable"
-														class="table table-striped table-bordered table-hover dataTable"
-														role="grid">
-														<thead class="thead-dark">
-															<tr role="row">
-																<th class="text-center">S.No</th>
-																<th class="text-center">ID</th>
-																<th class="text-center">Complaint Date</th>
-																<!-- <th class="text-center">Name</th>
-														<th class="text-center">Phone No</th> -->
-																<th class="text-center">Officer Name</th>
-																<th class="text-center">Officer PhoneNo</th>
-																<th class="text-center">Complaint Type</th>
-																<th class="text-center custom-width2">View</th>
-																<th class="text-center custom-width1">Actions</th>
-																<th class="text-center">Remarks</th>
-																<th class="text-center">Submit</th>
-															</tr>
-
-														</thead>
-														<tbody>
-
-															<!-- Thymeleaf loop for populating data -->
-
-
-															<tr th:each="call, iterStat : ${qaqcfollowuplists}">
-																<td th:text="${iterStat.index + 1}" class="text-center"></td>
-																<td th:text="${call['complaint_number']}"
-																	class="text-center complaint-select"></td>
-																<td th:text="${call['complaint_date']}"
-																	class="text-center"></td>
-																<!-- <td th:text="${call['complaint_person_name']}"
-															class="text-center"></td>
-														<td th:text="${call['complaint_mobilenumber']}"
-															class="text-center"></td> -->
-																<td th:text="${call['official_name']}"
-																	class="text-center"></td>
-																<td th:text="${call['official_mobilenum']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_type']}"
-																	class="text-center"></td>
-
-																<!-- view function -->
-
-																<td class="text-center">
-																	<button type="button" class="btn btn-info details-btn"
-																		style="margin-bottom: 3px"
-																		th:data-complaint-number="${call['complaint_number']}">
-																		View</button>
-																</td>
-
-
-																<td class="text-center"><select
-																	class="form-control form-control-sm action-select action-dropdown">
-																		<option value="" selected>Select</option>
-																		<option th:each="status : ${qaqccategorylists}"
-																			th:value="${status.call_status}"
-																			th:text="${status.call_status}"></option>
-																</select>
-																	<div class="schedule-call d-none mt-2">
-																		<!-- <span class="schedule-text">Schedule Call</span> -->
-																		<input type="date" class="date-picker form-control"
-																			name="remainderDate">
-																	</div></td>
-																<td class="text-center"><input type="text"
-																	class="form-control form-control-sm"
-																	placeholder="Remarks"></td>
-																<td class="text-center">
-																	<button class="btn btn-primary btn-sm submit-btn submitid"
-																		th:data-id="${call['data_id']}"
-																		onclick="submitComplaint(this)" disabled="disabled">
-																		Submit</button>
-																</td>
-															</tr>
-
-														</tbody>
-													</table>
-
-												</div>
-
-												<div class="table-responsive" id="secondaryTable"
-													style="display: none;">
-													<table id="SecondaryDatatable"
-														class="table table-striped table-bordered table-hover dataTable"
-														role="grid">
-														<thead class="thead-dark">
-															<tr role="row">
-																<th class="text-center">S.No</th>
-																<th class="text-center">ID</th>
-																<th class="text-center">Complaint Date</th>
-																<th class="text-center">Officer Name</th>
-																<th class="text-center">Officer PhoneNo</th>
-																<th class="text-center">Complaint Type</th>
-																<th class="text-center">View Details</th>
-																<th class="text-center custom-width1">Actions</th>
-																<th class="text-center">Remarks</th>
-															</tr>
-														</thead>
-														<tbody>
-															<!-- <tr th:each="call, iterStat : ${fcSubmitDetails}">
-																<td th:text="${iterStat.index + 1}" class="text-center"></td>
-																<td th:text="${call['complaint_number']}"
-																	class="text-center complaint-select"></td>
-																<td th:text="${call['complaint_date']}"
-																	class="text-center"></td>
-																<td th:text="${call['official_name']}"
-																	class="text-center"></td>
-																<td th:text="${call['official_mobilenum']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_type']}"
-																	class="text-center"></td>
-																<td class="text-center">
-																	<button type="button" class="btn btn-info"
-																		th:data-complaint-number="${call['complaint_number']}">View</button>
-																</td>
-																<td th:text="${call['call_status']}" class="text-center"></td>
-																<td th:text="${call['remarks']}" class="text-center"></td>
-															</tr> -->
-														</tbody>
-													</table>
-												</div>
-
-
-											</div>
-										 </div>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-
-					</div>
-				</div>
-			</div>
-			
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-			
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<!--Details button Modal -->
-	<div class="modal fade" id="detailsModal" tabindex="-1" role="dialog"
-		aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="detailsModalLabel">Complaint
-						Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body" id="modalBody">
-					<!-- Details will be populated here -->
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary"
-						data-dismiss="modal">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script type="text/javascript">
- 
- 
- 
-$(document).ready(function() {
-	
-	
-	 $(document).on('click', '.btn-info', function () {
-	        // Retrieve the complaint number from the data attribute
-	        var complaintNumber = $(this).data('complaint-number');
-	        
-	        // Call the viewDetails function with the complaint number
-	        viewDetails(complaintNumber);
-	    });
-	 
-	 $('#primaryButton').addClass('btn-success').removeClass('btn-secondary');
-     $('#secondaryButton').addClass('btn-secondary').removeClass('btn-success');
-		
-		// Toggle functionality for Primary and Secondary buttons
-	    $('#primaryButton').click(function () {
-	        $('#primaryTable').show();
-	        $('#secondaryTable').hide();
-	        
-	        $(this).addClass('btn-success').removeClass('btn-secondary');
-         $('#secondaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        $('#QaqcDatatable').DataTable().columns.adjust().draw();
-	    });
-
-	    $('#secondaryButton').click(function () {
-	        $('#primaryTable').hide();
-	        $('#secondaryTable').show();
-	        
-	        $(this).addClass('btn-success').removeClass('btn-secondary');
-         	$('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        //$('#SecondaryDatatable').DataTable().columns.adjust().draw();
-	        
-			let userId = document.getElementById('userIdSpan').textContent;
-	        
-	        
-	        // Destroy previous instance if exists
-	        if ($.fn.DataTable.isDataTable('#SecondaryDatatable')) {
-	            $('#SecondaryDatatable').DataTable().clear().destroy();
-	        }
-	        $('#pageLoader').show();
-	        // AJAX call to get data
-	        $.ajax({
-	            url: '/gcc/api/callcenterqaqc/agent/followupcalls/getoffsubmittedcalls', // Replace with your controller URL
-	            type: 'GET',
-	            data: { userId: userId },
-	            success: function (response) {
-	            	$('#pageLoader').hide();
-	                // Initialize DataTable with new data
-	                $('#SecondaryDatatable').DataTable({
-	                    data: response, // This should be an array of objects
-	                    columns: [
-	                        { data: null, render: function (data, type, row, meta) { return meta.row + 1; }, className: "text-center" },
-	                        { data: 'complaint_number', className: "text-center" },
-	                        { data: 'complaint_date', className: "text-center" },
-	                        { data: 'complaint_person_name', className: "text-center" },
-	                        { data: 'complaint_mobilenumber', className: "text-center" },
-	                        { data: 'complaint_type', className: "text-center" },
-	                        { 
-	                            data: 'complaint_number',
-	                            className: "text-center",
-	                            render: function (data, type, row) {
-	                                return `<button type="button" class="btn btn-info" data-complaint-number="${data}">View</button>`;
-	                            }
-	                        },
-	                        {
-	                            data: 'call_status',
-	                            className: "text-center"
-	                           
-	                        },
-	                        {
-	                            data: 'remarks',
-	                            className: "text-center"
-	                            
-	                        }
-	                    ],
-	                    dom: 'Bftip',
-	        	        columnDefs: [
-	        	            { targets: 'no-sort', orderable: false }
-	        	        ],
-	        	        lengthMenu: [
-	        	            [50, 100, 200, 500, -1],
-	        	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        	        ],
-	        	        scrollY: '50vh',
-	        	        scrollX:true,
-	        	        buttons: [
-	        	            {
-	        	                extend: 'pageLength',
-	        	                className: 'btn btn-warning'
-	        	            },
-	        	            {
-	        	                title: 'Data export',
-	        	                extend: 'copyHtml5',
-	        	                text: 'Copy',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'copyBtn'
-	        	            },
-	        	            {
-	        	                extend: 'excelHtml5',
-	        	                text: 'Excel',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'excelBtn'
-	        	            },
-	        	            {
-	        	                extend: 'csvHtml5',
-	        	                text: 'CSV',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'csvBtn'
-	        	            },
-	        	            {
-	        	                extend: 'pdfHtml5',
-	        	                text: 'PDF',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'pdfBtn'
-	        	            }
-	        	        ],
-	        	        fixedHeader: true,
-	        	        autoWidth: false,
-	        	        responsive: false,
-	        	        searching: true,
-	        	        select: false,
-	        	        processing: false
-	                });
-	            },
-	            error: function () {
-	            	$('#pageLoader').hide();
-	            	Swal.fire("Error", "Failed to get Finished complaints.", "error");
-	            }
-	        });
-
-	    });
-				
-
-    	     	var table = $('#QaqcDatatable').DataTable({
-    	             dom: 'Bftip',
-    	             columnDefs: [
-    	                 { targets: 'no-sort', orderable: false }
-    	             ],
-    	             lengthMenu: [
-    	                 [50, 100, 200, 500, -1],
-    	                 ['50 rows', '100 rows', '200 rows', 'Show all']
-    	             ],
-    	             scrollY: '50vh',
-    	             scrollX:true,
-    	             buttons: [
-    	                 {
-    	                     extend: 'pageLength',
-    	                     className: 'btn btn-warning'
-    	                 },
-    	                 {
-    	                     title: 'Data export',
-    	                     extend: 'copyHtml5',
-    	                     text: 'Copy',
-    	                     className: 'btn btn-secondary',
-    	                     id: 'copyBtn'
-    	                 },
-    	                 {
-    	                     extend: 'excelHtml5',
-    	                     text: 'Excel',
-    	                     className: 'btn btn-secondary',
-    	                     id: 'excelBtn'
-    	                 },
-    	                 {
-    	                     extend: 'csvHtml5',
-    	                     text: 'CSV',
-    	                     className: 'btn btn-secondary',
-    	                     id: 'csvBtn'
-    	                 },
-    	                 {
-    	                     extend: 'pdfHtml5',
-    	                     text: 'PDF',
-    	                     className: 'btn btn-secondary',
-    	                     id: 'pdfBtn'
-    	                 }
-    	             ],
-    	             fixedHeader: true,
-    	             autoWidth: false,
-    	             responsive: false,
-    	             searching: true, // Enable default search functionality
-    	             select: false,
-    	             processing: false
-    	             
-    	         });
-    	     	
-    	     	var table1 = $('#SecondaryDatatable').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',
-    		        scrollX:true,
-    		        buttons: [
-    		            {
-    		                extend: 'pageLength',
-    		                className: 'btn btn-warning'
-    		            },
-    		            {
-    		                title: 'Data export',
-    		                extend: 'copyHtml5',
-    		                text: 'Copy',
-    		                className: 'btn btn-secondary',
-    		                id: 'copyBtn'
-    		            },
-    		            {
-    		                extend: 'excelHtml5',
-    		                text: 'Excel',
-    		                className: 'btn btn-secondary',
-    		                id: 'excelBtn'
-    		            },
-    		            {
-    		                extend: 'csvHtml5',
-    		                text: 'CSV',
-    		                className: 'btn btn-secondary',
-    		                id: 'csvBtn'
-    		            },
-    		            {
-    		                extend: 'pdfHtml5',
-    		                text: 'PDF',
-    		                className: 'btn btn-secondary',
-    		                id: 'pdfBtn'
-    		            }
-    		        ],
-    		        fixedHeader: true,
-    		        autoWidth: false,
-    		        responsive: false,
-    		        searching: true,
-    		        select: false,
-    		        processing: false
-    		    });
-    	     	
-    	     	 // // Event listeners for changes in dropdown, remarks, and date picker
-    	        $(document).on('change', '.action-dropdown', function () {
-    	            const parentRow = $(this).closest('tr');
-    	            const schedulerDiv = parentRow.find('.schedule-call');
-    	            schedulerDiv.toggleClass('d-none', $(this).val() !== 'FOLLOWUP');
-    	            validateFields(parentRow);
-    	        });
-
-    	        $(document).on('input', 'input[type="text"]', function () {
-    	            const parentRow = $(this).closest('tr');
-    	            validateFields(parentRow);
-    	        });
-
-    	        $(document).on('change', '.date-picker', function () {
-    	            const parentRow = $(this).closest('tr');
-    	            validateFields(parentRow);
-    	        });
-
-    	        // Validate function to check conditions for enabling/disabling submit button
-    	        function validateFields(row) {
-    	            const actionSelect = row.find('.action-select');
-    	            const remarksInput = row.find('input[type="text"]');
-    	            const submitButton = row.find('.submit-btn');
-    	            const actionValue = actionSelect.val().trim();
-    	            const remarksFilled = remarksInput.val().trim() !== "";
-
-    	            const followUpSelected = actionValue === "FOLLOWUP";
-    	            const remainderDateFilled = row.find('.date-picker').val()?.trim() !== ""; // Check if date is selected
-
-    	           // Enable submit button based on conditions
-			        if (
-			            (followUpSelected && remainderDateFilled && remarksFilled) || (actionValue !== "FOLLOWUP" && actionValue !=="Select") // FOLLOWUP requires remainder date and remarks
-			        ) {
-			            submitButton.prop('disabled', false); // Enable submit button
-			        } else {
-			            submitButton.prop('disabled', true); // Disable submit button
-			        }
-    	        }
-
-    	     // Initial validation for all rows on page load
-    	    	$("#QaqcDatatable tbody tr").each(function () {
-    	    	    const row = $(this);
-    	    	    const submitButton = row.find('.submit-btn');
-    	    	    submitButton.prop('disabled', true); // Ensure submit button is initially disabled
-    	    	    validateFields(row); // Validate fields for further interaction
-    	    	});
-    	    	
-    	    	// Re-validate fields on input changes
-    	    	$("#QaqcDatatable").on('input change', '.action-select, input[type="text"], .date-picker', function () {
-    	    	    const row = $(this).closest('tr');
-    	    	    validateFields(row);
-    	    	});
-    	        
-    	
-    	     });
-    	     
-  
-function submitComplaint(button) {
-	var userId = document.getElementById('userIdSpan').textContent;
-	const row = button.parentNode.parentNode;
-
-    // Fetch the values from the corresponding cells in the row
-    const dataId = row.querySelector('.submit-btn').getAttribute('data-id'); // Fetch the data_id
-    const action = row.querySelector('.action-select').value.trim(); // Fetch the action value
-    const complaintNumber = row.querySelector('.complaint-select').innerText.trim(); // Fetch complaint number
-    const remarks = row.querySelector('input[type="text"]').value.trim(); // Fetch the remarks value
-    const remainderDate = row.querySelector('.date-picker')?.value.trim(); // Fetch the remainder date (if any)
-	/* console.log(row);
-	console.log(dataId);
-	console.log(action);
-	console.log(complaintNumber);
-	console.log(remarks);
-	console.log(remainderDate); */
-	
-    $('.submitid').prop('disabled', true).text('Submitting...');
-    
-    // Validation
-    if (!dataId || !action || action === "Select") {
-        Swal.fire("Error", "Action is required!", "error");
-        $('.submitid').prop('disabled', false).text('Submit');
-        return;
-    }
-
-    if (action === 'FOLLOWUP' && remarks === "" && (!remainderDate || remainderDate === "")) {
-        Swal.fire("Error", "Schedule Date is required for Follow-Up!", "error");
-        $('.submitid').prop('disabled', false).text('Submit');
-        return;
-    }
-
-    $('#pageLoader').show();
-    // AJAX Request
-    $.ajax({
-        url: '/gcc/api/callcenterqaqc/agent/followupcalls/update',
-        type: 'POST',
-        data: {
-            dataId: dataId,
-            complaintNumber: complaintNumber,
-            action: action,
-            remarks: remarks,
-            remainderDate: remainderDate,
-            userId:userId
-        },       
-        success: function (response) {
-        	$('#pageLoader').hide();
-            if (response === "Success") {
-                Swal.fire({
-                    icon: 'success',
-                    title: 'Success',
-                    text: 'Complaint updated successfully!',
-                    allowOutsideClick: false, // Disable clicking outside the modal to close it
-                    allowEscapeKey: false, // Disable escape key to close the modal
-                    allowEnterKey: false, // Disable enter key to close the modal
-                    showConfirmButton: true, // Ensure the confirm button is visible
-                }).then((result) => {
-                    if (result.isConfirmed) {
-                    	$('.submitid').prop('disabled', false).text('Submit');
-                   	
-                    	const table = $('#QaqcDatatable').DataTable();
-                        
-                        // Remove the row
-                        table.row($(row)).remove();
-
-                        // Reorder S.No column
-                        table.rows().every(function (index) {
-                            const row = this.node();
-                            $(row).find('td:first-child').text(index + 1); // Update S.No
-                        });
-
-                        // Redraw the table
-                        table.draw(false);
-                    }
-                });
-            } 
-            else if (response === "error") {
-            	$('.submitid').prop('disabled', false).text('Submit');
-            	Swal.fire("Error", "Failed to update complaint. Please try again later.", "error");
-            }
-            else {
-            	$('.submitid').prop('disabled', false).text('Submit');            	
-                Swal.fire("Error", "Failed to update complaint. Please try again.", "error");
-            }
-        },
-        error: function (xhr, status, error) {
-        	$('#pageLoader').hide();
-        	$('.submitid').prop('disabled', false).text('Submit');        	
-            Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
-        }
-        
-    });
-}
-	     
-    //view button script
-          
-	function viewDetails(complaintNumber) {
- 	    document.getElementById('modalBody').innerHTML = '<p style="text-align:center;">Please wait, loading data...</p>';
- 	    $('#detailsModal').modal('show');
-
- 	    // Fetch the main complaint details
- 	    $.ajax({
- 	        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails',
- 	        type: 'GET',
-            data:{complaintNumber:complaintNumber},
- 	        success: function (data) {
- 	            //console.log('Complaint Data:', data);
-
- 	            // Fetch agent response details
- 	            $.ajax({
- 	                url: '/gcc/api/callcenterqaqc/agent/attendedcomplaintshistory',
- 	                type: 'GET',
- 	                data: { complaintNumber },
- 	                success: function (agentResponse) {
- 	                    //console.log('Agent Response:', agentResponse);
-
- 	                    // Use the logic for building complaint and agent details as HTML
- 	                    const detailsHtml = generateDetailsHtml(data, agentResponse);
-
- 	                    // Update modal content
- 	                    document.getElementById('modalBody').innerHTML = detailsHtml;
- 	                },
- 	                error: function () {
- 	                    document.getElementById('modalBody').innerHTML = '<p>Error loading agent details. Please try again later.</p>';
- 	                }
- 	            });
- 	        },
- 	        error: function () {
- 	            document.getElementById('modalBody').innerHTML = '<p>Error loading complaint details. Please try again later.</p>';
- 	        }
- 	    });
- 	}
-
- 	// Function to generate complaint and agent details HTML
-function generateDetailsHtml(data, agentResponse) {
- 		
- 	// Helper function to format date to yyyy-mm-dd
-         function formatDate(dateStr) {
-             if (!dateStr) return 'N/A';
-             const date = new Date(dateStr);
-             return date.toISOString().split('T')[0]; // Formats to yyyy-mm-dd
-         }
-// Format complaint messages
-let messagesHtml = '';
-if (data.comments && data.comments.length > 0) {
-    data.comments.forEach((comment) => {
-        const commentImageLink = comment.Comp_Image && comment.Comp_Image !== "No image available"
-            ? `<a href="${comment.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">View Image</a>`
-            : '<p style="color: red;">No image available for this comment.</p>';
-
-        messagesHtml += `
-            <div class="comment mb-4">
-                <div class="row">
-                    <div class="col-2 text-center">
-                        <p class="text-muted">${comment.comment_date}</p>
-                    </div>
-                    <div class="col-10">
-                        <p><strong>${comment.user || 'N/A'}</strong> Says:</p>
-                        <p>${comment.message || 'No message available'}</p>
-                        <div class="user-image">${commentImageLink}</div>
-                    </div>
-                </div>
-            </div>
-        `;
-    });
-} else {
-    messagesHtml = '<p>No comments available.</p>';
-}
-
-// Format agent responses
-let agentRepliedHtml = '';
-if (agentResponse.length > 0) {
-    agentResponse.forEach((agentItem) => {
-        agentRepliedHtml += `
-            <div class="comment mb-4">
-                <div class="row">
-                    <div class="col-2 text-center">
-                        <p class="text-muted"><strong>${formatDate(agentItem.created_date) || 'N/A'}</strong></p>
-                    </div>
-                    <div class="col-10">
-                        <p><strong>${agentItem.agent_name || 'N/A'}</strong>, Says: ${agentItem.call_status || 'N/A'}</p>
-                        <p><strong>Remarks: </strong>${agentItem.remarks || 'N/A'}</p>
-                        <p><strong>Remainder Date: </strong> ${formatDate(agentItem.remainder_date) || 'N/A'}</p>
-                    </div>
-                </div>
-            </div>
-        `;
-    });
-} else {
-    agentRepliedHtml = '<p>No agent replied messages available.</p>';
-}
-
-// Check for user images
-const userImages = data.userimages && data.userimages.length > 0 ? data.userimages[0] : {};
-const imageLink = userImages.Comp_Image && userImages.Comp_Image !== "null" && userImages.Comp_Image !== ""
-    ? `<a href="${userImages.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">UserImages: View Image</a>`
-    : '<p style="color: red;">UserImages: No image available.</p>';
-
-// Combine all sections into the final HTML
-const detailsHtml = `
-    <div class="row">
-        <div class="col-md-12">
-            <h4>Complaint Person's Details:</h4>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Complaint Number:</strong> ${data.complaintid || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Complaint Date:</strong> ${data.complaintdate}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Complainant's Name:</strong> ${data.complainantName || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Phone Number:</strong> ${data.mobileNumber || 'N/A'}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Zone:</strong> ${data.Zone || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Division:</strong> ${data.Division || 'N/A'}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Gender:</strong> ${data.gender || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Complainant's Address:</strong> ${data.Street || 'N/A'}, ${data.Area || 'N/A'}, ${data.Landmark || 'N/A'}, ${data.Location || 'N/A'}</p>
-                </div>
-            </div>
-        </div>
-    </div>
-    <hr>
-    <h4>Complaint Details:</h4>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Complaint Dept:</strong> ${data.deptname || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong>Complaint Mode:</strong> ${data.compmode || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Complaint Type:</strong> ${data.complaintType || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong>Details of Complaint:</strong> ${data.description || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Current Status:</strong> ${data.currentStatus || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong style="color:blue;">Official Mobile:</strong> ${data.OfficialMobile || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-    <div class="col-6">
-        <p><strong>Last Updated Date:</strong> ${data.greatestDate || 'N/A'}</p>
-    </div>
-    
-</div>
-    <hr>
-    <h4>Complaint Messages:</h4>
-    ${messagesHtml}
-    <hr>
-    <h4>Agent Replied Messages:</h4>
-    ${agentRepliedHtml}
-    <hr>
-    ${imageLink}
-`;
-
-return detailsHtml;
-}
-            
-
-
-
-  
-</script>
-
-<script>
-    document.addEventListener("DOMContentLoaded", function () {
-        const today = new Date();
-        today.setDate(today.getDate() + 1); // Add 1 day to get tomorrow
-        const tomorrow = today.toISOString().split('T')[0];
-
-        document.querySelectorAll('.date-picker').forEach(function (input) {
-            input.setAttribute('min', tomorrow);
-        });
-    });
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcinprogresscalls.html b/src/main/resources/templates/modules/callcenterqaqc/agentqaqcinprogresscalls.html
deleted file mode 100644
index ae797198..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcinprogresscalls.html
+++ /dev/null
@@ -1,1022 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-.required {
-	color: red;
-}
-
-.card-box {
-	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-	height: 140px;
-}
-
-@media ( max-width : 768px) {
-	.card-box {
-		text-align: center;
-	}
-}
-
-/* .d-none {
-		display: none;
-	} */
-.custom-width1 {
-	width: 120px; /* Adjust the width as needed */
-}
-#modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-    
-</style>
-<body>
-	<div class="wrapper">
-		<!-- Header -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<!-- Left Menu -->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-layers bg-blue"></i>
-									<div class="d-inline">
-										<h5>Agent's Inprogress Calls</h5>
-										<span>1913 Inprogress Call List</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 QAQC</li>
-										<li class="breadcrumb-item" aria-current="page">Agents
-											QAQC</li>
-										<li class="breadcrumb-item active" aria-current="page">Inprogress
-											Calls</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-				
-
-				
-
-				<div class="row mt-4">
-
-					<div class="col-md-12">
-						<div class="card">
-
-							<div class="card-body">
-								<div class="page-header-title">
-									<h5 style="margin: 0; font-weight: bold;">Today Assigned
-										Calls</h5>
-								</div>
-								<div>
-									<div class="row mt-2">
-										<!-- Total Calls Assigned -->
-										<div class="col-xl-3 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-4">
-													<b>Total Calls Assigned</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text="${details[0]?.Total_Calls_assigned}">
-													<!-- Display Total Calls Assigned -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- QA&QC Calls -->
-										<div class="col-xl-3 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-4">
-													<b>QA&QC Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text=" ${details[0]?.Closed_Call_count}">
-													<!-- Display Closed Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- In-progress Calls -->
-										<div class="col-xl-2 col-md-6 col-sm-12" style="background-color: aqua;">
-											<div class="card card-box p-3 text-center mt-4 ">
-												<h6 class="text-facebook mb-4">
-													<b>In-progress Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text="${details[0]?.Inprogress_Call_count}">
-													<!-- Display In-progress Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- Follow-up Calls -->
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-2">
-													<b>Official Follow-up Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.Followup_Call_count}">
-													<!-- Display Follow-up Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-2">
-													<b>Public Follow-up Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.PublicFollowup_Call_count}">
-													<!-- Display Follow-up Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-									</div>
-
-
-									<div class="row mt-2">
-										<div class="col-md-12">
-
-											<div class="card-header">
-												<h3 style="font-weight: bold; font-size: large;"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-													<span th:text="${agent[0]['agent_name']}"
-														style="font-weight: bold; font-size: large;"></span>'s
-													Inprogress Calls List
-												</h3>
-											</div>
-
-											<div class="card-block">
-												<div class="col-md-12">
-													<div class="row">
-														<button id="primaryButton" class="btn btn-success">Non-Processed
-															Calls</button>
-														<button id="secondaryButton"
-															class="btn btn-secondary btn-custom ml-3">Processed
-															Calls</button>
-													</div>
-												</div>
-											</div>
-
-											<div class="card-body">
-
-												<div class="table-responsive" id="primaryTable"
-													style="display: block;">
-													<table id="QaqcDatatable"
-														class="table table-striped table-bordered table-hover dataTable"
-														role="grid">
-														<thead class="thead-dark">
-															<tr>
-																<th class="text-center">S.No</th>
-																<th class="text-center">ID</th>
-																<th class="text-center">Complaint Date</th>
-																<th class="text-center">Officer Name</th>
-																<th class="text-center">Phone No</th>
-																<th class="text-center">Complaint Type</th>
-																<th class="text-center">Type</th>
-																<!-- Added Date Column -->
-																<th class="text-center">View Details</th>
-																<th class="text-center custom-width1">Actions</th>
-																<th class="text-center">Remarks</th>
-																<th class="text-center">Submit</th>
-															</tr>
-														</thead>
-														<tbody>
-															<!-- Rows will be dynamically populated using AJAX -->
-
-															<!-- Thymeleaf loop for populating data -->
-															<tr th:each="call, iterStat : ${inprogresslists}">
-																<td th:text="${iterStat.index + 1}" class="text-center"></td>
-																<td th:text="${call['complaint_number']}"
-																	class="text-center complaint-select"></td>
-																<td th:text="${call['complaint_date']}"
-																	class="text-center"></td>
-																<td th:text="${call['official_name']}"
-																	class="text-center"></td>
-																<td th:text="${call['official_mobilenum']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_type']}"
-																	class="text-center"></td>
-																<td th:text="${call['call_category']}"
-																	class="text-center"></td>
-																<td class="text-center">
-
-																	<button type="button" class="btn btn-info"
-																		th:data-complaint-number="${call['complaint_number']}">
-																		View</button>
-																</td>
-
-
-																<td class="text-center"><select
-																	class="form-control form-control-sm action-select action-dropdown">
-																		<option value="" selected>Select</option>
-																		<option th:each="status : ${qaqcactionlists}"
-																			th:value="${status.call_status}"
-																			th:text="${status.call_status}"></option>
-																</select>
-																	<div class="schedule-call d-none mt-2">
-																		<!-- <span class="schedule-text">Schedule Call</span> -->
-																		<input type="date" class="date-picker form-control"
-																			name="remainderDate">
-																	</div>             </td>
-
-																<td class="text-center"><input type="text"
-																	class="form-control form-control-sm"
-																	placeholder="Remarks"></td>
-
-
-																<td class="text-center">
-																	<button class="btn btn-primary btn-sm submit-btn submitid"
-																		th:data-id="${call['data_id']}"
-																		onclick="submitComplaint(this)" disabled="disabled">
-																		Submit</button>
-																</td>
-
-															</tr>
-															<!-- End loop -->
-
-														</tbody>
-													</table>
-												</div>
-
-												<div class="table-responsive" id="secondaryTable"
-													style="display: none;">
-													<table id="SecondaryDatatable"
-														class="table table-striped table-bordered table-hover dataTable"
-														role="grid">
-														<thead class="thead-dark">
-															<tr role="row">
-																<th class="text-center">S.No</th>
-																<th class="text-center">ID</th>
-																<th class="text-center">Complaint Date</th>
-																<th class="text-center">Officer Name</th>
-																<th class="text-center">Officer PhoneNo</th>
-																<th class="text-center">Complaint Type</th>
-																<th class="text-center">View Details</th>
-																<th class="text-center custom-width1">Actions</th>
-																<th class="text-center">Remarks</th>
-															</tr>
-														</thead>
-														<tbody>
-															<!-- <tr th:each="call, iterStat : ${inSubmitDetails}">
-																<td th:text="${iterStat.index + 1}" class="text-center"></td>
-																<td th:text="${call['complaint_number']}"
-																	class="text-center complaint-select"></td>
-																<td th:text="${call['complaint_date']}"
-																	class="text-center"></td>
-																<td th:text="${call['official_name']}"
-																	class="text-center"></td>
-																<td th:text="${call['official_mobilenum']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_type']}"
-																	class="text-center"></td>
-																<td class="text-center">
-																	<button type="button" class="btn btn-info"
-																		th:data-complaint-number="${call['complaint_number']}">View</button>
-																</td>
-																<td th:text="${call['call_status']}" class="text-center"></td>
-																<td th:text="${call['remarks']}" class="text-center"></td>
-															</tr> -->
-														</tbody>
-													</table>
-												</div>
-
-
-											</div>
-											</div>
-										</div>
-									</div>
-								</div>
-
-							</div>
-
-						</div>
-					</div>
-
-				</div>
-			</div>
-			
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-			
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-	<!-- Modal -->
-	<div class="modal fade" id="detailsModal" tabindex="-1" role="dialog"
-		aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="detailsModalLabel">Complaint
-						Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body" id="modalBody">
-					<!-- Details will be populated here -->
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary"
-						data-dismiss="modal">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">
-	
-	$(document).ready(function () {
-		
-		$(document).on('click', '.btn-info', function () {
-	        // Retrieve the complaint number from the data attribute
-	        var complaintNumber = $(this).data('complaint-number');
-	        var complaintDept = $(this).data('complaint-department');
-	        var complaintMode = $(this).data('complaint-mode');
-	        // Call the viewDetails function with the complaint number
-	        viewDetails(complaintNumber);
-	    });
-		
-		$('#primaryButton').addClass('btn-success').removeClass('btn-secondary');
-        $('#secondaryButton').addClass('btn-secondary').removeClass('btn-success');
-		
-		// Toggle functionality for Primary and Secondary buttons
-	    $('#primaryButton').click(function () {
-	        $('#primaryTable').show();
-	        $('#secondaryTable').hide();
-	        
-	        $(this).addClass('btn-success').removeClass('btn-secondary');
-            $('#secondaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        $('#QaqcDatatable').DataTable().columns.adjust().draw();
-	    });
-
-	    $('#secondaryButton').click(function () {
-	        $('#primaryTable').hide();
-	        $('#secondaryTable').show();
-	        
-	        $(this).addClass('btn-success').removeClass('btn-secondary');
-            $('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        //$('#SecondaryDatatable').DataTable().columns.adjust().draw();
-	        
-	        
-			let userId = document.getElementById('userIdSpan').textContent;
-	        
-	        
-	        // Destroy previous instance if exists
-	        if ($.fn.DataTable.isDataTable('#SecondaryDatatable')) {
-	            $('#SecondaryDatatable').DataTable().clear().destroy();
-	        }
-	        $('#pageLoader').show();
-	        // AJAX call to get data
-	        $.ajax({
-	            url: '/gcc/api/callcenterqaqc/agent/inprogresscalls/getinprogresssubmittedcalls', // Replace with your controller URL
-	            type: 'GET',
-	            data: { userId: userId },
-	            success: function (response) {
-	            	$('#pageLoader').hide();
-	                // Initialize DataTable with new data
-	                $('#SecondaryDatatable').DataTable({
-	                    data: response, // This should be an array of objects
-	                    columns: [
-	                        { data: null, render: function (data, type, row, meta) { return meta.row + 1; }, className: "text-center" },
-	                        { data: 'complaint_number', className: "text-center" },
-	                        { data: 'complaint_date', className: "text-center" },
-	                        { data: 'complaint_person_name', className: "text-center" },
-	                        { data: 'complaint_mobilenumber', className: "text-center" },
-	                        { data: 'complaint_type', className: "text-center" },
-	                        { 
-	                            data: 'complaint_number',
-	                            className: "text-center",
-	                            render: function (data, type, row) {
-	                                return `<button type="button" class="btn btn-info" data-complaint-number="${data}">View</button>`;
-	                            }
-	                        },
-	                        {
-	                            data: 'call_status',
-	                            className: "text-center"
-	                           
-	                        },
-	                        {
-	                            data: 'remarks',
-	                            className: "text-center"
-	                            
-	                        }
-	                    ],
-	                    dom: 'Bftip',
-	        	        columnDefs: [
-	        	            { targets: 'no-sort', orderable: false }
-	        	        ],
-	        	        lengthMenu: [
-	        	            [50, 100, 200, 500, -1],
-	        	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        	        ],
-	        	        scrollY: '50vh',
-	        	        scrollX:true,
-	        	        buttons: [
-	        	            {
-	        	                extend: 'pageLength',
-	        	                className: 'btn btn-warning'
-	        	            },
-	        	            {
-	        	                title: 'Data export',
-	        	                extend: 'copyHtml5',
-	        	                text: 'Copy',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'copyBtn'
-	        	            },
-	        	            {
-	        	                extend: 'excelHtml5',
-	        	                text: 'Excel',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'excelBtn'
-	        	            },
-	        	            {
-	        	                extend: 'csvHtml5',
-	        	                text: 'CSV',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'csvBtn'
-	        	            },
-	        	            {
-	        	                extend: 'pdfHtml5',
-	        	                text: 'PDF',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'pdfBtn'
-	        	            }
-	        	        ],
-	        	        fixedHeader: true,
-	        	        autoWidth: false,
-	        	        responsive: false,
-	        	        searching: true,
-	        	        select: false,
-	        	        processing: false
-	                });
-	            },
-	            error: function () {
-	            	$('#pageLoader').hide();
-	            	Swal.fire("Error", "Failed to get Finished complaints.", "error");
-	            }
-	        });
-
-	    });
-		
-    var table = $('#QaqcDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        scrollX:true,
-        buttons: [
-            {
-                extend: 'pageLength',
-                className: 'btn btn-warning'
-            },
-            {
-                title: 'Data export',
-                extend: 'copyHtml5',
-                text: 'Copy',
-                className: 'btn btn-secondary',
-                id: 'copyBtn'
-            },
-            {
-                extend: 'excelHtml5',
-                text: 'Excel',
-                className: 'btn btn-secondary',
-                id: 'excelBtn'
-            },
-            {
-                extend: 'csvHtml5',
-                text: 'CSV',
-                className: 'btn btn-secondary',
-                id: 'csvBtn'
-            },
-            {
-                extend: 'pdfHtml5',
-                text: 'PDF',
-                className: 'btn btn-secondary',
-                id: 'pdfBtn'
-            }
-        ],
-        fixedHeader: true,
-        autoWidth: false,
-        responsive: false,
-        searching: true,
-        select: false,
-        processing: true
-    });
-    
-    var table1 = $('#SecondaryDatatable').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',
-        scrollX:true,
-        buttons: [
-            {
-                extend: 'pageLength',
-                className: 'btn btn-warning'
-            },
-            {
-                title: 'Data export',
-                extend: 'copyHtml5',
-                text: 'Copy',
-                className: 'btn btn-secondary',
-                id: 'copyBtn'
-            },
-            {
-                extend: 'excelHtml5',
-                text: 'Excel',
-                className: 'btn btn-secondary',
-                id: 'excelBtn'
-            },
-            {
-                extend: 'csvHtml5',
-                text: 'CSV',
-                className: 'btn btn-secondary',
-                id: 'csvBtn'
-            },
-            {
-                extend: 'pdfHtml5',
-                text: 'PDF',
-                className: 'btn btn-secondary',
-                id: 'pdfBtn'
-            }
-        ],
-        fixedHeader: true,
-        autoWidth: false,
-        responsive: false,
-        searching: true,
-        select: false,
-        processing: false
-    });
-    
-    
- // // Event listeners for changes in dropdown, remarks, and date picker
-    $(document).on('change', '.action-dropdown', function () {
-        const parentRow = $(this).closest('tr');
-        const schedulerDiv = parentRow.find('.schedule-call');
-        schedulerDiv.toggleClass('d-none', $(this).val() !== 'FOLLOWUP');
-        validateFields(parentRow);
-    });
-
-    $(document).on('input', 'input[type="text"]', function () {
-        const parentRow = $(this).closest('tr');
-        validateFields(parentRow);
-    });
-
-    $(document).on('change', '.date-picker', function () {
-        const parentRow = $(this).closest('tr');
-        validateFields(parentRow);
-    });
-
-    // Validate function to check conditions for enabling/disabling submit button
-    function validateFields(row) {
-        const actionSelect = row.find('.action-select');
-        const remarksInput = row.find('input[type="text"]');
-        const submitButton = row.find('.submit-btn');
-        const actionValue = actionSelect.val().trim();
-        const remarksFilled = remarksInput.val().trim() !== "";
-
-        const followUpSelected = actionValue === "FOLLOWUP";
-        const remainderDateFilled = row.find('.date-picker').val()?.trim() !== ""; // Check if date is selected
-
-        
-        // Enable submit button based on conditions
-	        if (
-	            (followUpSelected && remainderDateFilled && remarksFilled) || (actionValue !== "FOLLOWUP" && actionValue !=="Select") // FOLLOWUP requires remainder date and remarks
-	        ) {
-	            submitButton.prop('disabled', false); // Enable submit button
-	        } else {
-	            submitButton.prop('disabled', true); // Disable submit button
-	        }
-    }
-
-    // Initial validation for all rows on page load
-	$("#QaqcDatatable tbody tr").each(function () {
-	    const row = $(this);
-	    const submitButton = row.find('.submit-btn');
-	    submitButton.prop('disabled', true); // Ensure submit button is initially disabled
-	    validateFields(row); // Validate fields for further interaction
-	});
-	
-	// Re-validate fields on input changes
-	$("#QaqcDatatable").on('input change', '.action-select, input[type="text"], .date-picker', function () {
-	    const row = $(this).closest('tr');
-	    validateFields(row);
-	});
-
-    
-});
-	
-	
-	function submitComplaint(button) {
-		
-		var userId = document.getElementById('userIdSpan').textContent;
-		const row = button.parentNode.parentNode;
-		
-		 const dataId = row.querySelector('.submit-btn').getAttribute('data-id'); // Fetch the data_id
-		    const action = row.querySelector('.action-select').value.trim(); // Fetch the action value
-		    const complaintNumber = row.querySelector('.complaint-select').innerText.trim(); // Fetch complaint number
-		    const remarks = row.querySelector('input[type="text"]').value.trim(); // Fetch the remarks value
-		    const remainderDate = row.querySelector('.date-picker')?.value.trim(); // Fetch the remainder date (if any)
-		    /* console.log(row);
-			console.log(dataId);
-			console.log(action);
-			console.log(complaintNumber);
-			console.log(remarks);
-			console.log(remainderDate); */
-			
-		
-			//console.log("outside ajax");
-			
-	    $('.submitid').prop('disabled', true).text('Submitting...');
-	    // Validation
-	    if (!dataId || !action || action === "Select") {
-	        Swal.fire("Error", "Action is required!", "error");
-	        $('.submitid').prop('disabled', false).text('Submit');
-	        return;
-	    }
-
-	    if (action === 'FOLLOWUP' && remarks === "" && (!remainderDate || remainderDate === "")) {
-	        Swal.fire("Error", "Schedule Date is required for Follow-Up!", "error");
-	        $('.submitid').prop('disabled', false).text('Submit');
-	        return;
-	    }
-	    
-		if(action === 'MOBILE_NUM' && remarks === "")
-			    	
-	    {
-	    	Swal.fire("Error", "remarks  is required for Mobile_Num!", "error");
-	    	$('.submitid').prop('disabled', false).text('Submit');
-	    	return;
-	    }
-
-		$('#pageLoader').show();
-	    // AJAX Request
-	    $.ajax({
-	        url: '/gcc/api/callcenterqaqc/agent/inprogresscalls/update',
-	        type: 'POST',
-	        data: {
-	            dataId: dataId,
-	            complaintNumber: complaintNumber,
-	            action: action,
-	            remarks: remarks,
-	            remainderDate: remainderDate,
-	            userId:userId
-	        },	        
-	        success: function (response) {
-	        	$('#pageLoader').hide();
-	            if (response === "Success") {
-	            	//console.log("inside ajax success");
-	                Swal.fire({
-	                    icon: 'success',
-	                    title: 'Success',
-	                    text: 'Complaint updated successfully!',
-	                    allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                    allowEscapeKey: false, // Disable escape key to close the modal
-	                    allowEnterKey: false, // Disable enter key to close the modal
-	                    showConfirmButton: true, // Ensure the confirm button is visible
-	                }).then((result) => {
-	                    if (result.isConfirmed) {
-	                    	//console.log("ok button");
-	                    	$('.submitid').prop('disabled', false).text('Submit');
-							const table = $('#QaqcDatatable').DataTable();
-	                        
-	                        // Remove the row
-	                        table.row($(row)).remove();
-
-	                        // Reorder S.No column
-	                        table.rows().every(function (index) {
-	                            const row = this.node();
-	                            $(row).find('td:first-child').text(index + 1); // Update S.No
-	                        });
-
-	                        // Redraw the table
-	                        table.draw(false);
-	                    }
-	                });
-	            } 
-	            else if (response === "error") {
-	            	$('.submitid').prop('disabled', false).text('Submit');
-	            	Swal.fire("Error", "Failed to update complaint. Please try again later.", "error");
-	            }
-	            else {
-	            	$('.submitid').prop('disabled', false).text('Submit');
-	                Swal.fire("Error", "Failed to update complaint. Please try again.", "error");
-	            }
-	        },
-	        error: function (xhr, status, error) {
-	        	$('#pageLoader').hide();
-	        	$('.submitid').prop('disabled', false).text('Submit');
-	            Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
-	        }
-	        	        
-	    });
-	    
-	   // $('.submitid').prop('disabled', false).text('Submit');
-	    
-	}
-	
-	
-	function viewDetails(complaintNumber) {
- 	    document.getElementById('modalBody').innerHTML = '<p style="text-align:center;">Please wait, loading data...</p>';
- 	    $('#detailsModal').modal('show');
-
- 	    // Fetch the main complaint details
- 	    $.ajax({
- 	        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails',
- 	        type: 'GET',
-            data:{complaintNumber:complaintNumber},
- 	        success: function (data) {
- 	            //console.log('Complaint Data:', data);
-
- 	            // Fetch agent response details
- 	            $.ajax({
- 	                url: '/gcc/api/callcenterqaqc/agent/attendedcomplaintshistory',
- 	                type: 'GET',
- 	                data: { complaintNumber },
- 	                success: function (agentResponse) {
- 	                    //console.log('Agent Response:', agentResponse);
-
- 	                    // Use the logic for building complaint and agent details as HTML
- 	                    const detailsHtml = generateDetailsHtml(data, agentResponse);
-
- 	                    // Update modal content
- 	                    document.getElementById('modalBody').innerHTML = detailsHtml;
- 	                },
- 	                error: function () {
- 	                    document.getElementById('modalBody').innerHTML = '<p>Error loading agent details. Please try again later.</p>';
- 	                }
- 	            });
- 	        },
- 	        error: function () {
- 	            document.getElementById('modalBody').innerHTML = '<p>Error loading complaint details. Please try again later.</p>';
- 	        }
- 	    });
- 	}
-
- 	// Function to generate complaint and agent details HTML
-function generateDetailsHtml(data, agentResponse) {
- 		
- 	// Helper function to format date to yyyy-mm-dd
-         function formatDate(dateStr) {
-             if (!dateStr) return 'N/A';
-             const date = new Date(dateStr);
-             return date.toISOString().split('T')[0]; // Formats to yyyy-mm-dd
-         }
-// Format complaint messages
-let messagesHtml = '';
-if (data.comments && data.comments.length > 0) {
-    data.comments.forEach((comment) => {
-        const commentImageLink = comment.Comp_Image && comment.Comp_Image !== "No image available"
-            ? `<a href="${comment.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">View Image</a>`
-            : '<p style="color: red;">No image available for this comment.</p>';
-
-        messagesHtml += `
-            <div class="comment mb-4">
-                <div class="row">
-                    <div class="col-2 text-center">
-                        <p class="text-muted">${comment.comment_date}</p>
-                    </div>
-                    <div class="col-10">
-                        <p><strong>${comment.user || 'N/A'}</strong> Says:</p>
-                        <p>${comment.message || 'No message available'}</p>
-                        <div class="user-image">${commentImageLink}</div>
-                    </div>
-                </div>
-            </div>
-        `;
-    });
-} else {
-    messagesHtml = '<p>No comments available.</p>';
-}
-
-// Format agent responses
-let agentRepliedHtml = '';
-if (agentResponse.length > 0) {
-    agentResponse.forEach((agentItem) => {
-        agentRepliedHtml += `
-            <div class="comment mb-4">
-                <div class="row">
-                    <div class="col-2 text-center">
-                        <p class="text-muted"><strong>${formatDate(agentItem.created_date) || 'N/A'}</strong></p>
-                    </div>
-                    <div class="col-10">
-                        <p><strong>${agentItem.agent_name || 'N/A'}</strong>, Says: ${agentItem.call_status || 'N/A'}</p>
-                        <p><strong>Remarks: </strong>${agentItem.remarks || 'N/A'}</p>
-                        <p><strong>Remainder Date: </strong> ${formatDate(agentItem.remainder_date) || 'N/A'}</p>
-                    </div>
-                </div>
-            </div>
-        `;
-    });
-} else {
-    agentRepliedHtml = '<p>No agent replied messages available.</p>';
-}
-
-// Check for user images
-const userImages = data.userimages && data.userimages.length > 0 ? data.userimages[0] : {};
-const imageLink = userImages.Comp_Image && userImages.Comp_Image !== "null" && userImages.Comp_Image !== ""
-    ? `<a href="${userImages.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">UserImages: View Image</a>`
-    : '<p style="color: red;">UserImages: No image available.</p>';
-
-// Combine all sections into the final HTML
-const detailsHtml = `
-    <div class="row">
-        <div class="col-md-12">
-            <h4>Complaint Person's Details:</h4>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Complaint Number:</strong> ${data.complaintid || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Complaint Date:</strong> ${data.complaintdate}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Complainant's Name:</strong> ${data.complainantName || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Phone Number:</strong> ${data.mobileNumber || 'N/A'}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Zone:</strong> ${data.Zone || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Division:</strong> ${data.Division || 'N/A'}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Gender:</strong> ${data.gender || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Complainant's Address:</strong> ${data.Street || 'N/A'}, ${data.Area || 'N/A'}, ${data.Landmark || 'N/A'}, ${data.Location || 'N/A'}</p>
-                </div>
-            </div>
-        </div>
-    </div>
-    <hr>
-    <h4>Complaint Details:</h4>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Complaint Dept:</strong> ${data.deptname || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong>Complaint Mode:</strong> ${data.compmode || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Complaint Type:</strong> ${data.complaintType || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong>Details of Complaint:</strong> ${data.description || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Current Status:</strong> ${data.currentStatus || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong style="color:blue;">Official Mobile:</strong> ${data.OfficialMobile || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-    <div class="col-6">
-        <p><strong>Last Updated Date:</strong> ${data.greatestDate || 'N/A'}</p>
-    </div>
-    
-</div>
-    <hr>
-    <h4>Complaint Messages:</h4>
-    ${messagesHtml}
-    <hr>
-    <h4>Agent Replied Messages:</h4>
-    ${agentRepliedHtml}
-    <hr>
-    ${imageLink}
-`;
-
-return detailsHtml;
-}
-
-
-
-</script>
-
-<script>
-    document.addEventListener("DOMContentLoaded", function () {
-        const today = new Date();
-        today.setDate(today.getDate() + 1); // Add 1 day to get tomorrow
-        const tomorrow = today.toISOString().split('T')[0];
-
-        document.querySelectorAll('.date-picker').forEach(function (input) {
-            input.setAttribute('min', tomorrow);
-        });
-    });
-</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcpublicfollowupcalls.html b/src/main/resources/templates/modules/callcenterqaqc/agentqaqcpublicfollowupcalls.html
deleted file mode 100644
index fbfd923a..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcpublicfollowupcalls.html
+++ /dev/null
@@ -1,1088 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-.required {
-	color: red;
-}
-
-.card-box {
-	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-	height: 140px;
-}
-
-@media ( max-width : 768px) {
-	.card-box {
-		text-align: center;
-	}
-}
-
-.custom-width1 {
-	width: 120px; /* Adjust the width as needed */
-}
-
-.custom-width2 {
-	width: 100px; /* Adjust the width as needed */
-}
-#modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-    
-</style>
-<body>
-	<div class="wrapper">
-		<!-- Header -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<!-- Left Menu -->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-layers bg-blue"></i>
-									<div class="d-inline">
-										<h5>Agent's Followup Calls</h5>
-										<span>1913 Followup Call List</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 QAQC</li>
-										<li class="breadcrumb-item" aria-current="page">Agents
-											QAQC</li>
-										<li class="breadcrumb-item active" aria-current="page">Public FollowUp Calls</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-				
-
-
-				<div class="row mt-4">
-
-					<div class="col-md-12">
-						<div class="card">
-
-							<div class="card-body">
-								<div class="page-header-title">
-									<h5 style="margin: 0; font-weight: bold;">Today Assigned
-										Calls</h5>
-								</div>
-								<div>
-									<div class="row mt-2">
-										<!-- Total Calls Assigned -->
-										<div class="col-xl-3 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-4">
-													<b>Total Calls Assigned</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text="${details[0]?.Total_Calls_assigned}">
-													<!-- Display Total Calls Assigned -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- QA&QC Calls -->
-										<div class="col-xl-3 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-4">
-													<b>QA&QC Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text=" ${details[0]?.Closed_Call_count}">
-													<!-- Display Closed Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- In-progress Calls -->
-										<div class="col-xl-2 col-md-6 col-sm-12">
-											<div class="card card-box p-3 text-center mt-4 ">
-												<h6 class="text-facebook mb-4">
-													<b>In-progress Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-4"
-													th:text="${details[0]?.Inprogress_Call_count}">
-													<!-- Display In-progress Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<!-- Follow-up Calls -->
-										<div class="col-xl-2 col-md-6 col-sm-12" >
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-2">
-													<b>Official Follow-up Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.Followup_Call_count}">
-													<!-- Display Follow-up Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-										<div class="col-xl-2 col-md-6 col-sm-12" style="background-color: aqua;">
-											<div class="card card-box p-3 text-center mt-4">
-												<h6 class="text-facebook mb-2">
-													<b>Public Follow-up Calls</b>
-												</h6>
-												<h4 class="text-twitter fw-700 mt-3"
-													th:text="${details[0]?.PublicFollowup_Call_count}">
-													<!-- Display Follow-up Calls Count -->
-
-												</h4>
-											</div>
-										</div>
-									</div>
-
-
-									<div class="row mt-2">
-										<div class="col-md-12">
-
-											<div class="card-header">
-												<h3 style="font-weight: bold; font-size: large;"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-													<span th:text="${agent[0]['agent_name']}"
-														style="font-weight: bold; font-size: large;"></span>'s
-													Followup Calls List
-												</h3>
-											</div>
-
-											<div class="card-block">
-												<div class="col-md-12 ">
-													<div class="row">
-														<button id="primaryButton" class="btn btn-success">Non-Processed
-															Calls</button>
-														<button id="secondaryButton"
-															class="btn btn-secondary btn-custom ml-3">Processed
-															Calls</button>
-													</div>
-												</div>
-											</div>
-
-											<div class="card-body">
-
-												<div class="table-responsive" id="primaryTable"
-													style="display: block;">
-													<table id="QaqcDatatable"
-														class="table table-striped table-bordered table-hover dataTable"
-														role="grid">
-														<thead class="thead-dark">
-															<tr role="row">
-																<th class="text-center">S.No</th>
-																<th class="text-center">ID</th>
-																<th class="text-center">Complaint Date</th>																
-																<th class="text-center">Public Name</th>
-																<th class="text-center">Public PhoneNo</th>
-																<th class="text-center">Complaint Type</th>
-																<th class="text-center custom-width2">View</th>
-																<th class="text-center custom-width1">Actions</th>
-																<th class="text-center">Remarks</th>
-																<th class="text-center">Submit</th>
-															</tr>
-
-														</thead>
-														<tbody>
-
-															<!-- Thymeleaf loop for populating data -->
-
-
-															<tr th:each="call, iterStat : ${qaqcfollowuplists}">
-																<td th:text="${iterStat.index + 1}" class="text-center"></td>
-																<td th:text="${call['complaint_number']}"
-																	class="text-center complaint-select"></td>
-																<td th:text="${call['complaint_date']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_person_name']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_mobilenumber']}"
-																	class="text-center"></td>
-																<!-- <td th:text="${call['official_name']}"
-																	class="text-center"></td>
-																<td th:text="${call['official_mobilenum']}"
-																	class="text-center"></td> -->
-																<td th:text="${call['complaint_type']}"
-																	class="text-center"></td>
-
-																<!-- view function -->
-
-																<td class="text-center">
-																	<button type="button" class="btn btn-info details-btn"
-																		style="margin-bottom: 3px"
-																		th:data-complaint-number="${call['complaint_number']}">
-																		View</button>
-																</td>
-
-
-																<td class="text-center"><select
-																	class="form-control form-control-sm action-select action-dropdown">
-																		<option value="" selected>Select</option>
-																		<option th:each="status : ${qaqccategorylists}"
-																			th:value="${status.call_status}"
-																			th:text="${status.call_status}"></option>
-																</select>
-																	<div class="schedule-call d-none mt-2">
-																		<!-- <span class="schedule-text">Schedule Call</span> -->
-																		<input type="date" class="date-picker form-control"
-																			name="remainderDate">
-																	</div></td>
-																<td class="text-center"><input type="text"
-																	class="form-control form-control-sm"
-																	placeholder="Remarks"></td>
-																<td class="text-center">
-																	<button class="btn btn-primary btn-sm submit-btn submitid"
-																		th:data-id="${call['data_id']}"
-																		th:complaint-select="${call['complaint_number']}"
-																		th:data-name="${call['complaint_person_name']}"
-																		th:data-number="${call['complaint_mobilenumber']}"
-																		th:data-complaint-type="${call['complaint_type']}"
-																		onclick="submitComplaint(this)" disabled="disabled">
-																		Submit</button>
-																</td>
-															</tr>
-
-														</tbody>
-													</table>
-
-												</div>
-
-												<div class="table-responsive" id="secondaryTable"
-													style="display: none;">
-													<table id="SecondaryDatatable"
-														class="table table-striped table-bordered table-hover dataTable"
-														role="grid">
-														<thead class="thead-dark">
-															<tr role="row">
-																<th class="text-center">S.No</th>
-																<th class="text-center">ID</th>
-																<th class="text-center">Complaint Date</th>
-																<th class="text-center">Public Name</th>
-																<th class="text-center">Public PhoneNo</th>
-																<th class="text-center">Complaint Type</th>
-																<th class="text-center">View Details</th>
-																<th class="text-center custom-width1">Actions</th>
-																<th class="text-center">Remarks</th>
-															</tr>
-														</thead>
-														<tbody>
-															<!-- <tr th:each="call, iterStat : ${fcSubmitDetails}">
-																<td th:text="${iterStat.index + 1}" class="text-center"></td>
-																<td th:text="${call['complaint_number']}"
-																	class="text-center complaint-select"></td>
-																<td th:text="${call['complaint_date']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_person_name']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_mobilenumber']}"
-																	class="text-center"></td>
-																<td th:text="${call['complaint_type']}"
-																	class="text-center"></td>
-																<td class="text-center">
-																	<button type="button" class="btn btn-info"
-																		th:data-complaint-number="${call['complaint_number']}">View</button>
-																</td>
-																<td th:text="${call['call_status']}" class="text-center"></td>
-																<td th:text="${call['remarks']}" class="text-center"></td>
-															</tr> -->
-														</tbody>
-													</table>
-												</div>
-
-
-											</div>
-										 </div>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-
-					</div>
-				</div>
-			</div>
-			
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-			
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<!--Details button Modal -->
-	<div class="modal fade" id="detailsModal" tabindex="-1" role="dialog"
-		aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="detailsModalLabel">Complaint
-						Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body" id="modalBody">
-					<!-- Details will be populated here -->
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary"
-						data-dismiss="modal">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script type="text/javascript">
- 
- 
- 
-$(document).ready(function() {
-	
-	
-	 $(document).on('click', '.btn-info', function () {
-	        // Retrieve the complaint number from the data attribute
-	        var complaintNumber = $(this).data('complaint-number');
-	        
-	        // Call the viewDetails function with the complaint number
-	        viewDetails(complaintNumber);
-	    });
-	 
-	 $('#primaryButton').addClass('btn-success').removeClass('btn-secondary');
-     $('#secondaryButton').addClass('btn-secondary').removeClass('btn-success');
-		
-		// Toggle functionality for Primary and Secondary buttons
-	    $('#primaryButton').click(function () {
-	        $('#primaryTable').show();
-	        $('#secondaryTable').hide();
-	        
-	        $(this).addClass('btn-success').removeClass('btn-secondary');
-         $('#secondaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        $('#QaqcDatatable').DataTable().columns.adjust().draw();
-	    });
-
-	    $('#secondaryButton').click(function () {
-	        $('#primaryTable').hide();
-	        $('#secondaryTable').show();
-	        
-	        $(this).addClass('btn-success').removeClass('btn-secondary');
-            $('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        //$('#SecondaryDatatable').DataTable().columns.adjust().draw();
-	        
-            let userId = document.getElementById('userIdSpan').textContent;
-	        
-	        
-	        // Destroy previous instance if exists
-	        if ($.fn.DataTable.isDataTable('#SecondaryDatatable')) {
-	            $('#SecondaryDatatable').DataTable().clear().destroy();
-	        }
-	        $('#pageLoader').show();
-	        // AJAX call to get data
-	        $.ajax({
-	            url: '/gcc/api/callcenterqaqc/agent/publicfollowupcalls/getpubsubmittedcalls', 
-	            type: 'GET',
-	            data: { userId: userId },
-	            success: function (response) {
-	            	$('#pageLoader').hide();
-	                
-	                $('#SecondaryDatatable').DataTable({
-	                    data: response, 
-	                    columns: [
-	                        { data: null, render: function (data, type, row, meta) { return meta.row + 1; }, className: "text-center" },
-	                        { data: 'complaint_number', className: "text-center" },
-	                        { data: 'complaint_date', className: "text-center" },
-	                        { data: 'complaint_person_name', className: "text-center" },
-	                        { data: 'complaint_mobilenumber', className: "text-center" },
-	                        { data: 'complaint_type', className: "text-center" },
-	                        { 
-	                            data: 'complaint_number',
-	                            className: "text-center",
-	                            render: function (data, type, row) {
-	                                return `<button type="button" class="btn btn-info" data-complaint-number="${data}">View</button>`;
-	                            }
-	                        },
-	                        {
-	                            data: 'call_status',
-	                            className: "text-center"
-	                           
-	                        },
-	                        {
-	                            data: 'remarks',
-	                            className: "text-center"
-	                            
-	                        }
-	                    ],
-	                    dom: 'Bftip',
-	        	        columnDefs: [
-	        	            { targets: 'no-sort', orderable: false }
-	        	        ],
-	        	        lengthMenu: [
-	        	            [50, 100, 200, 500, -1],
-	        	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        	        ],
-	        	        scrollY: '50vh',
-	        	        scrollX:true,
-	        	        buttons: [
-	        	            {
-	        	                extend: 'pageLength',
-	        	                className: 'btn btn-warning'
-	        	            },
-	        	            {
-	        	                title: 'Data export',
-	        	                extend: 'copyHtml5',
-	        	                text: 'Copy',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'copyBtn'
-	        	            },
-	        	            {
-	        	                extend: 'excelHtml5',
-	        	                text: 'Excel',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'excelBtn'
-	        	            },
-	        	            {
-	        	                extend: 'csvHtml5',
-	        	                text: 'CSV',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'csvBtn'
-	        	            },
-	        	            {
-	        	                extend: 'pdfHtml5',
-	        	                text: 'PDF',
-	        	                className: 'btn btn-secondary',
-	        	                id: 'pdfBtn'
-	        	            }
-	        	        ],
-	        	        fixedHeader: true,
-	        	        autoWidth: false,
-	        	        responsive: false,
-	        	        searching: true,
-	        	        select: false,
-	        	        processing: false
-	                });
-	            },
-	            error: function () {
-	            	$('#pageLoader').hide();
-	            	Swal.fire("Error", "Failed to get Finished complaints.", "error");
-	            }
-	        });
-
-	    });
-				
-
-    	     	var table = $('#QaqcDatatable').DataTable({
-    	             dom: 'Bftip',
-    	             columnDefs: [
-    	                 { targets: 'no-sort', orderable: false }
-    	             ],
-    	             lengthMenu: [
-    	                 [50, 100, 200, 500, -1],
-    	                 ['50 rows', '100 rows', '200 rows', 'Show all']
-    	             ],
-    	             scrollY: '50vh',
-    	             scrollX:true,
-    	             buttons: [
-    	                 {
-    	                     extend: 'pageLength',
-    	                     className: 'btn btn-warning'
-    	                 },
-    	                 {
-    	                     title: 'Data export',
-    	                     extend: 'copyHtml5',
-    	                     text: 'Copy',
-    	                     className: 'btn btn-secondary',
-    	                     id: 'copyBtn'
-    	                 },
-    	                 {
-    	                     extend: 'excelHtml5',
-    	                     text: 'Excel',
-    	                     className: 'btn btn-secondary',
-    	                     id: 'excelBtn'
-    	                 },
-    	                 {
-    	                     extend: 'csvHtml5',
-    	                     text: 'CSV',
-    	                     className: 'btn btn-secondary',
-    	                     id: 'csvBtn'
-    	                 },
-    	                 {
-    	                     extend: 'pdfHtml5',
-    	                     text: 'PDF',
-    	                     className: 'btn btn-secondary',
-    	                     id: 'pdfBtn'
-    	                 }
-    	             ],
-    	             fixedHeader: true,
-    	             autoWidth: false,
-    	             responsive: false,
-    	             searching: true, // Enable default search functionality
-    	             select: false,
-    	             processing: false
-    	             
-    	         });
-    	     	
-    	     	var table1 = $('#SecondaryDatatable').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',
-    		        scrollX:true,
-    		        buttons: [
-    		            {
-    		                extend: 'pageLength',
-    		                className: 'btn btn-warning'
-    		            },
-    		            {
-    		                title: 'Data export',
-    		                extend: 'copyHtml5',
-    		                text: 'Copy',
-    		                className: 'btn btn-secondary',
-    		                id: 'copyBtn'
-    		            },
-    		            {
-    		                extend: 'excelHtml5',
-    		                text: 'Excel',
-    		                className: 'btn btn-secondary',
-    		                id: 'excelBtn'
-    		            },
-    		            {
-    		                extend: 'csvHtml5',
-    		                text: 'CSV',
-    		                className: 'btn btn-secondary',
-    		                id: 'csvBtn'
-    		            },
-    		            {
-    		                extend: 'pdfHtml5',
-    		                text: 'PDF',
-    		                className: 'btn btn-secondary',
-    		                id: 'pdfBtn'
-    		            }
-    		        ],
-    		        fixedHeader: true,
-    		        autoWidth: false,
-    		        responsive: false,
-    		        searching: true,
-    		        select: false,
-    		        processing: false
-    		    });
-    	     	
-    	     	 // // Event listeners for changes in dropdown, remarks, and date picker
-    	        $(document).on('change', '.action-dropdown', function () {
-    	            const parentRow = $(this).closest('tr');
-    	            const schedulerDiv = parentRow.find('.schedule-call');
-    	            schedulerDiv.toggleClass('d-none', $(this).val() !== 'FOLLOWUP');
-    	            validateFields(parentRow);
-    	        });
-
-    	        $(document).on('input', 'input[type="text"]', function () {
-    	            const parentRow = $(this).closest('tr');
-    	            validateFields(parentRow);
-    	        });
-
-    	        $(document).on('change', '.date-picker', function () {
-    	            const parentRow = $(this).closest('tr');
-    	            validateFields(parentRow);
-    	        });
-
-    	        // Validate function to check conditions for enabling/disabling submit button
-    	        function validateFields(row) {
-    	            const actionSelect = row.find('.action-select');
-    	            const remarksInput = row.find('input[type="text"]');
-    	            const submitButton = row.find('.submit-btn');
-    	            const actionValue = actionSelect.val().trim();
-    	            const remarksFilled = remarksInput.val().trim() !== "";
-
-    	            const followUpSelected = actionValue === "FOLLOWUP";
-    	            const remainderDateFilled = row.find('.date-picker').val()?.trim() !== ""; // Check if date is selected
-
-    	           // Enable submit button based on conditions
-			        if (
-			            (followUpSelected && remainderDateFilled && remarksFilled) || (actionValue !== "FOLLOWUP" && actionValue !=="Select") // FOLLOWUP requires remainder date and remarks
-			        ) {
-			            submitButton.prop('disabled', false); // Enable submit button
-			        } else {
-			            submitButton.prop('disabled', true); // Disable submit button
-			        }
-    	        }
-
-    	     // Initial validation for all rows on page load
-    	    	$("#QaqcDatatable tbody tr").each(function () {
-    	    	    const row = $(this);
-    	    	    const submitButton = row.find('.submit-btn');
-    	    	    submitButton.prop('disabled', true); // Ensure submit button is initially disabled
-    	    	    validateFields(row); // Validate fields for further interaction
-    	    	});
-    	    	
-    	    	// Re-validate fields on input changes
-    	    	$("#QaqcDatatable").on('input change', '.action-select, input[type="text"], .date-picker', function () {
-    	    	    const row = $(this).closest('tr');
-    	    	    validateFields(row);
-    	    	});
-    	        
-    	
-    	     });
-    	     
-  
-function submitComplaint(button) {
-	var userId = document.getElementById('userIdSpan').textContent;
-	const row = button.parentNode.parentNode;
-
-    // Fetch the values from the corresponding cells in the row
-    const dataId = row.querySelector('.submit-btn').getAttribute('data-id'); // Fetch the data_id
-    const action = row.querySelector('.action-select').value.trim(); // Fetch the action value
-    const complaintNumber = row.querySelector('.complaint-select').innerText.trim(); // Fetch complaint number
-    const remarks = row.querySelector('input[type="text"]').value.trim(); // Fetch the remarks value
-    const remainderDate = row.querySelector('.date-picker')?.value.trim(); // Fetch the remainder date (if any)
-	/* console.log(row);
-	console.log(dataId);
-	console.log(action);
-	console.log(complaintNumber);
-	console.log(remarks);
-	console.log(remainderDate); */
-	
-    $('.submitid').prop('disabled', true).text('Submitting...');
-	const name = button.getAttribute('data-name')?.trim() || "N/A";
-    const cellnumber = button.getAttribute('data-number');
-    const complaintTypeName = button.getAttribute('data-complaint-type');
-    
-    // Validation
-    if (!dataId || !action || action === "Select") {
-        Swal.fire("Error", "Action is required!", "error");
-        $('.submitid').prop('disabled', false).text('Submit');
-        return;
-    }
-    
-    if (action !== 'COMPLETED' && remarks === "") {
-        Swal.fire("Error", "Fill Remarks", "error");
-        $('.submitid').prop('disabled', false).text('Submit');
-        return;
-    }
-
-    if (action === 'FOLLOWUP' && remarks === "" && (!remainderDate || remainderDate === "")) {
-        Swal.fire("Error", "Schedule Date is required for Follow-Up!", "error");
-        $('.submitid').prop('disabled', false).text('Submit');
-        return;
-    }
-    
-    $('#pageLoader').show();
-
-    // AJAX Request
-    $.ajax({
-        url: '/gcc/api/callcenterqaqc/agent/publicfollowupcalls/update',
-        type: 'POST',
-        data: {
-            dataId: dataId,
-            complaintNumber: complaintNumber,
-            action: action,
-            remarks: remarks,
-            remainderDate: remainderDate,
-            userId:userId
-        },       
-        success: function (response) {
-        	$('#pageLoader').hide();
-            if (response === "Success") {
-            	
-            	//Validate cellnumber
-        	    if (!isNaN(cellnumber) || !cellnumber.trim() === "") {
-        	    	//console.log("valid phone number");
-        	    	$('.submitid').prop('disabled', false).text('Submit');
-        	    	// Trigger WhatsApp message functions based on action
-            	    if (action === "UNATTENDED") {
-            	    	//sendWhatsAppMessageUnattended(name, complaintNumber, cellnumber, complaintTypeName);
-            	    } else if (action === "REOPEN") {
-            	        //sendWhatsAppMessageReopened(name, complaintNumber, cellnumber, complaintTypeName);
-            	   }
-        	    }            	   
-        	    else{
-        	    	console.log("not valid phone number,So message not sent");
-        	    }
-            	
-                Swal.fire({
-                    icon: 'success',
-                    title: 'Success',
-                    text: 'Complaint updated successfully!',
-                    allowOutsideClick: false, // Disable clicking outside the modal to close it
-                    allowEscapeKey: false, // Disable escape key to close the modal
-                    allowEnterKey: false, // Disable enter key to close the modal
-                    showConfirmButton: true, // Ensure the confirm button is visible
-                }).then((result) => {
-                    if (result.isConfirmed) {
-                    	$('.submitid').prop('disabled', false).text('Submit');
-                   	
-                    	const table = $('#QaqcDatatable').DataTable();
-                        
-                        // Remove the row
-                        table.row($(row)).remove();
-
-                        // Reorder S.No column
-                        table.rows().every(function (index) {
-                            const row = this.node();
-                            $(row).find('td:first-child').text(index + 1); // Update S.No
-                        });
-
-                        // Redraw the table
-                        table.draw(false);
-                    }
-                });
-            } 
-            else if (response === "error") {
-            	$('.submitid').prop('disabled', false).text('Submit');
-            	Swal.fire("Error", "Failed to update complaint. Please try again later.", "error");
-            }
-            else {
-            	$('.submitid').prop('disabled', false).text('Submit');            	
-                Swal.fire("Error", "Failed to update complaint. Please try again.", "error");
-            }
-        },
-        error: function (xhr, status, error) {
-        	$('#pageLoader').hide();
-        	$('.submitid').prop('disabled', false).text('Submit');        	
-            Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
-        }
-        
-    });
-}
-	     
-    //view button script
-          
-	function viewDetails(complaintNumber) {
- 	    document.getElementById('modalBody').innerHTML = '<p style="text-align:center;">Please wait, loading data...</p>';
- 	    $('#detailsModal').modal('show');
-
- 	    // Fetch the main complaint details
- 	    $.ajax({
- 	        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails',
- 	        type: 'GET',
-            data:{complaintNumber:complaintNumber},
- 	        success: function (data) {
- 	            //console.log('Complaint Data:', data);
-
- 	            // Fetch agent response details
- 	            $.ajax({
- 	                url: '/gcc/api/callcenterqaqc/agent/attendedcomplaintshistory',
- 	                type: 'GET',
- 	                data: { complaintNumber },
- 	                success: function (agentResponse) {
- 	                    //console.log('Agent Response:', agentResponse);
-
- 	                    // Use the logic for building complaint and agent details as HTML
- 	                    const detailsHtml = generateDetailsHtml(data, agentResponse);
-
- 	                    // Update modal content
- 	                    document.getElementById('modalBody').innerHTML = detailsHtml;
- 	                },
- 	                error: function () {
- 	                    document.getElementById('modalBody').innerHTML = '<p>Error loading agent details. Please try again later.</p>';
- 	                }
- 	            });
- 	        },
- 	        error: function () {
- 	            document.getElementById('modalBody').innerHTML = '<p>Error loading complaint details. Please try again later.</p>';
- 	        }
- 	    });
- 	}
-
- 	// Function to generate complaint and agent details HTML
-function generateDetailsHtml(data, agentResponse) {
- 		
- 	// Helper function to format date to yyyy-mm-dd
-         function formatDate(dateStr) {
-             if (!dateStr) return 'N/A';
-             const date = new Date(dateStr);
-             return date.toISOString().split('T')[0]; // Formats to yyyy-mm-dd
-         }
-// Format complaint messages
-let messagesHtml = '';
-if (data.comments && data.comments.length > 0) {
-    data.comments.forEach((comment) => {
-        const commentImageLink = comment.Comp_Image && comment.Comp_Image !== "No image available"
-            ? `<a href="${comment.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">View Image</a>`
-            : '<p style="color: red;">No image available for this comment.</p>';
-
-        messagesHtml += `
-            <div class="comment mb-4">
-                <div class="row">
-                    <div class="col-2 text-center">
-                        <p class="text-muted">${comment.comment_date}</p>
-                    </div>
-                    <div class="col-10">
-                        <p><strong>${comment.user || 'N/A'}</strong> Says:</p>
-                        <p>${comment.message || 'No message available'}</p>
-                        <div class="user-image">${commentImageLink}</div>
-                    </div>
-                </div>
-            </div>
-        `;
-    });
-} else {
-    messagesHtml = '<p>No comments available.</p>';
-}
-
-// Format agent responses
-let agentRepliedHtml = '';
-if (agentResponse.length > 0) {
-    agentResponse.forEach((agentItem) => {
-        agentRepliedHtml += `
-            <div class="comment mb-4">
-                <div class="row">
-                    <div class="col-2 text-center">
-                        <p class="text-muted"><strong>${formatDate(agentItem.created_date) || 'N/A'}</strong></p>
-                    </div>
-                    <div class="col-10">
-                        <p><strong>${agentItem.agent_name || 'N/A'}</strong>, Says: ${agentItem.call_status || 'N/A'}</p>
-                        <p><strong>Remarks: </strong>${agentItem.remarks || 'N/A'}</p>
-                        <p><strong>Remainder Date: </strong> ${formatDate(agentItem.remainder_date) || 'N/A'}</p>
-                    </div>
-                </div>
-            </div>
-        `;
-    });
-} else {
-    agentRepliedHtml = '<p>No agent replied messages available.</p>';
-}
-
-// Check for user images
-const userImages = data.userimages && data.userimages.length > 0 ? data.userimages[0] : {};
-const imageLink = userImages.Comp_Image && userImages.Comp_Image !== "null" && userImages.Comp_Image !== ""
-    ? `<a href="${userImages.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">UserImages: View Image</a>`
-    : '<p style="color: red;">UserImages: No image available.</p>';
-
-// Combine all sections into the final HTML
-const detailsHtml = `
-    <div class="row">
-        <div class="col-md-12">
-            <h4>Complaint Person's Details:</h4>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Complaint Number:</strong> ${data.complaintid || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Complaint Date:</strong> ${data.complaintdate}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Complainant's Name:</strong> ${data.complainantName || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Phone Number:</strong> ${data.mobileNumber || 'N/A'}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Zone:</strong> ${data.Zone || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Division:</strong> ${data.Division || 'N/A'}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Gender:</strong> ${data.gender || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Complainant's Address:</strong> ${data.Street || 'N/A'}, ${data.Area || 'N/A'}, ${data.Landmark || 'N/A'}, ${data.Location || 'N/A'}</p>
-                </div>
-            </div>
-        </div>
-    </div>
-    <hr>
-    <h4>Complaint Details:</h4>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Complaint Dept:</strong> ${data.deptname || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong>Complaint Mode:</strong> ${data.compmode || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Complaint Type:</strong> ${data.complaintType || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong>Details of Complaint:</strong> ${data.description || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Current Status:</strong> ${data.currentStatus || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong style="color:blue;">Official Mobile:</strong> ${data.OfficialMobile || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-    <div class="col-6">
-        <p><strong>Last Updated Date:</strong> ${data.greatestDate || 'N/A'}</p>
-    </div>
-    
-</div>
-    <hr>
-    <h4>Complaint Messages:</h4>
-    ${messagesHtml}
-    <hr>
-    <h4>Agent Replied Messages:</h4>
-    ${agentRepliedHtml}
-    <hr>
-    ${imageLink}
-`;
-
-return detailsHtml;
-}
-            
-//whatsapp message function for REOPENED
-function sendWhatsAppMessageReopened(name,complaintNumber,cellnumber,complaintTypeName) {
-
-    //console.log('whatsapp CustomerMobile:', cellnumber);
-    
-    //console.log('name:',name);
-    //console.log('id:',complaintNumber);
-    //console.log('complainttype',complaintTypeName)
-    let viewstatus = "pgr" ;
-       // Send the WhatsApp message pending
-
-		    let msgUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${encodeURIComponent(cellnumber)}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=Dear+Mr%2FMs+${encodeURIComponent(name)}%2C%0A%0AYour+complaint+regarding+${encodeURIComponent(complaintTypeName)}+with+complaint+number+%2A${encodeURIComponent(complaintNumber)}%2A+has+been+reopened+based+on+your+feedback.%0AThe+relevant+department+is+working+to+resolve+the+issue%2C+and+updates+will+be+provided+on+the+progress.%0A%0AClick+the+button+below+to+view+your+complaint+status%F0%9F%91%87&media_url=https%3A%2F%2Ferp.chennaicorporation.gov.in%2Fpgr%2Fimages%2Fpgr_whatsapp_banner.jpg&isTemplate=true&footer=-Greater+Chennai+Corporation&buttonUrlParam=${encodeURIComponent(viewstatus)}`         		 
-		
-
-
-             let tamilmsgUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${encodeURIComponent(cellnumber)}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=%E0%AE%85%E0%AE%A9%E0%AF%8D%E0%AE%AA%E0%AE%BE%E0%AE%B0%E0%AF%8D%E0%AE%A8%E0%AF%8D%E0%AE%A4+%E0%AE%A4%E0%AE%BF%E0%AE%B0%E0%AF%81%2F%E0%AE%A4%E0%AE%BF%E0%AE%B0%E0%AF%81%E0%AE%AE%E0%AE%A4%E0%AE%BF+${encodeURIComponent(name)}%2C%0A%0A%E0%AE%89%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%8D+%2A${encodeURIComponent(complaintNumber)}%2A%2C+${encodeURIComponent(complaintTypeName)}+%E0%AE%A4%E0%AF%8A%E0%AE%9F%E0%AE%B0%E0%AF%8D%E0%AE%AA%E0%AE%BE%E0%AE%A9+%E0%AE%95%E0%AE%B0%E0%AF%81%E0%AE%A4%E0%AF%8D%E0%AE%A4%E0%AF%81%E0%AE%95%E0%AE%B3%E0%AE%BF%E0%AE%A9%E0%AF%8D+%E0%AE%85%E0%AE%9F%E0%AE%BF%E0%AE%AA%E0%AF%8D%E0%AE%AA%E0%AE%9F%E0%AF%88%E0%AE%AF%E0%AE%BF%E0%AE%B2%E0%AF%8D%2C+%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AF%8D+%E0%AE%AE%E0%AF%80%E0%AE%A3%E0%AF%8D%E0%AE%9F%E0%AF%81%E0%AE%AE%E0%AF%8D+%E0%AE%A4%E0%AE%BF%E0%AE%B1%E0%AE%95%E0%AF%8D%E0%AE%95%E0%AE%AA%E0%AF%8D%E0%AE%AA%E0%AE%9F%E0%AF%8D%E0%AE%9F%E0%AF%81%E0%AE%B3%E0%AF%8D%E0%AE%B3%E0%AE%A4%E0%AF%81.%0A%E0%AE%9A%E0%AE%AE%E0%AF%8D%E0%AE%AA%E0%AE%A8%E0%AF%8D%E0%AE%A4%E0%AE%AA%E0%AF%8D%E0%AE%AA%E0%AE%9F%E0%AF%8D%E0%AE%9F+%E0%AE%A4%E0%AF%81%E0%AE%B1%E0%AF%88+%E0%AE%85%E0%AE%A4%E0%AE%BF%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AE%BF%E0%AE%95%E0%AE%B3%E0%AF%8D+%E0%AE%87%E0%AE%A8%E0%AF%8D%E0%AE%A4+%E0%AE%AA%E0%AE%BF%E0%AE%B0%E0%AE%9A%E0%AF%8D%E0%AE%9A%E0%AE%BF%E0%AE%A9%E0%AF%88%E0%AE%AF%E0%AF%88+%E0%AE%A4%E0%AF%80%E0%AE%B0%E0%AF%8D%E0%AE%95%E0%AF%8D%E0%AE%95+%E0%AE%AA%E0%AE%A3%E0%AE%BF%E0%AE%AF%E0%AE%BE%E0%AE%B1%E0%AF%8D%E0%AE%B1%E0%AE%BF+%E0%AE%B5%E0%AE%B0%E0%AF%81%E0%AE%95%E0%AE%BF%E0%AE%A9%E0%AF%8D%E0%AE%B1%E0%AE%A9%E0%AE%B0%E0%AF%8D.%0A%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AE%BF%E0%AE%A9%E0%AF%8D+%E0%AE%A4%E0%AE%B1%E0%AF%8D%E0%AE%AA%E0%AF%8B%E0%AE%A4%E0%AF%88%E0%AE%AF+%E0%AE%A8%E0%AE%BF%E0%AE%B2%E0%AF%88+%E0%AE%95%E0%AF%81%E0%AE%B1%E0%AE%BF%E0%AE%A4%E0%AF%8D%E0%AE%A4+%E0%AE%A4%E0%AE%95%E0%AE%B5%E0%AE%B2%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%8D+%E0%AE%B5%E0%AE%BF%E0%AE%B0%E0%AF%88%E0%AE%B5%E0%AE%BF%E0%AE%B2%E0%AF%8D+%E0%AE%AE%E0%AF%87%E0%AE%B2%E0%AF%81%E0%AE%AE%E0%AF%8D+%E0%AE%B5%E0%AE%B4%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%AA%E0%AF%8D%E0%AE%AA%E0%AE%9F%E0%AF%81%E0%AE%AE%E0%AF%8D.%0A%0A%E0%AE%89%E0%AE%99%E0%AF%8D%E0%AE%95%E0%AE%B3%E0%AF%8D+%E0%AE%AA%E0%AF%81%E0%AE%95%E0%AE%BE%E0%AE%B0%E0%AE%BF%E0%AE%A9%E0%AF%8D+%E0%AE%A8%E0%AE%BF%E0%AE%B2%E0%AF%88%E0%AE%AF%E0%AF%88%E0%AE%AA%E0%AF%8D+%E0%AE%AA%E0%AE%BE%E0%AE%B0%E0%AF%8D%E0%AE%95%E0%AF%8D%E0%AE%95+%E0%AE%95%E0%AF%80%E0%AE%B4%E0%AF%87+%E0%AE%89%E0%AE%B3%E0%AF%8D%E0%AE%B3+%E0%AE%AA%E0%AF%8A%E0%AE%A4%E0%AF%8D%E0%AE%A4%E0%AE%BE%E0%AE%A9%E0%AF%88%E0%AE%95%E0%AF%8D+%E0%AE%95%E0%AE%BF%E0%AE%B3%E0%AE%BF%E0%AE%95%E0%AF%8D+%E0%AE%9A%E0%AF%86%E0%AE%AF%E0%AF%8D%E0%AE%AF%E0%AE%B5%E0%AF%81%E0%AE%AE%E0%AF%8D%F0%9F%91%87&media_url=https%3A%2F%2Ferp.chennaicorporation.gov.in%2Fpgr%2Fimages%2Fpgr_whatsapp_banner.jpg&isTemplate=true&footer=-%E0%AE%AA%E0%AF%86%E0%AE%B0%E0%AF%81%E0%AE%A8%E0%AE%95%E0%AE%B0+%E0%AE%9A%E0%AF%86%E0%AE%A9%E0%AF%8D%E0%AE%A9%E0%AF%88+%E0%AE%AE%E0%AE%BE%E0%AE%A8%E0%AE%95%E0%AE%B0%E0%AE%BE%E0%AE%9F%E0%AF%8D%E0%AE%9A%E0%AE%BF.&buttonUrlParam=${encodeURIComponent(viewstatus)}`
-     		    		
-     		    		
-     		  
-       $.ajax({
-           url: '/gcc/qaqc/api/whatsapp/send-whatsapp-message', // Replace with your service path
-           type: 'POST',
-           data: { msgUrl: msgUrl,
-         	  tamilmsgUrl: tamilmsgUrl},
-           success: function(response) {
-               //console.log('WhatsApp message sent successfully', response);
-               console.log('success');
-               //alert('WhatsApp message sent!');
-              
-           },
-           error: function(xhr, status, error) {
-               console.error('Error sending WhatsApp message:', error);
-               //alert('Failed to send WhatsApp message.');
-               
-               Swal.fire({
-                           title: 'Error!',
-                           text: 'Message Not sent!',
-                           icon: 'error',
-                           timer: 2000,
-                           showConfirmButton: false
-                       })
-           }
-       });
-   }
-
-
-  
-</script>
-
-<script>
-    document.addEventListener("DOMContentLoaded", function () {
-        const today = new Date();
-        today.setDate(today.getDate() + 1); // Add 1 day to get tomorrow
-        const tomorrow = today.toISOString().split('T')[0];
-
-        document.querySelectorAll('.date-picker').forEach(function (input) {
-            input.setAttribute('min', tomorrow);
-        });
-    });
-</script>
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/complaintstatus.html b/src/main/resources/templates/modules/callcenterqaqc/complaintstatus.html
deleted file mode 100644
index eb4eb769..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/complaintstatus.html
+++ /dev/null
@@ -1,1000 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-.required {
-	color: red;
-}
-
-.card-box {
-	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-}
-#modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fas fa-question-circle bg-blue"></i>
-									<div class="d-inline">
-										<h5>PGR Complaint Status</h5>
-										<span>1913 Check PGR Complaint Status</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">PGR
-											Complaint Status</li>
-										<li class="breadcrumb-item active" aria-current="page">Check
-											Status</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-
-
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header d-flex justify-content-between align-items-center">
-									<h3 class="mb-0" style="font-weight: bold">Check Complaint
-										Status</h3>
-
-									<!-- <div class="d-flex">
-
-										<input type="date" class="form-control mr-2" id="startDate"
-											placeholder="Start Date"> <input type="date"
-											class="form-control mr-2" id="endDate" placeholder="End Date">
-										<input class="form-control mr-2" placeholder="complaintnumber"
-											id="complaintNumber"> <input
-											class="form-control mr-2" placeholder="mobilenumber"
-											id="complaintMobileNumber"> <select id="year"
-											class="year-dropdown"></select>
-										<button type="submit" class="btn btn-primary ml-2"
-											id="searchBtn">Search</button>
-										<button type="button" class="btn btn-secondary ml-2"
-											id="resetBtn">Reset</button>
-									</div> -->
-								</div>
-								
-								<div class="card-block">
-									<div class="row">
-										<div class="col-sm-2 mb-2">
-										<input type="date" class="form-control mr-2" id="startDate" placeholder="Start Date">
-										</div>
-										<div class="col-sm-2 mb-2">
-										<input type="date" class="form-control mr-2" id="endDate" placeholder="End Date">
-										</div>
-										<div class="col-sm-2 mb-2">
-										<input class="form-control mr-2" placeholder="complaintnumber" id="complaintNumber">
-										</div>
-										<div class="col-sm-2 mb-2">
-										<input class="form-control mr-2" placeholder="mobilenumber" id="complaintMobileNumber">
-										</div>
-										<div class="col-sm-1 mb-2">
-										<select id="year" class="year-dropdown" style="height: 35px;"></select>
-										</div>
-										
-										<button type="submit" class="btn btn-primary  ml-2" style="height: 35px;"
-											id="searchBtn">Search</button>
-										<button type="button" class="btn btn-secondary ml-2" style="height: 35px;"
-											id="resetBtn">Reset</button>
-										
-									</div>
-								</div>
-
-
-
-								<div class="row mt-4">
-									<div class="col-md-12">
-										<!-- <div class="card"> -->
-										<div class="card-body">
-											<div class="table-responsive">
-
-												<table id="AgentQaqcDatatable"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-
-															<th class="text-center no-sort">S.No</th>
-															<th class="text-center no-sort">Complaint Number</th>
-															<th class="text-center">Complaint Date</th>
-															<th class="text-center no-sort">Name</th>
-															<th class="text-center no-sort">Mobile Number</th>
-															<th class="text-center">ComplaintType</th>
-															<th class="text-center no-sort ">View</th>
-															<th class="text-center">Call Status</th>
-															<th class="text-center">Updated Date</th>
-														</tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-										</div>
-										<!-- </div> -->
-									</div>
-								</div>
-
-							</div>
-						</div>
-
-
-					</div>
-				</div>
-
-			</div>
-
-			<div id="pageLoader"
-				style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				<div
-					style="position: relative; top: 50%; transform: translateY(-50%);">
-					<div class="spinner-border text-primary" role="status"
-						style="width: 3rem; height: 3rem;">
-						<span class="sr-only">Loading...</span>
-					</div>
-					<!-- Add the 'Please wait' text below the spinner -->
-					<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please
-						wait...</p>
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-
-
-	<!--Details button Modal -->
-	<div class="modal fade" id="detailsModal" tabindex="-1" role="dialog"
-		aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="detailsModalLabel">Complaint
-						Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body" id="modalBody">
-					<!-- Details will be populated here -->
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary"
-						data-dismiss="modal">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-
-	<!-- in the code use to show the download different type microsoft -->
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">	
-	 $(document).ready(function() {
-		 $('#AgentQaqcDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '50vh',
-             fixedColumns: {
-                 left: 1,
-                 right: 1
-             },
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: true,
-             responsive: true,
-             searching: true,
-             select: false,
-             processing: false
-         });  
-		// Get current year
-	        const currentYear = new Date().getFullYear();
-
-	        // Get reference to the year dropdown
-	        const yearDropdown = document.getElementById('year');
-
-	        // Populate the dropdown with years
-	        for (let year = currentYear; year >= 2010; year--) {
-	            const option = document.createElement('option');
-	            option.value = year;
-	            option.textContent = year;
-	            yearDropdown.appendChild(option);
-	        }
-
-	        
-     	
-
-     	document.getElementById('resetBtn').addEventListener('click', function () {
-     	event.preventDefault();
-     	
-     	window.location.href="/gcc/callcenterqaqccomplaintstatus/complaintstatus";
-     	
-     	});
-
-     // Event listener for From Date selection
- 	   $("#startDate").on("change", function() {
- 	       const startDate = $(this).val();  // Get the selected start date
- 	       // Set the min value for To Date to be the selected From Date
- 	       $("#endDate").attr("min", startDate);
- 	   });
-
- 	   // Event listener for To Date selection
- 	   $("#endDate").on("change", function() {
- 	       const endDate = $(this).val();  // Get the selected end date
- 	       // Set the max value for From Date to be the selected To Date
- 	       $("#startDate").attr("max", endDate);
- 	   }); 
-     	
-     	document.getElementById('searchBtn').addEventListener('click', function (e) {
-     	    let startDate = document.getElementById('startDate').value;
-     	    let endDate = document.getElementById('endDate').value;
-     	    const complaintNumber = $('#complaintNumber').val().toUpperCase();; // Fetch complaint number from input
-     	    const complaintMobileNumber = $('#complaintMobileNumber').val(); // Fetch mobile number (if exists)
-			const complaintYear=$('#year').val();
-     	    
-			//console.log("startdate: ", startDate);
-     	    //console.log("enddate: ", endDate);
-     	    //console.log("complaintNumber:",complaintNumber);
-     	    //console.log("complaintMobileNumber",complaintMobileNumber);
-     	    //console.log("complaintYear",complaintYear);
-     	    // Check if all required fields are empty
-     	    if (!startDate && !endDate && !complaintNumber && !complaintMobileNumber) {
-     	        Swal.fire({
-     	            icon: 'warning',
-     	            title: 'Error',
-     	            text: 'Please fill in at least one field to proceed.',
-     	            showConfirmButton: true,
-     	            timer: 3000
-     	        });
-     	        e.preventDefault(); // Prevent the default action
-     	        return; // Stop further execution
-     	    }
-
-     	    // Specific validation for startDate and endDate
-     	    if ((startDate && !endDate) || (!startDate && endDate)) {
-     	        Swal.fire({
-     	            icon: 'warning',
-     	            title: 'Error',
-     	            text: 'Please select both start and end dates.',
-     	            showConfirmButton: true,
-     	            timer: 3000
-     	        });
-     	        e.preventDefault();
-     	        return;
-     	    }
-     	    
-     	    if(complaintNumber !== '' && complaintMobileNumber !==''){
-     	    	Swal.fire({
-     	    		icon: 'info',
-     	            title: 'Info',
-     	            text: 'Please Enter any one either ComplaintNumber or MobileNumber',
-     	            showConfirmButton: true,
-     	            
-     	        });
-     	        e.preventDefault();
-     	        return;
-     	    }
-     	    
-     	 //complaintdetails datatable function script
-     	   if (complaintMobileNumber === '' && complaintNumber !== '') {
-     	      		    $('#pageLoader').show();
-
-     	      		    $.ajax({
-     	      		        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails',
-     	      		        type: 'GET',
-     	      		        dataType: 'json',
-     	      		        data: { complaintNumber },
-     	      		        success: function (response) {
-     	      		            $('#pageLoader').hide();
-
-     	      		            // Initialize or update the DataTable
-     	      		            let table = $('#AgentQaqcDatatable').DataTable({
-     	      		                destroy: true, // Reinitialize the DataTable
-     	      		                searching: true, // Enable search
-     	      		               autoWidth: true,
-     	      		              responsive: true,
-     	      		                paging: true,    // Enable pagination
-     	      		                info: true,      // Show table info
-     	      		                data: response ? [response] : [],
-     	      		                columns: [
-     	      		                    { data: null, render: (data, type, row, meta) => meta.row + 1, className: 'text-center' },
-     	      		                    { data: 'complaintid', defaultContent: '-', className: 'text-center' },
-     	      		                    { data: 'complaintdate', defaultContent: '-', className: 'text-center' },
-     	      		                    { data: 'complainantName', defaultContent: '-', className: 'text-center' },
-     	      		                    { data: 'mobileNumber', defaultContent: '-', className: 'text-center' },
-     	      		                    { data: 'complaintType', defaultContent: '-', className: 'text-center' },
-     	      		                    {
-     	      		                        data: 'complaintid',
-     	      		                        render: function (data) {
-     	      		                            return `
-     	      		                                <button type="button" class="btn btn-info details-btn" 
-     	      		                                    data-complaint-number="${data}">
-     	      		                                    View
-     	      		                                </button>`;
-     	      		                        },
-     	      		                        className: 'text-center'
-     	      		                    },
-     	      		                    { data: 'currentStatus', defaultContent: '-', className: 'text-center' },
-     	      		                    { data: 'greatestDate', defaultContent: '-', className: 'text-center' }
-     	      		                ],
-     	      		               dom: 'Bfrtip', // Include buttons in the DOM layout
-     	      		              buttons: [
-     	      		                  {
-     	      		                      extend: 'pageLength',
-     	      		                      className: 'btn btn-warning'
-     	      		                  },
-     	      		                  {
-     	      		                      title: 'Data export',
-     	      		                      extend: 'copyHtml5',
-     	      		                      text: 'Copy',
-     	      		                      className: 'btn btn-secondary',
-     	      		                      id: 'copyBtn'
-     	      		                  },
-     	      		                  {
-     	      		                      extend: 'excelHtml5',
-     	      		                      text: 'Excel',
-     	      		                      className: 'btn btn-secondary',
-     	      		                      id: 'excelBtn'
-     	      		                  },
-     	      		                  {
-     	      		                      extend: 'csvHtml5',
-     	      		                      text: 'CSV',
-     	      		                      className: 'btn btn-secondary',
-     	      		                      id: 'csvBtn'
-     	      		                  },
-     	      		                  {
-     	      		                      extend: 'pdfHtml5',
-     	      		                      text: 'PDF',
-     	      		                      className: 'btn btn-secondary',
-     	      		                      id: 'pdfBtn'
-     	      		                  }
-     	      		              ],
-     	      		             columnDefs: [
-     	      		                { targets: 'no-sort', orderable: false }
-     	      		            ],
-     	      		            lengthMenu: [
-     	      		                [50, 100, 200, 500, -1],
-     	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-     	      		            ],
-     	      		            scrollY: '50vh',
-     	      		            fixedColumns: {
-     	      		                left: 1,
-     	      		                right: 1
-     	      		            }
-     	      		            });
-     	      		        },
-     	      		        error: function () {
-     	      		            $('#pageLoader').hide();
-     	      		            $('#AgentQaqcDatatable').DataTable().clear().destroy();
-     	      		            $('#AgentQaqcDatatable tbody').html(`
-     	      		                <tr>
-     	      		                    <td colspan="9" class="text-center text-danger">Failed to load data</td>
-     	      		                </tr>
-     	      		            `);
-     	      		        }
-     	      		    });
-     	      		}
-
-     	      		if (complaintMobileNumber !== '' && complaintNumber === '' && complaintYear !== '') {
-     	      		    $('#pageLoader').show();
-
-     	      		    $.ajax({
-     	      		        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetailsByMobileNumber',
-     	      		        type: 'GET',
-     	      		        dataType: 'json',
-     	      		        data: { complaintMobileNumber, startDate, endDate, complaintYear },
-     	      		        success: function (response) {
-     	      		            $('#pageLoader').hide();
-
-     	      		            // Initialize or update the DataTable
-     	      		            let table = $('#AgentQaqcDatatable').DataTable({
-     	      		                destroy: true, // Reinitialize the DataTable
-     	      		                searching: true, // Enable search
-     	      		               autoWidth: true,
-     	      		              responsive: true,
-     	      		                paging: true,    // Enable pagination
-     	      		                info: true,      // Show table info
-     	      		                order: [],       // Disable initial ordering
-     	      		                data: response && response.status === "success" ? response.complaints : [],
-     	      		                columns: [
-     	      		                    { data: null, render: (data, type, row, meta) => meta.row + 1, className: 'text-center' },
-     	      		                    { data: 'complaintid', defaultContent: '-', className: 'text-center' },
-     	      		                    { data: 'complaintdate', defaultContent: '-', className: 'text-center' },
-     	      		                    { data: 'complainantName', defaultContent: '-', className: 'text-center' },
-     	      		                    { data: 'mobileNumber', defaultContent: '-', className: 'text-center' },
-     	      		                    { data: 'complaintType', defaultContent: '-', className: 'text-center' },
-     	      		                    {
-     	      		                        data: 'complaintid',
-     	      		                        render: function (data) {
-     	      		                            return `
-     	      		                                <button type="button" class="btn btn-info details-btn" 
-     	      		                                    data-complaint-number="${data}">
-     	      		                                    View
-     	      		                                </button>`;
-     	      		                        },
-     	      		                        className: 'text-center'
-     	      		                    },
-     	      		                    { data: 'currentStatus', defaultContent: '-', className: 'text-center' },
-     	      		                    { data: 'complaintcloseddate', defaultContent: '-', className: 'text-center' }
-     	      		                ],
-     	      		               dom: 'Bfrtip', // Include buttons in the DOM layout
-     	      		              buttons: [
-     	      		                  {
-     	      		                      extend: 'pageLength',
-     	      		                      className: 'btn btn-warning'
-     	      		                  },
-     	      		                  {
-     	      		                      title: 'Data export',
-     	      		                      extend: 'copyHtml5',
-     	      		                      text: 'Copy',
-     	      		                      className: 'btn btn-secondary',
-     	      		                      id: 'copyBtn'
-     	      		                  },
-     	      		                  {
-     	      		                      extend: 'excelHtml5',
-     	      		                      text: 'Excel',
-     	      		                      className: 'btn btn-secondary',
-     	      		                      id: 'excelBtn'
-     	      		                  },
-     	      		                  {
-     	      		                      extend: 'csvHtml5',
-     	      		                      text: 'CSV',
-     	      		                      className: 'btn btn-secondary',
-     	      		                      id: 'csvBtn'
-     	      		                  },
-     	      		                  {
-     	      		                      extend: 'pdfHtml5',
-     	      		                      text: 'PDF',
-     	      		                      className: 'btn btn-secondary',
-     	      		                      id: 'pdfBtn'
-     	      		                  }
-     	      		              ],
-     	      		             columnDefs: [
-     	      		                { targets: 'no-sort', orderable: false }
-     	      		            ],
-     	      		            lengthMenu: [
-     	      		                [50, 100, 200, 500, -1],
-     	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-     	      		            ],
-     	      		            scrollY: '50vh',
-     	      		            fixedColumns: {
-     	      		                left: 1,
-     	      		                right: 1
-     	      		            }
-     	      		            });
-     	      		        },
-     	      		        error: function () {
-     	      		            $('#pageLoader').hide();
-     	      		            $('#AgentQaqcDatatable').DataTable().clear().destroy();
-     	      		            $('#AgentQaqcDatatable tbody').html(`
-     	      		                <tr>
-     	      		                    <td colspan="9" class="text-center text-danger">Failed to load data</td>
-     	      		                </tr>
-     	      		            `);
-     	      		        }
-     	      		    });
-     	      		}
-     	});
-
-     	
-     	
-     	
-     	
-     // Handle the "View" button click
-     	$('#AgentQaqcDatatable').on('click', '.details-btn', function () {
-     	    const complaintNumber = $(this).data('complaint-number');
-     	    
-     	    // Call the `viewDetails` function
-     	    viewDetails(complaintNumber);
-     	});
-
-     	// Display detailed modal
-     	function viewDetails(complaintNumber) {
-     	    document.getElementById('modalBody').innerHTML = '<p style="text-align:center;">Please wait, loading data...</p>';
-     	    $('#detailsModal').modal('show');
-
-     	    // Fetch the main complaint details
-     	    $.ajax({
-     	        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails',
-     	        type: 'GET',
-                data:{complaintNumber:complaintNumber},
-     	        success: function (data) {
-     	            console.log('Complaint Data:', data);
-
-     	            // Fetch agent response details
-     	            $.ajax({
-     	                url: '/gcc/api/callcenterqaqc/agent/attendedcomplaintshistory',
-     	                type: 'GET',
-     	                data: { complaintNumber },
-     	                success: function (agentResponse) {
-     	                    //console.log('Agent Response:', agentResponse);
-
-     	                    // Use the logic for building complaint and agent details as HTML
-     	                    const detailsHtml = generateDetailsHtml(data, agentResponse);
-
-     	                    // Update modal content
-     	                    document.getElementById('modalBody').innerHTML = detailsHtml;
-     	                },
-     	                error: function () {
-     	                    document.getElementById('modalBody').innerHTML = '<p>Error loading agent details. Please try again later.</p>';
-     	                }
-     	            });
-     	        },
-     	        error: function () {
-     	            document.getElementById('modalBody').innerHTML = '<p>Error loading complaint details. Please try again later.</p>';
-     	        }
-     	    });
-     	}
-
-     	// Function to generate complaint and agent details HTML
-   function generateDetailsHtml(data, agentResponse) {
-     		
-     	// Helper function to format date to yyyy-mm-dd
-             function formatDate(dateStr) {
-                 if (!dateStr) return 'N/A';
-                 const date = new Date(dateStr);
-                 return date.toISOString().split('T')[0]; // Formats to yyyy-mm-dd
-             }
-    // Format complaint messages
-    let messagesHtml = '';
-    if (data.comments && data.comments.length > 0) {
-        data.comments.forEach((comment) => {
-            const commentImageLink = comment.Comp_Image && comment.Comp_Image !== "No image available"
-                ? `<a href="${comment.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">View Image</a>`
-                : '<p style="color: red;">No image available for this comment.</p>';
-
-            messagesHtml += `
-                <div class="comment mb-4">
-                    <div class="row">
-                        <div class="col-2 text-center">
-                            <p class="text-muted">${comment.comment_date}</p>
-                        </div>
-                        <div class="col-10">
-                            <p><strong>${comment.user || 'N/A'}</strong> Says:</p>
-                            <p>${comment.message || 'No message available'}</p>
-                            <div class="user-image">${commentImageLink}</div>
-                        </div>
-                    </div>
-                </div>
-            `;
-        });
-    } else {
-        messagesHtml = '<p>No comments available.</p>';
-    }
-
-    // Format agent responses
-    let agentRepliedHtml = '';
-    if (agentResponse.length > 0) {
-        agentResponse.forEach((agentItem) => {
-            agentRepliedHtml += `
-                <div class="comment mb-4">
-                    <div class="row">
-                        <div class="col-2 text-center">
-                            <p class="text-muted"><strong>${formatDate(agentItem.created_date) || 'N/A'}</strong></p>
-                        </div>
-                        <div class="col-10">
-                            <p><strong>${agentItem.agent_name || 'N/A'}</strong>, Says: ${agentItem.call_status || 'N/A'}</p>
-                            <p><strong>Remarks: </strong>${agentItem.remarks || 'N/A'}</p>
-                            <p><strong>Remainder Date: </strong> ${formatDate(agentItem.remainder_date) || 'N/A'}</p>
-                        </div>
-                    </div>
-                </div>
-            `;
-        });
-    } else {
-        agentRepliedHtml = '<p>No agent replied messages available.</p>';
-    }
-
-    // Check for user images
-    const userImages = data.userimages && data.userimages.length > 0 ? data.userimages[0] : {};
-    const imageLink = userImages.Comp_Image && userImages.Comp_Image !== "null" && userImages.Comp_Image !== ""
-        ? `<a href="${userImages.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">UserImages: View Image</a>`
-        : '<p style="color: red;">UserImages: No image available.</p>';
-
-    // Combine all sections into the final HTML
-    const detailsHtml = `
-        <div class="row">
-            <div class="col-md-12">
-                <h4>Complaint Person's Details:</h4>
-                <div class="row">
-                    <div class="col-6">
-                        <p><strong>Complaint Number:</strong> ${data.complaintid || 'N/A'}</p>
-                    </div>
-                    <div class="col-6">
-                        <p><strong>Complaint Date:</strong> ${data.complaintdate}</p>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-6">
-                        <p><strong>Complainant's Name:</strong> ${data.complainantName || 'N/A'}</p>
-                    </div>
-                    <div class="col-6">
-                        <p><strong>Phone Number:</strong> ${data.mobileNumber || 'N/A'}</p>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-6">
-                        <p><strong>Zone:</strong> ${data.Zone || 'N/A'}</p>
-                    </div>
-                    <div class="col-6">
-                        <p><strong>Division:</strong> ${data.Division || 'N/A'}</p>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-6">
-                        <p><strong>Gender:</strong> ${data.gender || 'N/A'}</p>
-                    </div>
-                    <div class="col-6">
-                        <p><strong>Complainant's Address:</strong> ${data.Street || 'N/A'}, ${data.Area || 'N/A'}, ${data.Landmark || 'N/A'}, ${data.Location || 'N/A'}</p>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <hr>
-        <h4>Complaint Details:</h4>
-        <div class="row">
-            <div class="col-6">
-                <p><strong>Complaint Dept:</strong> ${data.deptname || 'N/A'}</p>
-            </div>
-            <div class="col-6">
-                <p><strong>Complaint Mode:</strong> ${data.compmode || 'N/A'}</p>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-6">
-                <p><strong>Complaint Type:</strong> ${data.complaintType || 'N/A'}</p>
-            </div>
-            <div class="col-6">
-                <p><strong>Details of Complaint:</strong> ${data.description || 'N/A'}</p>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-6">
-                <p><strong>Current Status:</strong> ${data.currentStatus || 'N/A'}</p>
-            </div>
-            <div class="col-6">
-                <p><strong style="color:blue;">Official Mobile:</strong> ${data.OfficialMobile || 'N/A'}</p>
-            </div>
-        </div>
-        <div class="row">
-        <div class="col-6">
-            <p><strong>Last Updated Date:</strong> ${data.greatestDate || 'N/A'}</p>
-        </div>
-        
-    </div>
-        <hr>
-        <h4>Complaint Messages:</h4>
-        ${messagesHtml}
-        <hr>
-        <h4>Agent Replied Messages:</h4>
-        ${agentRepliedHtml}
-        <hr>
-        ${imageLink}
-    `;
-
-    return detailsHtml;
-}
-
-     	
-     	//function for viewing complaintdetails
-     	
-     	/* function viewDetails(complaintNumber, complaintMode, complaintDept) {
-     	    // Display a loading message while data is being fetched
-     	    document.getElementById('modalBody').innerHTML = '<p style="text-align:center;">Please wait, loading data...</p>';
-     	    $('#detailsModal').modal('show');
-
-     	    // Fetch the main complaint details
-     	    $.ajax({
-     	        url: `/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails`,
-     	        type: 'GET',
-     	        dataType: 'json',
-     	        data: { complaintNumber: complaintNumber, complaintMode: complaintMode, complaintDept: complaintDept },
-     	        success: function (data) {
-     	            console.log(data);
-
-     	            // Fetch agent response details
-     	            $.ajax({
-     	                url: `/gcc/api/callcenterqaqc/agent/attendedcomplaintshistory`,
-     	                type: 'GET',
-     	                data: { complaintNumber: complaintNumber },
-     	                success: function (agentResponse) {
-     	                    console.log('Agent Response:', agentResponse);
-
-     	                    const agentItem = agentResponse.find(
-     	                        (item) => item.complaint_number === complaintNumber
-     	                    );
-
-     	                    // Helper function to format date to yyyy-mm-dd
-     	                    function formatDate(dateStr) {
-     	                        if (!dateStr) return 'N/A';
-     	                        const date = new Date(dateStr);
-     	                        return date.toISOString().split('T')[0]; // Formats to yyyy-mm-dd
-     	                    }
-
-     	                    // Prepare complaint messages
-     	                    let messagesHtml = '';
-     	                    if (data.comments && data.comments.length > 0) {
-     	                        data.comments.forEach((comment) => {
-     	                            const commentImageLink = comment.Comp_Image && comment.Comp_Image !== "No image available"
-     	                                ? `<a href="${comment.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">View Image</a>`
-     	                                : '<p style="color: red;">No image available for this comment.</p>';
-
-     	                            messagesHtml += `
-     	                                <div class="comment mb-4">
-     	                                    <div class="row">
-     	                                        <div class="col-2 text-center">
-     	                                            <p class="text-muted">${comment.comment_date}</p>
-     	                                        </div>
-     	                                        <div class="col-10">
-     	                                            <p><strong>${comment.user || 'N/A'}</strong> Says:</p>
-     	                                            <p>${comment.message || 'No message available'}</p>
-     	                                            <div class="user-image">${commentImageLink}</div>
-     	                                        </div>
-     	                                    </div>
-     	                                </div>
-     	                            `;
-     	                        });
-     	                    } else {
-     	                        messagesHtml = '<p>No comments available.</p>';
-     	                    }
-     	                    
-     	                   let agentRepliedHtml = '';
-
-     	                // Iterate through all responses matching the complaint number
-     	                    const matchingResponses = agentResponse.filter(item => item.complaint_number === complaintNumber);
-     	                    if (matchingResponses.length > 0) {
-     	                        matchingResponses.forEach(agentItem => {
-     	                            agentRepliedHtml += `
-     	                                <div class="comment mb-4">
-     	                                    <div class="row">
-     	                                        <div class="col-2 text-center">
-     	                                            <p class="text-muted"><strong>${formatDate(agentItem.created_date) || 'N/A'}</strong></p>
-     	                                        </div>
-     	                                        <div class="col-10">
-     	                                            <p><strong>${agentItem.agent_name || 'N/A'}</strong>, Says: ${agentItem.call_status || 'N/A'}</p>
-     	                                           <p><strong>Remarks: </strong>${agentItem.remarks || 'No remarks provided'}</p>
-     	                                            <p><strong>Remainder Date: </strong> ${formatDate(agentItem.remainder_date) || 'N/A'}</p>
-     	                                            
-     	                                        </div>
-     	                                    </div>
-     	                                </div>
-     	                            `;
-     	                        });
-     	                    } else {
-     	                        agentRepliedHtml = '<p>No agent replied messages available.</p>';
-     	                    }
-
-
-     	                    // Check for user images
-     	                    const userImages = data.userimages && data.userimages.length > 0 ? data.userimages[0] : {};
-     	                    const imageLink = userImages.Comp_Image && userImages.Comp_Image !== "null" && userImages.Comp_Image !== ""
-     	                        ? `<a href="${userImages.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">UserImages: View Image</a>`
-     	                        : '<p style="color: red;">UserImages: No image available.</p>';
-
-     	                    // Combine all details into the modal content
-     	                    const detailsHtml = `
-     	                        <div class="row">
-     	                            <div class="col-md-12">
-     	                                <h4>Complaint Person's Details:</h4>
-     	                                <div class="row">
-     	                                    <div class="col-6">
-     	                                        <p><strong>Complaint Number:</strong> ${data.complaintid || 'N/A'}</p>
-     	                                    </div>
-     	                                    <div class="col-6">
-     	                                        <p><strong>Complaint Date:</strong> ${data.complaintdate}</p>
-     	                                    </div>
-     	                                </div>
-     	                                <div class="row">
-     	                                    <div class="col-6">
-     	                                        <p><strong>Complainant's Name:</strong> ${data.complainantName || 'N/A'}</p>
-     	                                    </div>
-     	                                    <div class="col-6">
-     	                                        <p><strong>Phone Number:</strong> ${data.mobileNumber || 'N/A'}</p>
-     	                                    </div>
-     	                                </div>
-     	                                <div class="row">
-     	                                    <div class="col-6">
-     	                                        <p><strong>Zone:</strong> ${data.Zone || 'N/A'}</p>
-     	                                    </div>
-     	                                    <div class="col-6">
-     	                                        <p><strong>Division:</strong> ${data.Division || 'N/A'}</p>
-     	                                    </div>
-     	                                </div>
-     	                                <div class="row">
-     	                                    <div class="col-6">
-     	                                        <p><strong>Gender:</strong> ${data.gender || 'N/A'}</p>
-     	                                    </div>
-     	                                    <div class="col-6">
-     	                                        <p><strong>Complainant's Address:</strong> ${data.Street || 'N/A'}, ${data.Area || 'N/A'}, ${data.Landmark || 'N/A'}, ${data.Location || 'N/A'}</p>
-     	                                    </div>
-     	                                </div>
-     	                            </div>
-     	                        </div>
-     	                        <hr>
-     	                        <h4>Complaint Details:</h4>
-     	                        <div class="row">
-     	                            <div class="col-6">
-     	                                <p><strong>Complaint Dept:</strong> ${complaintDept || 'N/A'}</p>
-     	                            </div>
-     	                            <div class="col-6">
-     	                                <p><strong>Complaint Mode:</strong> ${complaintMode || 'N/A'}</p>
-     	                            </div>
-     	                        </div>
-     	                        <div class="row">
-     	                            <div class="col-6">
-     	                                <p><strong>Complaint Type:</strong> ${data.complaintType || 'N/A'}</p>
-     	                            </div>
-     	                            <div class="col-6">
-     	                                <p><strong>Details of Complaint:</strong> ${data.description || 'N/A'}</p>
-     	                            </div>
-     	                        </div>
-     	                        <div class="row">
-     	                            <div class="col-6">
-     	                                <p><strong>Current Status:</strong> ${data.currentStatus || 'N/A'}</p>
-     	                            </div>
-     	                            <div class="col-6">
-     	                                <p><strong style="color:blue;">Official Mobile:</strong> ${data.OfficialMobile || 'N/A'}</p>
-     	                            </div>
-     	                        </div>
-     	                        <hr>
-     	                        <h4>Complaint Messages:</h4>
-     	                        ${messagesHtml}
-     	                        <hr>
-     	                        <h4>Agent Replied Messages:</h4>
-     	                        ${agentRepliedHtml}
-     	                        <hr>
-     	                        ${imageLink}
-     	                    `;
-
-     	                    // Update the modal content
-     	                    document.getElementById('modalBody').innerHTML = detailsHtml;
-     	                },
-     	                error: function () {
-     	                    document.getElementById('modalBody').innerHTML = '<p>Error loading agent details. Please try again later.</p>';
-     	                }
-     	            });
-     	        },
-     	        error: function () {
-     	            document.getElementById('modalBody').innerHTML = '<p>Error loading complaint details. Please try again later.</p>';
-     	        }
-     	    });
-     	} */
-
-    	
-});
-	 
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/domesticwastecancel.html b/src/main/resources/templates/modules/callcenterqaqc/domesticwastecancel.html
deleted file mode 100644
index efc2edda..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/domesticwastecancel.html
+++ /dev/null
@@ -1,783 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-#viewModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-    
-    .custom-doc-btn {
-  height: 20px;
-  width: 80px;
-  font-size: 9px;
-  font-weight:bold;
-  text-align: center;
-  padding: 0px;
-  border:1px solid grey;
-}
-.col-md-3{
-padding-bottom: 10px; 
-}
-
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Sofa and Bed Collection</h5>
-										<span>1913 Sofa and Bed Collection - Cancel Page</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Sofa and Bed Collection</li>
-										<li class="breadcrumb-item active" aria-current="page">Cancel Complaints</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Details Filters</span>
-									<span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-								</div>
-								<div class="card-body">
-									<div class="row">
-										<div class="col-sm-2 mb-2">
-											<label for="startDate" style="font-size: medium;">From Date:<span class="text-danger">*</span></label>
-						                    <input type="date" id="startDate" class="form-control">
-										</div>
-										<div class="col-sm-2 mb-2">
-											<label for="endDate" style="font-size: medium;">To Date:<span class="text-danger">*</span></label>
-						                    <input type="date" id="endDate" class="form-control">
-										</div>
-										<div class="col-sm-2 mb-2">
-											<label for="mobileNumber" style="font-size: medium;">Mobile Number:</label>
-						                    <input type="number" id="mobileNumber" class="form-control">
-										</div>
-										<!-- <div class="col-sm-2 mb-2">
-											<label for="requestNumber" style="font-size: medium;">Request Number:</label>
-						                    <input type="number" id="requestNumber" class="form-control">
-										</div> -->
-									
-									
-								</div>
-								
-								<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-							</div>
-						</div>
-					</div>
-					</div>
-			
-					
-					<div class="row mt-4">
-									<div class="col-md-12">
-										<div class="card">
-										<div class="card-header">
-											<span style="font-size: medium;font-weight: bold;">Complaints Open And Pending List</span>
-										</div>
-										<div class="card-body">
-											<div class="table-responsive">
-
-												<table id="ReportDatatable"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-
-															<th class="text-center no-sort">S.No</th>
-															<th class="text-center" width="100px;">Date</th>
-															<th class="text-center no-sort">Request Number</th>
-															<th class="text-center no-sort">Public Name</th>																																												
-															<th class="text-center">Public Mobile no</th>															
-															<th class="text-center no-sort">Address</th>	
-															<th class="text-center">Street Name</th>		
-															<th class="text-center">Current Status</th>	
-															<th class="text-center">Action</th>																												
-														</tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-										</div>
-									 </div>
-									</div>
-								</div>
-					
-				</div>
-
-			</div>
-			
-			
-			<!-- Modal -->
-				<div class="modal fade" id="viewModal" tabindex="-1" aria-labelledby="viewModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-				  <div class="modal-dialog modal-lg">
-				    <div class="modal-content">
-				      <div class="modal-header">
-				        <h5 class="modal-title" id="viewLabel">Request Details</h5>
-				       <button type="button" class="close"  data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-				      </div>
-				      <div class="modal-body" id="modalBodyContent">
-				        <!-- Dynamic content loads here -->
-				      </div>
-				      <div class="modal-footer">
-				        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-				
-				
-				<!-- Image Modal -->
-                <div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
-				  <div class="modal-dialog modal-dialog-scrollable modal-lg">
-				    <div class="modal-content border-0">
-				      <div class="modal-body p-0 text-center" style="background-color: #f8f9fa;">
-				        <div id="docContainer" style="max-height: 90vh; overflow: auto;"></div>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-			
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-				
-				
-		<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-
-			
-		</div>
-	</div>
-
-
-
-	<!-- in the code use to show the download different type microsoft -->
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">
-		
-	 $(document).ready(function() {
-		 
-		 $('#mobileNumber').on('input', function () {
-			    this.value = this.value.replace(/[^0-9]/g, '').slice(0, 10);
-			});
-
-     	var table = $('#ReportDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '80vh',
-             scrollX: false,
-             
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: false,
-             responsive: false,
-             searching: true,
-             select: false,
-             processing: false
-         });
-     	
-     // Event listener for From Date selection
-  	    $("#startDate").on("change", function() {
-  	       const startDate = $(this).val();  // Get the selected start date
-  	       // Set the min value for To Date to be the selected From Date
-  	       $("#endDate").attr("min", startDate);
-  	   });
-
-  	   // Event listener for To Date selection
-  	   $("#endDate").on("change", function() {
-  	       const endDate = $(this).val();  // Get the selected end date
-  	       // Set the max value for From Date to be the selected To Date
-  	       $("#startDate").attr("max", endDate);
-  	   }); 
-  	   
-  	 	document.getElementById('resetBtn').addEventListener('click', function () {
-      	event.preventDefault();
-      	
-      	location.reload();
-      	
-      	});
-  	 	
-  	 	document.getElementById('searchBtn').addEventListener('click', function (e) {
-  	 		
-  	 		
-  	 		let startDate	 = document.getElementById('startDate').value;
-     	    let endDate 	= document.getElementById('endDate').value; 
-     	   	let mobileNumber = document.getElementById('mobileNumber').value;
-     	  	/* let requestNumber = document.getElementById('requestNumber').value; */
-     	    
-     	    
-     	   console.log("startdate: ",startDate);
-    	   console.log("enddate: ",endDate); 
-    	   console.log("mobileNumber: ",mobileNumber);
-    	   /* console.log("requestNumber: ",requestNumber); */
-
-    	   if(!startDate && !endDate){
-    		   
-    		   Swal.fire({
-      	            icon: 'info',
-      	            title: 'Missing',
-      	            text: 'Please Select Both Dates',
-      	            showConfirmButton: true,
-      	            timer: 3000
-      	        });
-      	        e.preventDefault();
-      	        return;
-    	   }
-    	   
-			if(!startDate){
-    		   
-    		   Swal.fire({
-      	            icon: 'info',
-      	            title: 'Missing',
-      	            text: 'Please Select From Date',
-      	            showConfirmButton: true,
-      	            timer: 3000
-      	        });
-      	        e.preventDefault();
-      	        return;
-    	   }
-    	   
-			if(!endDate){
-	    		   
-	    		   Swal.fire({
-	      	            icon: 'info',
-	      	            title: 'Missing',
-	      	            text: 'Please Select To Date',
-	      	            showConfirmButton: true,
-	      	            timer: 3000
-	      	        });
-	      	        e.preventDefault();
-	      	        return;
-	    	   }
-			
-			/* if(!mobileNumber){
-	    		   
-	    		   Swal.fire({
-	      	            icon: 'info',
-	      	            title: 'Missing',
-	      	            text: 'Please Enter Mobile Number',
-	      	            showConfirmButton: true,
-	      	            timer: 3000
-	      	        });
-	      	        e.preventDefault();
-	      	        return;
-	    	   } */
-	    	   
-	    	   
-	    	   if(mobileNumber){
-	    		   
-	    		   if (!/^\d{10}$/.test(mobileNumber)) {
-	       	        Swal.fire({
-	       	            icon: 'warning',
-	       	            title: 'Invalid Mobile Number',
-	       	            text: 'Please enter a valid 10-digit mobile number.'
-	       	        });
-	       	        return;
-	       	    }
-	       	   
-	       	   if (/^0{10}$/.test(mobileNumber)) {
-	   				
-	   				 Swal.fire({
-	   	    	            icon: 'warning',
-	   	    	            title: 'Invalid Mobile Number',
-	   	    	            text: 'Mobile number cannot be all zeros.'
-	   	    	        });
-	   				return;
-	   			}
-
-	   			if (mobileNumber.startsWith('0')) {
-	   				
-	   				Swal.fire({
-	       	            icon: 'warning',
-	       	            title: 'Invalid Mobile Number',
-	       	            text: 'Mobile number cannot start with zero.'
-	       	        });
-	   				return;
-	   			}
-	   			
-	   			if (/^(\d)\1{9}$/.test(mobileNumber)) {
-	   				
-	   				Swal.fire({
-	       	            icon: 'warning',
-	       	            title: 'Invalid Mobile Number',
-	       	            text: 'Mobile number cannot have all digits the same.'
-	       	        });
-	   				return;
-	   			}
-	    		   
-	    	   }
-    	   
-    	   const params = new URLSearchParams({   	        
-    	        startDate:startDate,
-    	        endDate:endDate,
-    	        mobile:mobileNumber
-    	    });
-    	   $('#pageLoader').show();
-    	   $.ajax({
-               type: "GET",
-               url: `/gcc/api/domestic_waste/getpendingcomplaints?${params.toString()}`, // Append query string to URL
-               contentType: "application/json",
-               success: function (response) {
-            	    console.log("API Response:", response);
-            	    $('#pageLoader').hide();
-            	    if (response.status === "success") {
-            	        console.log("Details Array:", response.data);
-            	        // Ensure details is an array and has at least one entry
-            	        if (Array.isArray(response.data) && response.data.length > 0) {
-            	        	
-            	        	let tableContainer = $('#ReportDatatable');
-            	            let table = $('#ReportDatatable').DataTable({
-            	                destroy: true,
-            	                searching: true,
-            	                autoWidth: false,           	                
-            	                paging: true,
-            	                info: true,
-            	                data: response.data,           	                
-            	                columns: [
-            	                    { 
-            	                        data: null, 
-            	                        render: (data, type, row, meta) => meta.row + 1, 
-            	                        className: 'text-center' 
-            	                    },
-            	                    { data: 'created_date', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'request_id', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'user_name', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'mobile', defaultContent: '-', className: 'text-center' },           	                    
-            	                    { data: 'address', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'street_name', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'status_name', defaultContent: '-', className: 'text-center' }  ,
-            	                    {
-                                        data: 'request_id',
-                                        render: function (data, type, row) {
-                                            return `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
-                                        },
-                                        className: 'text-center'
-                                    }
-            	                      
-            	                ],
-            	                dom: 'Bfrtip',
-            	                buttons: [
-   	      		                  {
-   	      		                      extend: 'pageLength',
-   	      		                      className: 'btn btn-warning'
-   	      		                  },
-   	      		                  {
-   	      		                      title: 'Data export',
-   	      		                      extend: 'copyHtml5',
-   	      		                      text: 'Copy',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'copyBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'excelHtml5',
-   	      		                      text: 'Excel',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'excelBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'csvHtml5',
-   	      		                      text: 'CSV',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'csvBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'pdfHtml5',
-   	      		                      text: 'PDF',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'pdfBtn'
-   	      		                  }
-   	      		              ],
-   	      		             columnDefs: [
-   	      		                { targets: 'no-sort', orderable: false }
-   	      		            ],
-   	      		            lengthMenu: [
-   	      		                [50, 100, 200, 500, -1],
-   	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-   	      		            ],
-   	      		            scrollY: '80vh',
-   	      		            scrollX: true,   	      		            
-   	      		       		responsive: false,
-   	                		searching: true
-   	      		            });
-            	            
-            	            
-            	         // Bind view buttons
-                            tableContainer.on('click', '.btn-view', function () {
-                                let id = $(this).data('id');  
-                                console.log("req_id="+id);
-                               $.ajax({
-                                    url: `/gcc/api/domestic_waste/getDetailsByReqId?requestId=${id}`,
-                                    method: 'GET',
-                                    success: function (response) {
-                                    	console.log("response="+response.data);
-                                                   
-                                        if(response.status === "success"){
-
-                                        	const details = response.data[0];
-                                        	
-                                        	// ✅ Handle items array
-                                            let itemsHTML = '';
-                                            if (details.items && details.items.length > 0) {
-                                                itemsHTML += `
-                                                    <table class="table table-bordered table-striped">
-                                                        <thead class="thead-light">
-                                                            <tr>
-                                                                <th class="text-center">S.No</th>
-                                                                <th class="text-center">Item Name</th>
-                                                                <th class="text-center">Quantity</th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                `;
-                                                details.items.forEach((item, index) => {
-                                                    itemsHTML += `
-                                                        <tr>
-                                                            <td class="text-center">${index + 1}</td>
-                                                            <td class="text-center">${item.item_name || '-'}</td>
-                                                            <td class="text-center">${item.quantity || '-'}</td>
-                                                        </tr>
-                                                    `;
-                                                });
-                                                itemsHTML += `
-                                                        </tbody>
-                                                    </table>
-                                                `;
-                                            } else {
-                                                itemsHTML = `<p class="text-center text-muted mb-0">No items available.</p>`;
-                                            }
-                                        	
-                                        	const ImagePhotoBtn= details.image_url ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.image_url}')">View</button>` : '-';
-                                        	
-                                        	const content = `
-                                        	
-                                        		<div class="container-fluid">
-                                        	
-                                        		<!-- Personal Details -->
-	                                        		<div class="card mb-3">
-	                                        		
-	                                        		 <div class="card-header bg-primary text-white">Personal Details</div>
-	                                                 <div class="card-body row">
-	                                                 	
-	                                                 <div class="col-md-3"><strong>Name:</strong></div>
-	                                                 <div class="col-md-3">${details.user_name || '-'}</div>
-	                                                 <div class="col-md-3"><strong>Mobile:</strong></div>
-	                                                 <div class="col-md-3">${details.mobile || '-'}</div>
-	                                                 <div class="col-md-3"><strong>Zone:</strong></div>
-	                                                 <div class="col-md-3">${details.zone || '-'}</div>
-	                                                 <div class="col-md-3"><strong>Division:</strong></div>
-	                                                 <div class="col-md-3">${details.division || '-'}</div>
-	                                                 <div class="col-md-3"><strong>Address:</strong></div>
-	                                                 <div class="col-md-3">${details.address || '-'}</div>
-	                                                 <div class="col-md-3"><strong>Street:</strong></div>
-	                                                 <div class="col-md-3">${details.street_name || '-'}</div>
-	                                                 <div class="col-md-3"><strong>User Uploaded Image:</strong></div>
-	                                                 <div class="col-md-3">${ImagePhotoBtn || '-'}</div>
-	                                                 
-	                                                 </div>
-	                                        		</div>
-	                                        		
-	                                        		<!-- Item Details -->
-	                                                <div class="card mb-3">
-	                                                    <div class="card-header bg-success text-white">Item Details</div>
-	                                                    <div class="card-body">
-	                                                    	${itemsHTML}
-	                                                    </div>
-	                                                </div>
-	                                                
-	                                                <!-- Remarks Section -->
-	                                                <div class="card mb-3">
-	                                                    <p class="mt-2 ml-3">Remarks<span class="text-danger">*</span></p>
-	                                                    <div class="card-body text-center">                                             
-	                                                        <textarea id="remarksText" class="form-control mb-3" rows="3" placeholder="Enter remarks..."></textarea>
-	                                                        <button class="btn btn-danger" id="submitRemarksBtn" data-id="${id}">
-	                                                            Cancel
-	                                                        </button>
-	                                                    </div>
-	                                                </div>
-	                                                
-                                        		</div>
-                                        	`;
-                                        	
-                                        	$('#modalBodyContent').html(content);
-                                            $('#viewLabel').text( `${id} - Details`);
-                                            $('#viewModal').modal('show');
-                                        }
-                                        
-                                        else if (response.status === "nodata") {
-                                            $('#modalBodyContent').html("<p>No data found for this request.</p>");
-                                            $('#viewLabel').text( `${id} - Details`);
-                                            $('#viewModal').modal('show');
-                                            return;
-                                        }
-                                        
-                                        else if (response.status === "error") {
-                                        	 Swal.fire({
-                             	            	icon: 'error',
-                                 	            title: 'Error',
-                                 	            text: response.message || 'Something went wrong!'
-                             	            });
-                                        	 return;
-                                        }
-                                        else{
-                                        	Swal.fire({
-                             	            	icon: 'error',
-                                 	            title: 'Error',
-                                 	            text:'Something went wrong!'
-                             	            });
-                                        	 return;
-                                        }
-                                        
-                                    },
-                                    error: function (xhr) {
-                                        console.error("Error fetching detail:", xhr.responseText);
-                                        alert("Failed to fetch vendor details.");
-                                    }
-                                }); 
-                            });
-            	        }
-            	        
-            	    }
-            	    else if (response.status === "nodata") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	                icon: 'warning',
-        	                title: 'No Data',
-        	                text: 'No Pending data available.'
-        	            });
-        	        }
-            	    else if (response.status === "error") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	            	icon: 'error',
-            	            title: 'Error',
-            	            text: response.message || 'Something went wrong!'
-        	            });
-        	        }
-            	    else {
-            	    	$('#pageLoader').hide();
-            	        Swal.fire({
-            	            icon: 'error',
-            	            title: 'Error',
-            	            text: response.message || 'Something went wrong!'
-            	        });
-            	    }
-            	},
-
-               error: function (error) {
-               	$('#pageLoader').hide();
-               	Swal.fire({
-    	            icon: 'error',
-    	            title: 'Error',
-    	            text: response.message || 'Something went wrong!'
-    	        });
-               }
-           });
-    	   
-  	 	});
-     	
-     });
-	 
-	 
-		// Handle Remarks Submit button click
-		 $(document).on('click', '#submitRemarksBtn', function () {
-		    const requestId = $(this).data('id');
-		    const remarks = $('#remarksText').val().trim();
-		    let userId = document.getElementById('userIdSpan').textContent;
-		
-		    if (remarks === "") {
-		        Swal.fire({
-		            icon: 'warning',
-		            title: 'Remarks Required',
-		            text: 'Please enter remarks before Cancelling.'
-		        });
-		        return;
-		    }
-		
-		    console.log("Request ID:", requestId);
-		    console.log("Remarks:", remarks);
-		    console.log("userId:", userId);
-		
-		    // ✅ Confirmation popup
-		    Swal.fire({
-		        title: 'Are you sure to Cancel?',
-		        text: "You won't be able to revert this complaint!",
-		        icon: 'warning',
-		        showCancelButton: true,
-		        confirmButtonColor: '#3085d6',
-		        cancelButtonColor: '#d33',
-		        confirmButtonText: 'Yes, Cancel it!',
-		        cancelButtonText: 'No'
-		    }).then((result) => {
-		        if (result.isConfirmed) {
-		            
-		            cancelRequest(requestId, remarks, userId);
-		        } else {
-		            
-		            console.log("User cancelled the action.");
-		        }
-		    });
-	});
-		
-		function cancelRequest(requestId, remarks, userId){
-			
-			$('#pageLoader').show();
-	    	   $.ajax({
-	               type: "POST",
-	               url: `/gcc/api/domestic_waste/cancelbyagents`, 
-	               data:{
-	            	   requestId:requestId,
-	            	   remarks:remarks,
-	            	   userId:userId
-	               },	               
-	               success: function (response) {
-	            	   $('#pageLoader').hide();
-	            	    console.log("API Response:", response);
-	            	    
-	            	    if(response.status === "success"){
-	            	    	Swal.fire({
-	    	       	            icon: 'success',
-	    	       	            title: 'Success',
-	    	       	            text: response.message,
-	    	       	         	allowOutsideClick: false, 
-			                    allowEscapeKey: false,
-			                    allowEnterKey: false, 
-			                    showConfirmButton: true
-		                    }).then((result) => {
-			                    if (result.isConfirmed) {		                    	
-			                    	location.reload();		                    			                    	
-			                    }
-			                }); 
-	            	    }
-	            	    else{
-	            	    	Swal.fire({
-	    	       	            icon: 'error',
-	    	       	            title: 'Error',
-	    	       	            text: response.message || 'Something went wrong!'
-	    	       	        });
-	            	    }
-	               },
-	               error: function (error) {
-	                  	$('#pageLoader').hide();
-	                  	Swal.fire({
-	       	            icon: 'error',
-	       	            title: 'Error',
-	       	            text: response.message || 'Something went wrong!'
-	       	        });
-	                
-	               }
-	    	   });
-			
-		}
-
-	 
-	 function openDocModal(fileUrl) {
-	      const container = document.getElementById('docContainer');
-	      const ext = fileUrl.split('.').pop().toLowerCase();
-
-	      if (ext === 'pdf') {
-	          container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
-	      } else {
-	          container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;" onerror="No image">`;
-	      }
-
-	      $('#docModal').modal('show');
-	  }
-	 
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/domesticwastecheckstatus.html b/src/main/resources/templates/modules/callcenterqaqc/domesticwastecheckstatus.html
deleted file mode 100644
index 72d45041..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/domesticwastecheckstatus.html
+++ /dev/null
@@ -1,459 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Sofa and Bed Collection</h5>
-										<span>1913 Sofa and Bed Collection - Check Status</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Sofa and Bed Collection</li>
-										<li class="breadcrumb-item active" aria-current="page">Check Status</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Enter Registered Mobile Number</span>
-								</div>
-								<div class="card-body">
-									<div class="row">
-										<!-- <div class="col-sm-2 mb-2">
-											<label for="startDate" style="font-size: medium;">From Date:</label>
-						                    <input type="date" id="startDate" class="form-control">
-										</div>
-										<div class="col-sm-2 mb-2">
-											<label for="endDate" style="font-size: medium;">To Date:</label>
-						                    <input type="date" id="endDate" class="form-control">
-										</div> -->
-										<div class="col-sm-2 mb-2">
-											<label for="mobileNumber" style="font-size: medium;">Mobile Number:</label>
-						                    <input type="number" id="mobileNumber" class="form-control">
-										</div>
-										<!-- <div class="col-sm-2 mb-2">
-											<label for="requestNumber" style="font-size: medium;">Request Number:</label>
-						                    <input type="number" id="requestNumber" class="form-control">
-										</div> -->
-									
-									
-								</div>
-								
-								<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-							</div>
-						</div>
-					</div>
-					</div>
-			
-					
-					<div class="row mt-4">
-									<div class="col-md-12">
-										<div class="card">
-										<div class="card-header">
-											<span style="font-size: medium;font-weight: bold;">Reports List</span>
-										</div>
-										<div class="card-body">
-											<div class="table-responsive">
-
-												<table id="ReportDatatable"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-
-															<th class="text-center no-sort">S.No</th>
-															<th class="text-center">Date</th>
-															<th class="text-center no-sort">Request Number</th>
-															<th class="text-center no-sort">Public Name</th>																																												
-															<th class="text-center">Public Mobile no</th>
-															<th class="text-center">Zone</th>
-															<th class="text-center">Ward</th>
-															<th class="text-center">Item Type</th>	
-															<th class="text-center no-sort">Address</th>	
-															<th class="text-center">Street Name</th>	
-															<th class="text-center">Remarks</th>	
-															<th class="text-center">Current Status</th>																												
-														</tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-										</div>
-									 </div>
-									</div>
-								</div>
-					
-				</div>
-
-			</div>
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-				
-				
-		<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-
-			
-		</div>
-	</div>
-
-
-
-	<!-- in the code use to show the download different type microsoft -->
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">
-		
-	 $(document).ready(function() {
-		 
-		 $('#mobileNumber').on('input', function () {
-			    this.value = this.value.replace(/[^0-9]/g, '').slice(0, 10);
-			});
-
-     	var table = $('#ReportDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '80vh',
-             scrollX: true,
-             
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: true,
-             responsive: false,
-             searching: true,
-             select: false,
-             processing: false
-         });
-     	
-     // Event listener for From Date selection
-  	  /*  $("#startDate").on("change", function() {
-  	       const startDate = $(this).val();  // Get the selected start date
-  	       // Set the min value for To Date to be the selected From Date
-  	       $("#endDate").attr("min", startDate);
-  	   });
-
-  	   // Event listener for To Date selection
-  	   $("#endDate").on("change", function() {
-  	       const endDate = $(this).val();  // Get the selected end date
-  	       // Set the max value for From Date to be the selected To Date
-  	       $("#startDate").attr("max", endDate);
-  	   }); */
-  	   
-  	 	document.getElementById('resetBtn').addEventListener('click', function () {
-      	event.preventDefault();
-      	
-      	location.reload();
-      	
-      	});
-  	 	
-  	 	document.getElementById('searchBtn').addEventListener('click', function (e) {
-  	 		
-  	 		
-  	 		/* let startDate	 = document.getElementById('startDate').value;
-     	    let endDate 	= document.getElementById('endDate').value; */
-     	   	let mobileNumber = document.getElementById('mobileNumber').value;
-     	  	/* let requestNumber = document.getElementById('requestNumber').value; */
-     	    
-     	    
-     	   /* console.log("startdate: ",startDate);
-    	   console.log("enddate: ",endDate); */
-    	   console.log("mobileNumber: ",mobileNumber);
-    	   /* console.log("requestNumber: ",requestNumber); */
-
-    	   if(!mobileNumber){
-    		   
-    		   Swal.fire({
-      	            icon: 'info',
-      	            title: 'Missing',
-      	            text: 'Please Enter Mobile Number',
-      	            showConfirmButton: true,
-      	            timer: 3000
-      	        });
-      	        e.preventDefault();
-      	        return;
-    	   }
-    	   
-    	   
-    	   if(mobileNumber){
-    		   
-    		   if (!/^\d{10}$/.test(mobileNumber)) {
-       	        Swal.fire({
-       	            icon: 'warning',
-       	            title: 'Invalid Mobile Number',
-       	            text: 'Please enter a valid 10-digit mobile number.'
-       	        });
-       	        return;
-       	    }
-       	   
-       	   if (/^0{10}$/.test(mobileNumber)) {
-   				
-   				 Swal.fire({
-   	    	            icon: 'warning',
-   	    	            title: 'Invalid Mobile Number',
-   	    	            text: 'Mobile number cannot be all zeros.'
-   	    	        });
-   				return;
-   			}
-
-   			if (mobileNumber.startsWith('0')) {
-   				
-   				Swal.fire({
-       	            icon: 'warning',
-       	            title: 'Invalid Mobile Number',
-       	            text: 'Mobile number cannot start with zero.'
-       	        });
-   				return;
-   			}
-   			
-   			if (/^(\d)\1{9}$/.test(mobileNumber)) {
-   				
-   				Swal.fire({
-       	            icon: 'warning',
-       	            title: 'Invalid Mobile Number',
-       	            text: 'Mobile number cannot have all digits the same.'
-       	        });
-   				return;
-   			}
-    		   
-    	   }
-    	   
-    	     	   
-    	   
-    	   const params = new URLSearchParams({   	        
-    	        mobile:mobileNumber
-    	    });
-    	   $('#pageLoader').show();
-    	   $.ajax({
-               type: "GET",
-               url: `/gcc/api/domestic_waste/checkstatusbymobile?${params.toString()}`, // Append query string to URL
-               contentType: "application/json",
-               success: function (response) {
-            	    console.log("API Response:", response);
-            	    $('#pageLoader').hide();
-            	    if (response.status === "success") {
-            	        console.log("Details Array:", response.data);
-            	        // Ensure details is an array and has at least one entry
-            	        if (Array.isArray(response.data) && response.data.length > 0) {
-            	            let table = $('#ReportDatatable').DataTable({
-            	                destroy: true,
-            	                searching: true,
-            	                autoWidth: true,           	                
-            	                paging: true,
-            	                info: true,
-            	                data: response.data,           	                
-            	                columns: [
-            	                    { 
-            	                        data: null, 
-            	                        render: (data, type, row, meta) => meta.row + 1, 
-            	                        className: 'text-center' 
-            	                    },
-            	                    { data: 'cdate', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'request_id', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'user_name', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'mobile', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'zone', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'division', defaultContent: '-', className: 'text-center' },
-            	                    { 
-            	                        data: 'items', 
-            	                        className: 'text-center',
-            	                        render: function (data, type, row) {
-            	                            if (Array.isArray(data) && data.length > 0) {
-            	                                return data.map(item => `${item.item_name} - ${item.quantity}`).join(', ');
-            	                            }
-            	                            return '-';
-            	                        }
-            	                    },
-            	                    { data: 'address', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'street_name', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'remarks', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'status', defaultContent: '-', className: 'text-center' }           	                    
-            	                      
-            	                ],
-            	                dom: 'Bfrtip',
-            	                buttons: [
-   	      		                  {
-   	      		                      extend: 'pageLength',
-   	      		                      className: 'btn btn-warning'
-   	      		                  },
-   	      		                  {
-   	      		                      title: 'Data export',
-   	      		                      extend: 'copyHtml5',
-   	      		                      text: 'Copy',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'copyBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'excelHtml5',
-   	      		                      text: 'Excel',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'excelBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'csvHtml5',
-   	      		                      text: 'CSV',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'csvBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'pdfHtml5',
-   	      		                      text: 'PDF',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'pdfBtn'
-   	      		                  }
-   	      		              ],
-   	      		             columnDefs: [
-   	      		                { targets: 'no-sort', orderable: false }
-   	      		            ],
-   	      		            lengthMenu: [
-   	      		                [50, 100, 200, 500, -1],
-   	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-   	      		            ],
-   	      		            scrollY: '80vh',
-   	      		            scrollX: true,   	      		            
-   	      		       		responsive: false,
-   	                		searching: true
-   	      		            });
-            	        }
-            	        
-            	    }
-            	    else if (response.status === "no data") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	                icon: 'warning',
-        	                title: 'No Data',
-        	                text: 'No data available for the Mobile Number.'
-        	            });
-        	        }
-            	    else if (response.status === "error") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	            	icon: 'error',
-            	            title: 'Error',
-            	            text: response.message || 'Something went wrong!'
-        	            });
-        	        }
-            	    else {
-            	    	$('#pageLoader').hide();
-            	        Swal.fire({
-            	            icon: 'error',
-            	            title: 'Error',
-            	            text: response.message || 'Something went wrong!'
-            	        });
-            	    }
-            	},
-
-               error: function (error) {
-               	$('#pageLoader').hide();
-               	Swal.fire({
-    	            icon: 'error',
-    	            title: 'Error',
-    	            text: response.message || 'Something went wrong!'
-    	        });
-               }
-           });
-    	   
-  	 	});
-     	
-     });
-	 
-	 
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/domesticwastecomplaints.html b/src/main/resources/templates/modules/callcenterqaqc/domesticwastecomplaints.html
deleted file mode 100644
index c8572700..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/domesticwastecomplaints.html
+++ /dev/null
@@ -1,1579 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-<link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
-<link rel="stylesheet" href="https://unpkg.com/leaflet/dist/leaflet.css">
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
-<script src="https://unpkg.com/leaflet/dist/leaflet.js"></script>
-</head>
-
-<style>
-.required {
-	color: red;
-}
-/* Mobile screens - targeting devices with a max width of 767px */
-@media ( max-width : 767px) {
-	#complaintform label {
-		margin-top: 10px;
-	}
-}
-
-.form-row {
-	margin-bottom: 20px;
-}
-
-.form-step {
-	display: none;
-}
-
-.form-step.active {
-	display: block;
-}
-
-.container {
-	max-width: 100%;
-}
-
-/*css for step 3*/
-.complaint-icons {
-	display: flex;
-	justify-content: space-around;
-	margin-bottom: 20px;
-}
-
-.complaint-icon {
-	text-align: center;
-	cursor: pointer;
-}
-
-.complaint-icon img {
-	width: 50px;
-	height: 50px;
-}
-
-.complaint-fields {
-	display: none;
-}
-
-.complaint-fields.active {
-	display: block;
-}
-
-/*for radio button style*/
-.radio-group {
-	display: flex;
-	align-items: center;
-	/* Ensures all items are aligned to the center */
-}
-
-.radio-item {
-	display: flex;
-	align-items: center;
-	margin-right: 20px;
-	/* Adds space between each radio item */
-}
-
-.radio-item input[type="radio"] {
-	margin-right: 10px;
-	/* Adds space between the radio button and its label */
-	vertical-align: middle;
-	/* Ensures vertical alignment */
-}
-
-.radio-item label {
-	margin: 0;
-	/* Removes any default margins that might affect alignment */
-}
-
-.back-button {
-	background: none;
-	border: none;
-	color: #000;
-	font-size: 16px;
-	cursor: pointer;
-	padding: 0;
-	margin-right: auto;
-	/* Align the button to the left */
-}
-
-.title {
-	text-align: center;
-	flex-grow: 1;
-	font-size: 24px;
-	font-weight: bold;
-	margin: 0;
-}
-
-/*css for map in step2*/
-
-		#googleMap {
-			height: 300px;
-			width: 100%;
-			position: relative;
-			overflow: hidden;
-			max-width: 100%;
-		}
-		
-		#pac-input {
-		    position: absolute;
-		    top: 10px;
-		    left: 50%;
-		    transform: translateX(-50%);
-		    width: 300px;
-		    z-index: 5;
-		    padding: 10px;
-		    border: 1px solid #ccc;
-		    background-color: white;
-		    border-radius: 4px;
-		  }
-		  
-		  
-		  /* Media query for mobile devices */
-			@media (max-width: 576px) {
-			  #pac-input {
-			     top: 55px;
-			     z-index: 5;
-			  }
-			}
-
-		#search-container {
-			position: absolute;
-			top: 10px;
-			left: 50%;
-			transform: translateX(-50%);
-			z-index: 1000;
-			width: 500px;
-			box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3);
-			background-color: white;
-			border-radius: 4px;
-			padding: 0;
-			/* Removed extra padding to match the input width */
-		}
-
-		#search-box {
-			width: 100%;
-			/* Ensures the input takes up the entire width of the container */
-			padding: 5px;
-			font-size: 16px;
-			border: 1px solid #ccc;
-			border-radius: 4px;
-			/* Rounded corners matching the container */
-			box-sizing: border-box;
-			/* Makes sure padding is considered in width */
-		}
-
-		#suggestions {
-			border: 1px solid #ccc;
-			border-radius: 4px;
-			max-height: 200px;
-			overflow-y: auto;
-			margin-top: 5px;
-			background-color: white;
-			display: none;
-			width: 100%;
-			/* Matches the width of the container and input */
-			box-sizing: border-box;
-			/* Ensures the width includes borders and padding */
-		}
-
-		#suggestions ul {
-			list-style: none;
-			padding: 0;
-			margin: 0;
-		}
-
-		#suggestions ul li {
-			padding: 5px;
-			cursor: pointer;
-		}
-
-		#suggestions ul li:hover {
-			background-color: #f0f0f0;
-		}
-
-#reader-btn, #invertColorBtn {
-	padding: 5px 10px;
-	font-size: 14px;
-	cursor: pointer;
-}
-
-.loader {
-	border: 16px solid #f3f3f3;
-	/* Light grey */
-	border-top: 16px solid #3498db;
-	/* Blue */
-	border-radius: 50%;
-	width: 120px;
-	height: 120px;
-	animation: spin 2s linear infinite;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin: -60px 0 0 -100px;
-	/* Center the loader */
-	z-index: 9999;
-	/* Ensure it's on top of everything */
-	display: none;
-	/* Initially hidden */
-}
-
- .row {
-		  display: flex;
-		  flex-wrap: wrap;
-		  margin-bottom: 15px;
-		  
-		} 
-		
- 		.col-md-6 {
-		  flex: 0 0 48%;
-		  max-width: 48%;
-		  display: flex;
-		  flex-direction: column;
-		} 
-		
-		.col-md-6 label {
-		  font-weight: 600;
-		  margin-bottom: 5px;
-		}
-		
-		.col-md-6 select,
-		.col-md-6 input {
-		  height: 38px;
-		  padding: 5px 10px;
-		  border-radius: 5px;
-		  border: 1px solid #ccc;
-		}
-
-@keyframes spin { 0% 
-{
-	transform: rotate(0deg);
-}
-
-100%
-{
-transform:rotate(360deg);
-}
-}
-
-#snackbar {
-			visibility: hidden;
-			min-width: 250px;
-			background-color: #333;
-			color: #fff;
-			text-align: center;
-			border-radius: 2px;
-			padding: 16px;
-			position: fixed;
-			z-index: 1;
-			left: 50%;
-			bottom: 30px;
-			font-size: 17px;
-			transform: translateX(-50%);
-		}
-
-		#snackbar.show {
-			visibility: visible;
-			-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
-			animation: fadein 0.5s, fadeout 0.5s 2.5s;
-		}
-
-
-@-webkit-keyframes fadein {from { bottom:0;
-	opacity: 0;
-}
-
-to {
-	bottom: 30px;
-	opacity: 1;
-}
-
-}
-@keyframes fadein {from { bottom:0;
-	opacity: 0;
-}
-
-to {
-	bottom: 30px;
-	opacity: 1;
-}
-
-}
-@-webkit-keyframes fadeout {from { bottom:30px;
-	opacity: 1;
-}
-
-to {
-	bottom: 0;
-	opacity: 0;
-}
-
-}
-@keyframes fadeout {from { bottom:30px;
-	opacity: 1;
-}
-
-to {
-	bottom: 0;
-	opacity: 0;
-}
-}
-
-.input-error {
-	border: 1px solid red !important;
-}
-
-/*for snack bar*/
-</style>
-<body>
-<div id="snackbar"></div>
-
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fas fa-ticket-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Sofa and Bed Collection</h5>
-										<span>1913 Sofa and Bed Collection Registration</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Sofa Bed Collection</li>											
-										<li class="breadcrumb-item active" aria-current="page">Register Complaint</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-
-					<div class="row inside mt-4">
-
-						<div class="col-md-12"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-							<div class="card" style="margin-top: 0px;">
-							<div class="card-header"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-							<h3 class="mb-0" style="font-weight: bold;font-size: large;"><span th:text="${agent[0]['agent_name']}" style="font-weight: bold;font-size: large;"></span>'s Sofa Bed Collection Registration</h3>	
-							</div>
-							
-								<div class="card-body">
-
-									
-									<!-- Step 1 -->
-									<!-- Step 1 -->
-									<div class=" form-step active" id="step-1">
-										<!-- <div class="card-body"> -->										
-										<h5 class="card-title">1. Personal Details:</h5>
-										<div class="form-row">
-											<div class="col-md-4">
-												<label for="mobile">Mobile Number:<span class="required">*</span></label>												
-													<input type="text" id="mobileNo" name="mobileNo"
-														class="form-control mb-1"
-														placeholder="Enter Mobile Number" maxlength="10"
-														required>																								
-											</div>
-										</div>
-										<div class="form-row">
-											<div class="col-md-4 mb-2">
-												<label for="name">Name:<span class="required">*</span></label>
-												 <input type="text" class="form-control" id="name"
-													placeholder="Enter your name" required >
-											</div>
-											
-											<div class="col-md-8 mb-2">
-												<label for="address">Address:<span class="required">*</span></label>
-												 <input type="text" class="form-control" id="address"
-													placeholder="Enter your Address" required >
-											</div>											
-
-											
-											
-										</div>
-										<button id="nextStep1" class="btn btn-primary float-right"
-											onclick="nextStep('nextStep1')"
-											style="background-color: #414f69;">Next</button>
-										<!-- </div> -->
-									</div>
-									<!--step-2-->
-									<div class=" form-step readable" id="step-2">
-										<!-- <div class="card-body"> -->
-										<h5 class="card-title">2. Complaint Location Details:</h5>
-										<div class="form-row">
-
-											<!-- loader section -->
-											<!-- <div id="loader" class="loader" style="display: none;"></div> -->
-
-											<!--map fields-->
-
-											<div class="col-md-12">
-							<!-- <div id="map"></div> -->
-							<div id="mapContainer" style="position: relative; height: 500px;" class="mb-4 mt-2">
-							  <input id="pac-input" class="controls" type="text" placeholder="Search location">
-							  <div id="googleMap" style="height: 100%; width: 100%;border:2px solid black;"></div>
-							</div>
-							<div id="search-container">
-								<!-- <input type="text" id="search-box" placeholder="Search for a location..."> -->
-								<div id="suggestions"></div>
-							</div>
-							<div class="row">
-								<div class="col-md-6 mb-2">
-									<!-- <label for="street">Street:</label>
-									<input type="text" class="form-control" id="street"> -->
-									<label for="streetName">Street:</label>
-									<select id="streetName" name="streetName"></select>
-									<!-- 			<label for="streetName">Street:</label>
-									<input type="text" class="form-control" id="streetName"> -->
-								</div>
-
-								<div class="col-md-6 mb-2">
-									<!-- <label for="longitude_field">Longtitude</label>
-									<input type="text" class="form-control" id="longitude_field" name="longtitude"> -->
-									<label for="longitude_field">Longtitude</label>
-									<input type="text" class="form-control" id="longitude_field" readonly>
-								</div>
-								<div class="col-md-6 mb-2">
-									<!-- <label for="latitude_field">Latitide</label>
-									<input type="text" class="form-control" id="latitude_field"> -->
-									<label for="latitude_field">Latitude</label>
-									<input type="text" class="form-control" id="latitude_field" readonly>
-								</div>
-								<div class="col-md-6 mb-2">
-									<!-- <label for="street_id">Street Id</label>
-									<input type="text" class="form-control" id="street_id"> -->
-									<label for="streetId">Street Id</label>
-									<input type="text" class="form-control" id="streetId" readonly>
-								</div>
-								
-								<div class="col-md-6">
-									<label for="zone">Zone</label>
-									<input type="text" class="form-control" id="zone" readonly>
-								</div>
-								<div class="col-md-6">
-									<label for="ward">Ward</label>
-									<input type="text" class="form-control" id="ward" readonly>
-								</div>
-								<div class="col-md-6 mb-2">
-									<!-- <label for="landmark">Landmark</label>
-									<input type="text" class="form-control" id="landmark"> -->
-									<label for="landmark">Landmark</label>
-									<input type="text" class="form-control" id="landmark" readonly>
-								</div>
-							</div>
-						</div>
-										</div>
-										<button id="prevStep2" class="btn btn-secondary"
-											onclick="prevStep('prevStep2')">Previous</button>
-										<button id="nextStep2" class="btn btn-primary float-right"
-											onclick="nextStep('nextStep2')"
-											style="background-color: #414f69;">Next</button>
-										<!-- </div> -->
-									</div>
-									<!-- Step 3 -->
-									<div class=" form-step active readable" id="step-3">
-										<div class="card-body">
-											<h5 class="card-title">3. Item Details:</h5>
-																
-											
-											<!-- Specific Complaint Fields -->
-									        <div class="complaint-fields active mt-2" id="specific-fields">
-									            <div class="form-row">
-									                <div class="col-md-5">
-									                    <label for="specificComplaintType">Select Item Type:<span class="text-danger">*</span></label>									                   									                    
-									                    <div class="dropdown">
-													        <button class="btn btn-light border rounded w-100 text-start" type="button" id="complaintDropdownBtn" data-bs-toggle="dropdown" aria-expanded="false">
-													            Click to Select Item Type
-													        </button>
-													        <ul class="dropdown-menu p-3" aria-labelledby="complaintDropdownBtn" style="max-height: 200px; overflow-y: auto; width: 100%;">
-													            <div id="complaintCheckboxContainer">
-													                <!-- Checkboxes will be loaded here -->
-													            </div>
-													        </ul>
-													    </div>
-									                    
-									                </div>									                
-									            </div>
-									            <div class="row">
-									            	<div class="col-12">
-									            	<div id="complaintQuantityContainer" class="row mt-3"></div>
-									            	</div>	
-									            </div> 
-									            
-									            <div class="row mt-2">
-													<div class="col-md-12">
-									                        <label for="remarks" class="form-label fw-bold">Description:</label>
-									                        <textarea id="remarks" class="form-control"  rows="4" placeholder="Enter your description here"></textarea>
-									               </div>
-								               </div>
-									           
-									            								            
-									        </div>
-
-											<!-- Others Complaint Fields -->
-											<!-- <div class="complaint-fields" id="others-fields">
-												<div class="form-row">
-													<div class="col-md-4">
-														<label for="type">Type:</label> <select
-															class="form-control" id="type">
-															<option value="">Please Select</option>
-														</select>
-													</div>
-													<div class="col-md-4">
-														<label for="sub-type">Sub-Type:</label> <select
-															class="form-control" id="sub-type">
-															<option value="">Select complaint</option>
-														</select>
-													</div>
-													<div class="col-md-4">
-														<label for="uploadothers">Upload Photo:</label> <input
-															type="file" class="form-control" id="uploadothers"
-															accept="image/*"> <span style="color: red;">
-															<p>Upload Photo Less Than 1mb*.</p>
-														</span>
-													</div>
-												</div>
-												<div class="form-row">
-													<div class="col-md-6">
-														<label for="othercomplaintdetailsss">Details of
-															Complaint:</label>
-														<textarea class="form-control"
-															id="othercomplaintdetailsss" rows="3"
-															placeholder="Enter complaint details" maxlength="400"></textarea>
-													</div>
-												</div>
-											</div> -->
-
-
-											<button id="prevStep3" class="btn btn-secondary"
-												onclick="prevStep('prevStep3')">Previous</button>
-											<button id="nextStep3" class="btn btn-primary float-right"
-												onclick="nextStep('nextStep3')"
-												style="background-color: #414f69;">Next</button>
-										</div>
-									</div>
-
-									<!-- Step 4 -->
-									<div class=" form-step readable" id="step-4">
-										<div class="card-body">
-											<h5 class="card-title">4. Complaint Details:</h5>
-											<table class="table">
-												<tbody>
-													<tr>
-														<td><strong>Name</strong></td>
-														<td>: <span id="summaryName"></span></td>
-														<td><strong>Mobile Number</strong></td>
-														<td>: <span id="summaryMobile"></span></td>
-													</tr>
-													<tr>
-														<td><strong>Complaint Location</strong></td>
-														<td>: <span id="summaryStreet"></span></td>
-														
-														<td><strong>Street Id</strong></td>
-														<td>: <span id="summaryStreetId"></span></td>
-													</tr>
-													
-													<tr>
-														<td><strong>Zone</strong></td>
-														<td>: <span id="summaryZone"></span></td>
-														<td><strong>Ward</strong></td>
-														<td>: <span id="summaryWard"></span></td>
-														
-													</tr>
-																										
-													<tr>
-														<td><strong>Latitude</strong></td>
-														<td>: <span id="summaryLatitude"></span></td>
-														<td><strong>Longitude</strong></td>
-														<td>: <span id="summaryLongitude"></span></td>
-														
-													</tr>
-													<tr>
-														<td><strong>Item Type</strong></td>
-														<td>: <span id="summaryComplaintType"></span></td>
-														<td><strong>Description</strong></td>
-														<td>: <span id="summaryDescription"></span></td>
-													</tr>
-													<tr>
-														<td><strong>Address</strong></td>
-														<td>: <span id="summaryAddress"></span></td>
-													</tr>
-													
-												</tbody>
-											</table>
-
-
-
-											<button id="prevStep4" class="btn btn-secondary"
-												onclick="prevStep('prevStep4')">Previous</button>
-
-
-											<button id="submitButton" class="btn btn-success float-right">Submit</button>
-
-										</div>
-									</div>
-
-
-								</div>
-							</div>
-						</div>
-
-
-
-
-
-
-					</div>
-				</div>
-
-
-			</div>
-			
-			
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div> 
-
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-	<script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-	<script src="https://kit.fontawesome.com/a076d05399.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script th:src="@{/js/screenreader.js}"></script>
-	<script async defer
-		src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCi7N6uW5MZaSkd50Kzw7ax2GkMN1vjE-E&callback=myMap&libraries=places">
-		</script>
-		
-		
-
-	<script type="text/javascript">
-
-		//for snackbar script
-		 function showSnackbar(message) {
-			var snackbar = document.getElementById("snackbar");
-			snackbar.innerHTML = message;
-			snackbar.className = "show";
-			setTimeout(function () {snackbar.className = snackbar.className.replace("show", "");}, 3000);
-		} 
-		
-		 $(document).ready(function () {
-				// Trigger on change
-				$('#mobileNo').on('change', validateMobileNumber);
-				
-				$('#name').on('change', validateName);
-
-				// Optional: Allow only numeric input
-				$('#mobileNo').on('input', function () {
-					this.value = this.value.replace(/[^0-9]/g, '');
-					$(this).removeClass('input-error');
-				});
-				
-				$('#name').on('input', function () {
-					this.value = this.value.replace(/[^a-zA-Z.\s]/g, ''); // allow letters, dot, and space
-					$(this).removeClass('input-error');
-				});
-			});
-		 
-		 function validateName(){
-			 			 
-			 const $inputname = $('#name');
-			 const namefield = $('#name').val().trim();
-			 
-			 $inputname.removeClass('input-error');
-			 			 
-				if (!/^[A-Za-z\s.]+$/.test(namefield)) {
-					showSnackbar("Name should contain only alphabets.");
-					$inputname.addClass('input-error');
-					return false;
-				}
-			 
-			 return true;
-		 }
-		 
-		 function validateMobileNumber() {				
-				
-				const $input = $('#mobileNo');
-				const mobileStr = $('#mobileNo').val().trim();
-				console.log("mobileNo1=" + mobileStr);
-				
-				// Reset previous error style
-				$input.removeClass('input-error');
-
-				if (mobileStr === '') {
-					showSnackbar("Mobile number is required.");
-					$input.addClass('input-error');
-					return false;
-				}
-
-				if (!/^\d{10}$/.test(mobileStr)) {
-					showSnackbar("Please enter a valid 10-digit mobile number.");
-					$input.addClass('input-error');
-					return false;
-				}
-
-				if (/^0{10}$/.test(mobileStr)) {
-					showSnackbar("Mobile number cannot be all zeros.");
-					$input.addClass('input-error');
-					return false;
-				}
-
-				if (mobileStr.startsWith('0')) {
-					showSnackbar("Mobile number cannot start with zero.");
-					$input.addClass('input-error');
-					return false;
-				}
-				
-				if (/^(\d)\1{9}$/.test(mobileStr)) {
-					showSnackbar("Mobile number cannot have all digits the same.");
-					$input.addClass('input-error');
-					return false;
-				}
-	
-				// All validations passed – remove error styling
-				$input.removeClass('input-error');
-				return true;
-			}
-
-
-		//for snackbar script
-
-		let currentStep = 1;
-		let mapInitialized = false;
-
-		function showStep(step) {
-			$('.form-step').removeClass('active');
-			$('#step-' + step).addClass('active');
-			/* updateProgressBar(step); */
-
-			if (step === 2 && !mapInitialized) {
-				//document.getElementById('loader').style.display = 'block'; // Show loader before map initialization
-				//setTimeout(initializeMap, 3000); // Load the map after 3 seconds
-				mapInitialized = true; // Ensure the map is only initialized once
-			}
-
-			// If we're on step 4, populate the summary fields
-			if (step === 4) {
-				populateSummary();
-			}
-		}
-
-		function nextStep() {
-			if (currentStep < 4) {
-				// Perform validation for the current step
-				if (validateStep(currentStep)) {
-					currentStep++;
-					showStep(currentStep);
-				}
-			}
-		}
-
-		function prevStep() {
-			if (currentStep > 1) {
-				currentStep--;
-				showStep(currentStep);
-			}
-		}
-
-		/* function updateProgressBar(step) {
-			const progress = (step / 4) * 100;
-			$('.progress-bar').css('width', progress + '%').attr('aria-valuenow', progress);
-		} */
-
-		function validateStep(step) {
-			let isValid = true;
-
-			if (step === 1) {
-				console.log("step 1");
-				const mobileNo = $('#mobileNo').val().trim();
-				
-				const name = $('#name').val().trim();
-				
-				const address=$('#address').val().trim();
-								
-				console.log("mobileNo"+mobileNo);				
-				console.log("name="+name);
-				console.log("address="+address);
-
-
-				// Validate mobile number
-				if (mobileNo === '' || !/^\d{10}$/.test(mobileNo)) {
-					isValid = false;
-					showSnackbar("Please enter a valid 10-digit mobile number.");
-					return false;
-				}
-				
-				if (/^0{10}$/.test(mobileNo)) {
-					showSnackbar("Mobile number cannot be all zeros.");				
-					return false;
-				}
-				
-				if (mobileNo.startsWith('0')) {
-					showSnackbar("Mobile number cannot start with zero.");					
-					return false;
-				}
-				
-				if (/^(\d)\1{9}$/.test(mobileNo)) {
-					showSnackbar("Mobile number cannot have all digits the same.");					
-					return false;
-				}
-
-
-				// Validate name
-				if (!name) {
-					isValid = false;
-					showSnackbar("Please enter your name.");
-					return false;
-				}
-				
-				if (!/^[A-Za-z\s.]+$/.test(name)) {
-					showSnackbar("Name should contain only alphabets.");					
-					return false;
-				}
-				
-				if(!address){
-					showSnackbar("Please enter your address.");					
-					return false;
-				}
-				
-			} else if (step === 2) {
-				const streets = $('#streetName option:selected').val();
-				console.log("streets="+streets);
-				const longitude = $('#longitude_field').val();
-				const latitude = $('#latitude_field').val();
-				const streetId = $('#streetId').val();
-				const landmark = $('#landmark').val();
-				const stepzone= $('#zone').val();
-				const stepward = $('#ward').val();
-				
-
-				// Validate street
-				if (!streets) {
-					isValid = false;
-					showSnackbar("Please Select the street.");
-					return false;
-				}
-
-				// Validate longitude and latitude
-				if (longitude === '' || isNaN(longitude)) {
-					isValid = false;
-					showSnackbar("Please enter a valid longitude.");
-					return false;
-				}
-				if (latitude === '' || isNaN(latitude)) {
-					isValid = false;
-					showSnackbar("Please enter a valid latitude.");
-					return false;
-				}
-
-				// Validate street ID
-				if (streetId === '') {
-					isValid = false;
-					showSnackbar("Please enter the street ID.");
-					return false;
-				}
-
-				// Validate landmark
-				if (landmark === '') {
-					isValid = false;
-					showSnackbar("Please enter the landmark.");
-					return false;
-				}
-				
-				if (stepzone === '') {
-					isValid = false;
-					showSnackbar("Please enter the Zone.");
-					return false;
-				}
-				
-				if (stepward === '') {
-					isValid = false;
-					showSnackbar("Please enter the Ward.");
-					return false;
-				}
-				
-			}
-			else if (step === 3){
-				
-				 // Get all checked checkboxes
-			    const checkedBoxes = $(".compCheckbox:checked");
-
-			    // ✅ No checkboxes selected
-			    if (checkedBoxes.length === 0) {
-			        isValid = false;
-			        showSnackbar("Please select Item Type");
-			        return false;
-			    }
-			    
-			    // ✅ Check if each has a quantity value entered
-			    let allQuantitiesFilled = true;
-
-			    checkedBoxes.each(function () {
-			        const itemId = $(this).val();
-			        const quantity = $(`input[name='quantity-${itemId}']`).val();
-
-			        if (!quantity || parseInt(quantity) <= 0) {
-			            allQuantitiesFilled = false;
-			            showSnackbar("Please enter quantity for Selected Item Type");
-			            return false; // break loop
-			        }
-			        
-			     // ✅ Special case: Sofa (id = 2)
-			        if (itemId == "2") {
-			            const sofaSize = $(`select[name='size-${itemId}']`).val();
-			            if (!sofaSize) {
-			            	allQuantitiesFilled = false;
-			                showSnackbar("Please select Sofa size");
-			                return false; // break loop
-			            }
-			        }
-			        
-			        
-			    });
-			    			    
-			    if (!allQuantitiesFilled) {
-			        isValid = false;
-			        return false;
-			    }
-
-			    
-			}
-
-			return isValid;
-		}
-
-		function populateSummary() {
-			const name = $('#name').val();
-			const street = $('#streetName option:selected').text();
-			const mobileNo = $('#mobileNo').val();			
-			const compaddress=$('#address').val().trim();
-			const complaintDetails = $('#remarks').val(); // Others complaint details
-
-			//$('#summaryComplaintTitle').text(complaintTitle);
-			//$('#summaryComplaintType').text(complaintType);  
-			$('#summaryDescription').text(complaintDetails);
-			$('#summaryAddress').text(compaddress);
-
-
-			//const streetid = $('#street_id').val();
-			const streetid = $('#streetId').val();
-			const landmark = $('#landmark').val();
-			const latitude = $('#latitude_field').val();
-			const longtitude = $('#longitude_field').val();
-
-			$('#summaryName').text(name);
-			$('#summaryStreet').text(street);
-			$('#summaryMobile').text(mobileNo);
-
-			$('#summaryStreetId').text(streetid);
-			$('#summaryLandmark').text(landmark);
-			$('#summaryLatitude').text(latitude);
-			$('#summaryLongitude').text(longtitude);
-			
-			
-			const summaryzone= $('#zone').val();
-			const summaryward = $('#ward').val();
-			$('#summaryZone').text(summaryzone);
-			$('#summaryWard').text(summaryward);
-			
-			// Generate complaint summary
-		    let complaintSummary = "";
-		    let line = "";
-		    let count = 0;
-
-		    $(".compCheckbox:checked").each(function () {
-		        const itemId = $(this).val();
-		        const itemName = $(this).data("name");
-		        const quantity = $(`input[name='quantity-${itemId}']`).val();
-
-		        if (quantity && parseInt(quantity) > 0) {
-		            let extraInfo = "";
-
-		            // ✅ Special case: Sofa (id=2) → include size if selected
-		            if (itemId == "2") {
-		                const sofaSize = $(`select[name='size-${itemId}']`).val();
-		                if (sofaSize) {
-		                    extraInfo = ` (${sofaSize})`;
-		                }
-		            }
-
-		            line += `<strong>${itemName}${extraInfo}</strong> - ${quantity}&nbsp;&nbsp;&nbsp; `;
-		            count++;
-
-		            if (count % 2 === 0) {
-		                complaintSummary += line + "<br>";
-		                line = "";
-		            }
-		        }
-		    });
-
-		    // Add any remaining items not yet added
-		    if (line.trim() !== "") {
-		        complaintSummary += line;
-		    }
-
-		    if (complaintSummary === "") {
-		        complaintSummary = `<span class="text-danger">No valid complaint type selected.</span>`;
-		    }
-
-		    $("#summaryComplaintType").html(complaintSummary);
-
-
-		}
-
-
-		$(document).ready(function () {
-						
-			showStep(currentStep);
-		});
-
-		
-		$(document).ready(function () {
-			showStep(currentStep);
-		});
-	
-
-		//Script For Map
-
-		function myMap() {
-	const defaultCenter = { lat: 13.0827, lng: 80.2707 };
-	const map = new google.maps.Map(document.getElementById("googleMap"), {
-		center: defaultCenter,
-		zoom: 14
-	});
-
-	let marker = null;
-	let streetsList = []; // ✅ Define globally inside myMap
-	const infowindow = new google.maps.InfoWindow();
-
-	// 🔍 Initialize the SearchBox
-	const input = document.getElementById('pac-input');
-	const searchBox = new google.maps.places.SearchBox(input);
-	//map.controls[google.maps.ControlPosition.TOP_LEFT].push(input);
-
-	map.addListener('bounds_changed', function () {
-		searchBox.setBounds(map.getBounds());
-	});
-
-	searchBox.addListener('places_changed', function () {
-		const places = searchBox.getPlaces();
-		if (places.length === 0) return;
-
-		if (marker) marker.setMap(null);
-		const place = places[0];
-		if (!place.geometry) return;
-
-		marker = new google.maps.Marker({
-			map: map,
-			position: place.geometry.location
-		});
-
-		const lat = place.geometry.location.lat().toFixed(6);
-		const lng = place.geometry.location.lng().toFixed(6);
-		document.getElementById("latitude_field").value = lat;
-		document.getElementById("longitude_field").value = lng;
-
-		map.setCenter(place.geometry.location);
-		map.setZoom(15);
-
-		infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
-		infowindow.open(map, marker);
-
-		fetchStreets(lat, lng);
-	});
-
-	map.addListener("click", function (event) {
-		const clickedLatLng = event.latLng;
-		if (marker) marker.setMap(null);
-
-		marker = new google.maps.Marker({
-			position: clickedLatLng,
-			map: map
-		});
-
-		const lat = clickedLatLng.lat().toFixed(6);
-		const lng = clickedLatLng.lng().toFixed(6);
-
-		document.getElementById("latitude_field").value = lat;
-		document.getElementById("longitude_field").value = lng;
-
-		infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
-		infowindow.open(map, marker);
-
-		fetchStreets(lat, lng);
-	});
-
-	// ✅ Move fetchStreets here inside myMap, and use local streetsList
-	function fetchStreets(lat, lng) {
-		const encodedGeometry = encodeURIComponent(JSON.stringify({ y: lat, x: lng }));
-		const streetURL = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/0/query?` +
-			`where=&objectIds=&time=&geometry=${encodedGeometry}` +
-			`&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25` +
-			`&units=esriSRUnit_Meter&relationParam=&outFields=region%2Cnew_zone%2C+new_ward%2Croad_id%2C+road_name%2Cgis_id%2Ctype` +
-			`&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=` +
-			`&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=` +
-			`&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=` +
-			`&resultRecordCount=&returnTrueCurves=false&returnExceededLimitFeatures=false&quantizationParameters=&returnCentroid=false` +
-			`&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault` +
-			`&datumTransformation=&f=geojson`;
-
-		const streetSelect = document.getElementById("streetName");
-		streetSelect.innerHTML = "";
-
-		const defaultOption = document.createElement("option");
-		defaultOption.value = "";
-		defaultOption.text = "-- Select Street --";
-		streetSelect.appendChild(defaultOption);
-
-		document.getElementById("streetId").value = "";
-		document.getElementById("landmark").value = "";
-		document.getElementById("zone").value = "";
-		document.getElementById("ward").value = "";
-
-		// Timeout mechanism: 1 seconds
-		const timeout = new Promise((_, reject) =>
-			setTimeout(() => reject(new Error("Request timed out")), 1000)
-		);
-		
-		// Actual fetch
-		const fetchRequest = fetch(streetURL).then(res => res.json());
-
-		Promise.race([fetchRequest, timeout])
-			.then(data => {
-				const features = data.features;
-				if (!features || features.length === 0) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'No Street Found',
-						text: 'Please select the nearby street.',
-					});
-					return;
-				}
-
-				streetsList = features.map(f => f.properties); //Save for use in dropdown
-				streetsList.forEach((props, index) => {
-					const option = document.createElement("option");
-					option.value = index;
-					option.text = props.road_name;
-					streetSelect.appendChild(option);
-				});
-			})
-			.catch(err => {
-				console.error("Error fetching street:", err);
-				Swal.fire("Failed to load street data", '', 'error');
-			});
-	}
-
-	document.getElementById("streetName").addEventListener("change", function () {
-		const selectedIndex = this.value;
-		if (selectedIndex !== "") {
-			const selectedStreet = streetsList[selectedIndex];
-			
-			console.log("selectedStreet.new_zone==="+selectedStreet.new_zone);
-
-			document.getElementById("streetId").value = selectedStreet.road_id;
-			document.getElementById("landmark").value = selectedStreet.type;
-			document.getElementById("zone").value = selectedStreet.new_zone;
-			document.getElementById("ward").value = selectedStreet.new_ward;
-
-			console.log("Selected street:", selectedStreet);
-		} else {
-			document.getElementById("streetId").value = "";
-			document.getElementById("landmark").value = "";
-			document.getElementById("zone").value = "";
-			document.getElementById("ward").value = "";
-		}
-	});
-}
-		function fetchSuggestions(query) {
-			// ArcGIS API URL to fetch suggestions based on the input query
-			const arcgisSuggestionUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=UPPER(road_name)%20LIKE%20'%25${query.toUpperCase()}%25'&outFields=road_name,zone,ward,road_id&returnGeometry=true&f=geojson`;
-
-			fetch(arcgisSuggestionUrl)
-				.then(response => response.json())
-				.then(data => {
-					var suggestions = document.getElementById('suggestions');
-					suggestions.innerHTML = '';
-
-					if (data.features && data.features.length > 0) {
-						suggestions.style.display = 'block';
-						var ul = document.createElement('ul');
-						data.features.forEach(function (result) {
-							var lat = result.geometry.coordinates[1];
-							var lng = result.geometry.coordinates[0];
-							var roadName = result.properties.road_name || 'Unknown Road';
-							/* var zone = result.properties.zone || 'Unknown Zone';
-							var ward = result.properties.ward || 'Unknown Ward'; */
-							var roadId = result.properties.road_id || 'Unknown Road ID'
-
-							// Creating the suggestion item with road name, zone, and ward
-							var li = document.createElement('li');
-							li.textContent = `${roadName} - Zone: ${zone}, Ward: ${ward}`;
-							li.dataset.latlng = JSON.stringify([lat, lng]);
-							li.dataset.roadName = roadName;
-							li.dataset.roadId = roadId;
-							/* 	li.dataset.zone = zone;
-								li.dataset.ward = ward; */
-							ul.appendChild(li);
-						});
-						suggestions.appendChild(ul);
-					} else {
-						suggestions.style.display = 'none';
-					}
-				})
-				.catch(error => console.error('Error fetching suggestions:', error));
-		}
-
-		function fetchLocationInfoByMap(lat, lng, marker) {
-			const arcgisUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=&objectIds=&time=&geometry=%7B%22y%22%3A${lat}%2C%22x%22%3A${lng}%7D&geometryType=esriGeometryEnvelope&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25&units=esriSRUnit_Meter&relationParam=&outFields=zone%2Cward%2Croad_id%2Croad_name&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=&resultRecordCount=&returnTrueCurves=false&returnCentroid=false&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&datumTransformation=&lodType=geohash&lod=&lodSR=&f=geojson`;
-
-			fetch(arcgisUrl)
-				.then(response => response.json())
-				.then(data => {
-					console.log(data);
-					let info;
-					if (data.features && data.features.length > 0) {
-						const properties = data.features[0].properties;
-						const roadName = properties.road_name || 'N/A';
-						/* 	const zone = properties.zone || 'N/A';
-							const ward = properties.ward || 'N/A'; */
-						const roadId = properties.road_id || 'N/A';
-
-						info = `Road Name: ${roadName}<br>Zone: ${zone}<br>Ward: ${ward}<br>Latitude: ${lat}<br>Longitude: ${lng}`;
-						document.getElementById("street").value = roadName;
-						document.getElementById("latitude_field").value = lat;
-						document.getElementById("longitude_field").value = lng;
-						//document.getElementById("street_id").value = roadId;
-						document.getElementById("streetId").value = roadId;
-						document.getElementById("landmark").value = roadName;
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					} else {
-						document.getElementById("street").value = "No road data found for this location";
-						document.getElementById("latitude_field").value = "No latitude data found for this location";
-						document.getElementById("longitude_field").value = "No latitude data found for this location";
-						//document.getElementById("street_id").value = "No street id data found for this location";
-						document.getElementById("streetId").value = "No street id data found for this location";
-						document.getElementById("landmark").value = "No landmark data found for this location";
-						info = `No road data found for this location`
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					}
-				})
-				.catch(error => {
-					console.error('Error fetching road data:', error);
-					marker.bindTooltip(`Error fetching road data.<br>Latitude: ${lat}<br>Longitude: ${lng}`, {permanent: false, direction: 'top'}).openTooltip();
-				});
-		}
-
-		function fetchLocationInfoBySuggestions(lat, lng, marker) {
-			const arcgisUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=&objectIds=&time=&geometry=%7B%22y%22%3A${lat}%2C%22x%22%3A${lng}%7D&geometryType=esriGeometryEnvelope&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25&units=esriSRUnit_Meter&relationParam=&outFields=zone%2Cward%2Croad_id%2Croad_name&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=&resultRecordCount=&returnTrueCurves=false&returnCentroid=false&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&datumTransformation=&lodType=geohash&lod=&lodSR=&f=geojson`;
-
-			fetch(arcgisUrl)
-				.then(response => response.json())
-				.then(data => {
-					console.log(data);
-					let info;
-					if (data.features && data.features.length > 0) {
-						const properties = data.features[0].properties;
-						const roadName = properties.road_name || 'N/A';
-						 		/* const zone = properties.zone || 'N/A';
-								const ward = properties.ward || 'N/A'; */
-						const roadId = properties.road_id || 'N/A';
-						
-						//console.log("======="+zone,ward);
-
-						info = `Road Name: ${roadName}<br>Zone: ${zone}<br>Ward: ${ward}<br>Latitude: ${lat}<br>Longitude: ${lng}`;
-						document.getElementById("street").value = roadName;
-						document.getElementById("latitude_field").value = lat;
-						document.getElementById("longitude_field").value = lng;
-						//document.getElementById("street_id").value = roadId;
-						document.getElementById("streetId").value = roadId;
-						document.getElementById("landmark").value = roadName;
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					} else {
-						document.getElementById("street").value = suggestedRoadName;
-						document.getElementById("latitude_field").value = lat;
-						document.getElementById("longitude_field").value = lng;
-						//document.getElementById("street_id").value = suggestedRoadId;
-						document.getElementById("streetId").value = suggestedRoadId;
-						document.getElementById("landmark").value = suggestedRoadName;
-						info = `Road Name: ${suggestedRoadName}<br>Zone: ${suggestedZone}<br>Ward: ${suggestedWard}<br>Latitude: ${lat}<br>Longitude: ${lng}`
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					}
-				})
-				.catch(error => {
-					console.error('Error fetching road data:', error);
-					marker.bindTooltip(`Error fetching road data.<br>Latitude: ${lat}<br>Longitude: ${lng}`, {permanent: false, direction: 'top'}).openTooltip();
-				});
-		}
-		
-		$(document).ready(function () {
-			$('#submitButton').click(function (e) {
-				e.preventDefault(); // Prevent the default form submission
-				
-				$('#submitButton').prop('disabled', true).text('Processing...');
-
-				// Collect data from the form fields
-				var complainantName = $('#summaryName').text().trim();
-				var complainantStreet = $('#summaryStreet').text().trim();
-				var mobileNo = $('#summaryMobile').text().trim();
-				var useraddress=$('#summaryAddress').text().trim();
-				var complaintDetails = $('#summaryDescription').text().trim();
-				var streetId = $('#summaryStreetId').text().trim();
-				var landmark = $('#summaryLandmark').text().trim();
-				var latitude = $('#summaryLatitude').text().trim();
-				var longtitude = $('#summaryLongitude').text().trim(); // Note the misspelling
-
-				var zone=$('#summaryZone').text().trim();
-				var ward=$('#summaryWard').text().trim();
-
-				var userId = document.getElementById('userIdSpan').textContent;
-				
-				// ✅ Collect selected items and their quantities
-			     var items = [];
-        		 var error = false;
-        		 $(".compCheckbox:checked").each(function () {
-        	            var compitemId = $(this).val();
-        	            var compquantity = $(`input[name='quantity-${compitemId}']`).val();
-
-        	            if (!compquantity || parseInt(compquantity) <= 0) {
-        	                Swal.fire('Error', 'Please enter quantity for selected items.', 'error');
-        	                error = true;
-        	                return false; // break
-        	            }
-
-        	            var itemData = {
-        	                item_id: compitemId,
-        	                quantity: compquantity
-        	            };
-
-        	            // ✅ Special case for Sofa (id = 2)
-        	            if (compitemId == "2") {
-        	                var sofaSize = $(`select[name='size-${compitemId}']`).val();
-        	                if (!sofaSize) {
-        	                    Swal.fire('Error', 'Please select Sofa size.', 'error');
-        	                    error = true;
-        	                    return false;
-        	                }
-        	                itemData["sofa_size"] = sofaSize; // add sofa size in payload
-        	            }
-
-        	            items.push(itemData);
-        	        });
-
-        	        if (error) {
-        	            $('#submitButton').prop('disabled', false).text('Submit');
-        	            return;
-        	        }
-
-        	        if (items.length === 0) {
-        	            Swal.fire('Error', 'Please select at least one item with quantity.', 'error');
-        	            $('#submitButton').prop('disabled', false).text('Submit');
-        	            return;
-        	        }
-
-			    var itemsJson = JSON.stringify(items);
-
-				console.log({
-					user_name: complainantName,
-					address: useraddress,
-					mobile: mobileNo,
-					remarks: complaintDetails,
-					street_id: streetId,
-					street_name:complainantStreet,
-					latitude: latitude,
-					longtitude: longtitude,
-					itemsJson:itemsJson,
-					userId:userId,
-					zone:zone,
-					ward:ward
-				}); 
-
-				// AJAX call to your backend controller
-				 $.ajax({
-					url: '/gcc/api/domestic_waste/saverequest', 
-					type: 'POST',
-					data: {
-						user_name: complainantName,
-						address: useraddress,
-						mobile: mobileNo,
-						remarks: complaintDetails,
-						street_id: streetId,
-						street_name:complainantStreet,
-						latitude: latitude,
-						longitude: longtitude,
-						items: itemsJson,
-						userId:userId,
-						zone:zone,
-						ward:ward
-					},
-					success: function (response) {
-						$('#submitButton').prop('disabled', false).text('Submit');
-						// SweetAlert upon success
-						console.log("API Response:", response);
-						// Ensure response is a JavaScript object
-						
-						 if (response.status) {
-							 
-							  Swal.fire({
-						            title: 'Success!',
-						            text: `Request saved successfully. Your ID: ${response.requestId}`,
-						            icon: 'success',
-						            allowOutsideClick: false, // Disable clicking outside the modal to close it
-				                    allowEscapeKey: false, // Disable escape key to close the modal
-				                    allowEnterKey: false, // Disable enter key to close the modal
-				                    showConfirmButton: true, // Ensure the confirm button is visible
-						            confirmButtonText: 'OK'
-						        }).then(result => {
-						            if (result.isConfirmed) {
-						                location.reload();
-						            }
-						        });
-						 }
-						
-						 
-						    else {
-						        Swal.fire("Error", response.message || 'Failed to save request.', "error");
-						    }
-												
-					},
-					error: function (xhr) {
-					    $('#submitButton').prop('disabled', false).text('Submit');
-					    let message = "Submission failed. Please try again.";
-
-					    try {
-					        const res = JSON.parse(xhr.responseText);
-					        if (res.error) {
-					            message = res.error;
-					        }
-					    } catch (e) {
-					        console.error("Error parsing error response:", e);
-					    }
-
-					    Swal.fire("Error", message, "error");
-					}
-				}); 
-				
-				
-			});
-
-		});
-		
-		
-		$(document).ready(function () {  
-		    loadComplaintTypes();		    
-		});
-
-		function loadComplaintTypes() {
-		    $.ajax({
-		        url: "/gcc/api/domestic_waste/getitems",
-		        dataType: "json",
-		        type: "GET",
-		        success: function (res) {
-		            console.log("res=", res);
-
-		            // Clear container
-		            $("#complaintCheckboxContainer").empty();
-
-		            // Access res.data instead of res
-		            if (res.status === "success" && Array.isArray(res.data)) {
-		                res.data.forEach(item => {
-		                    $("#complaintCheckboxContainer").append(`
-		                        <li class="list-unstyled">
-		                            <label class="dropdown-item d-flex align-items-center">
-		                                <input type="checkbox" class="compCheckbox mr-2" value="${item.id}" data-name="${item.item_name}"> 
-		                                <span>${item.item_name}</span>
-		                            </label>
-		                        </li>
-		                    `);
-		                });
-		            } else {
-		                console.error("Error: Invalid response format", res);
-		            }
-
-		            
-		         // Handle checkbox changes
-		            $("#complaintCheckboxContainer").on("change", ".compCheckbox", function () {
-		                const itemId = $(this).val();
-		                const itemName = $(this).data("name");
-		                const $container = $("#complaintQuantityContainer");
-
-		                if ($(this).is(":checked")) {
-		                    let extraField = "";
-
-		                    // Special case: Sofa (id = 2)
-		                    if (itemId == "2") {
-		                        extraField = `
-		                            <div class="col-sm-12 col-md-6">
-		                                <label>Select size of ${itemName}:<span class="text-danger">*</span></label>
-		                                <select class="form-control" name="size-${itemId}" required>
-		                                    <option value="">-- Select Size --</option>
-		                                    <option value="Big">Big</option>
-		                                    <option value="Small">Small</option>
-		                                </select>
-		                            </div>
-		                        `;
-		                    }
-
-		                    $container.append(`
-		                        <div class="col-sm-12 col-md-6 mb-3" id="input-${itemId}">
-		                            <div class="form-row">
-		                                <div class="col-sm-12 col-md-6">
-		                                    <label>Enter quantity of ${itemName}:<span class="text-danger">*</span></label>
-		                                    <input type="number" min="1" class="form-control" name="quantity-${itemId}" required>
-		                                </div>
-		                                ${extraField}
-		                            </div>
-		                        </div>
-		                    `);
-		                } else {
-		                    $(`#input-${itemId}`).remove();
-		                }
-		            });
-
-		        },
-		        error: function (xhr, status, error) {
-		            console.error("Error loading complaint categories:", status, error);
-		        }
-		    });
-		}
-
-
-		
-        </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/overallreport.html b/src/main/resources/templates/modules/callcenterqaqc/overallreport.html
deleted file mode 100644
index 20fed606..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/overallreport.html
+++ /dev/null
@@ -1,613 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>PGR Reports</h5>
-										<span>1913 PGR Reports</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Reports</li>
-										<li class="breadcrumb-item active" aria-current="page">Overall Reports</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Reports Filters</span>
-								</div>
-								<div class="card-body">
-									<div class="row">
-										<div class="col-sm-2 mb-2">
-											<label for="startDate" style="font-size: medium;">From Date:</label>
-						                    <input type="date" id="startDate" class="form-control">
-										</div>
-										<div class="col-sm-2 mb-2">
-											<label for="endDate" style="font-size: medium;">To Date:</label>
-						                    <input type="date" id="endDate" class="form-control">
-										</div>
-										
-										<div class="col-sm-2 mb-2">
-								            <label for="regiondropdown" style="font-size: medium;">Region:</label>
-								            <select id="regiondropdown" class="form-control">
-								            <option value="">Select</option>
-								            <option value="North Region">North Region</option>
-								            <option value="Central Region">Central Region</option>
-								            <option value="South Region">South Region</option>
-								            
-											</select>
-										</div>
-										
-										<div class="col-sm-2 mb-2">
-								            <label for="stsdropdown" style="font-size: medium;">Status:</label>
-								            <select id="stsdropdown" class="form-control">
-								            <option value="total">Select</option>
-								            <option value="processing">Processing</option>
-								            <option value="reopened">Reopened</option>
-								            <option value="pendingwithinsla">Pending Within SLA</option>
-								            <option value="pendingbelow15days">Pending Below 15days</option>
-								            <option value="pending15to30days">Pending 15 to 30 days</option>
-								            <option value="pending30to60days">Pending 30 to 60 days</option>
-								            <option value="pendingabove60days">Pending Above 60 days</option>
-								            <option value="redressed">Action Taken Level 1</option>
-								            <option value="closed">Action Taken Level 2</option>
-								            <option value="completed">Final Closure</option>
-											</select>
-										</div>
-										
-										<div class="col-sm-2 mb-2">
-								            <label for="dropdown4" style="font-size: medium;">Group:</label>
-								            <select id="dropdown4" class="form-control">
-								            <option value="">Select</option>
-								               <!--  <option value="">general</option> -->
-								                <!-- Add options here -->
-											</select>
-										</div>
-															
-									
-										<div class="col-sm-2 mb-2">
-											 <label for="dropdown1"  style="font-size: medium;">Type:</label>
-						                     <select id="dropdown1" class="form-control">
-							                 <option value="">Select</option>
-							            	 <!-- <option value="Cleanliness in Parks">Cleanliness in Parks</option> -->
-
-											</select>
-										</div>
-
-										<div class="col-sm-2 mb-2">
-								            <label for="dropdown3" style="font-size: medium;">Mode:</label>
-								            <select id="dropdown3" class="form-control">
-								                <option value="">Select</option>
-								                <!-- <option value="">INTERNET</option> -->
-
-											</select>
-										</div>
-										
-										<div class="col-sm-2 mb-2">
-											<label for="dropdown2" style="font-size: medium;">Zone:</label>
-						                    <select id="dropdown2" class="form-control">
-						                    <option value="">Select</option>
-						                    <!-- <option value="N01">N01</option> -->
-												<!-- <option value="ALL">ALL</option> -->
-
-											</select>
-										</div>
-										
-										</div>
-										<!-- <div class="row mt-2">
-										
-										</div> -->
-									
-									
-									<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-			
-					
-					<div class="row mt-4">
-									<div class="col-md-12">
-										<div class="card">
-										<div class="card-header">
-											<span style="font-size: medium;font-weight: bold;">Reports List</span>
-										</div>
-										<div class="card-body">
-											<div class="table-responsive">
-
-												<table id="ReportDatatable"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-
-															<th class="text-center no-sort">S.No</th>
-															<th class="text-center no-sort">Complaint Number</th>
-															<th class="text-center">Complaint Type</th>
-															<th class="text-center">Complaint Group</th>
-															<th class="text-center">Mode</th>
-															
-															<th class="text-center">Department</th>															
-															<th class="text-center">Zone</th>
-															<th class="text-center">Ward</th>
-															<th class="text-center no-sort">Public Name</th>
-															<th class="text-center no-sort">Address</th>	
-															<th class="text-center">Public Mobile no</th>
-															<th class="text-center">Media Link</th>													
-															<th class="text-center">Assign To</th>
-															<th class="text-center">Official Contact Number</th>																															
-															<th class="text-center">Current Status</th>														
-															<th class="text-center">Complaint Opened Date</th>	
-															<th class="text-center">Complaint Redressed Date</th>
-															<th class="text-center">Complaint Closed Date</th>
-															<th class="text-center">Complaint Reopen Date</th>																												
-															<th class="text-center">Complaint Completed  Date</th>
-														</tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-										</div>
-									 </div>
-									</div>
-								</div>
-					
-				</div>
-
-			</div>
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-
-	<!-- in the code use to show the download different type microsoft -->
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">
-	document.addEventListener("DOMContentLoaded", function () {
-	    const complaintTypeDropdown = document.getElementById('dropdown1');
-	    const complaintGroupDropdown = document.getElementById('dropdown4');
-	    const complaintModeDropdown = document.getElementById('dropdown3');
-	    const complaintZoneDropdown = document.getElementById('dropdown2');
-	    const regionDropdown = document.getElementById('regiondropdown');
-	    
-	    let allZones = [];
-	    // Load Complaint Groups
-	    fetch('/gcc/api/callcenterqaqc/getComplaintGroup') 
-	        .then(response => response.json())
-	        .then(data => {
-	            // Clear existing options
-	            complaintGroupDropdown.innerHTML = `<option value="">Select</option>`;
-
-	            // Add options from the API response
-	            data.forEach(complaintGroupName => {
-	                complaintGroupDropdown.innerHTML += `<option value="${complaintGroupName}">${complaintGroupName}</option>`;
-	            });
-	        })
-	        .catch(error => {
-	            console.error('Error fetching complaint groups:', error);
-	        });
-
-	    // Event Listener for Complaint Group Change
-	    complaintGroupDropdown.addEventListener('change', function () {
-	        const selectedGroup = complaintGroupDropdown.value;
-
-	        if (selectedGroup) {
-	            // Fetch Complaint Types based on selected group
-	            fetch(`/gcc/api/callcenterqaqc/getComplaintTypesByGroup?group=${encodeURIComponent(selectedGroup)}`)
-	                .then(response => response.json())
-	                .then(data => {
-	                    // Clear existing options
-	                    complaintTypeDropdown.innerHTML = `<option value="">Select</option>`;
-
-	                    // Add options from the API response
-	                    data.forEach(complaintTypeName => {
-	                        complaintTypeDropdown.innerHTML += `<option value="${complaintTypeName}">${complaintTypeName}</option>`;
-	                    });
-	                })
-	                .catch(error => {
-	                    console.error('Error fetching complaint types:', error);
-	                });
-	        } else {
-	            // Clear complaint type dropdown if no group is selected
-	            complaintTypeDropdown.innerHTML = `<option value="">Select</option>`;
-	        }
-	    });
-	    
-	    
-	    // Load all Modes 
-	    fetch('/gcc/api/callcenterqaqc/getModes') 
-	    .then(response => response.json())
-	    .then(data => {
-	        // Clear existing options
-	        complaintModeDropdown.innerHTML = `<option value="">Select</option>`;
-
-	        // Add options from the API response
-	        data.forEach(complaintMode => {
-	        	complaintModeDropdown.innerHTML += `<option value="${complaintMode}">${complaintMode}</option>`;
-	        });
-	    })
-	    .catch(error => {
-	        console.error('Error fetching complaint groups:', error);
-	    });
-	    
-	    
-	 // Load all zones and store them globally
-	    fetch('/gcc/api/callcenterqaqc/getZones') 
-	        .then(response => response.json())
-	        .then(data => {
-	            allZones = data; // Store zones globally
-	            updateZoneDropdown(); // Populate zones initially
-	        })
-	        .catch(error => console.error('Error fetching complaint zones:', error));
-
-	    // Event Listener for Region Dropdown Change
-	    regionDropdown.addEventListener('change', updateZoneDropdown);
-
-	    // Function to update Zone Dropdown based on Region selection
-	    function updateZoneDropdown() {
-	        const selectedRegion = regionDropdown.value;
-	        complaintZoneDropdown.innerHTML = `<option value="">Select</option>`;
-
-	        let filteredZones = [];
-
-	        if (selectedRegion === "North Region") {
-	            filteredZones = allZones.filter(zone => zone >= "N01" && zone <= "N05");
-	        } else if (selectedRegion === "Central Region") {
-	            filteredZones = allZones.filter(zone => zone >= "N06" && zone <= "N10");
-	        } else if (selectedRegion === "South Region") {
-	            filteredZones = allZones.filter(zone => zone >= "N11" && zone <= "N15");
-	        } else {
-	            // Show all if no region is selected
-	            filteredZones = allZones;
-	        }
-
-	        filteredZones.forEach(zone => {
-	            complaintZoneDropdown.innerHTML += `<option value="${zone}">${zone}</option>`;
-	        });
-	    }
-	    
-	});
-	
-	 $(document).ready(function() {
-
-     	var table = $('#ReportDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '80vh',
-             scrollX: true,
-             
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: true,
-             responsive: false,
-             searching: true,
-             select: false,
-             processing: false
-         });
-     	
-     // Event listener for From Date selection
-  	   $("#startDate").on("change", function() {
-  	       const startDate = $(this).val();  // Get the selected start date
-  	       // Set the min value for To Date to be the selected From Date
-  	       $("#endDate").attr("min", startDate);
-  	   });
-
-  	   // Event listener for To Date selection
-  	   $("#endDate").on("change", function() {
-  	       const endDate = $(this).val();  // Get the selected end date
-  	       // Set the max value for From Date to be the selected To Date
-  	       $("#startDate").attr("max", endDate);
-  	   });
-  	   
-  	 	document.getElementById('resetBtn').addEventListener('click', function () {
-      	event.preventDefault();
-      	
-      	window.location.href="/gcc/callcenterqaqcreports/overallreport";
-      	
-      	});
-  	 	
-  	 	document.getElementById('searchBtn').addEventListener('click', function (e) {
-  	 		
-  	 		
-  	 		let startDate = document.getElementById('startDate').value;
-     	    let endDate = document.getElementById('endDate').value;
-     	    
-     	    let status = document.getElementById('stsdropdown').value;
-     	    let group= document.getElementById('dropdown4').value;
-     	 	let type= document.getElementById('dropdown1').value;
-     	    let mode= document.getElementById('dropdown3').value;
-     	    let zone= document.getElementById('dropdown2').value;
-     	    let region=document.getElementById('regiondropdown').value;
-     	    
-     	   console.log("startdate: ",startDate);
-    	   console.log("enddate: ",endDate);
-    	   console.log("status: ",status);
-    	   console.log("group: ",group);
-    	   console.log("type: ",type);
-    	   console.log("mode: ",mode);
-    	   console.log("zone: ",zone);
-    	   console.log("region: ",region);
-    	   if (!startDate && !endDate) {
-    	        Swal.fire({
-    	            icon: 'warning',
-    	            title: 'Error',
-    	            text: 'Please Select Both From Date and To Date',
-    	            showConfirmButton: true,
-    	            timer: 3000
-    	        });
-    	        e.preventDefault(); // Prevent the default action
-    	        return; // Stop further execution
-    	    }
-    	   const params = new URLSearchParams({
-    	        startDate: startDate,
-    	        endDate: endDate,
-    	        status: status,
-    	        group: group,
-    	        type: type,
-    	        mode: mode,
-    	        zone: zone,
-    	        region:region
-    	    });
-    	   $('#pageLoader').show();
-    	   $.ajax({
-               type: "GET",
-               url: `/gcc/api/callcenterqaqc/getfilterreport?${params.toString()}`, // Append query string to URL
-               contentType: "application/json",
-               success: function (response) {
-            	    console.log("API Response:", response);
-            	    $('#pageLoader').hide();
-            	    if (response.status === "success") {
-            	        console.log("Details Array:", response.details);
-            	        // Ensure details is an array and has at least one entry
-            	        if (Array.isArray(response.details) && response.details.length > 0) {
-            	            let table = $('#ReportDatatable').DataTable({
-            	                destroy: true,
-            	                searching: true,
-            	                autoWidth: true,           	                
-            	                paging: true,
-            	                info: true,
-            	                data: response.details,           	                
-            	                columns: [
-            	                    { 
-            	                        data: null, 
-            	                        render: (data, type, row, meta) => meta.row + 1, 
-            	                        className: 'text-center' 
-            	                    },
-            	                    { data: 'Complaint Number', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Complaint Type', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Complaint Group', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Complaint Mode', defaultContent: '-', className: 'text-center' },
-            	                    
-            	                    { data: 'Department', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Zone', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Ward', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Complaint Person Name', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Address', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Complaint Person Number', defaultContent: '-', className: 'text-center' },
-            	                    {
-            	                        data: 'Media Link',
-            	                        defaultContent: '-',
-            	                        className: 'text-center',
-            	                        render: function (data, type, row) {
-            	                            if (!data || data === "null" || data.trim() === "") {
-            	                                return '-';
-            	                            }
-            	                            // ✅ Make it a clickable hyperlink opening in a new tab
-            	                            return `<a href="${data}" target="_blank" style="color: #007bff; text-decoration: underline;">${data}</a>`;
-            	                        }
-            	                    },
-            	                    { data: 'Assign To', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Official Contact Number', defaultContent: '-', className: 'text-center',render: function (data, type, row) {
-            	                        return (data === null || data === "null") ? '-' : data;
-            	                    } },
-            	                    { data: 'Current Status', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Complaint Opened Date', defaultContent: '-', className: 'text-center' },
-            	                    { data: 'Complaint Redressed Date', defaultContent: '-', className: 'text-center',render: function (data, type, row) {
-            	                        return (data === null || data === "null") ? '-' : data;
-            	                    } },
-            	                    { data: 'Complaint Closed Date', defaultContent: '-', className: 'text-center',render: function (data, type, row) {
-            	                        return (data === null || data === "null") ? '-' : data;
-            	                    } },
-            	                    { data: 'Complaint Reopen Date', defaultContent: '-', className: 'text-center',render: function (data, type, row) {
-            	                        return (data === null || data === "null") ? '-' : data;
-            	                    } },
-            	                    { data: 'Complaint Completed Date', defaultContent: '-', className: 'text-center',render: function (data, type, row) {
-            	                        return (data === null || data === "null") ? '-' : data;
-            	                    } }
-            	                      
-            	                ],
-            	                dom: 'Bfrtip',
-            	                buttons: [
-   	      		                  {
-   	      		                      extend: 'pageLength',
-   	      		                      className: 'btn btn-warning'
-   	      		                  },
-   	      		                  {
-   	      		                      title: 'Data export',
-   	      		                      extend: 'copyHtml5',
-   	      		                      text: 'Copy',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'copyBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'excelHtml5',
-   	      		                      text: 'Excel',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'excelBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'csvHtml5',
-   	      		                      text: 'CSV',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'csvBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'pdfHtml5',
-   	      		                      text: 'PDF',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'pdfBtn'
-   	      		                  }
-   	      		              ],
-   	      		             columnDefs: [
-   	      		                { targets: 'no-sort', orderable: false }
-   	      		            ],
-   	      		            lengthMenu: [
-   	      		                [50, 100, 200, 500, -1],
-   	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-   	      		            ],
-   	      		            scrollY: '80vh',
-   	      		            scrollX: true,   	      		            
-   	      		       		responsive: false,
-   	                		searching: true
-   	      		            });
-            	        }
-            	        
-            	    }
-            	    else if (response.status === "nodata") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	                icon: 'warning',
-        	                title: 'No Data',
-        	                text: 'No data available for the selected criteria.'
-        	            });
-        	        }
-            	    else if (response.status === "error") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	            	icon: 'error',
-            	            title: 'Error',
-            	            text: response.message || 'Something went wrong!'
-        	            });
-        	        }
-            	    else {
-            	    	$('#pageLoader').hide();
-            	        Swal.fire({
-            	            icon: 'error',
-            	            title: 'Error',
-            	            text: response.message || 'Something went wrong!'
-            	        });
-            	    }
-            	},
-
-               error: function (error) {
-               	$('#pageLoader').hide();
-               	Swal.fire({
-    	            icon: 'error',
-    	            title: 'Error',
-    	            text: response.message || 'Something went wrong!'
-    	        });
-               }
-           });
-    	   
-  	 	});
-     	
-     });
-	 
-	 
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/pgrcomplaints.html b/src/main/resources/templates/modules/callcenterqaqc/pgrcomplaints.html
deleted file mode 100644
index efec8cc0..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/pgrcomplaints.html
+++ /dev/null
@@ -1,2145 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-<link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
-<link rel="stylesheet" href="https://unpkg.com/leaflet/dist/leaflet.css">
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
-<script src="https://unpkg.com/leaflet/dist/leaflet.js"></script>
-</head>
-
-<style>
-.required {
-	color: red;
-}
-/* Mobile screens - targeting devices with a max width of 767px */
-@media ( max-width : 767px) {
-	#complaintform label {
-		margin-top: 10px;
-	}
-}
-
-.form-row {
-	margin-bottom: 20px;
-}
-
-.form-step {
-	display: none;
-}
-
-.form-step.active {
-	display: block;
-}
-
-.container {
-	max-width: 100%;
-}
-
-/*css for step 3*/
-.complaint-icons {
-	display: flex;
-	justify-content: space-around;
-	margin-bottom: 20px;
-}
-
-.complaint-icon {
-	text-align: center;
-	cursor: pointer;
-}
-
-.complaint-icon img {
-	width: 50px;
-	height: 50px;
-}
-
-.complaint-fields {
-	display: none;
-}
-
-.complaint-fields.active {
-	display: block;
-}
-
-/*for radio button style*/
-.radio-group {
-	display: flex;
-	align-items: center;
-	/* Ensures all items are aligned to the center */
-}
-
-.radio-item {
-	display: flex;
-	align-items: center;
-	margin-right: 20px;
-	/* Adds space between each radio item */
-}
-
-.radio-item input[type="radio"] {
-	margin-right: 10px;
-	/* Adds space between the radio button and its label */
-	vertical-align: middle;
-	/* Ensures vertical alignment */
-}
-
-.radio-item label {
-	margin: 0;
-	/* Removes any default margins that might affect alignment */
-}
-
-.back-button {
-	background: none;
-	border: none;
-	color: #000;
-	font-size: 16px;
-	cursor: pointer;
-	padding: 0;
-	margin-right: auto;
-	/* Align the button to the left */
-}
-
-.title {
-	text-align: center;
-	flex-grow: 1;
-	font-size: 24px;
-	font-weight: bold;
-	margin: 0;
-}
-
-/*css for map in step2*/
-
-		#googleMap {
-			height: 300px;
-			width: 100%;
-			position: relative;
-			overflow: hidden;
-			max-width: 100%;
-		}
-		
-		#pac-input {
-		    position: absolute;
-		    top: 10px;
-		    left: 50%;
-		    transform: translateX(-50%);
-		    width: 300px;
-		    z-index: 5;
-		    padding: 10px;
-		    border: 1px solid #ccc;
-		    background-color: white;
-		    border-radius: 4px;
-		  }
-		  
-		  
-		  /* Media query for mobile devices */
-			@media (max-width: 576px) {
-			  #pac-input {
-			     top: 55px;
-			     z-index: 5;
-			  }
-			}
-
-		#search-container {
-			position: absolute;
-			top: 10px;
-			left: 50%;
-			transform: translateX(-50%);
-			z-index: 1000;
-			width: 500px;
-			box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3);
-			background-color: white;
-			border-radius: 4px;
-			padding: 0;
-			/* Removed extra padding to match the input width */
-		}
-
-		#search-box {
-			width: 100%;
-			/* Ensures the input takes up the entire width of the container */
-			padding: 5px;
-			font-size: 16px;
-			border: 1px solid #ccc;
-			border-radius: 4px;
-			/* Rounded corners matching the container */
-			box-sizing: border-box;
-			/* Makes sure padding is considered in width */
-		}
-
-		#suggestions {
-			border: 1px solid #ccc;
-			border-radius: 4px;
-			max-height: 200px;
-			overflow-y: auto;
-			margin-top: 5px;
-			background-color: white;
-			display: none;
-			width: 100%;
-			/* Matches the width of the container and input */
-			box-sizing: border-box;
-			/* Ensures the width includes borders and padding */
-		}
-
-		#suggestions ul {
-			list-style: none;
-			padding: 0;
-			margin: 0;
-		}
-
-		#suggestions ul li {
-			padding: 5px;
-			cursor: pointer;
-		}
-
-		#suggestions ul li:hover {
-			background-color: #f0f0f0;
-		}
-
-#reader-btn, #invertColorBtn {
-	padding: 5px 10px;
-	font-size: 14px;
-	cursor: pointer;
-}
-
-.loader {
-	border: 16px solid #f3f3f3;
-	/* Light grey */
-	border-top: 16px solid #3498db;
-	/* Blue */
-	border-radius: 50%;
-	width: 120px;
-	height: 120px;
-	animation: spin 2s linear infinite;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin: -60px 0 0 -100px;
-	/* Center the loader */
-	z-index: 9999;
-	/* Ensure it's on top of everything */
-	display: none;
-	/* Initially hidden */
-}
-
- .row {
-		  display: flex;
-		  flex-wrap: wrap;
-		  margin-bottom: 15px;
-		  
-		} 
-		
- 		.col-md-6 {
-		  flex: 0 0 48%;
-		  max-width: 48%;
-		  display: flex;
-		  flex-direction: column;
-		} 
-		
-		.col-md-6 label {
-		  font-weight: 600;
-		  margin-bottom: 5px;
-		}
-		
-		.col-md-6 select,
-		.col-md-6 input {
-		  height: 38px;
-		  padding: 5px 10px;
-		  border-radius: 5px;
-		  border: 1px solid #ccc;
-		}
-
-@keyframes spin { 0% 
-{
-	transform: rotate(0deg);
-}
-
-100%
-{
-transform:rotate(360deg);
-}
-}
-
-#snackbar {
-			visibility: hidden;
-			min-width: 250px;
-			background-color: #333;
-			color: #fff;
-			text-align: center;
-			border-radius: 2px;
-			padding: 16px;
-			position: fixed;
-			z-index: 1;
-			left: 50%;
-			bottom: 30px;
-			font-size: 17px;
-			transform: translateX(-50%);
-		}
-
-		#snackbar.show {
-			visibility: visible;
-			-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
-			animation: fadein 0.5s, fadeout 0.5s 2.5s;
-		}
-
-
-@-webkit-keyframes fadein {from { bottom:0;
-	opacity: 0;
-}
-
-to {
-	bottom: 30px;
-	opacity: 1;
-}
-
-}
-@keyframes fadein {from { bottom:0;
-	opacity: 0;
-}
-
-to {
-	bottom: 30px;
-	opacity: 1;
-}
-
-}
-@-webkit-keyframes fadeout {from { bottom:30px;
-	opacity: 1;
-}
-
-to {
-	bottom: 0;
-	opacity: 0;
-}
-
-}
-@keyframes fadeout {from { bottom:30px;
-	opacity: 1;
-}
-
-to {
-	bottom: 0;
-	opacity: 0;
-}
-}
-
-.input-error {
-	border: 1px solid red !important;
-}
-
-/*for snack bar*/
-</style>
-<body>
-<div id="snackbar"></div>
-
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fas fa-ticket-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>PGR Complaint Registration</h5>
-										<span>1913 PGR Complaint Registration</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Register Complaint</li>											
-										<li class="breadcrumb-item active" aria-current="page">Complaint Registration</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-
-					<div class="row inside mt-4">
-
-						<div class="col-md-12"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-							<div class="card" style="margin-top: 0px;">
-							<div class="card-header"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-							<h3 class="mb-0" style="font-weight: bold;font-size: large;"><span th:text="${agent[0]['agent_name']}" style="font-weight: bold;font-size: large;"></span>'s Complaints Registration</h3>	
-							</div>
-							
-								<div class="card-body">
-
-									
-									<!-- Step 1 -->
-									<!-- Step 1 -->
-									<div class=" form-step active" id="step-1">
-										<!-- <div class="card-body"> -->										
-										<h5 class="card-title">1. Complaining Person's Details:</h5>
-										<div class="form-row">
-											<div class="col-md-4">
-												<label for="mobile">Mobile Number:<span class="required">*</span></label>												
-													<input type="text" id="mobileNo" name="mobileNo"
-														class="form-control mb-1"
-														placeholder="Enter Mobile Number" maxlength="10"
-														required>																								
-											</div>
-										</div>
-										<div class="form-row">
-											<div class="col-md-4 mb-2">
-												<label for="name">Name:<span class="required">*</span></label>
-												 <input type="text" class="form-control" id="name"
-													placeholder="Enter your name" required >
-											</div>
-																						
-
-											<div class="col-md-4 mb-2">
-												<label for="email">Email:</label> <input type="email"
-													class="form-control" id="email"
-													placeholder="Enter your email">
-											</div>
-											
-											<div class="col-md-4 mb-2">
-												<label for="gender" >Gender/பாலினம்:<span
-													class="required">*</span></label>
-												<div class="radio-group mt-2 ">
-													<div class="radio-item">
-														<input type="radio" id="male" name="gender" value="male"
-															> <label for="male">Male</label>
-													</div>
-													<div class="radio-item">
-														<input type="radio" id="female" name="gender"
-															value="female"> <label for="female">Female</label>
-													</div>
-													<div class="radio-item">
-														<input type="radio" id="transgender" name="gender"
-															value="transgender"> <label for="transgender">Transgender</label>
-													</div>
-												</div>
-											</div>
-											
-										</div>
-										<button id="nextStep1" class="btn btn-primary float-right"
-											onclick="nextStep('nextStep1')"
-											style="background-color: #414f69;">Next</button>
-										<!-- </div> -->
-									</div>
-									<!--step-2-->
-									<div class=" form-step readable" id="step-2">
-										<!-- <div class="card-body"> -->
-										<h5 class="card-title">2. Complaint Location Details:</h5>
-										<div class="form-row">
-
-											<!-- loader section -->
-											<!-- <div id="loader" class="loader" style="display: none;"></div> -->
-
-											<!--map fields-->
-
-											<div class="col-md-12">
-							<!-- <div id="map"></div> -->
-							<div id="mapContainer" style="position: relative; height: 500px;" class="mb-4 mt-2">
-							  <input id="pac-input" class="controls" type="text" placeholder="Search location">
-							  <div id="googleMap" style="height: 100%; width: 100%;border:2px solid black;"></div>
-							</div>
-							<div id="search-container">
-								<!-- <input type="text" id="search-box" placeholder="Search for a location..."> -->
-								<div id="suggestions"></div>
-							</div>
-							<div class="row">
-								<div class="col-md-6 mb-2">
-									<!-- <label for="street">Street:</label>
-									<input type="text" class="form-control" id="street"> -->
-									<label for="streetName">Street:</label>
-									<select id="streetName" name="streetName"></select>
-									<!-- 			<label for="streetName">Street:</label>
-									<input type="text" class="form-control" id="streetName"> -->
-								</div>
-
-								<div class="col-md-6 mb-2">
-									<!-- <label for="longitude_field">Longtitude</label>
-									<input type="text" class="form-control" id="longitude_field" name="longtitude"> -->
-									<label for="longitude_field">Longtitude</label>
-									<input type="text" class="form-control" id="longitude_field" readonly>
-								</div>
-								<div class="col-md-6 mb-2">
-									<!-- <label for="latitude_field">Latitide</label>
-									<input type="text" class="form-control" id="latitude_field"> -->
-									<label for="latitude_field">Latitude</label>
-									<input type="text" class="form-control" id="latitude_field" readonly>
-								</div>
-								<div class="col-md-6 mb-2">
-									<!-- <label for="street_id">Street Id</label>
-									<input type="text" class="form-control" id="street_id"> -->
-									<label for="streetId">Street Id</label>
-									<input type="text" class="form-control" id="streetId" readonly>
-								</div>
-								<div class="col-md-6 mb-2">
-									<!-- <label for="landmark">Landmark</label>
-									<input type="text" class="form-control" id="landmark"> -->
-									<label for="landmark">Landmark</label>
-									<input type="text" class="form-control" id="landmark" readonly>
-								</div>
-								<!-- 								<div class="col-md-6">
-									<label for="zone">Zone</label>
-									<input type="text" class="form-control" id="zone" readonly>
-								</div>
-								<div class="col-md-6">
-									<label for="ward">Ward</label>
-									<input type="text" class="form-control" id="ward" readonly>
-								</div> -->
-							</div>
-						</div>
-										</div>
-										<button id="prevStep2" class="btn btn-secondary"
-											onclick="prevStep('prevStep2')">Previous</button>
-										<button id="nextStep2" class="btn btn-primary float-right"
-											onclick="nextStep('nextStep2')"
-											style="background-color: #414f69;">Next</button>
-										<!-- </div> -->
-									</div>
-									<!-- Step 3 -->
-									<div class=" form-step active readable" id="step-3">
-										<div class="card-body">
-											<h5 class="card-title">3. Complaint Type:&nbsp;<span>(Please Select Complaint Type from Below...)</span></h5>
-
-											<!-- Icons -->
-											<!-- <div class="complaint-icons">
-												<div class="complaint-icon" data-type="specific"
-													data-id="112">
-													<img src="/gcc/assets/images/road.png" alt="Pothole">
-													<p>Pothole</p>
-												</div>
-												<div class="complaint-icon" data-type="specific"
-													data-id="97">
-													<img src="/gcc/assets/images/recycle.png" alt="garbage">
-													<p>Garbage</p>
-												</div>
-												<div class="complaint-icon" data-type="specific"
-													data-id="104">
-													<img src="/gcc/assets/images/waste-bin.png" alt="broken-bin">
-													<p>Broken-Bin</p>
-												</div>
-												<div class="complaint-icon" data-type="specific"
-													data-id="146">
-													<img src="/gcc/assets/images/street-lamp.png" alt="StreetLight">
-													<p>StreetLight</p>
-												</div>
-												<div class="complaint-icon" data-type="specific"
-													data-id="199">
-													<img src="/gcc/assets/images/portable-bathroom.png"
-														alt="public-toilet">
-													<p>Public Toilet</p>
-												</div>
-												<div class="complaint-icon" data-type="specific"
-													data-id="118">
-													<img src="/gcc/assets/images/mosquito.png" alt="mosquito">
-													<p>Mosquito Menace</p>
-												</div>
-												<div class="complaint-icon" data-type="specific"
-													data-id="138">
-													<img src="/gcc/assets/images/tsunami.png" alt="waterstag">
-													<p>WaterStagnation</p>
-												</div>
-												<div class="complaint-icon" data-type="specific"
-													data-id="142">
-													<img src="/gcc/assets/images/sewage.png" alt="sewage">
-													<p>Storm Water Drains</p>
-												</div>
-												<div class="complaint-icon" data-type="specific"
-													data-id="119">
-													<img src="/gcc/assets/images/dog.png" alt="dog">
-													<p>Street Dog</p>
-												</div>
-												<div class="complaint-icon" data-type="specific" data-id="">
-							<img src="images/bad-weather.png" alt="weather">
-							<p>Tree Fallen</p>
-						</div>
-
-												<div class="complaint-icon" data-type="others">
-													<img src="/gcc/assets/images/menu.png" alt="Others">
-													<p>Others</p>
-												</div>
-											</div> -->
-
-
-											<!-- Specific Complaint Fields -->
-											<!-- <div class="complaint-fields active" id="specific-fields">
-												<div class="form-row">
-													<div class="col-md-6">
-														<label for="complaint-title">Complaint Title:</label> <input
-															type="text" class="form-control" id="complaint-title"
-															 placeholder="Enter Complaint Type">
-													</div>
-													<div class="col-md-6">
-														<label for="complaint-id">Complaint Type:</label> <input
-															type="text" class="form-control" id="complaint-id"
-															disabled>
-													</div>
-
-												</div>
-												<div class="form-row">
-													<div class="col-md-6">
-														<label for="othercomplaint-details">Details of
-															Complaint:</label>
-														<textarea class="form-control" id="othercomplaint-details"
-															rows="3" placeholder="Enter complaint details"
-															maxlength="400"></textarea>
-													</div>
-													<div class="col-md-6">
-														<label for="complaint-image">Upload Photo:&nbsp;<span style="color: orange;">
-															Less than 1 MB.</span></label>
-															<input type="file" class="form-control" id="complaint-image" name="Comp_Image"> 
-														
-													</div>
-
-												</div>
-											</div> -->
-											
-											
-											<!-- Specific Complaint Fields -->
-									        <div class="complaint-fields active" id="specific-fields">
-									            <div class="form-row">
-									                <div class="col-md-6">
-									                    <label for="specificComplaintType">Complaint Type:</label>
-									                    <select class="form-control" id="specificComplaintType">
-									                        <option value="">-- Select Complaint Type --</option>
-									                    </select>
-									                </div>
-									                <div class="col-md-6">
-									                    <label for="specificComplaintSubType">Complaint Sub-Type:</label>
-									                    <select class="form-control" id="specificComplaintSubType" disabled>
-									                        <option value="">-- Select Complaint Sub-Type --</option>
-									                    </select>
-									                </div>
-									            </div>
-									            <div class="form-row">
-									                <div class="col-md-6">
-									                    <label for="specificComplaintDetails">Details of Complaint:</label>
-									                    <textarea class="form-control" id="specificComplaintDetails" rows="3"
-									                        placeholder="Enter complaint details" maxlength="400"></textarea>
-									                </div>
-									                <div class="col-md-6">
-									                    <label for="specificComplaintImage">Upload Photo:
-									                        <p style="color: orange;">Note: Upload Photo Less Than 1MB.</p>
-									                    </label>
-									                    <input type="file" class="form-control" id="specificComplaintImage" name="Comp_Image"
-									                        accept="image/*">
-									                </div>
-									            </div>
-									        </div>
-
-											<!-- Others Complaint Fields -->
-											<div class="complaint-fields" id="others-fields">
-												<div class="form-row">
-													<div class="col-md-4">
-														<label for="type">Type:</label> <select
-															class="form-control" id="type">
-															<option value="">Please Select</option>
-														</select>
-													</div>
-													<div class="col-md-4">
-														<label for="sub-type">Sub-Type:</label> <select
-															class="form-control" id="sub-type">
-															<option value="">Select complaint</option>
-														</select>
-													</div>
-													<div class="col-md-4">
-														<label for="uploadothers">Upload Photo:</label> <input
-															type="file" class="form-control" id="uploadothers"
-															accept="image/*"> <span style="color: red;">
-															<p>Upload Photo Less Than 1mb*.</p>
-														</span>
-													</div>
-												</div>
-												<div class="form-row">
-													<div class="col-md-6">
-														<label for="othercomplaintdetailsss">Details of
-															Complaint:</label>
-														<textarea class="form-control"
-															id="othercomplaintdetailsss" rows="3"
-															placeholder="Enter complaint details" maxlength="400"></textarea>
-													</div>
-												</div>
-											</div>
-
-
-											<button id="prevStep3" class="btn btn-secondary"
-												onclick="prevStep('prevStep3')">Previous</button>
-											<button id="nextStep3" class="btn btn-primary float-right"
-												
-												style="background-color: #414f69;">Next</button>
-										</div>
-									</div>
-
-									<!-- Step 4 -->
-									<div class=" form-step readable" id="step-4">
-										<div class="card-body">
-											<h5 class="card-title">4. Complaint Details:</h5>
-											<table class="table">
-												<tbody>
-													<tr>
-														<td><strong>Name</strong></td>
-														<td>: <span id="summaryName"></span></td>
-														<td><strong>Complaint Location</strong></td>
-														<td>: <span id="summaryStreet"></span></td>
-													</tr>
-													<tr>
-														<td><strong>Mobile Number</strong></td>
-														<td>: <span id="summaryMobile"></span></td>
-														<td><strong>Email Address</strong></td>
-														<td>: <span id="summaryEmail"></span></td>
-													</tr>
-													<tr>
-														<td><strong>Complaint Type</strong></td>
-														<td>: <span id="summaryComplaintType"></span></td>
-														<td><strong>Complaint Title</strong></td>
-														<td>: <span id="summaryComplaintTitle"></span></td>
-													</tr>
-													<tr>
-														<td><strong>Description</strong></td>
-														<td>: <span id="summaryDescription"></span></td>
-														<td><strong>Street Id</strong></td>
-														<td>: <span id="summaryStreetId"></span></td>
-													</tr>
-													<tr>
-														<td><strong>Landmark</strong></td>
-														<td>: <span id="summaryLandmark"></span></td>
-														<td><strong>Latitude</strong></td>
-														<td>: <span id="summaryLatitude"></span></td>
-													</tr>
-													<tr>
-														<td><strong>Longitude</strong></td>
-														<td>: <span id="summaryLongitude"></span></td>
-														<td><strong>Gender</strong></td>
-														<td>: <span id="summaryGender"></span></td>
-													</tr>
-													<tr>
-														<td><strong>Image / Video</strong></td>
-														<td>: <img id="summaryImage" src="#"
-															alt="Uploaded Image/Video" width="100"
-															style="display: none;">
-														</td>
-													</tr>
-												</tbody>
-											</table>
-
-
-
-											<button id="prevStep4" class="btn btn-secondary"
-												onclick="prevStep('prevStep4')">Previous</button>
-
-
-											<button id="submitButton" class="btn btn-success float-right">Submit</button>
-
-										</div>
-									</div>
-
-
-								</div>
-							</div>
-						</div>
-
-
-
-
-
-
-					</div>
-				</div>
-
-
-			</div>
-			
-			
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div> 
-
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-	<script src="https://kit.fontawesome.com/a076d05399.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script th:src="@{/js/screenreader.js}"></script>
-	<script async defer
-		src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCi7N6uW5MZaSkd50Kzw7ax2GkMN1vjE-E&callback=myMap&libraries=places">
-		</script>
-
-	<script type="text/javascript">
-
-		//for snackbar script
-		 function showSnackbar(message) {
-			var snackbar = document.getElementById("snackbar");
-			snackbar.innerHTML = message;
-			snackbar.className = "show";
-			setTimeout(function () {snackbar.className = snackbar.className.replace("show", "");}, 3000);
-		} 
-		
-		 $(document).ready(function () {
-				// Trigger on change
-				$('#mobileNo').on('change', validateMobileNumber);
-				
-				$('#name').on('change', validateName);
-
-				// Optional: Allow only numeric input
-				$('#mobileNo').on('input', function () {
-					this.value = this.value.replace(/[^0-9]/g, '');
-					$(this).removeClass('input-error');
-				});
-				
-				$('#name').on('input', function () {
-					this.value = this.value.replace(/[^a-zA-Z.\s]/g, ''); // allow letters, dot, and space
-					$(this).removeClass('input-error');
-				});
-			});
-		 
-		 function validateName(){
-			 			 
-			 const $inputname = $('#name');
-			 const namefield = $('#name').val().trim();
-			 
-			 $inputname.removeClass('input-error');
-			 			 
-				if (!/^[A-Za-z\s.]+$/.test(namefield)) {
-					showSnackbar("Name should contain only alphabets.");
-					$inputname.addClass('input-error');
-					return false;
-				}
-			 
-			 return true;
-		 }
-		 
-		 function validateMobileNumber() {				
-				
-				const $input = $('#mobileNo');
-				const mobileStr = $('#mobileNo').val().trim();
-				console.log("mobileNo1=" + mobileStr);
-				
-				// Reset previous error style
-				$input.removeClass('input-error');
-
-				if (mobileStr === '') {
-					showSnackbar("Mobile number is required.");
-					$input.addClass('input-error');
-					return false;
-				}
-
-				if (!/^\d{10}$/.test(mobileStr)) {
-					showSnackbar("Please enter a valid 10-digit mobile number.");
-					$input.addClass('input-error');
-					return false;
-				}
-
-				if (/^0{10}$/.test(mobileStr)) {
-					showSnackbar("Mobile number cannot be all zeros.");
-					$input.addClass('input-error');
-					return false;
-				}
-
-				if (mobileStr.startsWith('0')) {
-					showSnackbar("Mobile number cannot start with zero.");
-					$input.addClass('input-error');
-					return false;
-				}
-				
-				if (/^(\d)\1{9}$/.test(mobileStr)) {
-					showSnackbar("Mobile number cannot have all digits the same.");
-					$input.addClass('input-error');
-					return false;
-				}
-	
-				// All validations passed – remove error styling
-				$input.removeClass('input-error');
-				return true;
-			}
-
-
-		//for snackbar script
-
-		let currentStep = 1;
-		let mapInitialized = false;
-
-		function showStep(step) {
-			$('.form-step').removeClass('active');
-			$('#step-' + step).addClass('active');
-			/* updateProgressBar(step); */
-
-			if (step === 2 && !mapInitialized) {
-				//document.getElementById('loader').style.display = 'block'; // Show loader before map initialization
-				//setTimeout(initializeMap, 3000); // Load the map after 3 seconds
-				mapInitialized = true; // Ensure the map is only initialized once
-			}
-
-			// If we're on step 4, populate the summary fields
-			if (step === 4) {
-				populateSummary();
-			}
-		}
-
-		function nextStep() {
-			if (currentStep < 4) {
-				// Perform validation for the current step
-				if (validateStep(currentStep)) {
-					currentStep++;
-					showStep(currentStep);
-				}
-			}
-		}
-
-		function prevStep() {
-			if (currentStep > 1) {
-				currentStep--;
-				showStep(currentStep);
-			}
-		}
-
-		/* function updateProgressBar(step) {
-			const progress = (step / 4) * 100;
-			$('.progress-bar').css('width', progress + '%').attr('aria-valuenow', progress);
-		} */
-
-		function validateStep(step) {
-			let isValid = true;
-
-			if (step === 1) {
-				console.log("step 1");
-				const mobileNo = $('#mobileNo').val().trim();
-				const gender = $('input[name="gender"]:checked').val();
-				const name = $('#name').val().trim();
-				let email = $('#email').val().trim();
-				
-				console.log("mobileNo"+mobileNo);
-				console.log("gender="+gender);
-				console.log("name="+name);
-				console.log("email="+email);
-
-				// Validate mobile number
-				if (mobileNo === '' || !/^\d{10}$/.test(mobileNo)) {
-					isValid = false;
-					showSnackbar("Please enter a valid 10-digit mobile number.");
-					return false;
-				}
-				
-				if (/^0{10}$/.test(mobileNo)) {
-					showSnackbar("Mobile number cannot be all zeros.");				
-					return false;
-				}
-				
-				if (mobileNo.startsWith('0')) {
-					showSnackbar("Mobile number cannot start with zero.");					
-					return false;
-				}
-				
-				if (/^(\d)\1{9}$/.test(mobileNo)) {
-					showSnackbar("Mobile number cannot have all digits the same.");					
-					return false;
-				}
-
-
-				// Validate name
-				if (!name) {
-					isValid = false;
-					showSnackbar("Please enter your name.");
-					return false;
-				}
-				
-				if (!/^[A-Za-z\s.]+$/.test(name)) {
-					showSnackbar("Name should contain only alphabets.");					
-					return false;
-				}
-
-				// Validate gender
-				if (!gender) {
-					showSnackbar("Please select your gender.");
-					return false;
-				}
-				// Check email
-				if (email === '') {
-					email = ''; // Set N/A if empty
-					$('#email').val(email); // Update the input field with N/A
-				} else if (!/^\S+@\S+\.\S+$/.test(email)) {
-					isValid = false;
-					showSnackbar("Please enter a valid email address.");
-					return false;
-				}
-			} else if (step === 2) {
-				const streets = $('#streetName option:selected').val();
-				console.log("streets="+streets);
-				const longitude = $('#longitude_field').val();
-				const latitude = $('#latitude_field').val();
-				const streetId = $('#streetId').val();
-				const landmark = $('#landmark').val();
-
-				// Validate street
-				if (!streets) {
-					isValid = false;
-					showSnackbar("Please Select a street.");
-					return false;
-				}
-
-				// Validate longitude and latitude
-				if (longitude === '' || isNaN(longitude)) {
-					isValid = false;
-					showSnackbar("Please enter a valid longitude.");
-					return false;
-				}
-				if (latitude === '' || isNaN(latitude)) {
-					isValid = false;
-					showSnackbar("Please enter a valid latitude.");
-					return false;
-				}
-
-				// Validate street ID
-				if (streetId === '') {
-					isValid = false;
-					showSnackbar("Please enter the street ID.");
-					return false;
-				}
-
-				// Validate landmark
-				if (landmark === '') {
-					isValid = false;
-					showSnackbar("Please enter the landmark.");
-					return false;
-				}
-			}
-
-			return isValid;
-		}
-
-		function populateSummary() {
-			const name = $('#name').val();
-			const street = $('#streetName option:selected').text();
-			const mobileNo = $('#mobileNo').val();
-			const gender = $('input[name="gender"]:checked').val();
-			const email = $('#email').val();
-
-			// Check if 'specific-fields' is active and use its values
-			/* if ($('#specific-fields').hasClass('active')) {
-				const complaintTitle = $('#complaint-title').val();
-				const complaintid = $('#complaint-id').val();
-				const complaintDetails = $('#othercomplaint-details').val(); // Specific complaint details
-
-				$('#summaryComplaintTitle').text(complaintTitle);
-				$('#summaryComplaintType').text(complaintid);
-				$('#summaryDescription').text(complaintDetails);
-
-			} else if ($('#others-fields').hasClass('active')) {
-				const complaintTitle = $('#type').find('option:selected').text();
-				const complaintSubType = $('#sub-type').find('option:selected').text();
-				const complaintDetails = $('#othercomplaintdetailsss').val(); // Others complaint details
-
-				$('#summaryComplaintTitle').text(complaintTitle + ' - ' + complaintSubType);
-				$('#summaryComplaintType').text('Other Complaint');
-				$('#summaryDescription').text(complaintDetails);
-			} */
-			
-			
-			const complaintTitle = $('#specificComplaintType option:selected').text(); // groupname
-			const complaintType = $('#specificComplaintSubType option:selected').text(); // complaintname
-			const complaintDetails = $('#specificComplaintDetails').val(); // Others complaint details
-
-			$('#summaryComplaintTitle').text(complaintTitle); // group
-			$('#summaryComplaintType').text(complaintType);   // sub-type
-			$('#summaryDescription').text(complaintDetails);
-
-
-
-			//const streetid = $('#street_id').val();
-			const streetid = $('#streetId').val();
-			const landmark = $('#landmark').val();
-			const latitude = $('#latitude_field').val();
-			const longtitude = $('#longitude_field').val();
-
-			$('#summaryName').text(name);
-			$('#summaryStreet').text(street);
-			$('#summaryMobile').text(mobileNo);
-			$('#summaryGender').text(gender);
-			$('#summaryEmail').text(email);
-			$('#summaryStreetId').text(streetid);
-			$('#summaryLandmark').text(landmark);
-			$('#summaryLatitude').text(latitude);
-			$('#summaryLongitude').text(longtitude);
-
-			// Handle image preview
-			/*		const fileInput = $('#complaint-image')[0];  // Assuming this is for the "Others" section
-					if (fileInput.files && fileInput.files[0]) {
-						const reader = new FileReader();
-						reader.onload = function (e) {
-							$('#summaryImage').attr('src', e.target.result).show();
-						}
-						reader.readAsDataURL(fileInput.files[0]);
-					} else {
-						$('#summaryImage').hide();
-					}*/
-
-			// If there's a separate image input for the specific form, handle it similarly:
-			// Check if specific fields section is active
-//			if ($('#specific-fields').hasClass('active')) {
-				const specificFileInput = $('#specificComplaintImage')[0]; // Example ID for specific form
-				if (specificFileInput.files && specificFileInput.files[0]) {
-					const reader = new FileReader();
-					reader.onload = function (e) {
-						$('#summaryImage').attr('src', e.target.result).show();
-					};
-					reader.readAsDataURL(specificFileInput.files[0]);
-				} else {
-					$('#summaryImage').hide(); // Hide the image if no file is selected
-				}
-//			}
-			// Check if "Others" section is active
-			 if ($('#others-fields').hasClass('active')) {
-				const fileInput = $('#uploadothers')[0]; // Assuming this is for the "Others" section
-				if (fileInput.files && fileInput.files[0]) {
-					const reader = new FileReader();
-					reader.onload = function (e) {
-						$('#summaryImage').attr('src', e.target.result).show();
-					};
-					reader.readAsDataURL(fileInput.files[0]);
-				} else {
-					$('#summaryImage').hide(); // Hide the image if no file is selected
-				}
-			} else {
-				$('#summaryImage').hide(); // Default hide if no section is active
-			}
-
-
-
-
-
-		}
-
-
-		$(document).ready(function () {
-						
-			showStep(currentStep);
-		});
-
-		
-		$(document).ready(function () {
-			showStep(currentStep);
-		});
-
-
-		//for step3 onclick function
-		$(document).ready(function () {
-			// On icon click
-			/* $('.complaint-icon').click(function () {
-				const type = $(this).data('type'); // Get the type (specific or others)
-				const title = $(this).find('p').text().trim(); // Get the icon name (complaint title)
-				const complaintId = $(this).data('id'); // Get the complaint ID
-
-				// Toggle complaint fields based on type
-				$('.complaint-fields').removeClass('active');
-
-				if (type === 'specific') {
-					$('#specific-fields').addClass('active'); // Show specific fields form
-					$('#others-fields').removeClass('active'); // Hide others form
-					$('#complaint-title').val(title); // Set the complaint title to the icon name
-					$('#complaint-id').val(complaintId); // Set the complaint ID to the corresponding ID
-				} else if (type === 'others') {
-					$('#others-fields').addClass('active'); // Show others form
-					$('#specific-fields').removeClass('active'); // Hide specific fields form
-					$('#complaint-title').val(''); // Clear the complaint title for 'Others'
-					$('#complaint-id').val(''); // Clear the complaint ID for 'Others'
-				}
-			}); */
-		});
-		
-		
-		
-
-
-
-		//for complaint group and complainttype wise options dropdown api
-/* 		$(document).ready(function () {
-			const $type = $('#type');
-			const $subType = $('#sub-type');
-
-			$subType.prop('disabled', true);
-
-			// Fetch and populate the Type dropdown
-			$.ajax({
-				url: '/gcc/api/callcenterqaqc/pgrcomplaint/getComplaintCategories',
-				method: 'GET',
-				success: function (response) {
-
-					const data = typeof response === 'string' ? JSON.parse(response) : response;
-					//console.log('Response:', response); // Log the response to verify
-					let optionsHtml = '<option value="">Please Select</option>';
-					data.ComplaintCategoryListResult.forEach(function (group) {
-						optionsHtml += `<option value="${group.groupid}">${group.groupname}</option>`;
-					});
-					$type.html(optionsHtml);
-				},
-				error: function (error) {
-					console.error('Error fetching complaint categories:', error);
-				}
-			});
-
-			// Handle Type dropdown change
-			$type.change(function () {
-				const selectedType = $(this).val();
-				$subType.empty().append('<option value="">Select complaint</option>');
-
-				if (selectedType) {
-
-					$.ajax({
-						url: `/gcc/api/callcenterqaqc/pgrcomplaint/getComplaintSubTypes?groupId=${selectedType}`,
-						method: 'GET',
-						success: function (response) {
-							const data = typeof response === 'string' ? JSON.parse(response) : response;
-							const selectedGroup = data.ComplaintCategoryListResult[0];
-
-							//console.log(data);
-
-
-							if (selectedGroup && selectedGroup.group) {
-								$subType.prop('disabled', false);
-								selectedGroup.group.forEach(function (complaint) {
-									$subType.append(`<option value="${complaint.id}">${complaint.complaintname}</option>`);
-								});
-							} else {
-								$subType.prop('disabled', true);
-							}
-						},
-						error: function (error) {
-							console.error('Error fetching sub-types:', error);
-							$subType.prop('disabled', true);
-						}
-					});
-				} else {
-					$subType.prop('disabled', true);
-				}
-			});
-		}); */
-
-		//api for saving
-		//for sweet alert
-		/* function showSuccessAlert() {
-			Swal.fire({
-				icon: 'success',
-				title: 'Complaint Registration Success',
-				text: 'Complaint Number 123456. Use this Number for Complaint Status Check.',
-				confirmButtonText: 'Back to Home',
-				confirmButtonColor: '#3085d6',
-			}).then((result) => {
-				if (result.isConfirmed) {
-					window.location.href = 'home';
-				}
-			});
-		} */
-		
-		$('#complaint-image, #uploadothers').on('change', function () {
-			const file = this.files[0];
-			const allowedTypes = ['image/jpeg', 'image/jpg', 'image/png'];
-
-			if (file) {
-				// Check file type
-				if (!allowedTypes.includes(file.type)) {
-					Swal.fire({
-						icon: 'error',
-						title: 'Invalid File Format',
-						text: 'Only JPG, JPEG, and PNG image formats are allowed.',
-						confirmButtonText: 'OK'
-					});
-					$(this).val(''); // Clear the input
-					return;
-				}
-
-				// Check file size
-				if (file.size > 1024 * 1024) {
-					Swal.fire({
-						icon: 'error',
-						title: 'File Too Large',
-						text: 'File size exceeds 1MB. Please upload an image less than 1MB.',
-						confirmButtonText: 'OK'
-					});
-					$(this).val(''); // Clear the input
-					return;
-				}
-			}
-		});	
-
-
-		//Script For Map
-
-		function myMap() {
-	const defaultCenter = { lat: 13.0827, lng: 80.2707 };
-	const map = new google.maps.Map(document.getElementById("googleMap"), {
-		center: defaultCenter,
-		zoom: 14
-	});
-
-	let marker = null;
-	let streetsList = []; // ✅ Define globally inside myMap
-	const infowindow = new google.maps.InfoWindow();
-
-	// 🔍 Initialize the SearchBox
-	const input = document.getElementById('pac-input');
-	const searchBox = new google.maps.places.SearchBox(input);
-	//map.controls[google.maps.ControlPosition.TOP_LEFT].push(input);
-
-	map.addListener('bounds_changed', function () {
-		searchBox.setBounds(map.getBounds());
-	});
-
-	searchBox.addListener('places_changed', function () {
-		const places = searchBox.getPlaces();
-		if (places.length === 0) return;
-
-		if (marker) marker.setMap(null);
-		const place = places[0];
-		if (!place.geometry) return;
-
-		marker = new google.maps.Marker({
-			map: map,
-			position: place.geometry.location
-		});
-
-		const lat = place.geometry.location.lat().toFixed(6);
-		const lng = place.geometry.location.lng().toFixed(6);
-		document.getElementById("latitude_field").value = lat;
-		document.getElementById("longitude_field").value = lng;
-
-		map.setCenter(place.geometry.location);
-		map.setZoom(15);
-
-		infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
-		infowindow.open(map, marker);
-
-		fetchStreets(lat, lng);
-	});
-
-	map.addListener("click", function (event) {
-		const clickedLatLng = event.latLng;
-		if (marker) marker.setMap(null);
-
-		marker = new google.maps.Marker({
-			position: clickedLatLng,
-			map: map
-		});
-
-		const lat = clickedLatLng.lat().toFixed(6);
-		const lng = clickedLatLng.lng().toFixed(6);
-
-		document.getElementById("latitude_field").value = lat;
-		document.getElementById("longitude_field").value = lng;
-
-		infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
-		infowindow.open(map, marker);
-
-		fetchStreets(lat, lng);
-	});
-
-	// ✅ Move fetchStreets here inside myMap, and use local streetsList
-	function fetchStreets(lat, lng) {
-		const encodedGeometry = encodeURIComponent(JSON.stringify({ y: lat, x: lng }));
-		const streetURL = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/0/query?` +
-			`where=&objectIds=&time=&geometry=${encodedGeometry}` +
-			`&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25` +
-			`&units=esriSRUnit_Meter&relationParam=&outFields=region%2Cnew_zone%2C+new_ward%2Croad_id%2C+road_name%2Cgis_id%2Ctype` +
-			`&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=` +
-			`&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=` +
-			`&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=` +
-			`&resultRecordCount=&returnTrueCurves=false&returnExceededLimitFeatures=false&quantizationParameters=&returnCentroid=false` +
-			`&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault` +
-			`&datumTransformation=&f=geojson`;
-
-		const streetSelect = document.getElementById("streetName");
-		streetSelect.innerHTML = "";
-
-		const defaultOption = document.createElement("option");
-		defaultOption.value = "";
-		defaultOption.text = "-- Select Street --";
-		streetSelect.appendChild(defaultOption);
-
-		document.getElementById("streetId").value = "";
-		document.getElementById("landmark").value = "";
-
-		// Timeout mechanism: 1 seconds
-		const timeout = new Promise((_, reject) =>
-			setTimeout(() => reject(new Error("Request timed out")), 1000)
-		);
-		
-		// Actual fetch
-		const fetchRequest = fetch(streetURL).then(res => res.json());
-
-		Promise.race([fetchRequest, timeout])
-			.then(data => {
-				const features = data.features;
-				if (!features || features.length === 0) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'No Street Found',
-						text: 'Please select the nearby street.',
-					});
-					return;
-				}
-
-				streetsList = features.map(f => f.properties); //Save for use in dropdown
-				streetsList.forEach((props, index) => {
-					const option = document.createElement("option");
-					option.value = index;
-					option.text = props.road_name;
-					streetSelect.appendChild(option);
-				});
-			})
-			.catch(err => {
-				console.error("Error fetching street:", err);
-				Swal.fire("Failed to load street data", '', 'error');
-			});
-	}
-
-	document.getElementById("streetName").addEventListener("change", function () {
-		const selectedIndex = this.value;
-		if (selectedIndex !== "") {
-			const selectedStreet = streetsList[selectedIndex];
-
-			document.getElementById("streetId").value = selectedStreet.road_id;
-			document.getElementById("landmark").value = selectedStreet.type;
-			// document.getElementById("zone").value = selectedStreet.new_zone;
-			// document.getElementById("ward").value = selectedStreet.new_ward;
-
-			console.log("Selected street:", selectedStreet);
-		} else {
-			document.getElementById("streetId").value = "";
-			document.getElementById("landmark").value = "";
-			// document.getElementById("zone").value = "";
-			// document.getElementById("ward").value = "";
-		}
-	});
-}
-		function fetchSuggestions(query) {
-			// ArcGIS API URL to fetch suggestions based on the input query
-			const arcgisSuggestionUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=UPPER(road_name)%20LIKE%20'%25${query.toUpperCase()}%25'&outFields=road_name,zone,ward,road_id&returnGeometry=true&f=geojson`;
-
-			fetch(arcgisSuggestionUrl)
-				.then(response => response.json())
-				.then(data => {
-					var suggestions = document.getElementById('suggestions');
-					suggestions.innerHTML = '';
-
-					if (data.features && data.features.length > 0) {
-						suggestions.style.display = 'block';
-						var ul = document.createElement('ul');
-						data.features.forEach(function (result) {
-							var lat = result.geometry.coordinates[1];
-							var lng = result.geometry.coordinates[0];
-							var roadName = result.properties.road_name || 'Unknown Road';
-							/* var zone = result.properties.zone || 'Unknown Zone';
-							var ward = result.properties.ward || 'Unknown Ward'; */
-							var roadId = result.properties.road_id || 'Unknown Road ID'
-
-							// Creating the suggestion item with road name, zone, and ward
-							var li = document.createElement('li');
-							li.textContent = `${roadName} - Zone: ${zone}, Ward: ${ward}`;
-							li.dataset.latlng = JSON.stringify([lat, lng]);
-							li.dataset.roadName = roadName;
-							li.dataset.roadId = roadId;
-							/* 	li.dataset.zone = zone;
-								li.dataset.ward = ward; */
-							ul.appendChild(li);
-						});
-						suggestions.appendChild(ul);
-					} else {
-						suggestions.style.display = 'none';
-					}
-				})
-				.catch(error => console.error('Error fetching suggestions:', error));
-		}
-
-		function fetchLocationInfoByMap(lat, lng, marker) {
-			const arcgisUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=&objectIds=&time=&geometry=%7B%22y%22%3A${lat}%2C%22x%22%3A${lng}%7D&geometryType=esriGeometryEnvelope&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25&units=esriSRUnit_Meter&relationParam=&outFields=zone%2Cward%2Croad_id%2Croad_name&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=&resultRecordCount=&returnTrueCurves=false&returnCentroid=false&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&datumTransformation=&lodType=geohash&lod=&lodSR=&f=geojson`;
-
-			fetch(arcgisUrl)
-				.then(response => response.json())
-				.then(data => {
-					console.log(data);
-					let info;
-					if (data.features && data.features.length > 0) {
-						const properties = data.features[0].properties;
-						const roadName = properties.road_name || 'N/A';
-						/* 	const zone = properties.zone || 'N/A';
-							const ward = properties.ward || 'N/A'; */
-						const roadId = properties.road_id || 'N/A';
-
-						info = `Road Name: ${roadName}<br>Zone: ${zone}<br>Ward: ${ward}<br>Latitude: ${lat}<br>Longitude: ${lng}`;
-						document.getElementById("street").value = roadName;
-						document.getElementById("latitude_field").value = lat;
-						document.getElementById("longitude_field").value = lng;
-						//document.getElementById("street_id").value = roadId;
-						document.getElementById("streetId").value = roadId;
-						document.getElementById("landmark").value = roadName;
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					} else {
-						document.getElementById("street").value = "No road data found for this location";
-						document.getElementById("latitude_field").value = "No latitude data found for this location";
-						document.getElementById("longitude_field").value = "No latitude data found for this location";
-						//document.getElementById("street_id").value = "No street id data found for this location";
-						document.getElementById("streetId").value = "No street id data found for this location";
-						document.getElementById("landmark").value = "No landmark data found for this location";
-						info = `No road data found for this location`
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					}
-				})
-				.catch(error => {
-					console.error('Error fetching road data:', error);
-					marker.bindTooltip(`Error fetching road data.<br>Latitude: ${lat}<br>Longitude: ${lng}`, {permanent: false, direction: 'top'}).openTooltip();
-				});
-		}
-
-		function fetchLocationInfoBySuggestions(lat, lng, marker) {
-			const arcgisUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=&objectIds=&time=&geometry=%7B%22y%22%3A${lat}%2C%22x%22%3A${lng}%7D&geometryType=esriGeometryEnvelope&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25&units=esriSRUnit_Meter&relationParam=&outFields=zone%2Cward%2Croad_id%2Croad_name&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=&resultRecordCount=&returnTrueCurves=false&returnCentroid=false&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&datumTransformation=&lodType=geohash&lod=&lodSR=&f=geojson`;
-
-			fetch(arcgisUrl)
-				.then(response => response.json())
-				.then(data => {
-					console.log(data);
-					let info;
-					if (data.features && data.features.length > 0) {
-						const properties = data.features[0].properties;
-						const roadName = properties.road_name || 'N/A';
-						/* 		const zone = properties.zone || 'N/A';
-								const ward = properties.ward || 'N/A'; */
-						const roadId = properties.road_id || 'N/A';
-
-						info = `Road Name: ${roadName}<br>Zone: ${zone}<br>Ward: ${ward}<br>Latitude: ${lat}<br>Longitude: ${lng}`;
-						document.getElementById("street").value = roadName;
-						document.getElementById("latitude_field").value = lat;
-						document.getElementById("longitude_field").value = lng;
-						//document.getElementById("street_id").value = roadId;
-						document.getElementById("streetId").value = roadId;
-						document.getElementById("landmark").value = roadName;
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					} else {
-						document.getElementById("street").value = suggestedRoadName;
-						document.getElementById("latitude_field").value = lat;
-						document.getElementById("longitude_field").value = lng;
-						//document.getElementById("street_id").value = suggestedRoadId;
-						document.getElementById("streetId").value = suggestedRoadId;
-						document.getElementById("landmark").value = suggestedRoadName;
-						info = `Road Name: ${suggestedRoadName}<br>Zone: ${suggestedZone}<br>Ward: ${suggestedWard}<br>Latitude: ${lat}<br>Longitude: ${lng}`
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					}
-				})
-				.catch(error => {
-					console.error('Error fetching road data:', error);
-					marker.bindTooltip(`Error fetching road data.<br>Latitude: ${lat}<br>Longitude: ${lng}`, {permanent: false, direction: 'top'}).openTooltip();
-				});
-		}
-		
-		$(document).ready(function () {
-			$('#submitButton').click(function (e) {
-				e.preventDefault(); // Prevent the default form submission
-				
-				$('#submitButton').prop('disabled', true).text('Processing...');
-
-				// Collect data from the form fields
-				var complainantName = $('#summaryName').text().trim();
-				var complainantAddr = $('#summaryStreet').text().trim();
-				var mobileNo = $('#summaryMobile').text().trim();
-				var email = $('#summaryEmail').text().trim();
-				var complaintType = $('#specificComplaintSubType').val();								
-				var complaintTitle = $('#specificComplaintSubType option:selected').text();
-				var complaintDetails = $('#summaryDescription').text().trim();
-				var streetId = $('#summaryStreetId').text().trim();
-				var landmark = $('#summaryLandmark').text().trim();
-				var latitude = $('#summaryLatitude').text().trim();
-				var longtitude = $('#summaryLongitude').text().trim(); // Note the misspelling
-				var gender = $('#summaryGender').text().trim();
-				var imageSrc = $('#summaryImage').attr('src');
-				var userId = document.getElementById('userIdSpan').textContent;
-
-				console.log({
-					ComplainantName: complainantName,
-					ComplainantAddr: complainantAddr,
-					MobileNo: mobileNo,
-					Email: email,
-					ComplaintType: complaintType,
-					ComplaintTitle: complaintTitle,
-					ComplaintDetails: complaintDetails,
-					StreetId: streetId,
-					Comp_Image: imageSrc,
-					latitude: latitude,
-					longtitude: longtitude,
-					Landmark: landmark,
-					gender: gender,
-					userId:userId
-				}); 
-
-				// AJAX call to your backend controller
-				$.ajax({
-					url: '/gcc/api/callcenterqaqc/pgrcomplaint/register', // Update to your Spring Boot endpoint
-					type: 'POST',
-					data: {
-						ComplainantName: complainantName,
-						ComplainantAddr: complainantAddr,
-						MobileNo: mobileNo,
-						Email: email,
-						ComplaintType: complaintType,
-						ComplaintTitle: complaintTitle,
-						ComplaintDetails: complaintDetails,
-						StreetId: streetId,
-						Comp_Image: imageSrc,
-						latitude: latitude,
-						longtitude: longtitude,
-						Landmark: landmark,
-						gender: gender,
-						userId:userId
-					},
-					success: function (response) {
-						$('#submitButton').prop('disabled', false).text('Submit');
-						// SweetAlert upon success
-						console.log("API Response:", response);
-						// Ensure response is a JavaScript object
-						
-						
-						if (typeof response === "string") {
-					        try {
-					            response = JSON.parse(response);
-					        } 
-					        catch (error) {				        	
-					            console.error("Failed to parse response:", error);
-					            Swal.fire("Error", "Unexpected response from server.", "error");
-					            return;
-					        }
-				   		 }
-						
-						 if (response.complaintNumber) {
-						        let complaintNumber = response.complaintNumber;
-						        Swal.fire({
-						            title: 'Success!',
-						            text: `Your complaint has been submitted successfully. Your Complaint Number is ${complaintNumber}. It will be sent to your mobile number.`,
-						            icon: 'success',
-						            allowOutsideClick: false, // Disable clicking outside the modal to close it
-				                    allowEscapeKey: false, // Disable escape key to close the modal
-				                    allowEnterKey: false, // Disable enter key to close the modal
-				                    showConfirmButton: true, // Ensure the confirm button is visible
-						            confirmButtonText: 'OK'
-						        }).then(result => {
-						            if (result.isConfirmed) {
-						                location.reload();
-						            }
-						        });
-						    } else {
-						        Swal.fire("Error", "Complaint number not received. Please try again.", "error");
-						    }
-												
-					},
-					error: function (xhr) {
-					    $('#submitButton').prop('disabled', false).text('Submit');
-					    let message = "Submission failed. Please try again.";
-
-					    try {
-					        const res = JSON.parse(xhr.responseText);
-					        if (res.error) {
-					            message = res.error;
-					        }
-					    } catch (e) {
-					        console.error("Error parsing error response:", e);
-					    }
-
-					    Swal.fire("Error", message, "error");
-					}
-				});
-			});
-			
-			// ✅ Step 1: Map complaint ID to complaint title
-			const complaintTypeMap = {
-				"97": "Removal of Garbage",
-				"98": "Overflowing of Garbage Bin",
-				"99": "Removal of Debris",
-				"100": "Absenteeism of Sweepers",
-				"101": "Absenteeism of Door to door garbage Collector",
-				"102": "Improper Sweeping",
-				"103": "Provison of Garbage Bin",
-				"104": "Broken Bin",
-				"105": "Shifting of Garbage Bin",
-				"106": "Cleaning of Water Table",
-				"107": "Nuisance by Garbage Tractor/Truck",
-				"108": "Burning of Garbage",
-				"109": "Garbage Lorry without Net",
-				"110": "Spilling of Garbage from Lorry",
-				"111": "Burning of Garbage at Dumping Ground",
-				"112": "Pot hole fill up / Repairs to the damaged surface",
-				"113": "Relaying of Road",
-				"114": "Formation of New Road",
-				"115": "Repairs to existing Footpath",
-				"116": "Request to provide Footpath",
-				"117": "Removal of Shops in the Footpath",
-				"118": "Mosquito Menace",
-				"119": "Street Dogs",
-				"120": "Stray Cattle",
-				"121": "Stray Pigs",
-				"122": "Death of Stray Animals",
-				"123": "Public Health / Dengue / Malaria  / Gastro Enteritis",
-				"124": "Transfer Station Smell",
-				"125": "Flies Menace from Dumping Ground",
-				"126": "Open Defecation",
-				"127": "Illegal Draining of Sewage to SWD / Open Site",
-				"128": "Complaints regarding unhygenic Restaurants",
-				"129": "Complaints regarding quality of food in hotels",
-				"130": "Road Side Eateries",
-				"131": "Slaughter House related complaints",
-				"132": "Unauthorized Sale of Meat and Meat products",
-				"133": "Illegal Slaughtering",
-				"134": "Unhygenic and Improper Transport of Meat and Livestock",
-				"135": "Biomedical waste / Health hazard waste removal",
-				"136": "Complaints regarding Corporation Hospitals",
-				"137": "Complaints regarding CDH",
-				"138": "Stagnation of Water",
-				"139": "Obstruction of Water Flow",
-				"140": "Desilting of Drain",
-				"141": "Desilting of Canal",
-				"142": "Repairs to Storm Water Drain",
-				"143": "Covering  Manholes of Storm Water Drain",
-				"144": "New Drain Construction",
-				"145": "Disposal of Removed Silt on the Road",
-				"146": "Non burning of Street lights",
-				"147": "Electric shock due to street light",
-				"148": "Damage to the Electric pole",
-				"149": "New Street lights",
-				"150": "Shifting of Street light pole",
-				"151": "Overhead cable wires running in a haphazard manner",
-				"152": "Removal of Fallen Trees",
-				"153": "Complaints regarding Park",
-				"154": "Complaints regarding Playground",
-				"155": "Complaints regarding Centre Median",
-				"156": "Complaints regarding Traffic Island",
-				"157": "Unauthorized Tree Cutting",
-				"158": "Obstruction of Trees",
-				"159": "Complaints regarding Public Toilets",
-				"160": "Complaints regarding Free Usage of Public Toilets",
-				"161": "Complaints regarding Cleanliness of Toilets in Theatre",
-				"162": "Complaints regarding Cleanliness of Toilets in Shopping Complex",
-				"163": "Building Plan Sanction",
-				"164": "Violation of DCR/Building By laws",
-				"165": "Unauthorized / Illegal Construction",
-				"166": "Complaints related to Property Tax",
-				"167": "Complaints related to Professional Tax",
-				"168": "Complaints related to Trade Licence",
-				"174": "Name Error (Spelling Related)",
-				"175": "Change of Address in Electoral Roll",
-				"176": "Issue of Voter ID",
-				"177": "Inclusion, Deletion, Correction in Voter List",
-				"178": "Complaints regarding Voter List",
-				"179": "Name not found in the Electoral Roll",
-				"180": "Issue of Birth and Death Certificate",
-				"181": "Encroachment on the Public Property",
-				"182": " Complaints related to Schools",
-				"183": "Sanction of Financial Assistance under Moovalaur Thirumana Thittam",
-				"184": "Complaints related to issue of all types of Registration Certificate",
-				"185": "Slow Progress of Work",
-				"186": "Poor Quality of Work",
-				"187": "Unauthorized Advertisement Boards",
-				"188": "Complaints regarding Bridges / Flyovers / Subways",
-				"189": "Complaints related Shopping Complex",
-				"190": "Complaints regarding Community Hall",
-				"191": "Complaints regarding Burial Ground",
-				"192": "Complaints regarding any other CoC building",
-				"193": "Parking Issue",
-				"195": "Complaints Regarding Plastics",
-				"196": "No electricity in public toilet",
-				"197": "No water supply in public toilet",
-				"198": "Public toilet blockage",
-				"199": "Public toilet cleaning",
-				"200": "Burning of street light in daytime",
-				"201": "Illegal Parking on foot path",
-				"202": "Complaints regarding non availability of Doctors",
-				"203": "Complaints regarding non availability of medicines",
-				"204": "Complaints regarding laboratory issues",
-				"205": "Issues regarding amma baby care kits (After Delivery)",
-				"206": "Issues regarding Amma nutrition kit for pregnant woman",
-				"207": "Issues regarding Muthulakshmi Reddy Maternity Benefit Scheme (MRMBS)",
-				"208": "Issues regarding janani suraksha yojana scheme (JSY)",
-				"209": "Travel pass related complaints",
-				"210": "Food related complaints",
-				"212": "Covid Health Related Queries",
-				"213": "Hospital and Covid care centre(CCC) Related Queries",
-				"214": "Medical Emergencies",
-				"215": "Essentials and Medicines",
-				"216": "PSYCHO-SOCIO support",
-				"218": "Quarantine and isolation Related Queries",
-				"219": "General Health Queries",
-				"220": "Disinfection request",
-				"221": "Non Covid Health Related Queries",
-				"222": "Milling/Scraping of Road before Relaying of Road",
-				"226": "Food Requirement",
-				"227": "Relief Center Requirement",
-				"228": "Covid19 Ambulance Service",
-				"229": "Air Quality",
-				"230": "Online Payment Issue",
-				"231": "General Revision Objection",
-				"232": "Water Mixed with Sewarage",
-				"233": "Sewerage Overflow",
-				"234": "Drinking water supply",
-				"235": "Electricity Shock",
-				"236": "Electricity Unavailability",
-				"237": "Insufficient Barricading",
-				"238": "Fallen poles/towers/hoardings/other infra",
-				"239": "Fallen EB cables",
-				"240": "Project information not provided (Thiruvotriyur High Road)",
-				"241": "Project information not provided (Arunachaleshwar Road)",
-				"242": "Project information not provided (MC Road)",
-				"243": "Project information not provided (Washermenpet Metro)",
-				"244": "Project information not provided (Khadar Nawas Khan Road)",
-				"245": "Project information not provided (Race Course road + Guindy MMI)",
-				"246": "Advance information on consultation not provided (Thiruvotriyur High Road)",
-				"247": "Advance information on consultation not provided (Arunachaleshwar Road)",
-				"248": "Advance information on consultation not provided (MC Road)",
-				"249": "Advance information on consultation not provided (Washermenpet Metro)",
-				"250": "Advance information on consultation not provided (Khadar Nawas Khan Road)",
-				"251": "Advance information on consultation not provided (Race Course road + Guindy MMI)",
-				"252": "Location and area of consultation not provided (Thiruvotriyur High Road)",
-				"253": "Location and area of consultation not provided (Arunachaleshwar Road)",
-				"254": "Location and area of consultation not provided (MC Road)",
-				"255": "Location and area of consultation not provided (Washermenpet Metro)",
-				"256": "Location and area of consultation not provided (Khadar Nawas Khan Road)",
-				"257": "Location and area of consultation not provided (Race Course road + Guindy MMI)",
-				"258": "Information on detailed work plan not provided (Thiruvotriyur High Road)",
-				"259": "Information on detailed work plan not provided (Arunachaleshwar Road)",
-				"260": "Information on detailed work plan not provided (MC Road)",
-				"261": "Information on detailed work plan not provided (Washermenpet Metro)",
-				"262": "Information on detailed work plan not provided (Khadar Nawas Khan Road)",
-				"263": "Information on detailed work plan not provided (Race Course road + Guindy MMI)",
-				"264": "Others (Thiruvotriyur High Road)",
-				"265": "Others (Arunachaleshwar Road)",
-				"266": "Others (MC Road)",
-				"267": "Others (Washermenpet Metro)",
-				"268": "Others (Khadar Nawas Khan Road)",
-				"269": "Others (Race Course road + Guindy MMI)",
-				"270": "No information in advance provided on the date and time of civil works (Thiruvotriyur High Road)",
-				"271": "No information in advance provided on the date and time of civil works (Arunachaleshwar Road)",
-				"272": "No information in advance provided on the date and time of civil works (MC Road)",
-				"273": "No information in advance provided on the date and time of civil works (Washermenpet Metro)",
-				"274": "No information in advance provided on the date and time of civil works (Khadar Nawas Khan Road)",
-				"275": "No information in advance provided on the date and time of civil works (Race Course road + Guindy MMI)",
-				"276": "No information provided on the nature and schedule of civil work (Thiruvotriyur High Road)",
-				"277": "No information provided on the nature and schedule of civil work (Arunachaleshwar Road)",
-				"278": "No information provided on the nature and schedule of civil work (MC Road)",
-				"279": "No information provided on the nature and schedule of civil work (Washermenpet Metro)",
-				"280": "No information provided on the nature and schedule of civil work (Khadar Nawas Khan Road)",
-				"281": "No information provided on the nature and schedule of civil work (Race Course road + Guindy MMI)",
-				"282": "No consultation carried out with the people affected by the civil works (Thiruvotriyur High Road)",
-				"283": "No consultation carried out with the people affected by the civil works (Arunachaleshwar Road)",
-				"284": "No consultation carried out with the people affected by the civil works (MC Road)",
-				"285": "No consultation carried out with the people affected by the civil works (Washermenpet Metro)",
-				"286": "No consultation carried out with the people affected by the civil works (Khadar Nawas Khan Road)",
-				"287": "No consultation carried out with the people affected by the civil works (Race Course road + Guindy MMI)",
-				"288": "No arrangement made for temporary displacement (Thiruvotriyur High Road)",
-				"289": "No arrangement made for temporary displacement (Arunachaleshwar Road)",
-				"290": "No arrangement made for temporary displacement (MC Road)",
-				"291": "No arrangement made for temporary displacement (Washermenpet Metro)",
-				"292": "No arrangement made for temporary displacement (Khadar Nawas Khan Road)",
-				"293": "No arrangement made for temporary displacement (Race Course road + Guindy MMI)",
-				"294": "No display board on the project installed at work site (Thiruvotriyur High Road)",
-				"295": "No display board on the project installed at work site (Arunachaleshwar Road)",
-				"296": "No display board on the project installed at work site (MC Road)",
-				"297": "No display board on the project installed at work site (Washermenpet Metro)",
-				"298": "No display board on the project installed at work site (Khadar Nawas Khan Road)",
-				"299": "No display board on the project installed at work site (Race Course road + Guindy MMI)",
-				"300": "Temporary access to structures not provided and or not adequate (Thiruvotriyur High Road)",
-				"301": "Temporary access to structures not provided and or not adequate (Arunachaleshwar Road)",
-				"302": "Temporary access to structures not provided and or not adequate (MC Road)",
-				"303": "Temporary access to structures not provided and or not adequate (Washermenpet Metro)",
-				"304": "Temporary access to structures not provided and or not adequate (Khadar Nawas Khan Road)",
-				"305": "Temporary access to structures not provided and or not adequate (Race Course road + Guindy MMI)",
-				"306": "No safety measures taken at worksite (Thiruvotriyur High Road)",
-				"307": "No safety measures taken at worksite (Arunachaleshwar Road)",
-				"308": "No safety measures taken at worksite (MC Road)",
-				"309": "No safety measures taken at worksite (Washermenpet Metro)",
-				"310": "No safety measures taken at worksite (Khadar Nawas Khan Road)",
-				"311": "No safety measures taken at worksite (Race Course road + Guindy MMI)",
-				"312": "Water supply disrupted and alternate arrangement not provided (Thiruvotriyur High Road)",
-				"313": "Water supply disrupted and alternate arrangement not provided (Arunachaleshwar Road)",
-				"314": "Water supply disrupted and alternate arrangement not provided (MC Road)",
-				"315": "Water supply disrupted and alternate arrangement not provided (Washermenpet Metro)",
-				"316": "Water supply disrupted and alternate arrangement not provided (Khadar Nawas Khan Road)",
-				"317": "Water supply disrupted and alternate arrangement not provided (Race Course road + Guindy MMI)",
-				"318": "Electricity supply disrupted and alternate arrangement not provided (Thiruvotriyur High Road)",
-				"319": "Electricity supply disrupted and alternate arrangement not provided (Arunachaleshwar Road)",
-				"320": "Electricity supply disrupted and alternate arrangement not provided (MC Road)",
-				"321": "Electricity supply disrupted and alternate arrangement not provided (Washermenpet Metro)",
-				"322": "Electricity supply disrupted and alternate arrangement not provided (Khadar Nawas Khan Road)",
-				"323": "Electricity supply disrupted and alternate arrangement not provided (Race Course road + Guindy MMI)",
-				"324": "Disposal of debris not appropriately managed (Thiruvotriyur High Road)",
-				"325": "Disposal of debris not appropriately managed (Arunachaleshwar Road)",
-				"326": "Disposal of debris not appropriately managed (MC Road)",
-				"327": "Disposal of debris not appropriately managed (Washermenpet Metro)",
-				"328": "Disposal of debris not appropriately managed (Khadar Nawas Khan Road)",
-				"329": "Disposal of debris not appropriately managed (Race Course road + Guindy MMI)",
-				"330": " Temporary arrangement for parking not provided (Thiruvotriyur High Road)",
-				"331": " Temporary arrangement for parking not provided (Arunachaleshwar Road)",
-				"332": " Temporary arrangement for parking not provided (MC Road)",
-				"333": " Temporary arrangement for parking not provided (Washermenpet Metro)",
-				"334": " Temporary arrangement for parking not provided (Khadar Nawas Khan Road)",
-				"335": " Temporary arrangement for parking not provided (Race Course road + Guindy MMI)",
-				"336": "GRM and helpline numbers not displayed at worksite (Thiruvotriyur High Road)",
-				"337": "GRM and helpline numbers not displayed at worksite (Arunachaleshwar Road)",
-				"338": "GRM and helpline numbers not displayed at worksite (MC Road)",
-				"339": "GRM and helpline numbers not displayed at worksite (Washermenpet Metro)",
-				"340": "GRM and helpline numbers not displayed at worksite (Khadar Nawas Khan Road)",
-				"341": "GRM and helpline numbers not displayed at worksite (Race Course road + Guindy MMI)",
-				"342": "Drinking water/ other basic needs for Labour not available at worksite (Thiruvotriyur High Road)",
-				"343": "Drinking water/ other basic needs for Labour not available at worksite (Arunachaleshwar Road)",
-				"344": "Drinking water/ other basic needs for Labour not available at worksite (MC Road)",
-				"345": "Drinking water/ other basic needs for Labour not available at worksite (Washermenpet Metro)",
-				"346": "Drinking water/ other basic needs for Labour not available at worksite (Khadar Nawas Khan Road)",
-				"347": "Drinking water/ other basic needs for Labour not available at worksite (Race Course road + Guindy MMI)",
-				"348": "Noise levels are very high (Thiruvotriyur High Road)",
-				"349": "Noise levels are very high (Arunachaleshwar Road)",
-				"350": "Noise levels are very high (MC Road)",
-				"351": "Noise levels are very high (Washermenpet Metro)",
-				"352": "Noise levels are very high (Khadar Nawas Khan Road)",
-				"353": "Noise levels are very high (Race Course road + Guindy MMI)",
-				"354": " Sprinkling of water at worksite not carried out (Thiruvotriyur High Road)",
-				"355": " Sprinkling of water at worksite not carried out (Arunachaleshwar Road)",
-				"356": " Sprinkling of water at worksite not carried out (MC Road)",
-				"357": " Sprinkling of water at worksite not carried out (Washermenpet Metro)",
-				"358": " Sprinkling of water at worksite not carried out (Khadar Nawas Khan Road)",
-				"359": " Sprinkling of water at worksite not carried out (Race Course road + Guindy MMI)",
-				"360": "The worksite is not barricaded;  (Thiruvotriyur High Road)",
-				"361": "The worksite is not barricaded;  (Arunachaleshwar Road)",
-				"362": "The worksite is not barricaded;  (MC Road)",
-				"363": "The worksite is not barricaded;  (Washermenpet Metro)",
-				"364": "The worksite is not barricaded;  (Khadar Nawas Khan Road)",
-				"365": "The worksite is not barricaded;  (Race Course road + Guindy MMI)",
-				"366": " No information on number of labour working at the site (Thiruvotriyur High Road)",
-				"367": " No information on number of labour working at the site (Arunachaleshwar Road)",
-				"368": " No information on number of labour working at the site (MC Road)",
-				"369": " No information on number of labour working at the site (Washermenpet Metro)",
-				"370": " No information on number of labour working at the site (Khadar Nawas Khan Road)",
-				"371": " No information on number of labour working at the site (Race Course road + Guindy MMI)",
-				"372": "Labourer not using the safety equipment (Thiruvotriyur High Road)",
-				"373": "Labourer not using the safety equipment (Arunachaleshwar Road)",
-				"374": "Labourer not using the safety equipment (MC Road)",
-				"375": "Labourer not using the safety equipment (Washermenpet Metro)",
-				"376": "Labourer not using the safety equipment (Khadar Nawas Khan Road)",
-				"377": "Labourer not using the safety equipment (Race Course road + Guindy MMI)",
-				"378": "Sewerage pipe is damaged (Thiruvotriyur High Road)",
-				"379": "Sewerage pipe is damaged (Arunachaleshwar Road)",
-				"380": "Sewerage pipe is damaged (MC Road)",
-				"381": "Sewerage pipe is damaged (Washermenpet Metro)",
-				"382": "Sewerage pipe is damaged (Khadar Nawas Khan Road)",
-				"383": "Sewerage pipe is damaged (Race Course road + Guindy MMI)",
-				"384": "Others (Thiruvotriyur High Road)",
-				"385": "Others (Arunachaleshwar Road)",
-				"386": "Others (MC Road)",
-				"387": "Others (Washermenpet Metro)",
-				"388": "Others (Khadar Nawas Khan Road)",
-				"389": "Others (Race Course road + Guindy MMI)",
-				"390": "Insufficient Barricading (Thiruvotriyur High Road)",
-				"391": "Insufficient Barricading (Arunachaleshwar Road)",
-				"392": "Insufficient Barricading (MC Road)",
-				"393": "Insufficient Barricading (Washermenpet Metro)",
-				"394": "Insufficient Barricading (Khadar Nawas Khan Road)",
-				"395": "Insufficient Barricading (Race Course road + Guindy MMI)",
-				"396": "Non Removal of Debris (Thiruvotriyur High Road)",
-				"397": "Non Removal of Debris (Arunachaleshwar Road)",
-				"398": "Non Removal of Debris (MC Road)",
-				"399": "Non Removal of Debris (Washermenpet Metro)",
-				"400": "Non Removal of Debris (Khadar Nawas Khan Road)",
-				"401": "Non Removal of Debris (Race Course road + Guindy MMI)",
-				"402": "Potholes fill up (Thiruvotriyur High Road)",
-				"403": "Potholes fill up (Arunachaleshwar Road)",
-				"404": "Potholes fill up (MC Road)",
-				"405": "Potholes fill up (Washermenpet Metro)",
-				"406": "Potholes fill up (Khadar Nawas Khan Road)",
-				"407": "Potholes fill up (Race Course road + Guindy MMI)",
-				"408": "Damage to utilities (TNEB, CMWSSB, BSNL) (Thiruvotriyur High Road)",
-				"409": "Damage to utilities (TNEB, CMWSSB, BSNL) (Arunachaleshwar Road)",
-				"410": "Damage to utilities (TNEB, CMWSSB, BSNL) (MC Road)",
-				"411": "Damage to utilities (TNEB, CMWSSB, BSNL) (Washermenpet Metro)",
-				"412": "Damage to utilities (TNEB, CMWSSB, BSNL) (Khadar Nawas Khan Road)",
-				"413": "Damage to utilities (TNEB, CMWSSB, BSNL) (Race Course road + Guindy MMI)",
-				"414": "Encroaching Public Space (Thiruvotriyur High Road)",
-				"415": "Encroaching Public Space (Arunachaleshwar Road)",
-				"416": "Encroaching Public Space (MC Road)",
-				"417": "Encroaching Public Space (Washermenpet Metro)",
-				"418": "Encroaching Public Space (Khadar Nawas Khan Road)",
-				"419": "Encroaching Public Space (Race Course road + Guindy MMI)",
-				"420": "Need Pathway ramp (Thiruvotriyur High Road)",
-				"421": "Need Pathway ramp (Arunachaleshwar Road)",
-				"422": "Need Pathway ramp (MC Road)",
-				"423": "Need Pathway ramp (Washermenpet Metro)",
-				"424": "Need Pathway ramp (Khadar Nawas Khan Road)",
-				"425": "Need Pathway ramp (Race Course road + Guindy MMI)",
-				"426": "Cleanliness in Parks",
-				"427": "Greenary in Parks",
-				"428": "Play Equipment",
-				"429": "Opening and closing hours",
-				"430": "Toilets in parks",
-				"431": "Non functional lights/ no lights in parks",
-				"432": "Safety in parks/playgrounds",
-				"433": "Women related safety issues in parks",
-				"434": "Availability or cleanliness of dustbins in public toilets",
-				"435": "Cleanliness/ water supply in toilets",
-				"436": "Broken sinks, toilets or urinals and doors",
-				"437": "Request for new toilet",
-				"438": "Illegal activities in toilet",
-				"439": "Toilets not in use/ closed",
-				"440": "Inadequate lighting in and around the toilet",
-				"441": "Safety in public toilets",
-				"442": "Cleanliness in footpath",
-				"443": "Electrical wires/obstruction on footpath",
-				"444": "Unsafe dark spots/ corners",
-				"445": "Public defecation/urination",
-				"446": "Women related safety issues   ",
-				"447": "Inadequate light in a particular location or spot/ dark spots",
-			};
-			
-			$('#nextStep3').off('click').on('click', function (e) {
-				e.preventDefault();
-				
-				let complaintId = '';
-			    let complaintTitle = '';
-				
-				const selectedGroupId1 = $(specificComplaintType).val();
-				const selectedSubGroupId1=$(specificComplaintSubType).val();
-				
-				if (!selectedGroupId1) {
-			        Swal.fire({
-			            icon: 'warning',
-			            title: 'Complaint Type Required',
-			            text: 'Please select a complaint type before continuing.',
-			            confirmButtonText: 'OK'
-			        });
-			        return;
-			    }
-				
-				if (!selectedSubGroupId1) {
-			        Swal.fire({
-			            icon: 'warning',
-			            title: 'Complaint Sub Type Required',
-			            text: 'Please select a complaint sub type before continuing.',
-			            confirmButtonText: 'OK'
-			        });
-			        return;
-			    }
-
-
-				//const shareMobile = $('input[name="shareMobile"]:checked').val();
-				const mobileNo = $('#mobileNo').val().trim();
-				const streetName = $('#streetName option:selected').text().trim().toLowerCase();
-
-/* 				if (shareMobile === 'no' || mobileNo === '') {
-					nextStep(); // Skip duplicate check if mobile not shared
-					return;
-				} */
-			
-				complaintId = selectedSubGroupId1;
-				
-				console.log("Checking for duplicate:", { complaintId, complaintTitle, streetName });
-
-				const backendUrl = `/gcc/api/callcenterqaqc/pgrcomplaint/checktypeforduplicate?mobileNo=${mobileNo}&complaintId=${complaintId}&streetName=${encodeURIComponent(streetName)}`;
-				$('#pageLoader').show();
-				$.get(backendUrl, function (response) {
-					 $('#pageLoader').hide();
-					const subTypeText = $('#specificComplaintSubType option:selected').text();
-					if (response.duplicate) {
-						Swal.fire({
-							icon: 'warning',
-							title: 'Duplicate Complaint Found',
-							text: `A similar complaint like "${subTypeText}" already exists for this street within the last 7 days.`,
-							confirmButtonText: 'OK',
-							allowOutsideClick: false
-						}).then(() => {
-							location.reload();
-						});
-					} else {
-						nextStep();
-					}
-				}).fail(function () {
-					 $('#pageLoader').hide();
-					Swal.fire({
-						icon: 'error',
-						title: 'Error',
-						text: 'Could not verify for duplicate complaints. Please try again.'
-					});
-				});
-			});
-		});
-		
-		
-		let complaintGroups = [];
-
-		$(document).ready(function () {  
-		    loadComplaintTypes();
-
-		    $('#specificComplaintType').on('change', function () {
-		        const selectedGroupId = $(this).val();
-		        const $subTypeDropdown = $('#specificComplaintSubType');
-
-		        // Clear previous options
-		        $subTypeDropdown.empty().append('<option value="">-- Select Complaint Sub-Type --</option>');
-
-		        // Find the group based on groupid
-		        const selectedGroup = complaintGroups.find(g => g.groupid === selectedGroupId);
-
-		        if (selectedGroup && selectedGroup.group && selectedGroup.group.length > 0) {
-		            selectedGroup.group.forEach(sub => {
-		                $subTypeDropdown.append(
-		                    `<option value="${sub.id}">${sub.complaintname}</option>`
-		                );
-		            });
-		            $subTypeDropdown.prop('disabled', false);
-		        } else {
-		            $subTypeDropdown.prop('disabled', true);
-		        }
-		    });
-		});
-
-		function loadComplaintTypes() {
-		    $.ajax({
-		        url: "/gcc/api/callcenterqaqc/pgrcomplaint/getComplaintCategories",
-		        dataType: "json",
-		        type: "GET",
-		        success: function (res) {
-		            complaintGroups = res?.ComplaintCategoryListResult || [];
-
-		            const $typeDropdown = $('#specificComplaintType');
-		            $typeDropdown.empty().append('<option value="">-- Select Complaint Type --</option>');
-
-		            complaintGroups.forEach(group => {
-		                $typeDropdown.append(
-		                    `<option value="${group.groupid}">${group.groupname}</option>`
-		                );
-		            });
-		        },
-		        error: function (xhr, status, error) {
-		            console.error("Error loading complaint categories:", status, error);
-		        }
-		    });
-		}
-        
-
-		/*     html: `Your complaint has been submitted successfully. Your Complaint Number is <strong>${complaintNumber}</strong>. It will be sent to your mobile number.`, */
-        </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/qaqcadminsettings.html b/src/main/resources/templates/modules/callcenterqaqc/qaqcadminsettings.html
deleted file mode 100644
index f126f032..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/qaqcadminsettings.html
+++ /dev/null
@@ -1,597 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-	color: red;
-}
-.editAgentName {
-    color: black; /* Default color */
-    text-decoration: none; /* Remove underline */
-    transition: color 0.1s ease-in-out; /* Smooth color transition */
-}
-
-.editAgentName:hover {
-    color: blue; /* Change color to blue on hover */
-    text-decoration: underline; /* Optional: add underline on hover */
-}
-/* Mobile screens - targeting devices with a max width of 767px */
-@media (max-width: 767px) 
-{
-	#qaqcRequestForm label{
-		margin-top: 10px;
-	} 
-}
-</style>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fas fa-edit bg-blue"></i>
-									<div class="d-inline">	
-										<h5>Admin Settings</h5>
-										<span>1913 Admin Setting for Select Agents inbound or outbound</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Admin Settings</li>
-										<li class="breadcrumb-item active" aria-current="page">Admin Settings</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-                        
-                      
-                      <div class="row mt-4">
-                      
-
-					
-						<div class="col-md-12">
-							<div class="card" style="margin-top: 0px;">
-								<div class="card-header justify-content-between align-items-center">
-									<h3><b>Admin Settings</b></h3>									
-								</div>
-								<div class="card-body">
-								
-									 
-									    <div class="form-group">  
-										    <div class="row">
-										        <div class="col-sm-12 col-md-3">
-										            <label for="productivity_count">Productivity Count Per Agent<span class="required">*</span></label>
-										            <input 
-										                type="number" 
-										                class="form-control" 
-										                id="productivity_count" 
-										                th:value="${Counts != null && !Counts.isEmpty() ? Counts[0].productivity_count : 0}" 
-										                >
-										        </div>	
-										        <div class="col-sm-12 col-md-3">
-										            <label for="total_count">Total Agents</label>
-										            <input 
-										                type="number" 
-										                class="form-control" 
-										                id="total_count" 
-										                th:value="${Counts != null && !Counts.isEmpty() ? Counts[0].total_count : 0}" 
-										                readonly>
-										        </div>
-										        <div class="col-sm-12 col-md-3">
-										            <label for="assigned">Assigned Agents</label>
-										            <input 
-										                type="number" 
-										                class="form-control" 
-										                id="assigned" 
-										                th:value="${Counts != null && !Counts.isEmpty() ? Counts[0].assigned : 0}" 
-										                readonly>
-										        </div>
-										        <div class="col-sm-12 col-md-3">
-										            <label for="notassigned">Not Assigned Agents</label>
-										            <input 
-										                type="number" 
-										                class="form-control" 
-										                id="notassigned" 
-										                th:value="${Counts != null && !Counts.isEmpty() ? Counts[0].notassigned : 0}" 
-										                readonly>
-										        </div>
-										        
-										        
-										    </div>
-										    
-										    <div class="row mt-3">
-										    	<div class="col-sm-12 col-md-3">
-										            <label for="inbound_count">Inbound Agents</label>
-										            <input 
-										                type="number" 
-										                class="form-control" 
-										                id="inbound_count" 
-										                th:value="${Counts != null && !Counts.isEmpty() ? Counts[0].inbound_count : 0}" 
-										                readonly>
-										        </div>
-										        
-										        <div class="col-sm-12 col-md-3">
-										            <label for="outbound_count">Outbound Agents</label>
-										            <input 
-										                type="number" 
-										                class="form-control" 
-										                id="outbound_count" 
-										                th:value="${Counts != null && !Counts.isEmpty() ? Counts[0].outbound_count : 0}" 
-										                readonly>
-										        </div>
-										    </div>
-										</div>
-									
-									    <div class="form-group text-center">
-									        <button type="submit" class="btn btn-primary" id="requestSubmit">Submit</button>
-									    </div>																	
-								</div>
-							</div>
-						</div>
-						
-						
-						
-						<div class="col-md-12">
-						    <div class="card">
-						        <div class="card-block">
-						            <div class="page-header-title">
-						                <h5 style="margin: 0; font-weight: bold;">Agent List</h5>
-						                <hr>
-						            </div>
-						
-						            <div>
-						                <table id="QaqcDatatable" class="table  table-bordered table-hover dataTable" role="grid">
-						                    <thead class="thead-dark">
-						                        <tr role="row">
-						                            <th class="text-center">S.No</th> 
-						                            <th class="text-center">Agent ID</th> 
-						                            <th class="text-center">Username</th>
-						                            <th class="text-center">Name</th> 
-						                            <th class="text-center">Phone No</th>
-						                            <th class="text-center ">
-											            <div class="d-inline-flex align-items-center">
-											                <input type="checkbox" id="selectAllInbound" title="Select All InBound" style="margin-right: 5px;">
-											                <span>InBound</span>
-											            </div>
-											        </th>
-											        <th class="text-center">
-											            <div class="d-inline-flex align-items-center">
-											                <input type="checkbox" id="selectAllOutbound" title="Select All OutBound" style="margin-right: 5px;">
-											                <span>OutBound</span>
-											            </div>
-											        </th>
-						                        </tr>
-						                    </thead>
-						                    <tbody>
-						                        <!-- Populate the table dynamically using Thymeleaf -->
-						                        <tr th:each="agent, iterStat : ${Agents}">
-						                            <td th:text="${iterStat.index + 1}" class="text-center"></td>
-						                             <td th:text="${agent.agent_id}" class="text-center"></td>
-						                             <td th:text="${agent.username}" class="text-center"></td>
-						                            <td class="text-center">
-													    <a href="#" th:text="${agent.agent_name}" 
-													       th:attr="data-id=${agent.agent_id}, data-name=${agent.agent_name}" 
-													       class="editAgentName"
-													       data-toggle="modal" data-target="#editAgentModal"></a>
-													</td>						                          
-						                            <td th:text="${agent.mobile_number}" class="text-center"></td>
-						                            <td class="text-center">
-						                                <!-- Inbound checkbox, checked if calling_type is INBOUND -->
-						                                <input type="checkbox" th:id="'inbound_' + ${agent.agent_id}" th:checked="${'INBOUND'.equals(agent.calling_type)}">
-						                            </td>
-						                            <td class="text-center">
-						                                <!-- Outbound checkbox, checked if calling_type is OUTBOUND -->
-						                                <input type="checkbox" th:id="'outbound_' + ${agent.agent_id}" th:checked="${'OUTBOUND'.equals(agent.calling_type)}">
-						                            </td>
-						                        </tr>
-						                    </tbody>
-						                </table>
-						
-						                <!-- Center the Submit button -->
-						                <div class="text-center mt-2">
-						                    <button type="button" class="btn btn-primary" id="submitBtn">Click to Assign</button>
-						                </div>
-						            </div>
-						        </div>
-						    </div>
-						</div>
-
-						
-                      </div>
-                        
-                    </div>
-                </div>
-                
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<!-- Edit Agent Modal -->
-		<div class="modal fade" id="editAgentModal" tabindex="-1" role="dialog" aria-labelledby="editAgentModalLabel" aria-hidden="true">
-		    <div class="modal-dialog" role="document">
-		        <div class="modal-content">
-		            <div class="modal-header">
-		                <h5 class="modal-title" id="editAgentModalLabel">Edit Agent Name</h5>
-		                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-		            </div>
-		            <div class="modal-body">
-		                <form id="editAgentForm">
-		                    <input type="hidden" id="editAgentId"> <!-- Hidden input for agent_id -->
-		                    <div class="form-group">
-		                        <label for="editAgentName">Agent Name</label>
-		                        <input type="text" class="form-control" id="editAgentName" required>
-		                    </div>
-		                    <button type="submit" class="btn btn-primary">Save Changes</button>
-		                </form>
-		            </div>
-		        </div>
-		    </div>
-		</div>
-		
-        
-    
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-        
-        <script type="text/javascript">
-        
-        $(document).ready(function () {
-            // When clicking the agent name
-            $(".editAgentName").click(function () {
-                let agentId = $(this).data("id");    // Get agent ID
-                let agentName = $(this).data("name"); // Get agent name
-
-                $("#editAgentId").val(agentId); // Set ID in hidden field
-                $("#editAgentName").val(agentName); // Set name in input field
-            });
-
-            // Handle Save button inside modal
-            $("#editAgentForm").submit(function (e) {
-                e.preventDefault(); // Prevent form from reloading page
-                
-                let updatedName = $("#editAgentName").val();
-                let agentId = $("#editAgentId").val();
-                                
-
-                console.log("Updated Agent ID:", agentId);
-                console.log("Updated Name:", updatedName);
-
-                // Here, you can send the updated name to the server via AJAX
-                 $.ajax({
-				    type: "POST",
-				    url: "/gcc/api/callcenterqaqc/adminsettings/updateagentname",
-				    contentType: "application/json",
-				    data: JSON.stringify({ agent_id: agentId, agent_name: updatedName }),
-				    success: function (response) {
-				        if (response.status === "success") {
-				            Swal.fire({
-				            	allowOutsideClick: false, 
-	    	                    allowEscapeKey: false, 
-	    	                    allowEnterKey: false,
-				                icon: "success",
-				                title: "Success",
-				                text: response.message,
-				                confirmButtonText: "OK"
-				            }).then(() => {
-				                location.reload(); // Reload page after user clicks "OK"
-				            });
-				        } else {
-				            Swal.fire({
-				                icon: "error",
-				                title: "Error",
-				                text: response.message
-				            });
-				        }
-				    },
-				    error: function (xhr) {
-				        let errorMessage = "Error updating agent name!";
-				        if (xhr.responseJSON && xhr.responseJSON.message) {
-				            errorMessage = xhr.responseJSON.message;
-				        }
-				        Swal.fire({
-				            icon: "error",
-				            title: "Error",
-				            text: errorMessage
-				        });
-				    }
-				});
- 
-                
-                $("#editAgentModal").modal("hide"); // Close modal after saving
-            });
-        });
-        
-        $(document).ready(function() {
-
-        	var table = $('#QaqcDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { targets: 'no-sort', orderable: false }
-                ],
-                lengthMenu: [
-                    [200, 500, -1],
-                    [ '200 rows','500 rows', 'Show all']
-                ],
-                scrollY: '80vh',
-                
-                scrollX: true,
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: true,
-                autoWidth: false,
-                responsive: false,
-                searching: true,
-                select: false,
-                processing: false
-            });
-        });
-        
-        $(document).ready(function () {
-            let lastClickedColumn = null; // Track the last clicked "Select All" checkbox
-
-            // Handle "Select All" for InBound
-            $('#selectAllInbound').on('change', function () {
-                if (this.checked) {
-                    // Uncheck the "Select All" checkbox in the OutBound column
-                    $('#selectAllOutbound').prop('checked', false);
-                    lastClickedColumn = 'Inbound';
-
-                    // Check all checkboxes in the InBound column
-                    $('#QaqcDatatable tbody input[id^="inbound_"]').prop('checked', true);
-
-                    // Uncheck all checkboxes in the OutBound column
-                    $('#QaqcDatatable tbody input[id^="outbound_"]').prop('checked', false);
-                } else {
-                    // Uncheck all checkboxes in the InBound column
-                    $('#QaqcDatatable tbody input[id^="inbound_"]').prop('checked', false);
-                }
-            });
-
-            // Handle "Select All" for OutBound
-            $('#selectAllOutbound').on('change', function () {
-                if (this.checked) {
-                    // Uncheck the "Select All" checkbox in the InBound column
-                    $('#selectAllInbound').prop('checked', false);
-                    lastClickedColumn = 'Outbound';
-
-                    // Check all checkboxes in the OutBound column
-                    $('#QaqcDatatable tbody input[id^="outbound_"]').prop('checked', true);
-
-                    // Uncheck all checkboxes in the InBound column
-                    $('#QaqcDatatable tbody input[id^="inbound_"]').prop('checked', false);
-                } else {
-                    // Uncheck all checkboxes in the OutBound column
-                    $('#QaqcDatatable tbody input[id^="outbound_"]').prop('checked', false);
-                }
-            });
-
-            // Ensure individual checkboxes deselect the "Select All" if unchecked
-            $('#QaqcDatatable').on('change', 'input[id^="inbound_"], input[id^="outbound_"]', function () {
-                const agentId = $(this).closest('tr').find('td:eq(1)').text().trim();
-
-                // Uncheck "Select All" if any checkbox in its column is deselected
-                if ($(this).attr('id').includes('inbound')) {
-                    if (!this.checked) {
-                        $('#selectAllInbound').prop('checked', false);
-                    }
-                    $('#outbound_' + agentId).prop('checked', false);
-                } else if ($(this).attr('id').includes('outbound')) {
-                    if (!this.checked) {
-                        $('#selectAllOutbound').prop('checked', false);
-                    }
-                    $('#inbound_' + agentId).prop('checked', false);
-                }
-            });
-        });
-
-                
-        $(document).ready(function () {
-            // Ensure only one checkbox is selected at a time (Inbound or Outbound)
-            $('#QaqcDatatable').on('change', 'input[type="checkbox"]', function () {
-                var agentId = $(this).closest('tr').find('td:eq(1)').text().trim(); // Get agent_id from the second column
-                if ($(this).attr('id').includes('inbound')) {
-                    // If Inbound checkbox is selected, uncheck Outbound
-                    $('#outbound_' + agentId).prop('checked', false);
-                } else if ($(this).attr('id').includes('outbound')) {
-                    // If Outbound checkbox is selected, uncheck Inbound
-                    $('#inbound_' + agentId).prop('checked', false);
-                }
-            });
-           
-            
-
-            $('#submitBtn').click(function () {
-                var selectedAgents = [];
-                $('#QaqcDatatable tbody tr').each(function () {
-                    var agentId = $(this).find('td:eq(1)').text().trim(); // Get agent_id from the second column
-                    var isInboundChecked = $(this).find('input[id="inbound_' + agentId + '"]').prop('checked');
-                    var isOutboundChecked = $(this).find('input[id="outbound_' + agentId + '"]').prop('checked');
-
-                    // Set calling_type based on the checked checkboxes
-                    var callingType = null;
-                    if (isInboundChecked) {
-                        callingType = 'INBOUND';
-                    } else if (isOutboundChecked) {
-                        callingType = 'OUTBOUND';
-                    }
-
-                 // Add agent object to the array with agent_id and calling_type
-                    selectedAgents.push({ agent_id: parseInt(agentId, 10), calling_type: callingType });
-                });
-
-                
-
-                // Check if no agents were selected and show an alert
-                if (selectedAgents.length === 0) {
-                    Swal.fire({
-                        icon: 'warning',
-                        title: 'No Selection',
-                        text: 'Please select at least one agent to proceed.',
-                    });
-                    return; // Stop further execution
-                }
-
-                $('#pageLoader').show();
-                // Send the selected agents and their calling types to the API
-                $.ajax({
-                    type: "POST",
-                    url: "/gcc/api/callcenterqaqc/adminsettings/updateCallType", // Your API endpoint
-                    data: JSON.stringify(selectedAgents),
-                    contentType: "application/json",
-                    success: function (response) {
-                    	$('#pageLoader').hide();
-                        // Success: Show success message with Swal
-                        Swal.fire({
-                            icon: 'success',
-                            title: 'Success',
-                            text: response.message || 'Agents Assigned Successfully',
-                        }).then(function () {
-                            // Reload the page after the Swal is closed
-                            location.reload();
-                        });
-                    },
-                    error: function (error) {
-                    	$('#pageLoader').hide();
-                        // Error: Show error message with Swal
-                        Swal.fire({
-                            icon: 'error',
-                            title: 'Error',
-                            text: error.responseJSON.message || 'Error in Assigning Agents',
-                        });
-                    }
-                });
-            });
-
-        });
-        
-        $(document).ready(function () {
-            $('#requestSubmit').click(function (event) {
-                event.preventDefault(); // Prevent form submission if it's inside a form
-                
-             // Get the productivity_count value from the input field
-                let productivityCount = $('#productivity_count').val();
-
-                // Check if the value is null, empty, or NaN
-                if (!productivityCount || isNaN(parseInt(productivityCount, 10))) {
-                    // Show an error message using Swal
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Invalid Input',
-                        text: 'Please enter a valid productivity count.',
-                    });
-                    return; // Stop further execution
-                }
-
-                // Parse productivityCount as an integer
-                productivityCount = parseInt(productivityCount, 10);
-
-                // Prepare the data to send
-                const data = { productivity_count: productivityCount };
-
-                $('#pageLoader').show();
-                // Send the data to the API using AJAX
-                $.ajax({
-                    type: "POST",
-                    url: "/gcc/api/callcenterqaqc/adminsettings/updateproductivity", // Replace with your API endpoint
-                    data: JSON.stringify(data),
-                    contentType: "application/json",
-                    success: function (response) {
-                    	$('#pageLoader').hide();
-                        // Show a success message using Swal
-                        Swal.fire({
-                            icon: 'success',
-                            title: 'Success',
-                            text: response.message || 'Productivity updated successfully!',
-                        }).then(function () {
-                            // Reload the page after the Swal is closed
-                            location.reload();
-                        
-                        });
-                    },
-                    error: function (error) {
-                    	$('#pageLoader').hide();
-                        // Show an error message using Swal
-                        Swal.fire({
-                            icon: 'error',
-                            title: 'Error',
-                            text: error.responseJSON?.message || 'Failed to update productivity!',
-                        });
-                    }
-                });
-            });
-        });
-
-
-                            	            
-
-		
-        </script>
-        
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/qaqcagentperformance.html b/src/main/resources/templates/modules/callcenterqaqc/qaqcagentperformance.html
deleted file mode 100644
index 4dda1685..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/qaqcagentperformance.html
+++ /dev/null
@@ -1,801 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-
-    #QaqcDatatable th, #QaqcDatatable td {
-        text-align: center;
-    }
-
-.modal-dialog {
-    max-width: 80%; /* Adjust width as needed */
-}
-.modal-header {
-    background-color: #007bff;
-    color: #fff;
-}
-.modal-title {
-    font-weight: bold;
-}
-
-
-.boxcard {
-	height: 100px;
-	border-radius: 20px;
-}
-
-
- .required{
-	color: red;
-}
-.card-box {
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-@media (max-width: 768px) {
-    .card-box {
-        text-align: center;
-    }
-
-}
-</style>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="fas fa-user-graduate bg-blue"></i>
-									<div class="d-inline">	
-										<h5>QAQC Agent Performance</h5>
-										<span>1913 Agent Performance</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 Reports</li>
-										<li class="breadcrumb-item active" aria-current="page">Agent Performance</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-                        
-                      
-                      <div class="row mt-4">
- 
-                      
-                      <div class="col-md-12">
-                             <div class="card">
-                             	<div class="card-header">
-                             		<h3>Agent Performance</h3>
-                             	</div>
-                             	<div class="row mt-3 ml-2">
-									
-									    <div class="col-md-3">
-									        <label for="startDate" class="form-label" style="font-size: medium;">From Date:</label>
-									        <input type="date" id="startDate" class="form-control">
-									    </div>
-									    <div class="col-md-3">
-									        <label for="endDate" class="form-label" style="font-size: medium;">To Date:</label>
-									        <input type="date" id="endDate" class="form-control">
-									    </div>
-									    <div class="col-md-3" style="margin-top: 30px;">
-									        <button id="searchBtn" class="btn btn-primary">Search</button>
-									        <button id="resetBtn" class="btn btn-secondary">Reset</button>
-									    </div>
-									
-									</div>
-
-
-                             	<div class="card-body">
-                             		
-										<div>
-										    <div class="row mt-2">
-										        <div class="col-xl-3 col-md-12">
-										            <div class="card card-box p-4">
-										                <p class="text-facebook mb-20 text-center mt-2"><b>No Of Agents</b></p>
-										                <h3 class="text-twitter fw-700 ml-5 text-center" id="totalnoofagentsCount"></h3>
-										            </div>
-										        </div>
-										        
-										        <div class="col-xl-3 col-md-4">
-										            <div class="card card-box p-4">
-										                <p class="text-facebook mb-20 text-center mt-2"><b>Assigned Calls</b></p> 
-										                <h3 class="text-twitter fw-700 ml-5 text-center" id="totalassignedCount"></h3>
-										            </div>
-										        </div>
-										        <div class="col-xl-3 col-md-4">
-										            <div class="card card-box p-4">
-										                <p class="text-facebook mb-20 text-center mt-2"><b>Finished</b></p> 
-										                <h3 class="text-twitter fw-700 ml-5 text-center" id="totalcompleteCount"></h3>
-										            </div>
-										        </div>
-										        <div class="col-xl-3 col-md-4">
-										            <div class="card card-box p-4">
-										                <p class="text-facebook mb-20 text-center mt-2"><b>Pending Calls</b></p> 
-										                <h3 class="text-twitter fw-700 ml-5 text-center" id="totalpendingCount"></h3>
-										            </div>
-										        </div>
-										    </div>
-										
-										    <div class="cards">
-										        <table id="QaqcDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-										            <thead class="thead-dark">
-										                <tr role="row">
-										                    <th rowspan="2" class="text-center">S.No</th>
-										                    <th rowspan="2" class="text-center">Agent Name</th>
-										                    <th colspan="4" class="text-center">Performance</th>
-							                            	<th colspan="4" class="text-center">Call Results</th>
-							                            </tr>
-							                       		<tr role="row">
-										                    <th class="text-center no-sort">Assigned Calls</th>							                            
-								                            <th class="text-center no-sort">Finished</th>
-								                            <th class="text-center no-sort">Pending Calls</th>
-								                            <th class="text-center no-sort">Completion(%)</th>
-								                            <th class="no-sort">Completed</th> 
-								                            <th class="no-sort">Reopen</th>
-								                            <th class="no-sort">Followup</th>
-								                            <th class="no-sort">Others</th>
-										                </tr>
-										            </thead>
-										            <tbody>
-										                <!-- Data will be populated here -->
-										            </tbody>
-										        </table>
-										    </div>
-										</div>
-                             	</div>						 
-							 </div>
-                         </div> 
-					
-						
-
-						
-                      </div>
-                        
-                    </div>
-                </div>
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-        
-        
-<!--agentperformance Modal -->
-		<div class="modal fade" id="agentperformance" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Task Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    
-                    <div class="modal-body">
-						<div class="table-responsive" >
-						<table id="agentperformanceDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" >
-                              <thead class="thead-dark">
-                                 	<tr role="row">
-                            <th rowspan="2" class="text-center">S.No</th>
-                            <th rowspan="2" class="text-center">TaskId</th>
-                            <th rowspan="2" class="text-center" width="100px;">Date</th>                           
-                            <th colspan="4" class="text-center">Performance</th>
-                            <th colspan="4" class="text-center">Call Results</th>
-                        </tr>
-                        <tr role="row">          
-                            <th class="text-center">Assigned Calls</th>
-                            <th class="text-center">Finished</th>
-                            <th class="text-center">Pending Calls</th>
-                            <th class="text-center no-sort">Completion (%)</th>
-                            <th class="text-center no-sort">Completed</th>
-                            <th class="text-center no-sort">Reopen</th>
-                            <th class="text-center no-sort">Followup</th>
-                            <th class="text-center no-sort">Others</th>
-                            
-                        </tr>
-						 </thead>
-                         <tbody>
-                                    
-                         </tbody>
-                               
-                       </table>
-						</div>
-                     </div>
-  					
-  					<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-                        
-                    </div>                                        
-                </div>
-            </div>
-        </div>
-        
-        
-        <!-- Assign Task Details Modal -->
-		<div class="modal fade" id="Assignagentperformance" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel1" aria-hidden="true">
-		    <div class="modal-dialog modal-xl" role="document">
-		        <div class="modal-content">
-		            <div class="modal-header">
-		                <h5 class="modal-title" id="exampleModalCenterLabel1">Assign Task Details</h5>
-		                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-		            </div>
-		            
-		            <div class="modal-body">
-		                <div class="table-responsive">
-		                    <table id="AssignagentperformanceDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-		                        <thead class="thead-dark">
-		                            <tr role="row">
-		                                <th class="text-center">S.No</th>
-		                                
-		                                <th class="text-center">Call Category</th>
-		                                <th class="text-center">Complaint Number</th>
-		                                <th class="text-center">Complaint Date</th>
-		                                <th class="text-center">Complaint Person Name</th>
-		                                <th class="text-center">Complaint Mob no</th>
-		                                <th class="text-center">Complaint Type</th>
-		                                <th class="text-center">Official Name</th>
-		                                <th class="text-center">Official Ph no</th>
-		                                <th class="text-center">Call Status</th>
-		                                <th class="text-center">Remarks</th>
-		                                <!-- <th class="text-center">Updated Date</th> -->
-		                            </tr>
-		                        </thead>
-		                        <tbody>
-		                            <!-- Dynamic content will be populated here -->
-		                        </tbody>
-		                    </table>
-		                </div>
-		            </div>
-		            
-		            <div class="modal-footer">
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-		            </div>
-		        </div>
-		    </div>
-		</div>	
-               
-    
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-        
-         <script type="text/javascript">
-         
-        	 $(document).ready(function() { 
-        		        	        		 
-        		 $('#agentperformance').on('shown.bs.modal', function () {
-
-         	    	 var 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'
-         	             }
-         	         ];
-         	        
-         	            $('#agentperformanceDatatable').DataTable({
-         	                dom: 'Bftip',               
-         	                columnDefs: [
-         	                    { targets: 'no-sort', orderable: false }
-         	                ],
-         	                lengthMenu: [
-         	                    [50, 100, 200, 500, -1],
-         	                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-         	                ],
-         	                scrollY: '50vh',
-         	                scrollX: true,  // Enable horizontal scrolling	
-         	                fixedColumns: {
-         	                    left: 1,
-         	                    right: 1
-         	                },
-         	                buttons: buttons,
-         	                fixedHeader: false,
-         	                autoWidth: false,
-         	                responsive: true,
-         	                searching: true,
-         	                select: false,
-         	                processing: false,
-         	            });
-         	        	
-         	        
-         	    });
-            	 
-            	 
-            	 $('#Assignagentperformance').on('shown.bs.modal', function () {
-
-         	    	 var 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'
-         	             }
-         	         ];
-         	       
-         	            $('#AssignagentperformanceDatatable').DataTable({
-         	                dom: 'Bftip',               
-         	                columnDefs: [
-         	                    { targets: 'no-sort', orderable: false }
-         	                ],
-         	               lengthMenu: [
-        	                    [50, 100, 200, 500, -1],
-        	                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-        	                ],
-         	                scrollY: '30vh',
-         	                scrollX: true,  // Enable horizontal scrolling	
-         	                fixedColumns: {
-         	                    left: 1,
-         	                    right: 1
-         	                },
-         	                buttons: buttons,
-         	                fixedHeader: false,
-         	                autoWidth: false,
-         	                responsive: true,
-         	                searching: true,
-         	                select: false,
-         	                processing: false,
-         	            });
-         	        
-         	        
-         	    });
-        	 
-          	var table = $('#QaqcDatatable').DataTable({
-                  dom: 'Bftip',
-                  columnDefs: [
-                      { targets: 'no-sort', orderable: false }
-                  ],
-                  lengthMenu: [
-                      [50, 100, 200, 500, -1],
-                      ['50 rows', '100 rows', '200 rows', 'Show all']
-                  ],
-                  scrollY: '50vh',
-                  fixedColumns: {
-                      left: 1,
-                      right: 1
-                  },
-                  buttons: [
-                      {
-                          extend: 'pageLength',
-                          className: 'btn btn-warning'
-                      },
-                      {
-                          title: 'Data export',
-                          extend: 'copyHtml5',
-                          text: 'Copy',
-                          className: 'btn btn-secondary',
-                          id: 'copyBtn'
-                      },
-                      {
-                          extend: 'excelHtml5',
-                          text: 'Excel',
-                          className: 'btn btn-secondary',
-                          id: 'excelBtn'
-                      },
-                      {
-                          extend: 'csvHtml5',
-                          text: 'CSV',
-                          className: 'btn btn-secondary',
-                          id: 'csvBtn'
-                      },
-                      {
-                          extend: 'pdfHtml5',
-                          text: 'PDF',
-                          className: 'btn btn-secondary',
-                          id: 'pdfBtn'
-                      }
-                  ],
-                  fixedHeader: true,
-                  autoWidth: true,
-                  responsive: true,
-                  searching:true,
-                  select: false,
-                  processing: false
-              });
-          	
-                   	
-          	 // Initialize DataTable with export buttons
-            
-
-        
-                 const overallcountapiUrl = "/gcc/api/callcenterqaqc/agent/getagentperformancecount"; // Replace with your API endpoint
-     		     const tableApiUrl = "/gcc/api/callcenterqaqc/agent/getagentperformancelist";
-               
-                 
-                 
-                 const totalagents = document.getElementById("totalnoofagentsCount");
-         	   
-         	    const assignedcallscount = document.getElementById("totalassignedCount");
-         	    const totalcompletedcount = document.getElementById("totalcompleteCount");
-         	    const pendingcallscount = document.getElementById("totalpendingCount");
-         	    /* const dataTableElement = $("#QaqcDatatable").DataTable(); // Initialize DataTable
-                  */
-                 // Fetch Data Function
-         	    const fetchData = async (startDate = "", endDate = "") => {
-         	    	
-         	        try {
-         	            const params = new URLSearchParams();
-         	            if (startDate) params.append("startDate", startDate);
-         	            if (endDate) params.append("endDate", endDate);
-
-         	            const response = await fetch(`${overallcountapiUrl}?${params.toString()}`);
-         	            const data = await response.json();
-         				
-         	            //console.log(data);
-         	            // Update Summary Counts
-         	            const firstItem = data[0];  // Get the first object from the array
-         	            totalagents.textContent = firstItem.no_of_agents || 0;          	            
-         	            assignedcallscount.textContent = firstItem.total_calls || 0;  
-         	            totalcompletedcount.textContent = firstItem.completed_calls || 0; 
-         	            pendingcallscount.textContent = firstItem.pending_calls || 0; 
-                  } catch (error) {
-         	            console.error("Error fetching data:", error);
-         	        }
-         	    };
-         	
-         	
-         	//fetchData();
-         	
-         // Fetch and Populate Table Data Function
-         const fetchTableData = async (startDate = "", endDate = "") => {
-        	 $('#pageLoader').show();
-             try {
-                 const params = new URLSearchParams();
-                 if (startDate) params.append("startDate", startDate);
-                 if (endDate) params.append("endDate", endDate);
-
-                 const response = await fetch(`${tableApiUrl}?${params.toString()}`);
-                 const tableData = await response.json();
-
-                 // Update DataTable with new data
-                 table.clear(); // Clear existing data
-                 tableData.forEach((row, index) => {
-                     
-                         
-                         const percentage = row.Assigned
-                         ? Math.round((row.TotalCompleted / row.Assigned) * 100)
-                         : 0;
-
-                     table.row.add([
-                     	
-                     	`<div style="text-align: center;">${index + 1}</div>`,
-                         `<button class="btn btn-success" data-agentId="${row.agent_id}" 
-                         onclick="handleTaskButtonClick('${row.agent_id}')">${row.agent_name}</button>`,                         
-                        /*  `<button class="btn btn-success" data-agentId="${row.agent_id}" 
-                         onclick="handleAssignTaskButtonClick('${row.agent_id}')">${row.Assigned}</button>`, */
-                         `<div style="text-align: center;">${row.Assigned}</div>`,
-                         `<div style="text-align: center;">${row.TotalCompleted}</div>`,
-                         `<div style="text-align: center;">${row.Pending}</div>`,
-                         `<div style="text-align: center;">${percentage}%</div>`,
-                         `<div style="text-align: center;">${row.Completed_count}</div>`,
-                         `<div style="text-align: center;">${row.Reopened_count}</div>`,
-                         `<div style="text-align: center;">${row.Followup_count}</div>`,
-                         `<div style="text-align: center;">${row.Other_count}</div>`,
-                        
-                     	
-                     ]);
-                     
-                 });
-                 table.draw(); // Redraw the DataTable with the updated data
-           
-             } catch (error) {
-                 console.error("Error fetching table data:", error);
-             }finally {
-                 $('#pageLoader').hide(); // Hide loader in both success or error
-             }
-         };
-
-               
-
-     		    // Search Button Click
-     		    document.getElementById("searchBtn").addEventListener("click", () => {
-     		        const startDate = document.getElementById("startDate").value;
-     		        const endDate = document.getElementById("endDate").value;
-     		        
-     		       if (!startDate || !endDate) {
-   	     	        // Show SweetAlert if dates are missing
-   	     	        Swal.fire({
-   	     	            icon: 'warning', // Warning icon
-   	     	            title: 'Please select both dates.',
-   	     	            showConfirmButton: true, // Show a confirmation button
-   	     	            timer: 3000 // Optional: Auto-close after 3 seconds
-   	     	        });
-
-   	     	        e.preventDefault(); // Prevent form submission if validation fails
-   	     	        return;
-   	     	    }
-     		       
-     		        fetchData(startDate, endDate);
-     		        fetchTableData(startDate,endDate);
-     		        
-     		        
-     		    });
-
-     		    // Reset Button Click
-     		    document.getElementById("resetBtn").addEventListener("click", () => {
-     		        /* document.getElementById("startDate").value = "";
-     		        document.getElementById("endDate").value = "";
-     		        fetchData(); // Fetch data without date filters
-     		        fetchTableData(); */
-     		        window.location.href = "/gcc/callcenterqaqcreports/qaqcagentperformance";
-     		    });
-     		    
-     		    
-
-    		    let today = new Date();
-
-    			// Get the first day of the current month (this should give 2024-11-01 for November)
-    			let firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
-
-    			// Manually format the date as yyyy-mm-dd without relying on toISOString
-    			let formattedFirstDay = firstDayOfMonth.getFullYear() + '-' + 
-    			                        (firstDayOfMonth.getMonth() + 1).toString().padStart(2, '0') + '-' + 
-    			                        firstDayOfMonth.getDate().toString().padStart(2, '0');
-
-    			let formattedToday = today.getFullYear() + '-' + 
-    			                     (today.getMonth() + 1).toString().padStart(2, '0') + '-' + 
-    			                     today.getDate().toString().padStart(2, '0');
-
-    		    // Set the date input values
-    		    $('#startDate').val(formattedFirstDay);
-    		    $('#endDate').val(formattedToday);
-    		    
-    		    $('#endDate').attr('min', formattedFirstDay); // Initial minimum for To Date
-    		    $('#startDate').attr('max', formattedToday); // Initial maximum for From Date
-    		    
-
-    		    // Update To Date's min attribute when From Date changes
-    		    $('#startDate').on('change', function () {
-    		        const fromDate = $(this).val();
-    		        $('#endDate').attr('min', fromDate); // Update min attribute for To Date
-
-    		        // If To Date is earlier than the new From Date, adjust it
-    		        const toDate = $('#endDate').val();
-    		        if (new Date(toDate) < new Date(fromDate)) {
-    		            $('#endDate').val(fromDate);
-    		        }
-    		    });
-
-    		    // Update From Date's max attribute when To Date changes
-    		    $('#endDate').on('change', function () {
-    		        const toDate = $(this).val();
-    		        $('#startDate').attr('max', toDate); // Update max attribute for From Date
-
-    		        // If From Date is later than the new To Date, adjust it
-    		        const fromDate = $('#startDate').val();
-    		        if (new Date(fromDate) > new Date(toDate)) {
-    		            $('#startDate').val(toDate);
-    		        }
-    		    });
-
-     		    // Initial Load
-    		    fetchData(formattedFirstDay, formattedToday);
-    		    fetchTableData(formattedFirstDay, formattedToday);
-     		});
-
-         function handleTaskButtonClick(agentId)
-     	 {
-     		 //console.log("agentId",agentId);
-     		 
-     		 const fromDate = document.getElementById("startDate").value;
-     		 const toDate = document.getElementById("endDate").value;
-     		 
-     		if (!fromDate || !toDate) {
-	     	        // Show SweetAlert if dates are missing
-	     	        Swal.fire({
-	     	            icon: 'warning', // Warning icon
-	     	            title: 'Missing Date.',
-	     	            showConfirmButton: true, // Show a confirmation button
-	     	            timer: 3000 // Optional: Auto-close after 3 seconds
-	     	        });
-
-	     	        e.preventDefault(); // Prevent form submission if validation fails
-	     	        return;
-	     	    }
-     		 
-     		      		 
-     		$('#agentperformance').modal({
-                backdrop: 'static',
-                keyboard: false
-            });
-            $('#agentperformance').modal('show');
-            
-         // Clear old data from the table
-     	    if ($.fn.DataTable.isDataTable('#agentperformanceDatatable')) {
-     	        $('#agentperformanceDatatable').DataTable().clear().destroy();
-     	    }
-     		 
-             $.ajax({
-                url: '/gcc/api/callcenterqaqc/agent/agenttaskwise?agentId='+agentId,
-                type: 'GET',
-                data:{agentId:agentId,startDate:fromDate,endDate:toDate},
-                contentType: 'application/json',
-                success: function (response) {
-                	//console.log("response",response);
-                	if (response && response.length > 0) {
-                		 
-                	let CtableBody = $('#agentperformanceDatatable tbody');
-                	CtableBody.empty();
-                	response.forEach((item, index) => {
-                		let row = `
-                			<tr>
-                            <td class="text-center">${index + 1}</td>
-                            <td class="text-center no-sort">${item.taskid}</td>
-                            <td class="text-center">${item.cdate}</td>
-                            <td class="text-center">${item.assigned || 0}</td>
-                            <td class="text-center">${item.callstaken || 0}</td>
-                            <td class="text-center">${item.pending || 0}</td>
-                            <td class="text-center">${item.percentage || 0}%</td>
-                            <td class="text-center">${item.Completed || 0}</td>
-                            <td class="text-center">${item.Reopened || 0}</td>
-                            <td class="text-center">${item.Followup || 0}</td>
-                            <td class="text-center">${item.Others || 0}</td>
-                        </tr>
-                    `;
-                		CtableBody.append(row); 
-                	});
-                	 
-                    
-                	}
-                	else {
-                        $('#agentperformanceDatatable tbody').html(`
-                            <tr>
-                                <td colspan="11" class="text-center">No data available</td>
-                            </tr>
-                        `);
-                    }
-                	 
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error in Fetching Task:', error);
-                    $('#agentperformanceDatatable tbody').html(`
-                            <tr>
-                                <td colspan="11" class="text-center text-danger">Failed to load data</td>
-                            </tr>
-                        `);
-                }
-            }); 
-     		 
-     	 }
-         
-         
-         function handleAssignTaskButtonClick(agentId) {
-     	    // Show modal with static backdrop
-     	    $('#Assignagentperformance').modal({
-     	        backdrop: 'static',
-     	        keyboard: false
-     	    });
-     	    $('#Assignagentperformance').modal('show');
-
-     	    // Clear old data from the table
-     	    if ($.fn.DataTable.isDataTable('#AssignagentperformanceDatatable')) {
-     	        $('#AssignagentperformanceDatatable').DataTable().clear().destroy();
-     	    }
-
-     	    // Fetch and display data
-     	    $.ajax({
-     	        url: `/gcc/api/callcenterqaqc/agent/agenttaskassign?agentId=${agentId}`,
-     	        type: 'GET',
-     	        contentType: 'application/json',
-     	        success: function (response) {
-     	            let CtableBody1 = $('#AssignagentperformanceDatatable tbody');
-     	            CtableBody1.empty();
-
-     	            if (response && response.length > 0) {
-     	                response.forEach((item, index) => {
-     	                	let callStatus = item.call_status && item.call_status.trim() !== '' ? item.call_status : 'N/A';
-     	                   let remarks = item.remarks && item.remarks.trim() !== '' ? item.remarks : 'N/A';
-     	                    let row = `
-     	                        <tr>
-     	                            <td class="text-center">${index + 1}</td>
-     	                            <td class="text-center">${item.call_category}</td>
-     	                            <td class="text-center">${item.complaint_number}</td>
-     	                            <td class="text-center">${item.complaint_date}</td>
-     	                            <td class="text-center">${item.complaint_person_name}</td>
-     	                            <td class="text-center">${item.complaint_mobilenumber}</td>
-     	                            <td class="text-center">${item.complaint_type}</td>
-     	                            <td class="text-center">${item.official_name}</td>
-     	                            <td class="text-center">${item.official_mobilenum}</td>
-     	                           <td class="text-center">${callStatus}</td>
-     	                          <td class="text-center">${remarks}</td>
-     	                        </tr>
-     	                    `;
-     	                    CtableBody1.append(row);
-     	                });
-     	            } else {
-     	                CtableBody1.html(`
-     	                    <tr>
-     	                        <td colspan="11" class="text-center">No data available</td>
-     	                    </tr>
-     	                `);
-     	            }
-
-     	        },
-     	        error: function (xhr, status, error) {
-     	            console.error('Error in Fetching Task:', error);
-     	            $('#AssignagentperformanceDatatable tbody').html(`
-     	                <tr>
-     	                    <td colspan="11" class="text-center text-danger">Failed to load data</td>
-     	                </tr>
-     	            `);
-     	        }
-     	    });
-     	}
-      	
-//<td class="text-center">${item.updated_date}</td>
-     	</script>
-
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/qaqcfollowuplist.html b/src/main/resources/templates/modules/callcenterqaqc/qaqcfollowuplist.html
deleted file mode 100644
index 0f543344..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/qaqcfollowuplist.html
+++ /dev/null
@@ -1,659 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #officialfollowupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#officialfollowupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#publicfollowupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#publicfollowupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>FollowUp List</h5>
-                                        <span>1913 QAQC FollowUp List</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">1913 QAQC</li>
-                                        <li class="breadcrumb-item" aria-current="page">Admin QAQC</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Followup List</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-					<div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-								<p>Click the card to Assign Agents</p>							
-								<div class="row">
-									<div class="col-lg-4 col-md-4 col-sm-12">
-										<div class="card card-box" id="officialfollowupCard">
-											<p class="text-facebook mb-20 text-center mt-4" id="todayFollowUpText"><b>Today Followup</b></p>
-							                <h3 class="text-twitter fw-700 ml-5 text-center" id="officialtotalFollowup"></h3>
-										</div>
-									</div>
-									
-									<div class="col-lg-4 col-md-4 col-sm-12">
-										<div class="card card-box" id="publicfollowupCard">
-											<p class="text-facebook mb-20 text-center mt-4" id="todayFollowUpText2"><b>Today Followup</b></p>
-							                <h3 class="text-twitter fw-700 ml-5 text-center" id="publictotalFollowup"></h3>
-										</div>
-									</div>
-								</div>
-								<hr>
-								<div class="row mb-4">
-								    <div class="col-md-4">
-								        <label for="fromDate">From Date <span class="required">*</span></label>
-								        <input type="date" id="fromDate" class="form-control datepicker" placeholder="yyyy-mm-dd" >
-								    </div>
-								    <div class="col-md-4">
-								        <label for="toDate">To Date <span class="required">*</span></label>
-								        <input type="date" id="toDate" class="form-control datepicker" placeholder="yyyy-mm-dd" >
-								    </div>
-								    <div class="col-md-4 mt-4">
-								        <button id="filterButton" class="btn btn-primary mt-2">Filter</button>
-								        <button id="resetButton" class="btn btn-secondary mt-2">Reset</button>
-								    </div>
-								</div>
-
-					            <div class="page-header-title"></div>
-					            <div>
-					                <table id="FollowupDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Task ID</th>
-												<th class="text-center">Complaint Number</th>
-												<th class="text-center">Scheduled Date</th>
-					                            <th class="text-center">Name</th>
-					                            <th class="text-center">Mobile Number</th>
-					                            <th class="text-center">Complaint Type</th>
-					                            <th class="text-center">View</th>
-					                            
-					                            
-
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                        
-					                    </tbody>
-					                    <tfoot class="thead-dark">
-					                        <tr>
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Task ID</th>
-												<th class="text-center">Complaint Number</th>
-												<th class="text-center">Scheduled Date</th>
-					                            <th class="text-center">Name</th>
-				                                <th class="text-center">Mobile Number</th>
-					                            <th class="text-center">Complaint Type</th>
-					                            <th class="text-center">View</th>
-					                         	
-					                        </tr>
-					                    </tfoot>
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	<!-- Modal -->
-			<div class="modal fade" id="detailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-lg" role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">Complaint Details</h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body" id="modalBody">
-			                <!-- Details will be populated here -->
-			            </div>
-			            <div class="modal-footer">
-			                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-			            </div>
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-		$(document).ready(function () {
-		    // Initialize DataTable
-		    const table = $('#FollowupDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: false,
-		        select: false,
-		        processing: false
-		    });
-
-			// Default Date Range Setup
-			let today = new Date();
-
-			// Get the first day of the current month (this should give 2024-11-01 for November)
-			let firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
-
-			// Manually format the date as yyyy-mm-dd without relying on toISOString
-			let formattedFirstDay = firstDayOfMonth.getFullYear() + '-' + 
-			                        (firstDayOfMonth.getMonth() + 1).toString().padStart(2, '0') + '-' + 
-			                        firstDayOfMonth.getDate().toString().padStart(2, '0');
-
-			let formattedToday = today.getFullYear() + '-' + 
-			                     (today.getMonth() + 1).toString().padStart(2, '0') + '-' + 
-			                     today.getDate().toString().padStart(2, '0');
-
-			//console.log("formattedFirstDay:", formattedFirstDay); // Check what is printed in the console
-
-					
-			// Set default values for date inputs
-		    $('#fromDate').val(formattedFirstDay);
-		    $('#toDate').val(formattedToday);
-		    $('#toDate').attr('min', formattedFirstDay); // Initial minimum for To Date
-		    $('#fromDate').attr('max', formattedToday); // Initial maximum for From Date
-
-		    // Trigger data load on page load
-		    loadData(formattedFirstDay, formattedToday);
-
-		    // Update To Date's min attribute when From Date changes
-		    $('#fromDate').on('change', function () {
-		        const fromDate = $(this).val();
-		        $('#toDate').attr('min', fromDate); // Update min attribute for To Date
-
-		        // If To Date is earlier than the new From Date, adjust it
-		        const toDate = $('#toDate').val();
-		        if (new Date(toDate) < new Date(fromDate)) {
-		            $('#toDate').val(fromDate);
-		        }
-		    });
-
-		    // Update From Date's max attribute when To Date changes
-		    $('#toDate').on('change', function () {
-		        const toDate = $(this).val();
-		        $('#fromDate').attr('max', toDate); // Update max attribute for From Date
-
-		        // If From Date is later than the new To Date, adjust it
-		        const fromDate = $('#fromDate').val();
-		        if (new Date(fromDate) > new Date(toDate)) {
-		            $('#fromDate').val(toDate);
-		        }
-		    });
-
-		    // Event listener for the Filter button
-		    $('#filterButton').on('click', function () {
-		        const fromDate = $('#fromDate').val();
-		        const toDate = $('#toDate').val();
-
-		        // Ensure valid date range
-		        if (new Date(fromDate) > new Date(toDate)) {
-		            Swal.fire({
-		                icon: 'error',
-		                title: 'Invalid Date Range',
-		                text: 'From Date cannot be later than To Date.'
-		            });
-		            return;
-		        }
-
-		        // Load data for the selected date range
-		        loadData(fromDate, toDate);
-		    });
-		    
-		    $('#resetButton').on('click', function () {
-		    	window.location.href = "/gcc/callcenterqaqc/admin/qaqcfollowuplist";
-		    });
-			
-		    // Function to load data based on the date range
-		    function loadData(fromDate, toDate) {
-		    	const followupStatus = "FOLLOWUP";
-		        $.ajax({
-		            url: '/gcc/api/callcenterqaqc/followuplist',
-		            method: 'GET',
-		            data: { callStatus: followupStatus,fromDate: fromDate, toDate: toDate },
-		            success: function (response) {
-		                //console.log('API Response:', response);
-
-		                const table = $('#FollowupDatatable').DataTable();
-		                table.clear();
-
-		                if (response && response.length > 0) {
-		                    response.forEach(function (item, index) {
-		                        table.row.add([
-		                            index + 1,
-		                            item.taskid || 'N/A',
-		                            item.complaint_number || 'N/A',
-		                            item.remainder_date || 'N/A',
-		                            item.complaint_person_name || 'N/A',
-		                            item.complaint_mobilenumber || 'N/A',
-		                            item.complaint_type || 'N/A',
-		                            `<button type="button" class="btn btn-info" 
-		                                    onclick="viewDetails('${item.complaint_number}')">Details</button>`,
-                                    
-		                        ]);
-		                    });
-		                } else {
-		                    //alert('No data found for the selected date range.');
-		                    $('#FollowupDatatable tbody').html(`
-		                            <tr>
-		                                <td colspan="8" class="text-center">No data available</td>
-		                            </tr>
-		                        `);
-		                }
-
-		                table.draw();
-		            },
-		            error: function (xhr, status, error) {
-		                console.error('Error fetching data:', error);
-		            }
-		        });
-		    }
-		});
-
-		
-		
-		function viewDetails(complaintNumber, complaintMode, complaintDept) {
-	 	    document.getElementById('modalBody').innerHTML = '<p style="text-align:center;">Please wait, loading data...</p>';
-	 	    $('#detailsModal').modal('show');
-
-	 	    // Fetch the main complaint details
-	 	    $.ajax({
-	 	        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails',
-	 	        type: 'GET',
-	            data:{complaintNumber:complaintNumber},
-	 	        success: function (data) {
-	 	           // console.log('Complaint Data:', data);
-
-	 	            // Fetch agent response details
-	 	            $.ajax({
-	 	                url: '/gcc/api/callcenterqaqc/agent/attendedcomplaintshistory',
-	 	                type: 'GET',
-	 	                data: { complaintNumber },
-	 	                success: function (agentResponse) {
-	 	                    //console.log('Agent Response:', agentResponse);
-
-	 	                    // Use the logic for building complaint and agent details as HTML
-	 	                    const detailsHtml = generateDetailsHtml(data, agentResponse);
-
-	 	                    // Update modal content
-	 	                    document.getElementById('modalBody').innerHTML = detailsHtml;
-	 	                },
-	 	                error: function () {
-	 	                    document.getElementById('modalBody').innerHTML = '<p>Error loading agent details. Please try again later.</p>';
-	 	                }
-	 	            });
-	 	        },
-	 	        error: function () {
-	 	            document.getElementById('modalBody').innerHTML = '<p>Error loading complaint details. Please try again later.</p>';
-	 	        }
-	 	    });
-	 	}
-
-	 	// Function to generate complaint and agent details HTML
-	function generateDetailsHtml(data, agentResponse) {
-	 		
-	 	// Helper function to format date to yyyy-mm-dd
-	         function formatDate(dateStr) {
-	             if (!dateStr) return 'N/A';
-	             const date = new Date(dateStr);
-	             return date.toISOString().split('T')[0]; // Formats to yyyy-mm-dd
-	         }
-	// Format complaint messages
-	let messagesHtml = '';
-	if (data.comments && data.comments.length > 0) {
-	    data.comments.forEach((comment) => {
-	        const commentImageLink = comment.Comp_Image && comment.Comp_Image !== "No image available"
-	            ? `<a href="${comment.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">View Image</a>`
-	            : '<p style="color: red;">No image available for this comment.</p>';
-
-	        messagesHtml += `
-	            <div class="comment mb-4">
-	                <div class="row">
-	                    <div class="col-2 text-center">
-	                        <p class="text-muted">${comment.comment_date}</p>
-	                    </div>
-	                    <div class="col-10">
-	                        <p><strong>${comment.user || 'N/A'}</strong> Says:</p>
-	                        <p>${comment.message || 'No message available'}</p>
-	                        <div class="user-image">${commentImageLink}</div>
-	                    </div>
-	                </div>
-	            </div>
-	        `;
-	    });
-	} else {
-	    messagesHtml = '<p>No comments available.</p>';
-	}
-
-	// Format agent responses
-	let agentRepliedHtml = '';
-	if (agentResponse.length > 0) {
-	    agentResponse.forEach((agentItem) => {
-	        agentRepliedHtml += `
-	            <div class="comment mb-4">
-	                <div class="row">
-	                    <div class="col-2 text-center">
-	                        <p class="text-muted"><strong>${formatDate(agentItem.created_date) || 'N/A'}</strong></p>
-	                    </div>
-	                    <div class="col-10">
-	                        <p><strong>${agentItem.agent_name || 'N/A'}</strong>, Says: ${agentItem.call_status || 'N/A'}</p>
-	                        <p><strong>Remarks: </strong>${agentItem.remarks || 'N/A'}</p>
-	                        <p><strong>Remainder Date: </strong> ${formatDate(agentItem.remainder_date) || 'N/A'}</p>
-	                    </div>
-	                </div>
-	            </div>
-	        `;
-	    });
-	} else {
-	    agentRepliedHtml = '<p>No agent replied messages available.</p>';
-	}
-
-	// Check for user images
-	const userImages = data.userimages && data.userimages.length > 0 ? data.userimages[0] : {};
-	const imageLink = userImages.Comp_Image && userImages.Comp_Image !== "null" && userImages.Comp_Image !== ""
-	    ? `<a href="${userImages.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">UserImages: View Image</a>`
-	    : '<p style="color: red;">UserImages: No image available.</p>';
-
-	// Combine all sections into the final HTML
-	const detailsHtml = `
-	    <div class="row">
-	        <div class="col-md-12">
-	            <h4>Complaint Person's Details:</h4>
-	            <div class="row">
-	                <div class="col-6">
-	                    <p><strong>Complaint Number:</strong> ${data.complaintid || 'N/A'}</p>
-	                </div>
-	                <div class="col-6">
-	                    <p><strong>Complaint Date:</strong> ${data.complaintdate}</p>
-	                </div>
-	            </div>
-	            <div class="row">
-	                <div class="col-6">
-	                    <p><strong>Complainant's Name:</strong> ${data.complainantName || 'N/A'}</p>
-	                </div>
-	                <div class="col-6">
-	                    <p><strong>Phone Number:</strong> ${data.mobileNumber || 'N/A'}</p>
-	                </div>
-	            </div>
-	            <div class="row">
-	                <div class="col-6">
-	                    <p><strong>Zone:</strong> ${data.Zone || 'N/A'}</p>
-	                </div>
-	                <div class="col-6">
-	                    <p><strong>Division:</strong> ${data.Division || 'N/A'}</p>
-	                </div>
-	            </div>
-	            <div class="row">
-	                <div class="col-6">
-	                    <p><strong>Gender:</strong> ${data.gender || 'N/A'}</p>
-	                </div>
-	                <div class="col-6">
-	                    <p><strong>Complainant's Address:</strong> ${data.Street || 'N/A'}, ${data.Area || 'N/A'}, ${data.Landmark || 'N/A'}, ${data.Location || 'N/A'}</p>
-	                </div>
-	            </div>
-	        </div>
-	    </div>
-	    <hr>
-	    <h4>Complaint Details:</h4>
-	    <div class="row">
-	        <div class="col-6">
-	            <p><strong>Complaint Dept:</strong> ${data.deptname || 'N/A'}</p>
-	        </div>
-	        <div class="col-6">
-	            <p><strong>Complaint Mode:</strong> ${data.compmode || 'N/A'}</p>
-	        </div>
-	    </div>
-	    <div class="row">
-	        <div class="col-6">
-	            <p><strong>Complaint Type:</strong> ${data.complaintType || 'N/A'}</p>
-	        </div>
-	        <div class="col-6">
-	            <p><strong>Details of Complaint:</strong> ${data.description || 'N/A'}</p>
-	        </div>
-	    </div>
-	    <div class="row">
-	        <div class="col-6">
-	            <p><strong>Current Status:</strong> ${data.currentStatus || 'N/A'}</p>
-	        </div>
-	        <div class="col-6">
-	            <p><strong style="color:blue;">Official Mobile:</strong> ${data.OfficialMobile || 'N/A'}</p>
-	        </div>
-	    </div>
-	    <div class="row">
-        <div class="col-6">
-            <p><strong>Last Updated Date:</strong> ${data.greatestDate || 'N/A'}</p>
-        </div>
-        
-    </div>
-	    <hr>
-	    <h4>Complaint Messages:</h4>
-	    ${messagesHtml}
-	    <hr>
-	    <h4>Agent Replied Messages:</h4>
-	    ${agentRepliedHtml}
-	    <hr>
-	    ${imageLink}
-	`;
-
-	return detailsHtml;
-	}
-		
-		$(document).ready(function () {
-		// Function to fetch today's follow-up count
-		    function fetchTodayFollowUpCount() {
-		        const followupStatus = "FOLLOWUP"; // Adjust based on your status filter
-
-		        $.ajax({
-		            url: '/gcc/api/callcenterqaqc/followup/todayCount',
-		            method: 'GET',
-		            data: { followupStatus: followupStatus },
-		            success: function (counts) {
-		                // Update the card with the fetched count
-		                $('#officialtotalFollowup').text(counts.officialfollowup || 0);
-		                $('#publictotalFollowup').text(counts.publicfollowup || 0);
-		                
-		             // Get the current date in 'yyyy-mm-dd' format
-		                const currentDate = new Date();
-		                const formattedDate = currentDate.toISOString().split('T')[0];
-		                
-		                sessionStorage.setItem('followupname1', 'officialfollowup');
-		                sessionStorage.setItem('followupcount1', counts.officialfollowup || "0");
-		                sessionStorage.setItem('followupname2', 'publicfollowup');
-		                sessionStorage.setItem('followupcount2', counts.publicfollowup || "0");
-		                sessionStorage.setItem('startDate', formattedDate);
-		                sessionStorage.setItem('endDate', formattedDate);
-		                sessionStorage.setItem('redirected', 'true');
-		                
-		                document.getElementById('officialfollowupCard').addEventListener('click', function () {
-		                    if (parseInt(sessionStorage.getItem('followupcount1')) === 0) {
-		                        Swal.fire({
-		                            icon: 'info',
-		                            title: 'No Data',
-		                            text: 'No Follow-up records available for today.',
-		                        });
-		                    } else {
-		                        sessionStorage.setItem('cardType', 'Followup1'); // Set card type
-		                        window.location.href = "/gcc/callcenterqaqc/admin/qaqcassigntaskagents";
-		                    }
-		                });
-		                
-		                document.getElementById('publicfollowupCard').addEventListener('click', function () {
-		                    if (parseInt(sessionStorage.getItem('followupcount2')) === 0) {
-		                        Swal.fire({
-		                            icon: 'info',
-		                            title: 'No Data',
-		                            text: 'No Follow-up records available for today.',
-		                        });
-		                    } else {
-		                        sessionStorage.setItem('cardType', 'Followup2'); // Set card type
-		                        window.location.href = "/gcc/callcenterqaqc/admin/qaqcassigntaskagents";
-		                    }
-		                });
-		                
-		                
-		            },
-		            error: function (xhr, status, error) {
-		                console.error('Error fetching follow-up count:', error);
-		                $('#officialtotalFollowup').text('N/A');
-		            }
-		        });
-		    }
-
-		    // Fetch count on page load
-		    fetchTodayFollowUpCount();
-			
-			    // Get the current date
-			    const currentDate = new Date();
-			    const formattedDate = currentDate.toISOString().split('T')[0]; // Format: YYYY-MM-DD
-
-			    // Update the text with the current date
-			    document.getElementById("todayFollowUpText").innerText = `Today Official Follow-up (${formattedDate})`;
-			    document.getElementById("todayFollowUpText2").innerText = `Today Public Follow-up (${formattedDate})`;
-		  });
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/qaqcgrievancedashboard.html b/src/main/resources/templates/modules/callcenterqaqc/qaqcgrievancedashboard.html
deleted file mode 100644
index 0d8d6bf5..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/qaqcgrievancedashboard.html
+++ /dev/null
@@ -1,1050 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.boxcard {
-	height: 100px;
-	border-radius: 20px;
-}
-.boxcard1 {
-	height: 200px;
-	border-radius: 20px;
-	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-}
-
-.required{
-	color: red;
-}
-/* Mobile screens - targeting devices with a max width of 767px */
-@media (max-width: 767px) 
-{
-	#qaqcRequestForm label{
-		margin-top: 10px;
-	} 
-		
-}
-
-.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }  
-    
-.bg-grey-inline-text {
-        padding:2px 2px;
-        background-color: #e6e6e6; 
-        border-radius: 4px;
-    }
-    
-    #closedCard {
-    transition: transform 0.2s ease; 
-    cursor: pointer; 
-}
-
-#closedCard:hover {
-    transform: scale(1.05); 
-    cursor: pointer; 
-}
-
-/* #inProgressCard {
-    transition: transform 0.2s ease; 
-    cursor: pointer;
-}
-
-#inProgressCard:hover {
-    transform: scale(1.05); 
-    cursor: pointer; 
-} */
-    
-    #redressedCard {
-    transition: transform 0.2s ease; 
-    cursor: pointer; 
-}
-
-#redressedCard:hover {
-    transform: scale(1.05); 
-    cursor: pointer; 
-}
-    
-/*    #reopenedCard {
-    transition: transform 0.2s ease; 
-    cursor: pointer; 
-}
-
-#reopenedCard:hover {
-    transform: scale(1.05); 
-    cursor: pointer; 
-} */
-
-/* #withdrawCard{
-	transition: transform 0.2s ease; 
-    cursor: pointer;  
-}
-#withdrawCard:hover {
-    transform: scale(1.05); 
-    cursor: pointer; 
-} */    
-    #closedCard {
-    transition: transform 0.2s ease; 
-    cursor: pointer; 
-}
-
-#closedCard:hover {
-    transform: scale(1.05); 
-    cursor: pointer; 
-}
-
-</style>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fas fa-tachometer-alt bg-blue"></i>
-									<div class="d-inline">	
-										<h5>Dashboard QAQC</h5>
-										<span>1913 QAQC Dashboard</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 QAQC</li>
-										<li class="breadcrumb-item" aria-current="page">Admin QAQC</li>
-										<li class="breadcrumb-item active" aria-current="page">Grievance Dashboard</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-                    <!-- <h4 class="h4 text-right text-mute" style="font-size: 12px;">
-						Auto refresh in <font id="refresh-countdown">00</font> seconds
-					</h4>  -->
-					
-					<div class="card mt-4">
-					 	<div class="card-header">
-								<h3>
-									<img alt="No image" src="/gcc/assets/images/donut-chart.png"
-										style="height: 23px; width: 23px;" class="mr-2"><b>Overall Grievance
-										Dashboard</b>
-									</h3>
-								</div> 
-							<div class="card-body">
-									<div class="row">
-										<div class="col-sm-2 mb-2">
-											<label for="startDate" style="font-size: medium; margin-bottom: 0px;">From Date:</label>
-						                    <input type="date" id="startDate" class="form-control" onclick="this.showPicker()">
-										</div>
-										<div class="col-sm-2 mb-2">
-											<label for="endDate" style="font-size: medium; margin-bottom: 0px;">To Date:</label>
-						                    <input type="date" id="endDate" class="form-control" onclick="this.showPicker()">
-										</div>
-										
-										<div class="col-sm-2 mb-2">
-								            <label for="regiondropdown" style="font-size: medium; margin-bottom: 0px;">Region:</label>
-								            <select id="regiondropdown" class="form-control">
-								            <option value="">Select</option>
-								            <option value="North Region">North Region</option>
-								            <option value="Central Region">Central Region</option>
-								            <option value="South Region">South Region</option>
-								            
-											</select>
-										</div>
-
-										<div class="col-sm-2 mb-2">
-								            <label for="dropdown4" style="font-size: medium; margin-bottom: 0px;">Group:</label>
-								            <select id="dropdown4" class="form-control">
-								            <option value="">Select</option>
-								               <!--  <option value="">general</option> -->
-								                <!-- Add options here -->
-											</select>
-										</div>
-															
-									
-										<div class="col-sm-2 mb-2">
-											 <label for="dropdown1"  style="font-size: medium; margin-bottom: 0px;">Type:</label>
-						                     <select id="dropdown1" class="form-control">
-							                 <option value="">Select</option>
-							            	 <!-- <option value="Cleanliness in Parks">Cleanliness in Parks</option> -->
-
-											</select>
-										</div>
-
-										<div class="col-sm-2 mb-2">
-								            <label for="dropdown3" style="font-size: medium; margin-bottom: 0px;">Mode:</label>
-								            <select id="dropdown3" class="form-control">
-								                <option value="">Select</option>
-								                <!-- <option value="">INTERNET</option> -->
-
-											</select>
-										</div>
-										
-										<div class="col-sm-2 mb-2">
-											<label for="dropdown2" style="font-size: medium; margin-bottom: 0px;">zone:</label>
-						                    <select id="dropdown2" class="form-control">
-						                    <option value="">Select</option>
-						                    
-
-											</select>
-										</div>
-
-									</div>
-									
-															
-					
-									<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchButton"
-												class="btn btn-primary mx-2">Filter</button>
-
-											<button class="btn btn-danger mx-2" onclick="resetDate()"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-
-								</div>
-							
-					
-							<div class="col-12">
-								<div class="row mt-3">
-								    <!-- First Part: 2 cards vertically -->
-								    <div class="col-lg-4 col-md-4 col-sm-12">
-								     	<div class="card card-box" id="inProgressCard">
-											 <p class="text-facebook mb-20 text-center mt-4" id="inProgressname" style="font-size: medium;"><i class="fas fa-spinner text-center" ></i>&nbsp;<b>In-progress</b></p>
-				                             <h3 class="text-twitter fw-700 ml-5 text-center" id="inProgressCount"></h3>
-										</div>
-								       
-								       
-										<div class="card card-box" id="redressedCard">
-											<p class="text-facebook mb-20 text-center mt-4"id="redressedname" style="font-size: medium;"><i class="fas fa-check-circle text-center" style=" color: green;"></i>&nbsp;<b>Action Taken Level 1</b></p>
-				                            <h3 class="text-twitter fw-700 ml-5 text-center" id="redressedCount"></h3>
-										</div>
-								        
-								    </div>
-								    
-								    <!-- Second Part: 1 card, height equal to both cards in the first part -->
-								    <div class="col-lg-4 col-md-4 col-sm-12 mt-3">
-								        								        	
-										<div class="card boxcard1">
-										   <div class="card-body">
-											 <p class="text-facebook mb-20 text-center mt-4" style="font-size: medium;"><i class="fas fa-clipboard-list text-center"></i>&nbsp;<b>Total Complaints</b></p>
-				            				<h3 class="text-twitter fw-700 ml-5 text-center" id="totalComplaints"></h3>
-				            				</div>
-										</div>
-											
-								        
-								    </div>
-								    
-								    <!-- Third Part: 2 cards vertically -->
-								    <div class="col-lg-4 col-md-4 col-sm-12">
-								        
-										<div class="card card-box" id="reopenedCard">
-											<p class="text-facebook mb-20 text-center mt-4" id="Reopenname" style="font-size: medium;"><i class="fas fa-exclamation-circle text-center" style=" color: orange;"></i>&nbsp;<b>Reopened</b></p>
-				            				<h3 class="text-twitter fw-700 ml-5 text-center" id="reopenedCount"></h3>
-										</div>
-						        
-						        
-										<div class="card card-box" id="closedCard">
-											 <p class="text-facebook mb-20 text-center mt-4" id="Closename" style="font-size: medium;"><i class="fas fa-check-circle text-center" style=" color: green;"></i>&nbsp;<b>Action Taken Level 2</b></p>
-				            				<h3 class="text-twitter fw-700 ml-5 text-center" id="closedCount"></h3>
-										</div>
-								        
-								    </div>
-								    
-								    <div class="col-12 d-flex justify-content-center">
-									<div class="col-lg-4 col-md-4 col-sm-12 ">
-									        
-											<div class="card card-box" id="withdrawCard">
-												<p class="text-facebook mb-20 text-center mt-4" id="withdrawname" style="font-size: medium;"><i class="fa fa-envelope text-center" style=" color: orange;"></i>&nbsp;<b>Withdraw</b></p>
-					            				<h3 class="text-twitter fw-700 ml-5 text-center" id="withdrawCount"></h3>
-											</div>
-									</div> 
-									</div>
-								    
-								</div>								
-								
-							</div>
-					 
-					
-						
-						<!-- agent wise yesterday performance counts card-->
-					<div class="card-body">
-						<div class="page-header-title" >
-									<h5 style="margin: 0;font-weight: bold;">Yesterday Event - Agent Performance Dashboard</h5><hr>
-					    </div>
-						<div class="row mt-2">
-						    <div class="col-xl-3 col-md-6 col-sm-12">
-						        <div class="card card-box">
-						            <p class="text-facebook mb-20 text-center mt-4"><b>Agent Assigned</b></p>
-						            <h3 class="text-twitter fw-700 ml-5 text-center" th:text="${previousday[0].TotalAgents}"></h3>
-						        </div>
-						    </div>
-						    <div class="col-xl-3 col-md-6 col-sm-12">
-						        <div class="card card-box">
-						            <p class="text-facebook mb-20 text-center mt-4"><b>Assigned Calls</b></p>
-						            <h3 class="text-twitter fw-700 ml-5 text-center" th:text="${previousday[0].TotalAssigned != null ? previousday[0].TotalAssigned : 0}"></h3>
-						        </div>
-						    </div>
-						
-						    <div class="col-xl-3 col-md-6 col-sm-12">
-						        <div class="card card-box">
-						            <p class="text-facebook mb-20 text-center mt-4"><b>Finished</b></p>
-						            <h3 class="text-twitter fw-700 ml-5 text-center" th:text="${previousday[0].TotalCompleted != null ? previousday[0].TotalCompleted : 0}"></h3>
-						        </div>
-						    </div>
-						    <div class="col-xl-3 col-md-6 col-sm-12">
-						        <div class="card card-box">
-						            <p class="text-facebook mb-20 text-center mt-4"><b>Pending Calls</b></p>
-						            <h3 class="text-twitter fw-700 ml-5 text-center" th:text="${previousday[0].TotalPending != null ? previousday[0].TotalPending : 0}"></h3>
-						        </div>
-						    </div>
-						</div>
-						
-						 
-					</div>	
-						
-						<div class="col-md-16">
-							
-							<div class="card-body">
-								<div class="page-header-title" >
-									<h5 style="margin: 0;font-weight: bold;">Yesterday Event - Agents Wise Breakup</h5><hr>
-							    </div> 
-									<table id="YesterdayQaqctable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-                                    	<thead class="thead-dark">
-		                                 	<tr role="row">
-					                            <th rowspan="2" class="text-center">S.No</th>
-					                            <th rowspan="2" class="text-center">Agent</th>
-					                            <th colspan="4" class="text-center">Performance</th>
-					                            <th colspan="4" class="text-center">Call Results</th>
-			                            
-			                        		</tr>
-			                        		<tr role="row">			                            
-					                            <th class="text-center">Assigned Calls</th>
-					                            <th class="text-center">Finished</th>
-					                            <th class="text-center">Pending Calls</th>
-					                            <th class="text-center">Completion (%)</th>
-					                            <th class="text-center">Completed</th>
-					                            <th class="text-center">ReOpen</th>
-					                            <th class="text-center">Followup</th>
-					                            <th class="text-center">Others</th>
-			                        		</tr>
-									 </thead>
-			                         <tbody>
-			                              <!-- Loop through the agentcount data -->
-									        <tr th:each="row, iterStat : ${agentcount}">
-									            <td class="text-center" th:text="${iterStat.index + 1}"></td>
-									            <td class="text-center" th:text="${row.agent_name}"></td>
-									            <td class="text-center" th:text="${row.Assigned}"></td>
-									            <td class="text-center" th:text="${row.TotalCompleted}"></td>
-									            <td class="text-center" th:text="${row.Pending}"></td>
-												<td class="text-center" th:text="${row.CompletionPercentage + '%'}"></td>									            <td class="text-center" th:text="${row.Completed_count}"></td>
-									            <td class="text-center" th:text="${row.Reopened_count}"></td>
-									            <td class="text-center" th:text="${row.Followup_count}"></td>
-									            <td class="text-center" th:text="${row.Other_count}"></td>
-									        </tr>      
-			                         </tbody>
-		                           </table>
-								</div>
-						</div>
-						
-						
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<!-- Details Modal -->
-		<div class="modal fade" id="detailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true">
-		    <div class="modal-dialog modal-xl" role="document">
-		        <div class="modal-content">
-		            <div class="modal-header">
-		                <h5 class="modal-title" id="detailsModalLabel">Complaint Details</h5>
-		                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-		            </div>
-		            <div class="modal-body">
-		                <table id="detailsTable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-		                    <thead class="thead-dark">
-									<tr role="row">
-
-										<th class="text-center no-sort">S.No</th>
-										<th class="text-center no-sort">Complaint Number</th>
-										<th class="text-center">Complaint Type</th>
-										<th class="text-center">Complaint Group</th>
-										<th class="text-center">Mode</th>
-										<th class="text-center">Department</th>															
-										<th class="text-center">Zone</th>
-										<th class="text-center">Ward</th>
-										<th class="text-center no-sort">Public Name</th>
-										<th class="text-center no-sort">Address</th>	
-										<th class="text-center">Public Mobile no</th>													
-										<th class="text-center">Assign To</th>
-										<th class="text-center">Official Contact Number</th>																															
-										<th class="text-center">Current Status</th>														
-										<th class="text-center">Complaint Opened Date</th>	
-										<th class="text-center">Complaint Redressed Date</th>
-										<th class="text-center">Complaint Closed Date</th>
-										<th class="text-center">Complaint Reopen Date</th>																												
-										<th class="text-center">Complaint Completed  Date</th>
-									</tr>
-								</thead>
-		                    <tbody>
-		                        
-		                    </tbody>
-		                </table>
-		            </div>
-		        </div>
-		    </div>
-		</div>
-		
-        
-    
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-        
-       <script type="text/javascript">
-        $(document).ready(function() {
-
-        	        	
-        	
-        	var table = $('#YesterdayQaqctable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { targets: 'no-sort', orderable: false }
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', 'Show all']
-                ],
-                scrollY: '50vh',
-                fixedColumns: {
-                    left: 1,
-                    right: 1
-                },
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false
-            });
-        	
-        	       	
-        	
-         // 🟢 Function to Fetch Data & Open Modal
-            function openDetailsModal(pzone, columnType,pfromDate,ptodate,ptype,pmode,pgroup) {
-                console.log("Fetching details for:", { pzone, columnType,pfromDate,ptodate,ptype,pmode,pgroup });
-
-                // Show loading message in modal
-                $('#detailsTable tbody').html(`<tr><td colspan="19" class="text-center text-danger">Loading...</td></tr>`);
-                
-                
-             // Destroy any existing DataTable instance to avoid reinitialization issues
-                if ($.fn.DataTable.isDataTable("#detailsTable")) {
-                    $('#detailsTable').DataTable().destroy();
-                }
-
-                // Clear table before fetching new data
-                $('#detailsTable tbody').empty();
-				
-                const params = new URLSearchParams({
-        	        startDate: pfromDate,
-        	        endDate: ptodate,
-        	        status: columnType,
-        	        group: pgroup,
-        	        type: ptype,
-        	        mode: pmode,
-        	        zone: pzone
-        	    });
-                $.ajax({
-                    type: "GET",
-                    url: `/gcc/api/callcenterqaqc/getfilterreport?${params.toString()}`, // Append query string to URL
-                    contentType: "application/json",
-                    success: function (response) {
-                 	    console.log("API Response:", response);
-                 	   
-                 	    if (response.status === "success") {
-                 	        console.log("Details Array:", response.details);
-                 	        // Ensure details is an array and has at least one entry
-                 	        if (Array.isArray(response.details) && response.details.length > 0) {
-                 	            let table = $('#detailsTable').DataTable({
-                 	                destroy: true,
-                 	                searching: true,
-                 	                autoWidth: true,           	                
-                 	                paging: true,
-                 	                info: true,
-                 	                data: response.details,           	                
-                 	                columns: [
-                 	                    { 
-                 	                        data: null, 
-                 	                        render: (data, type, row, meta) => meta.row + 1, 
-                 	                        className: 'text-center' 
-                 	                    },
-                 	                    { data: 'Complaint Number', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Complaint Type', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Complaint Group', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Complaint Mode', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Department', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Zone', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Ward', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Complaint Person Name', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Address', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Complaint Person Number', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Assign To', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Official Contact Number', defaultContent: '-', className: 'text-center',render: function (data, type, row) {
-                 	                        return (data === null || data === "null") ? '-' : data;
-                 	                    } },
-                 	                    { data: 'Current Status', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Complaint Opened Date', defaultContent: '-', className: 'text-center' },
-                 	                    { data: 'Complaint Redressed Date', defaultContent: '-', className: 'text-center',render: function (data, type, row) {
-                 	                        return (data === null || data === "null") ? '-' : data;
-                 	                    } },
-                 	                    { data: 'Complaint Closed Date', defaultContent: '-', className: 'text-center',render: function (data, type, row) {
-                 	                        return (data === null || data === "null") ? '-' : data;
-                 	                    } },
-                 	                    { data: 'Complaint Reopen Date', defaultContent: '-', className: 'text-center',render: function (data, type, row) {
-                 	                        return (data === null || data === "null") ? '-' : data;
-                 	                    } },
-                 	                    { data: 'Complaint Completed Date', defaultContent: '-', className: 'text-center',render: function (data, type, row) {
-                 	                        return (data === null || data === "null") ? '-' : data;
-                 	                    } }
-                 	                      
-                 	                ],
-                 	                dom: 'Bfrtip',
-                 	                buttons: [
-        	      		                  {
-        	      		                      extend: 'pageLength',
-        	      		                      className: 'btn btn-warning'
-        	      		                  },
-        	      		                  {
-        	      		                      title: 'Data export',
-        	      		                      extend: 'copyHtml5',
-        	      		                      text: 'Copy',
-        	      		                      className: 'btn btn-secondary',
-        	      		                      id: 'copyBtn'
-        	      		                  },
-        	      		                  {
-        	      		                      extend: 'excelHtml5',
-        	      		                      text: 'Excel',
-        	      		                      className: 'btn btn-secondary',
-        	      		                      id: 'excelBtn'
-        	      		                  },
-        	      		                  {
-        	      		                      extend: 'csvHtml5',
-        	      		                      text: 'CSV',
-        	      		                      className: 'btn btn-secondary',
-        	      		                      id: 'csvBtn'
-        	      		                  },
-        	      		                  {
-        	      		                      extend: 'pdfHtml5',
-        	      		                      text: 'PDF',
-        	      		                      className: 'btn btn-secondary',
-        	      		                      id: 'pdfBtn'
-        	      		                  }
-        	      		              ],
-        	      		             columnDefs: [
-        	      		                { targets: 'no-sort', orderable: false }
-        	      		            ],
-        	      		            lengthMenu: [
-        	      		                [50, 100, 200, 500, -1],
-        	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-        	      		            ],
-        	      		            scrollY: '50vh',
-        	      		            scrollX: true,   	      		            
-        	      		       		responsive: false,
-        	                		searching: true
-        	      		            });
-                 	        }
-                 	        
-                 	       $('#detailsModal').modal('show');
-                 	        
-                 	    }
-                 	    else if (response.status === "nodata") {
-             	        	
-             	            Swal.fire({
-             	                icon: 'warning',
-             	                title: 'No Data',
-             	                text: 'No data available for the selected criteria.'
-             	            });
-             	        }
-                 	    else if (response.status === "error") {
-             	        	$
-             	            Swal.fire({
-             	            	icon: 'error',
-                 	            title: 'Error',
-                 	            text: response.message || 'Something went wrong!'
-             	            });
-             	        }
-                 	    else {
-                 	    	
-                 	        Swal.fire({
-                 	            icon: 'error',
-                 	            title: 'Error',
-                 	            text: response.message || 'Something went wrong!'
-                 	        });
-                 	    }
-                 	},
-					
-                    error: function (error) {
-                    	$('#pageLoader').hide();
-                    	Swal.fire({
-         	            icon: 'error',
-         	            title: 'Error',
-         	            text: response.message || 'Something went wrong!'
-         	        });
-                    }
-                });
-                
-            }
-
-    // Get today's date
-    const today = new Date();
-    const year = today.getFullYear();
-    const month = String(today.getMonth() + 1).padStart(2, '0'); // Months are 0-indexed
-    const day = String(today.getDate()).padStart(2, '0');
-
-    // Calculate the first day of the current month
-    const startOfMonth = `${year}-${month}-01`; // yyyy-MM-dd format
-    const todayFormatted = `${year}-${month}-${day}`; // yyyy-MM-dd format
-
-    const startDateField = document.getElementById('startDate');
-    const endDateField = document.getElementById('endDate');
-	
-	// Event listener for To Date
-	   endDateField.addEventListener('change', function () {
-	       if (endDateField.value) {
-	           startDateField.max = endDateField.value; // Set max value for From Date
-	       } else {
-	           startDateField.removeAttribute('max'); // Remove max if To Date is cleared
-	       }
-
-	       // Validate From Date against updated To Date
-	       if (startDateField.value && new Date(startDateField.value) > new Date(endDateField.value)) {
-	           startDateField.value = ''; // Clear invalid From Date
-	           alert("From Date cannot be after To Date.");
-	       }
-	   });
-
-	   // Event listener for From Date
-	   startDateField.addEventListener('change', function () {
-	       if (startDateField.value) {
-	           endDateField.min = startDateField.value; // Set min value for To Date
-	       } else {
-	           endDateField.removeAttribute('min'); // Remove min if From Date is cleared
-	       }
-
-	       // Validate To Date against updated From Date
-	       if (endDateField.value && new Date(endDateField.value) < new Date(startDateField.value)) {
-	           endDateField.value = ''; // Clear invalid To Date
-	           alert("To Date cannot be before From Date.");
-	       }
-	   });
-
-    // Set the default date values in the input fields
-    if (startDateField && endDateField) {
-        startDateField.value = startOfMonth; // yyyy-MM-dd format required for input[type="date"]
-        endDateField.value = todayFormatted; // yyyy-MM-dd format required for input[type="date"]
-    } else {
-        console.error("Start date or end date input field not found!");
-    }
-
-    // Call the search logic directly to load default data on page load
-     
-     loadDashboardData(formatDateForAPI(startOfMonth), formatDateForAPI(todayFormatted));
-    
-});
-
-// Helper function to convert yyyy-MM-dd to dd-MM-yyyy for API calls
-function formatDateForAPI(dateStr) {
-    const [year, month, day] = dateStr.split('-');
-    return `${day}-${month}-${year}`; // Convert to dd-MM-yyyy
-}
-
-
-function loadDashboardData(startDate, endDate) {
-    // Show loading indicators
-    call_loading('totalComplaints', 'start');
-    call_loading('inProgressCount', 'start');
-    call_loading('redressedCount', 'start');
-    call_loading('reopenedCount', 'start');
-    call_loading('closedCount', 'start');
-    call_loading('withdrawCount', 'start');
-
-    // Get dropdown values
-    const startDateValue = document.getElementById('startDate').value;
-    const endDateValue = document.getElementById('endDate').value;
-    const dropdown1 = document.getElementById('dropdown1').value;
-    const dropdown2 = document.getElementById('dropdown2').value;
-    const dropdown3 = document.getElementById('dropdown3').value;
-    const dropdown4 = document.getElementById('dropdown4').value;
-    const regiondropdown=document.getElementById('regiondropdown').value;
-    
-
-    // Make API call to get dashboard data
-    
-    fetch(`/gcc/api/callcenterqaqc/dashboard?startDate=${startDate}&endDate=${endDate}&dropdown1=${dropdown1}&dropdown2=${dropdown2}&dropdown3=${dropdown3}&dropdown4=${dropdown4}&regiondropdown=${regiondropdown}`)
-        .then(response => response.json())
-        .then(data => {
-            console.log(data);
-
-            // Store data in sessionStorage
-            sessionStorage.setItem('closename', 'closed');
-            sessionStorage.setItem('closedcount', data["Closed"] || "0");
-            sessionStorage.setItem('reopenname', 'reopened');
-            sessionStorage.setItem('reopenedcount', data["Reopened"] || "0");
-            sessionStorage.setItem('inProgressName', 'processing');
-            sessionStorage.setItem('inProgressCount', data["In Progress"] || "0");
-            sessionStorage.setItem('redressedName', 'redressed');
-            sessionStorage.setItem('redressedCount', data["Redressed"] || "0");
-            sessionStorage.setItem('withdrawname', 'withdraw');
-            sessionStorage.setItem('withdrawCount', data["Withdraw"] || "0");
-            sessionStorage.setItem('startDate', startDateValue);
-            sessionStorage.setItem('endDate', endDateValue);
-             
-            sessionStorage.setItem('type', dropdown1);
-            sessionStorage.setItem('zone', dropdown2);
-            sessionStorage.setItem('mode', dropdown3);
-            sessionStorage.setItem('group', dropdown4);
-            sessionStorage.setItem('region', regiondropdown);
-            
-            sessionStorage.setItem('redirected', 'true'); // Set flag for redirection
-            
-         // Function to handle redirection based on count
-            function handleCardClick(count, cardType, url) {
-                if (parseInt(count) === 0) {
-                    Swal.fire({
-                        icon: 'info',
-                        title: 'No Data',
-                        text: `No ${cardType} records available.`,
-                    });
-                } else {
-                    sessionStorage.setItem('cardType', cardType); // Set card type
-                    window.location.href = url;
-                }
-            }
-
-         // Attach click events to each card
-            document.getElementById('closedCard').addEventListener('click', function () {
-                handleCardClick(sessionStorage.getItem('closedcount'), 'Closed', '/gcc/callcenterqaqc/admin/qaqcassigntaskagents');
-            });
-			/*
-            document.getElementById('reopenedCard').addEventListener('click', function () {
-                handleCardClick(sessionStorage.getItem('reopenedcount'), 'Reopened', '/gcc/callcenterqaqc/admin/qaqcassigntaskagents');
-            });
-			
-            document.getElementById('inProgressCard').addEventListener('click', function () {
-                handleCardClick(sessionStorage.getItem('inProgressCount'), 'In Progress', '/gcc/callcenterqaqc/admin/qaqcassigntaskagents');
-            });
-			*/
-            document.getElementById('redressedCard').addEventListener('click', function () {
-                handleCardClick(sessionStorage.getItem('redressedCount'), 'Redressed', '/gcc/callcenterqaqc/admin/qaqcassigntaskagents');
-            });
-            /*
-            document.getElementById('withdrawCard').addEventListener('click', function () {
-                handleCardClick(sessionStorage.getItem('withdrawCount'), 'withdraw', '/gcc/callcenterqaqc/admin/qaqcassigntaskagents');
-            });
-			*/
-            // Update UI with fetched data
-            document.getElementById('totalComplaints').textContent = data["Total Complaints"] || "0";
-            document.getElementById('inProgressCount').textContent = data["In Progress"] || "0";
-            document.getElementById('redressedCount').textContent = data["Redressed"] || "0";
-            document.getElementById('reopenedCount').textContent = data["Reopened"] || "0";
-            document.getElementById('closedCount').textContent = data["Closed"] || "0";
-            document.getElementById('withdrawCount').textContent = data["Withdraw"] || "0";
-            
-            
-
-            // Stop loading indicators
-            call_loading('totalComplaints', 'stop');
-            call_loading('inProgressCount', 'stop');
-            call_loading('redressedCount', 'stop');
-            call_loading('reopenedCount', 'stop');
-            call_loading('closedCount', 'stop');
-            call_loading('withdrawCount', 'stop');
-                   
-	        })
-	        .catch(error => {
-	            console.error('Error:', error);
-	        });
-} 
-
-//Event listener for the search button to reload data based on selected filters
-document.getElementById('searchButton').addEventListener('click', function () {
-    // Get values from input fields
-    const startDateValue = document.getElementById('startDate').value; // yyyy-MM-dd format
-    const endDateValue = document.getElementById('endDate').value;   // yyyy-MM-dd format
-
-    const table = $("#PendingDatatable").DataTable();
-    // Function to format date as dd-MM-yyyy
-    const formatDate = (dateStr) => {
-        const [year, month, day] = dateStr.split('-'); // Split yyyy-MM-dd
-        return `${day}-${month}-${year}`;             // Rearrange to dd-MM-yyyy
-    };
-
-    // Convert to dd-MM-yyyy format
-    const formattedStartDate = formatDate(startDateValue);
-    const formattedEndDate = formatDate(endDateValue);
-
-    // Validate dates
-    const startDate = new Date(startDateValue); // Use original yyyy-MM-dd for comparison
-    const endDate = new Date(endDateValue);
-
-    if (startDate && endDate && startDate > endDate) {
-        alert("Start Date should be earlier than End Date.");
-        return;
-    }
-
-    // Call dashboard data loading logic with formatted date values
-    loadDashboardData(formattedStartDate, formattedEndDate);
-});
-
-//api for complainttypes,group,zone,ward
-
-/* document.addEventListener("DOMContentLoaded", function () {
-    const complaintTypeDropdown = document.getElementById('dropdown1');
-    const complaintGroupDropdown = document.getElementById('dropdown4');
-    const complaintModeDropdown = document.getElementById('dropdown3');
-    const complaintZoneDropdown = document.getElementById('dropdown2');
-    
-    const regionName = document.getElementById('regiondropdown');
-
-    // Load Complaint Groups
-    fetch('/gcc/api/callcenterqaqc/getComplaintGroup') 
-        .then(response => response.json())
-        .then(data => {
-            // Clear existing options
-            complaintGroupDropdown.innerHTML = `<option value="">Select</option>`;
-
-            // Add options from the API response
-            data.forEach(complaintGroupName => {
-                complaintGroupDropdown.innerHTML += `<option value="${complaintGroupName}">${complaintGroupName}</option>`;
-            });
-        })
-        .catch(error => {
-            console.error('Error fetching complaint groups:', error);
-        });
-
-    // Event Listener for Complaint Group Change
-    complaintGroupDropdown.addEventListener('change', function () {
-        const selectedGroup = complaintGroupDropdown.value;
-
-        if (selectedGroup) {
-            // Fetch Complaint Types based on selected group
-            fetch(`/gcc/api/callcenterqaqc/getComplaintTypesByGroup?group=${encodeURIComponent(selectedGroup)}`)
-                .then(response => response.json())
-                .then(data => {
-                    // Clear existing options
-                    complaintTypeDropdown.innerHTML = `<option value="">Select</option>`;
-
-                    // Add options from the API response
-                    data.forEach(complaintTypeName => {
-                        complaintTypeDropdown.innerHTML += `<option value="${complaintTypeName}">${complaintTypeName}</option>`;
-                    });
-                })
-                .catch(error => {
-                    console.error('Error fetching complaint types:', error);
-                });
-        } else {
-            // Clear complaint type dropdown if no group is selected
-            complaintTypeDropdown.innerHTML = `<option value="">Select</option>`;
-        }
-    });
-    
-    
-    // Load all Modes 
-    fetch('/gcc/api/callcenterqaqc/getModes') 
-    .then(response => response.json())
-    .then(data => {
-        // Clear existing options
-        complaintModeDropdown.innerHTML = `<option value="">Select</option>`;
-
-        // Add options from the API response
-        data.forEach(complaintMode => {
-        	complaintModeDropdown.innerHTML += `<option value="${complaintMode}">${complaintMode}</option>`;
-        });
-    })
-    .catch(error => {
-        console.error('Error fetching complaint groups:', error);
-    });
-    
-    
- // Load all zones 
-    fetch('/gcc/api/callcenterqaqc/getZones') 
-    .then(response => response.json())
-    .then(data => {
-        // Clear existing options
-        complaintZoneDropdown.innerHTML = `<option value="">Select</option>`;
-
-        // Add options from the API response
-        data.forEach(complaintZone => {
-        	complaintZoneDropdown.innerHTML += `<option value="${complaintZone}">${complaintZone}</option>`;
-        });
-    })
-    .catch(error => {
-        console.error('Error fetching complaint groups:', error);
-    });
-    
-}); */
-
-document.addEventListener("DOMContentLoaded", function () {
-    const complaintTypeDropdown = document.getElementById('dropdown1');
-    const complaintGroupDropdown = document.getElementById('dropdown4');
-    const complaintModeDropdown = document.getElementById('dropdown3');
-    const complaintZoneDropdown = document.getElementById('dropdown2');
-    const regionDropdown = document.getElementById('regiondropdown');
-
-    let allZones = []; // Store all zones globally
-
-    // Load Complaint Groups
-    fetch('/gcc/api/callcenterqaqc/getComplaintGroup') 
-        .then(response => response.json())
-        .then(data => {
-            complaintGroupDropdown.innerHTML = `<option value="">Select</option>`;
-            data.forEach(complaintGroupName => {
-                complaintGroupDropdown.innerHTML += `<option value="${complaintGroupName}">${complaintGroupName}</option>`;
-            });
-        })
-        .catch(error => console.error('Error fetching complaint groups:', error));
-
-    // Event Listener for Complaint Group Change
-    complaintGroupDropdown.addEventListener('change', function () {
-        const selectedGroup = complaintGroupDropdown.value;
-        if (selectedGroup) {
-            fetch(`/gcc/api/callcenterqaqc/getComplaintTypesByGroup?group=${encodeURIComponent(selectedGroup)}`)
-                .then(response => response.json())
-                .then(data => {
-                    complaintTypeDropdown.innerHTML = `<option value="">Select</option>`;
-                    data.forEach(complaintTypeName => {
-                        complaintTypeDropdown.innerHTML += `<option value="${complaintTypeName}">${complaintTypeName}</option>`;
-                    });
-                })
-                .catch(error => console.error('Error fetching complaint types:', error));
-        } else {
-            complaintTypeDropdown.innerHTML = `<option value="">Select</option>`;
-        }
-    });
-
-    // Load all Modes 
-    fetch('/gcc/api/callcenterqaqc/getModes') 
-        .then(response => response.json())
-        .then(data => {
-            complaintModeDropdown.innerHTML = `<option value="">Select</option>`;
-            data.forEach(complaintMode => {
-                complaintModeDropdown.innerHTML += `<option value="${complaintMode}">${complaintMode}</option>`;
-            });
-        })
-        .catch(error => console.error('Error fetching complaint modes:', error));
-
-    // Load all zones and store them globally
-    fetch('/gcc/api/callcenterqaqc/getZones') 
-        .then(response => response.json())
-        .then(data => {
-            allZones = data; // Store zones globally
-            updateZoneDropdown(); // Populate zones initially
-        })
-        .catch(error => console.error('Error fetching complaint zones:', error));
-
-    // Event Listener for Region Dropdown Change
-    regionDropdown.addEventListener('change', updateZoneDropdown);
-
-    // Function to update Zone Dropdown based on Region selection
-    function updateZoneDropdown() {
-        const selectedRegion = regionDropdown.value;
-        complaintZoneDropdown.innerHTML = `<option value="">Select</option>`;
-
-        let filteredZones = [];
-
-        if (selectedRegion === "North Region") {
-            filteredZones = allZones.filter(zone => zone >= "N01" && zone <= "N05");
-        } else if (selectedRegion === "Central Region") {
-            filteredZones = allZones.filter(zone => zone >= "N06" && zone <= "N10");
-        } else if (selectedRegion === "South Region") {
-            filteredZones = allZones.filter(zone => zone >= "N11" && zone <= "N15");
-        } else {
-            // Show all if no region is selected
-            filteredZones = allZones;
-        }
-
-        filteredZones.forEach(zone => {
-            complaintZoneDropdown.innerHTML += `<option value="${zone}">${zone}</option>`;
-        });
-    }
-});
-
-
-
-
-//Function to reset date fields
-  function resetDate() {
-
-  window.location.href = "/gcc/callcenterqaqc/admin/qaqcgrievancedashboard";
-      
-  } 
-
-</script>
-
-<script type="text/javascript">
-
-</script>
-
-        
-        
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/qaqctaskagentassign.html b/src/main/resources/templates/modules/callcenterqaqc/qaqctaskagentassign.html
deleted file mode 100644
index a180c33d..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/qaqctaskagentassign.html
+++ /dev/null
@@ -1,925 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-	color: red;
-}
-/* Mobile screens - targeting devices with a max width of 767px */
-@media (max-width: 767px) 
-{
-	#qaqcRequestForm label{
-		margin-top: 10px;
-	} 
-}
-
-.card-box {
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }  
-    
-.bg-grey-inline-text {
-        padding:2px 2px;
-        background-color: #e6e6e6; 
-        border-radius: 4px;
-    }
-</style>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="far fa-calendar-plus bg-blue"></i>
-									<div class="d-inline">	
-										<h5>Assign Agents</h5>
-										<span>Assign Agents for Task</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 QAQC</li>	
-										<li class="breadcrumb-item" aria-current="page">Admin QAQC</li>
-										<li class="breadcrumb-item active" aria-current="page">Assign Agents</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-                        
-                      
-                     <div class="row mt-4">
-
-						<div class="col-sm-4 mb-2">
-							<label for="displaystartDate" class="form-label"
-								style="font-size: medium; margin-bottom: 0px; font-weight: bold;">From
-								Date:</label> <input type="date" id="displaystartDate"
-								class="form-control" >
-						</div>
-						<div class="col-sm-4 mb-2">
-							<label for="displayendDate" class="form-label"
-								style="font-size: medium; margin-bottom: 0px; font-weight: bold;">To
-								Date:</label> <input type="date" id="displayendDate"
-								class="form-control">
-						</div>
-					</div>
-
-                      
-                      <div class="row mt-3">                   	
-                    	
-                    	<div class="col-xl-3 col-md-4 col-sm-12">
-
-							<div class="card card-box" id="closedCard" style="display: none;">
-							    <p class="text-facebook mb-20 text-center mt-4" id="displayClosename"><b></b></p>
-							    <h2 class="text-twitter fw-700 ml-5 text-center" id="displayClosedcount"></h2>
-							</div>
-							
-							<div class="card card-box" id="reopenedCard" style="display: none;">
-							    <p class="text-facebook mb-20 text-center mt-4" id="displayReopenname"><b></b></p>
-							    <h3 class="text-twitter fw-700 ml-5 text-center" id="displayReopenedcount"></h3>
-							</div>
-							
-							<div class="card card-box" id="inProgressCard" style="display: none;">
-							    <p class="text-facebook mb-20 text-center mt-4" id="displayInProgressname"><b></b></p>
-							    <h3 class="text-twitter fw-700 ml-5 text-center" id="displayInProgresscount"></h3>
-							</div>
-							
-							<div class="card card-box" id="redressedCard" style="display: none;">
-							    <p class="text-facebook mb-20 text-center mt-4" id="displayRedressedname"><b></b></p>
-							    <h3 class="text-twitter fw-700 ml-5 text-center" id="displayRedressedcount"></h3>
-							</div>
-							
-							<div class="card card-box" id="followupCard1" style="display: none;">
-							    <p class="text-facebook mb-20 text-center mt-4" id="displayFollowupname1"><b></b></p>
-							    <h3 class="text-twitter fw-700 ml-5 text-center" id="displayfollowupcount1"></h3>
-							</div>
-							
-							<div class="card card-box" id="followupCard2" style="display: none;">
-							    <p class="text-facebook mb-20 text-center mt-4" id="displayFollowupname2"><b></b></p>
-							    <h3 class="text-twitter fw-700 ml-5 text-center" id="displayfollowupcount2"></h3>
-							</div>
-							
-							<div class="card card-box" id="withdrawCard" style="display: none;">
-							    <p class="text-facebook mb-20 text-center mt-4" id="displaywithdrawname"><b></b></p>
-							    <h3 class="text-twitter fw-700 ml-5 text-center" id="displaywithdrawcount"></h3>
-							</div>
-							         	
-                    	</div>
-                    	                   	                  	
-                 	</div>
-                 	
-                 	<div class="row">
-                 		<div class="col-12">
-                 			<div class="card">
-                 				<div class="card-block">
-										<label>Task Description If any</label>
-										<textarea rows="1" cols="5" style="width: 100%;height:50px;" placeholder="Enter description"></textarea>
-								</div>								
-								
-                 			</div>
-                 		</div>
-                 	</div>
-                 	
-                 	<div class="row">
-                 		<div class="col-12">
-                 			<div class="card">
-                 				<div class="card-block">
-                 					<div class="row">
-                 						<div class=" col-lg-4 col-md-5 col-sm-12">
-											<label style="font-size: medium;font-weight: bold;">Click this Button to Clear the Pending Calls...</label>
-										</div>
-										<div class="col-lg-8 col-md-7 col-sm-12">
-											<button id="clearButton" class="btn btn-danger">Clear</button>
-										</div>
-									</div>
-								</div>														
-                 			</div>
-                 		</div>
-                 	</div>
-                 	
-                 	<div class="row">
-                 		<div class="col-12">
-                 			<div class="card">
-                 				<div class="card-header">
-									<h3><b>Available Agent List</b></h3>
-								</div>	
-								
-								<div class="card-body">
-									<div class="d-flex justify-content-end mb-2">
-										<button class="btn btn-light mr-4" disabled style="color: blue;border-color: blue;"><i class="ik ik-user-plus f-16" style="color: blue;"></i>Productivity Count:<span class="ml-4" id="productivitycount" style="color: blue;"></span></button>
-										<button class="btn btn-primary" disabled><i class="ik ik-user-plus f-16"></i>Total Available agents:<span class="ml-4" id="availableagentcount"></span></button>
-									</div>
-									<table id="AgentDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" >
-									    <thead class="thead-dark">
-									        <tr role="row">
-									        	<th class="text-center">
-												    <input type="checkbox" id="selectAll" />
-												    <label for="selectAll">Select All</label>
-												</th>
-									            <th class="text-center" width="1%">S.No</th>									            
-									            <th class="text-center">AGENT ID</th>
-									            <th class="text-center">NAME</th>
-									            <th class="text-center">CAMPAIGN PENDING CALLS</th>
-									            <th class="text-center">ALREADY ASSIGNED CALLS</th>
-									            <th class="text-center">CALLS ASSIGNED</th>
-									            <th class="text-center">TOTAL CALLS</th>	
-												<th class="text-center">ACTION</th>
-									        </tr>
-									    </thead>
-									    <tbody style="text-align:center;">
-									        
-									    </tbody>
-										<!-- Transfer Modal -->
-										<div id="transferModal" class="modal" tabindex="-1" role="dialog">
-											<div class="modal-dialog" role="document">
-												<div class="modal-content">
-													<div class="modal-header">
-														<h5 class="modal-title">Transfer Calls</h5>
-														<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-															<span aria-hidden="true">&times;</span>
-														</button>
-													</div>
-													<div class="modal-body">
-														<!-- Editable Calls Assigned Count -->
-														<div class="form-group">
-															<label for="callsAssignedInput">Calls Assigned Count</label>
-															<input type="number" id="callsAssignedInput" class="form-control" min="1" placeholder="Enter Calls Count">
-														</div>
-														<!-- Transfer To Dropdown -->
-														<div class="form-group">
-															<label for="transferToDropdown">Transfer To</label>
-															<select id="transferToDropdown" class="form-control">
-																<!-- Options populated dynamically -->
-															</select>
-														</div>
-													</div>
-													<div class="modal-footer">
-														<button type="button" id="transferButton" class="btn btn-primary">Transfer</button>
-														<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-													</div>
-												</div>
-											</div>
-										</div>
-									</table>
-									 <div class="text-center">
-								      	<button class="btn btn-primary" id="assignBtn">Click to Assign</button>
-								    </div>
-									<div>
-								      	<button class="btn btn-secondary" id="backBtn">Back</button>
-								    </div>
-								</div>							
-								
-                 			</div>
-                 		</div>
-                 	</div>
-                        
-                    </div>
-                </div>
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		
-        
-    
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-        
-        <script type="text/javascript">
-        
-	        $(document).ready(function () {
-	
-	        	const redirected = sessionStorage.getItem('redirected'); // Check if redirected flag is set
-	            const cardType = sessionStorage.getItem('cardType'); // Get the card type
-	            //console.log("Redirected flag:", redirected);
-	            //console.log("Card Type:", cardType);
-	
-	            if (redirected === 'true') {
-	                // Fetch data from sessionStorage
-	                const closeName = sessionStorage.getItem("closename");
-	                const closedCount = sessionStorage.getItem("closedcount");
-	                const reopenName = sessionStorage.getItem("reopenname");
-	                const reopenedCount = sessionStorage.getItem("reopenedcount");
-	                const inProgressName = sessionStorage.getItem("inProgressName");
-	                const inProgressCount = sessionStorage.getItem("inProgressCount");
-	                const redressedName = sessionStorage.getItem("redressedName");
-	                const redressedCount = sessionStorage.getItem("redressedCount");
-	                const startDate = sessionStorage.getItem("startDate");
-	                const endDate = sessionStorage.getItem("endDate");
-	                const followupName1=sessionStorage.getItem("followupname1");
-	                const followupCount1=sessionStorage.getItem("followupcount1");
-	                const followupName2=sessionStorage.getItem("followupname2");
-	                const followupCount2=sessionStorage.getItem("followupcount2");
-	                const withdrawname = sessionStorage.getItem("withdrawname");
-	                const withdrawCount = sessionStorage.getItem("withdrawCount");
-	                
-	                
-	                const group=sessionStorage.getItem("group");
-	                const type=sessionStorage.getItem("type");
-	                const mode=sessionStorage.getItem("mode");
-	                const zone=sessionStorage.getItem("zone");
-	                const region=sessionStorage.getItem("region");
-	
-	                /* console.log("CloseName:", closeName);
-	                console.log("ClosedCount:", closedCount);
-	                console.log("ReopenName:", reopenName);
-	                console.log("ReopenedCount:", reopenedCount);
-	                console.log("InProgressName:", inProgressName);
-	                console.log("InProgressCount:", inProgressCount);
-	                console.log("RedressedName:", redressedName);
-	                console.log("RedressedCount:", redressedCount);
-	                console.log("StartDate:", startDate);
-	                console.log("EndDate:", endDate);
-	                console.log("followupName:", followupName);
-	                console.log("followupCount:", followupCount);
-	                
-	                console.log("group:",group);
-	                console.log("type",type);
-	                console.log("mode",mode);
-	                console.log("zone",zone);  */
-	                
-	                /* console.log("ofollowupName:", followupName1);
-	                console.log("ofollowupCount:", followupCount1);
-	                console.log("pfollowupName:", followupName2);
-	                console.log("pfollowupCount:", followupCount2); */
-	                
-	                let cardName = '';
-	                let cardCount = '';
-	
-	                // Set the relevant data based on cardType
-	                if (cardType === 'Closed') {
-	                	cardName = closeName;
-	                    cardCount = closedCount;
-	                    $("#displayClosename").text(closeName); // Display Closed
-	                    $("#displayClosedcount").text(closedCount);
-	                    // Hide others
-	                    $("#reopenedCard, #inProgressCard, #redressedCard","#followupCard1","#followupCard2").hide();
-	                    $("#closedCard").show();  // Show the Closed card
-	                } else if (cardType === 'Reopened') {
-	                	cardName = reopenName;
-	                    cardCount = reopenedCount;
-	                    $("#displayReopenname").text(reopenName); // Display Reopened
-	                    $("#displayReopenedcount").text(reopenedCount);
-	                    // Hide others
-	                    $("#closedCard, #inProgressCard, #redressedCard","#followupCard1","#followupCard2").hide();
-	                    $("#reopenedCard").show();  // Show the Reopened card
-	                } else if (cardType === 'In Progress') {
-	                	cardName = inProgressName;
-	                    cardCount = inProgressCount;
-	                    $("#displayInProgressname").text(inProgressName); // Display In Progress
-	                    $("#displayInProgresscount").text(inProgressCount);
-	                    // Hide others
-	                    $("#closedCard, #reopenedCard, #redressedCard","#followupCard1","#followupCard2").hide();
-	                    $("#inProgressCard").show();  // Show the In Progress card
-	                } else if (cardType === 'Redressed') {
-	                	 cardName = redressedName;
-	                     cardCount = redressedCount;
-	                    $("#displayRedressedname").text(redressedName); // Display Redressed
-	                    $("#displayRedressedcount").text(redressedCount);
-	                    // Hide others
-	                    $("#closedCard, #reopenedCard, #inProgressCard","#followupCard1","#followupCard2").hide();
-	                    $("#redressedCard").show();  // Show the Redressed card
-	                }
-	                else if (cardType === 'Followup1') {
-	               	 cardName = followupName1;
-	                    cardCount = followupCount1;
-	                   $("#displayFollowupname1").text(followupName1); // Display Redressed
-	                   $("#displayfollowupcount1").text(followupCount1);
-	                   // Hide others
-	                   $("#closedCard, #reopenedCard,#redressedCard, #inProgressCard","#followupCard2").hide();
-	                   $("#followupCard1").show();  // Show the Redressed card
-	               }
-	                else if (cardType === 'Followup2') {
-		               	 cardName = followupName2;
-		                    cardCount = followupCount2;
-		                   $("#displayFollowupname2").text(followupName2); // Display Redressed
-		                   $("#displayfollowupcount2").text(followupCount2);
-		                   // Hide others
-		                   $("#closedCard, #reopenedCard,#redressedCard, #inProgressCard","#followupCard1").hide();
-		                   $("#followupCard2").show();  // Show the Redressed card
-		               }
-	                else if (cardType === 'withdraw') {
-		               	 cardName = withdrawname;
-		                    cardCount = withdrawCount;
-		                   $("#displaywithdrawname").text(withdrawname); // Display Redressed
-		                   $("#displaywithdrawcount").text(withdrawCount);
-		                   // Hide others
-		                   $("#closedCard, #reopenedCard,#redressedCard, #inProgressCard","#followupCard1","#followupCard2").hide();
-		                   $("#withdrawCard").show();  // Show the Redressed card
-		               }
-	
-	                // Fill in date values
-	                $("#displaystartDate").val(startDate);
-	                $("#displayendDate").val(endDate);
-	
-	                // Disable the start and end date inputs
-	                $("#displaystartDate, #displayendDate").prop("disabled", true);
-	
-	                // Call the getStart function
-	                getStart(cardName, cardCount, startDate, endDate);
-	                
-	                
-	                $('#assignBtn').click(function (event) {
-	                    event.preventDefault();
-	                    
-	                    
-	                    if (!isCleared) {
-	                    	
-	                    	// Trigger Clear button flow
-	                        Swal.fire({
-	                        	allowOutsideClick: false, // Disable clicking outside the modal to close it
-	    	                    allowEscapeKey: false, // Disable escape key to close the modal
-	    	                    allowEnterKey: false, // Disable enter key to close the modal
-							    title: 'Clear pending calls before assigning?',
-							    icon: 'info',
-							    showCancelButton: true,
-							    showDenyButton: true, // Show the Deny button
-							    confirmButtonColor: 'green',
-							    cancelButtonColor: 'orange',
-							    denyButtonColor: 'grey',
-							    confirmButtonText: 'Yes, clear it!', // Confirm button text
-							    cancelButtonText: 'No, assign without clearing', // Cancel button text
-							    denyButtonText: 'Exit' // Deny button text
-							}).then((result) => {
-	                            if (result.isConfirmed) {
-	                                // Trigger Clear logic
-	                                $('#clearButton').click();
-	                                // Wait until Clear logic completes
-	                                const interval = setInterval(() => {
-	                                    if (isCleared) {
-	                                        clearInterval(interval); // Stop checking
-	                                        assignLogic(); // Proceed to Assign logic
-	                                    }
-	                                }, 500); // Check every 500ms
-	                            } 
-	                            else if (result.isDenied) {
-	                                // Do nothing on cancel (Cancel button clicked)
-	                                Swal.fire('Cancelled', 'No action performed.', 'info');
-	                            }
-	                            else {
-	                                // Proceed directly to Assign logic
-	                                assignLogic();
-	                            }
-	                        });
-	                    } else {
-	                        // Proceed with Assign logic directly if Clear is already done
-	                        assignLogic();
-	                    }
-	                    	
-	                });
-	
-	                    
-	            
-	        function assignLogic() {
-	        	
-	        	// Fetch the values from the fields
-                const startDate = $('#displaystartDate').val();
-                const endDate = $('#displayendDate').val();
-                
-                const description = $('textarea').val().trim() || "N/A"; // Default to "N/A" if empty
-                 /* console.log("startDate",startDate);  
-                 console.log("endDate",endDate); */ 
-
-                // Validate inputs if necessary
-                if (!startDate || !endDate || !cardName || !cardCount) {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'All fields must be filled!',
-                    });
-                    return;
-                }
-                
-                const allAgents = [];
-                const table = $('#AgentDatatable').DataTable();
-                
-             //Loop through all rows in the DataTable
-                table.rows().every(function (rowIdx, tableLoop, rowLoop) {
-                    const row = $(this.node()); // Get the DOM row
-                    const checkbox = row.find('.select-agent');
-                    const agentId = row.find('td:nth-child(3)').text().trim();
-                    const callsPerAgent = row.find('td:nth-child(7)').text().trim();
-
-                    // Add agent to allAgents with default callsPerAgent = 0
-                    allAgents.push({ agentId: agentId, callsPerAgent: 0 });
-
-                    // If checkbox is checked, update callsPerAgent
-                    if (checkbox.is(':checked')) {
-                        const agent = allAgents.find(a => a.agentId === agentId);
-                        if (agent) {
-                            agent.callsPerAgent = callsPerAgent;
-                        }
-                    }
-                });
-
-                // Remove agents with callsPerAgent still set to 0
-                const filteredAgents = allAgents.filter(agent => agent.callsPerAgent > 0);
-
-             // Check if no agents were selected
-                if (filteredAgents.length === 0) {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Please select at least one agent to assign calls!',
-                    });
-                    return;
-                }
-             
-                //console.log('Filtered agents:', filteredAgents);
-                
-
-             // Prepare the data object to send in the AJAX request
-                const data = {
-                    startDate: startDate,
-                    endDate: endDate,
-                    closeName: cardName,
-                    closedCount: cardCount,
-                    description: description,
-                    group:group,
-	                type:type,
-	                mode:mode,
-	                zone:zone,
-	                region:region,
-                    agents:filteredAgents // Send only agents with callsPerAgent > 0
-                };
-
-                console.log('Data to send:', data);
-                
-             	// Show the loader
-              $('#pageLoader').show();
-
-                // Send the AJAX request
-                $.ajax({
-                    type: "POST",
-                    url: "/gcc/api/callcenterqaqc/agentassign/taskassign", // Replace with your API endpoint
-                    data: JSON.stringify(data),
-                    contentType: "application/json",
-                    success: function (response) {
-                    	// Hide the loader
-                        $('#pageLoader').hide();
-                        // Show a success message using Swal
-                        Swal.fire({
-                            icon: 'success',
-                            title: 'Success',
-                            allowOutsideClick: false, // Disable clicking outside the modal to close it
-    	                    allowEscapeKey: false, // Disable escape key to close the modal
-    	                    allowEnterKey: false, // Disable enter key to close the modal
-    	                    showConfirmButton: true, // Ensure the confirm button is visible
-                            text: response.message || 'Data transferred successfully!',
-                        }).then((result) => {
-                        	if (result.isConfirmed) {       		            
-   		                 window.location.href = `/gcc/callcenterqaqcreports/qaqctasklist`;
-                        	}
-   		            });
-                    },
-                    error: function (error) {
-                    	$('#pageLoader').hide();
-                        // Show an error message using Swal
-                        Swal.fire({
-                        	allowOutsideClick: false, // Disable clicking outside the modal to close it
-    	                    allowEscapeKey: false, // Disable escape key to close the modal
-    	                    allowEnterKey: false, // Disable enter key to close the modal
-    	                    showConfirmButton: true, // Ensure the confirm button is visible
-                            icon: 'error',
-                            title: 'Error',
-                            text: error.responseJSON?.message,
-                        }).then((result) => {
-                        	if (result.isConfirmed) {       		            
-          		                 window.location.href = `/gcc/callcenterqaqc/admin/qaqcgrievancedashboard`;
-                               	}
-          		            });
-                    }
-                }); 
-	        }
-	
-	                // Clear the redirected flag after use
-	                sessionStorage.removeItem('redirected');
-	            } else {
-	                // Clear sessionStorage and notify the user
-	                sessionStorage.clear();
-	             // Show Swal alert and redirect on OK button
-	                Swal.fire({
-	                	allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                    allowEscapeKey: false, // Disable escape key to close the modal
-	                    allowEnterKey: false, // Disable enter key to close the modal
-	                    showConfirmButton: true, // Ensure the confirm button is visible
-	                    icon: 'error',
-	                    title: 'Access Denied',
-	                    text: 'Please navigate from the Dashboard Page.',
-	                    confirmButtonText: 'OK',
-	                }).then((result) => {
-	                    if (result.isConfirmed) {
-	                        // Redirect to the desired page
-	                    	window.location.href = `/gcc/callcenterqaqc/admin/qaqcgrievancedashboard`;
-	                    }
-	                });	            }
-
-            // Optional: You can still allow toggling of cards if needed:
-            $('.card-box').on('click', function () {
-                // Hide all the card-box elements
-                $('.card-box').hide();
-                
-                // Get the id of the clicked card-box and show it
-                const cardId = $(this).attr('id');
-                $('#' + cardId).show();
-            });
-
-            function getStart(closeName,closedCount,startDate,endDate)
-            {	
-            	// Show the loader
-                $('#pageLoader').show();
-            	
-            	$.ajax({
-    		        url: '/gcc/api/callcenterqaqc/agentassign/getavailableagents?totalDataCount='+closedCount,
-    		        type: 'GET',
-    		        dataType: 'json',
-    		        success: function(response) {
-    		        	// Hide the loader
-                        $('#pageLoader').hide();
-    		        	if (response.status === 'success') {
-    	                    populateDataTable(response);
-    	                    $("#productivitycount").text(response.productivity_count);
-    	                    $("#availableagentcount").text(response.agent_available_count);
-    	                } if (response.status === 'error') {
-    	                	 $('#pageLoader').hide();
-    	                    Swal.fire({
-    	                        icon: 'error',
-    	                        title: 'Error',
-    	                        text: response.message || "Error fetching Agents.",
-    	                        confirmButtonText: 'OK',
-    	                    }).then((result) => {
-    	                        if (result.isConfirmed) {
-    	                            // Reload the same page
-             		                 window.location.href = `/gcc/callcenterqaqc/admin/qaqcgrievancedashboard`;
-    	                        }
-    	                    });
-    	                }
-    		        },
-    		        error: function(xhr, status, error) {
-    		        	 $('#pageLoader').hide();
-    		            console.error('Error fetching assigned agents:', error);
-    		        }
-    		    });
-            }
-            
-            function populateDataTable(data) {
-                // Clear existing rows
-                var table = $('#AgentDatatable').DataTable();
-                table.clear();
-
-                // Populate table
-                data.available_agents.forEach((agent, index) => {
-
-                    table.row.add([
-                        `<input type="checkbox" class="select-agent" value="${agent.agent_id}" checked />`,
-                        index + 1,
-                        agent.agent_id,
-                        agent.agent_name,
-                        agent.campaignPendingCount,
-                        agent.todayCount1,
-                        agent.calls_per_agent,
-                        agent.totalCallsCount,
-                         `<button class="btn btn-warning btn-sm edit-agent" data-id="${agent.agent_id}"><i class="ik ik-edit"></i></button>`
-                    ]);
-                });
-
-                // Redraw table to reflect new data
-                table.draw();                             
-               
-            }
-
-			let selectedAgentId; // Store the agent being edited
-
-			// Handle "Edit" button click
-			$(document).on('click', '.edit-agent', function () {
-				const row = $(this).closest('tr'); // Get the parent row of the clicked button
-				selectedAgentId = row.find('td:nth-child(3)').text().trim(); // Get the Agent ID
-				const callsAssigned = row.find('td:nth-child(7)').text().trim(); // Get Calls Assigned Count
-
-				// Populate the Calls Assigned input field
-				$('#callsAssignedInput').val(callsAssigned);
-
-				// Populate the Transfer To dropdown
-				const dropdown = $('#transferToDropdown');
-				dropdown.empty(); // Clear previous options
-				$('#AgentDatatable tbody tr').each(function () {
-					const agentId = $(this).find('td:nth-child(3)').text().trim();
-					const agentName = $(this).find('td:nth-child(4)').text().trim();
-
-					// Exclude the currently selected agent from the dropdown
-					if (agentId !== selectedAgentId) {
-						dropdown.append(`<option value="${agentId}">${agentName}</option>`);
-					}
-				});
-
-				// Show the modal
-				$('#transferModal').modal('show');
-			});
-
-			// Handle "Transfer" button click
-			$('#transferButton').click(function () {
-				const transferCount = parseInt($('#callsAssignedInput').val(), 10);
-				const transferToAgentId = $('#transferToDropdown').val();
-
-				if (!transferCount || transferCount <= 0) {
-					alert('Please enter a valid calls count!');
-					return;
-				}
-
-				if (!transferToAgentId) {
-					alert('Please select an agent to transfer the calls!');
-					return;
-				}
-
-				let deductionSuccess = false; // Flag for successful deduction from the current agent
-				let additionSuccess = false; // Flag for successful addition to the receiving agent
-				const productivityCount = parseInt($('#productivitycount').text().trim(), 10); // Fetch dynamic productivity count from the button
-
-				// Validate and update the table
-				$('#AgentDatatable tbody tr').each(function () {
-					const agentId = $(this).find('td:nth-child(3)').text().trim();
-					const callsAssignedCell = $(this).find('td:nth-child(7)'); // Calls Assigned column
-
-					// Validate deduction from the current agent
-					if (agentId === selectedAgentId) {
-						const currentCount = parseInt(callsAssignedCell.text().trim(), 10);
-						if (currentCount >= transferCount) {
-							deductionSuccess = true;
-						} else {
-
-							alert('Transfer not allowed! Transferring more calls than assigned.');
-
-							return false; // Stop the operation
-						}
-					}
-
-					// Validate addition to the receiving agent
-					if (agentId === transferToAgentId) {
-						const currentCount = parseInt(callsAssignedCell.text().trim(), 10);
-						const newCount = currentCount + transferCount;
-						if (newCount <= productivityCount) {
-							additionSuccess = true;
-						} else {
-							alert(`Transfer not allowed! Transferring ${transferCount} calls will exceed the productivity count of ${productivityCount} for agent ID: ${transferToAgentId}.`);
-
-							return false; // Stop the operation
-						}
-					}
-				});
-
-				// If both validations pass, proceed to update the table
-				if (deductionSuccess && additionSuccess) {
-					$('#AgentDatatable tbody tr').each(function () {
-						const agentId = $(this).find('td:nth-child(3)').text().trim();
-						const callsAssignedCell = $(this).find('td:nth-child(7)'); // Calls Assigned column
-						const totalCallsCell = $(this).find('td:nth-child(8)'); // TOTAL CALLS column
-
-						// Deduct calls from the current agent
-						if (agentId === selectedAgentId) {
-							const currentCount = parseInt(callsAssignedCell.text().trim(), 10);
-							callsAssignedCell.text(currentCount - transferCount);
-
-							// Update TOTAL CALLS for the current agent
-							const currentTotalCalls = parseInt(totalCallsCell.text().trim(), 10);
-							totalCallsCell.text(currentTotalCalls - transferCount);
-						}
-
-						// Add calls to the receiving agent
-						if (agentId === transferToAgentId) {
-							const currentCount = parseInt(callsAssignedCell.text().trim(), 10);
-							callsAssignedCell.text(currentCount + transferCount);
-
-							// Update TOTAL CALLS for the receiving agent
-							const currentTotalCalls = parseInt(totalCallsCell.text().trim(), 10);
-							totalCallsCell.text(currentTotalCalls + transferCount);
-						}
-					});
-
-					// Dynamically update the total calls across all agents
-					let totalCalls = 0;
-					$('#AgentDatatable tbody tr').each(function () {
-						const totalCallsCell = $(this).find('td:nth-child(8)'); // TOTAL CALLS column
-						totalCalls += parseInt(totalCallsCell.text().trim(), 10);
-					});
-					$('#totalCallsCount').text(totalCalls); // Update total calls count across all agents
-
-					// Close the modal
-					$('#transferModal').modal('hide');
-				}
-
-			});
-
-
-            
-            // Initialize DataTable
-            var table = $('#AgentDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { targets: 'no-sort', orderable: false }
-                ],
-                lengthMenu: [
-                    [200, 500, -1],
-                    [ '200 rows','500 rows', 'Show all']
-                ],
-                scrollY: '70vh',
-                fixedColumns: {
-                    left: 1,
-                    right: 1
-                },
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
-                searching: true,
-                select: false,
-                processing: false
-            });
-        });
-
-        $(document).ready(function () {
-            // "Select All" checkbox functionality
-            $('#selectAll').on('change', function () {
-                const isChecked = $(this).is(':checked');
-                $('.select-agent').prop('checked', isChecked); // Check/uncheck all checkboxes
-            });
-
-            // Ensure "Select All" is checked/unchecked based on individual checkboxes
-            $(document).on('change', '.select-agent', function () {
-                const allChecked = $('.select-agent:checked').length === $('.select-agent').length;
-                $('#selectAll').prop('checked', allChecked); // Check "Select All" only if all checkboxes are selected
-            });
-        });		
-        </script>
-        <script type="text/javascript">
-        $(document).ready(function () {
-        	$('#backBtn').click(function (event) {
-	                 window.location.href = `/gcc/callcenterqaqc/admin/qaqcgrievancedashboard`;
-        	});
-        	
-        });
-        </script>
-        <script>
-     // Global flag to track if Clear logic has been executed
-        let isCleared = false;
-     	
-    document.getElementById('clearButton').addEventListener('click', function () {
-        Swal.fire({
-            title: 'Are you sure to clear calls?',          
-            icon: 'warning',
-            allowOutsideClick: false, // Disable clicking outside the modal to close it
-            allowEscapeKey: false, // Disable escape key to close the modal
-            allowEnterKey: false, // Disable enter key to close the modal
-            showCancelButton: true,
-            confirmButtonColor: '#d33',
-            cancelButtonColor: '#3085d6',
-            confirmButtonText: 'Yes, clear it!',
-            cancelButtonText: 'No, cancel'
-        }).then((result) => {
-            if (result.isConfirmed) {
-                // Logic to clear calls can be added here
-                
-                $.ajax({
-	            url: '/gcc/api/callcenterqaqc/agentassign/deleteRecords',
-	            type: 'GET',
-	            contentType: 'application/json',
-	            success: function (response) {
-            		//console.log("response",response);
-            		if (response==="success") {
-            		
-            			Swal.fire(
-                                'Cleared!',
-                                'The calls have been cleared.',
-                                'success'
-                            );
-            			isCleared = true; // Mark as cleared
-	            	}
-	            	else {
-		                Swal.fire("Info", "No Records to clear,You can Assign", "info");
-		                isCleared = true; // Mark as cleared
-	                }
-            	 
-		            },
-		            error: function (xhr, status, error) {
-			            Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
-		                
-		            }
-		        });
-
-            } else {
-                Swal.fire(
-                    'Cancelled',
-                    'Your data is safe,If you wish you can Assign :)',
-                    'info'
-                );
-                isCleared = true;
-            }
-        });
-    });
-</script>
-        
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/qaqctasklist.html b/src/main/resources/templates/modules/callcenterqaqc/qaqctasklist.html
deleted file mode 100644
index 8d6a6af2..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/qaqctasklist.html
+++ /dev/null
@@ -1,639 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style> 
- .required{
-	color: red;
-}
-.card-box {
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-       	
-    }
-    
-@media (max-width: 768px) {
-    .card-box {
-        text-align: center;
-    }
-
-}		
-</style>
-<body>
-    <div class="wrapper">
-        <!-- Header -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-        <div class="page-wrap">
-            <!-- Left Menu -->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-6">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>QAQC Task List</h5>
-                                        <span>1913 QAQC Task List</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-6">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item">
-                                            <a href="/gcc/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">1913 Reports</li>																				
-                                        <li class="breadcrumb-item active" aria-current="page">QAQC Task List</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-					
-	                <div class="row mt-4">
-	                	
-	                	<div class="col-md-12">
-                             <div class="card">
-                             	<div class="card-header">
-                             		<h3>Task Details</h3>
-                             	</div>
-                             	
-                          	<div class="row mt-3 ml-2">
-									    <div class="col-md-3">
-									    	<label for="startDate" class="form-label" style="font-size: medium;">From Date:</label>
-									        <input type="date" id="startDate" class="form-control" placeholder="Start Date">
-									    </div>
-									    <div class="col-md-3">
-									    	<label for="endDate" class="form-label" style="font-size: medium;">To Date:</label>
-									        <input type="date" id="endDate" class="form-control" placeholder="End Date">
-									    </div>
-									    <div class="col-md-3" style="margin-top: 30px;">
-									        <button id="searchBtn" class="btn btn-primary">Search</button>
-									        <button id="resetBtn" class="btn btn-secondary">Reset</button>
-									    </div>
-									</div>
-					   				
-					   				<div class="card-body">
-					   				<div>
-					   					<div class="row mt-2"> 
-					   					
-					   							                  	                  	
-                    						<div class="col-xl-3 col-md-3 col-sm-12">
-												<div class="card card-box p-4">                   			
-					                    				<h6 class="text-facebook mb-20 mt-2 text-center"><b>Total Task</b></h6>
-                    									<h4 class="text-twitter fw-700 text-center" id="totaltask"></h4>                   			
-                    							</div>                   	
-                    						</div>  
-                    						<div class="col-xl-3 col-md-3 col-sm-12">
-												<div class="card card-box p-4">                   			
-					                    				<h6 class="text-facebook mb-20 mt-2 text-center"><b>Assigned Calls</b></h6>
-                    									<h4 class="text-twitter fw-700 text-center" id="totalcalls"></h4>                   			
-                    							</div>                   	
-                    						</div>
-                    						<div class="col-xl-3 col-md-3 col-sm-12">
-												<div class="card card-box p-4">                   			
-					                    				<h6 class="text-facebook mb-20 mt-2 text-center"><b>Finished</b></h6>
-                    									<h4 class="text-twitter fw-700 text-center" id="completedcalls"></h4>                   			
-                    							</div>                   	
-                    						</div>
-                    						<div class="col-xl-3 col-md-3 col-sm-12">
-												<div class="card card-box p-4">                   			
-					                    				<h6 class="text-facebook mb-20 mt-2 text-center"><b>Pending Calls</b></h6>
-                    									<h4 class="text-twitter fw-700 text-center" id="pendingcalls"></h4>                   			
-                    							</div>                   	
-                    						</div>                  						                	                   	                  	
-                 						</div>
-                 						
-                 						<div>               							
-                 							<table id="QaqcDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" >
-							                    <thead class="thead-dark">
-											        <tr role="row">
-							                            <th rowspan="2" class="text-center" width="1%;">S.No</th>
-							                            <th rowspan="2" class="text-center no-sort">Task ID</th>
-							                            <th rowspan="2" class="text-center" width="100px;">Date</th> 
-							                            <th rowspan="2" class="text-center no-sort">Category</th>
-							                            <!-- <th rowspan="2" class="text-center">Description</th> -->
-							                            <th colspan="4" class="text-center">Performance</th>
-							                            <th colspan="4" class="text-center">Call Results</th>
-							                            
-							                        </tr>
-							                        <tr role="row">           
-							                            <!-- <th class="text-center">S.No</th> 
-							                            <th class="text-center">Task ID</th>  -->
-							                            
-							                            <th class="text-center no-sort">Assigned Calls</th>							                            
-							                            <th class="text-center no-sort">Finished</th>
-							                            <th class="text-center no-sort">Pending Calls</th>
-							                            <th class="text-center no-sort">Completion(%)</th>
-							                            <th class="no-sort">Completed</th> 
-							                            <th class="no-sort">Reopen</th>
-							                            <th class="no-sort">Followup</th>
-							                            <th class="no-sort">Others</th>
-							                        </tr>
-							                    </thead>
-							                    <tbody>
-							                        
-							                    </tbody>
-							                </table>
-                 						</div>
-                 						
-					   				</div>
-                             	</div>						 
-							 </div>
-                         </div> 
-					</div>	               	
-             						 					  
-			</div> 
-        </div>
-   
-   
- 				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>  
-   
-     <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-      </div>
-</div>
-
-
-<!--agentperformance Modal -->
-		<div class="modal fade" id="agentperformance" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Task Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    
-                    <div class="modal-body">
-                    
-                    <div class="modal-info"></div>
-						<div class="table-responsive" >
-						<table id="agentperformanceDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" >
-                              <thead class="thead-dark">
-                                 	<tr role="row">
-                            <th rowspan="2" class="text-center">S.No</th>
-                            <th rowspan="2" class="text-center">Agent Name</th>                           
-                            <th colspan="4" class="text-center">Performance</th>
-                            <th colspan="4" class="text-center">Call Results</th>
-                        </tr>
-                        <tr role="row">          
-                            <th class="text-center">Assigned Calls</th>
-                            <th class="text-center">Finished</th>
-                            <th class="text-center">Pending Calls</th>
-                            <th class="text-center">Completion (%)</th>
-                            <th class="text-center">Completed</th>
-                            <th class="text-center">Reopen</th>
-                            <th class="text-center">Followup</th>
-                            <th class="text-center">Others</th>
-                            
-                        </tr>
-						 </thead>
-                         <tbody>
-                                    
-                         </tbody>
-                               
-                       </table>
-						</div>
-                     </div>
-  					
-  					<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-                        
-                    </div>                                        
-                </div>
-            </div>
-        </div>
-
-
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">	
- 	 $(document).ready(function() {
- 		 
- 		 $('#agentperformance').on('shown.bs.modal', function () {
-
- 	    	 var 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'
- 	             }
- 	         ];
- 	        
- 	            $('#agentperformanceDatatable').DataTable({
- 	                dom: 'Bftip',               
- 	                columnDefs: [
- 	                    { targets: 'no-sort', orderable: false }
- 	                ],
- 	                lengthMenu: [
- 	                    [50, 100, 200, 500, -1],
- 	                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
- 	                ],
- 	                scrollY: '30vh',
- 	                scrollX: true,  // Enable horizontal scrolling	
- 	                fixedColumns: {
- 	                    left: 1,
- 	                    right: 1
- 	                },
- 	                buttons: buttons,
- 	                fixedHeader: false,
- 	                autoWidth: false,
- 	                responsive: true,
- 	                searching: true,
- 	                select: false,
- 	                processing: false,
- 	            });
- 	        
- 	        
- 	    });
-
-     	var table = $('#QaqcDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '50vh',
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: false,
-             autoWidth: true,
-             responsive: true,
-             searching:true,
-             select: false,
-             processing: false
-         });
-    	
-     	 // Initialize DataTable with export buttons
-
-            const overallcountapiUrl = "/gcc/api/callcenterqaqc/qaqctasklist/overalltaskcount"; // Replace with your API endpoint
-		    const tableApiUrl = "/gcc/api/callcenterqaqc/qaqctasklist/taskdatacount";
-            const agentApiUrl = "/gcc/api/callcenterqaqc/qaqctasklist/agentdatacount";
-		    const totaltasks = document.getElementById("totaltask");
-		    const totalcallsassigned = document.getElementById("totalcalls");
-		    const completedcallscount = document.getElementById("completedcalls");
-		    const pendingcallscount = document.getElementById("pendingcalls");
-		    const dataTableElement = $("#QaqcDatatable").DataTable(); // Initialize DataTable
-
-		    
-		    // Fetch Data Function
-		    const fetchData = async (startDate = "", endDate = "") => {
-		    	
-		        try {
-		            const params = new URLSearchParams();
-		            if (startDate) params.append("startDate", startDate);
-		            if (endDate) params.append("endDate", endDate);
-
-		            const response = await fetch(`${overallcountapiUrl}?${params.toString()}`);
-		            const data = await response.json();
-					
-		            //console.log(data);
-		            // Update Summary Counts
-		            const firstItem = data[0];  // Get the first object from the array
-		            totaltasks.textContent = firstItem.total_tasks || 0; 
-		            totalcallsassigned.textContent = firstItem.total_calls || 0; 
-		            completedcallscount.textContent = firstItem.completed_calls || 0;  
-		            pendingcallscount.textContent = firstItem.pending_calls || 0; 
-             } catch (error) {
-		            console.error("Error fetching data:", error);
-		        }
-		    };
-		    
-
-    // Fetch and Populate Table Data Function
-    const fetchTableData = async (startDate = "", endDate = "") => {
-    	$('#pageLoader').show();
-        try {
-            const params = new URLSearchParams();
-            if (startDate) params.append("startDate", startDate);
-            if (endDate) params.append("endDate", endDate);
-
-            const response = await fetch(`${tableApiUrl}?${params.toString()}`);
-            const tableData = await response.json();
-
-            // Update DataTable with new data
-            table.clear(); // Clear existing data
-            tableData.forEach((row, index) => {
-                const percentage = row.Assigned
-                    ? Math.round((row.TotalCompleted / row.Assigned) * 100)
-                    : 0;
-
-                table.row.add([
-                	
-                	`<div style="text-align: center;">${index + 1}</div>`,
-                	`<button class="btn btn-success" data-taskid="${row.qaqc_id}" 
-                    onclick="handleTaskButtonClick('${row.qaqc_id}')">${row.taskid}</button>`,
-                    `<div style="text-align: center;">${row.TaskCreatedDate}</div>`,
-                    `<div style="text-align: center;">${row.call_category}</div>`,
-                    /* `<div style="text-align: center;">${row.description}</div>`, */                                      
-                    `<div style="text-align: center;">${row.Assigned}</div>`,
-                    `<div style="text-align: center;">${row.TotalCompleted}</div>`,
-                    `<div style="text-align: center;">${row.Pending}</div>`,
-                    `<div style="text-align: center;">${percentage}%</div>`,
-                    `<div style="text-align: center;">${row.Completed}</div>`,
-                    `<div style="text-align: center;">${row.Reopened}</div>`,
-                    `<div style="text-align: center;">${row.Followup}</div>`,
-                    `<div style="text-align: center;">${row.Others}</div>`,
-                ]);
-                
-            });
-            table.draw(); // Redraw the DataTable with the updated data
-      
-        } catch (error) {
-            console.error("Error fetching table data:", error);
-        }finally {
-            $('#pageLoader').hide(); // Hide loader in both success or error
-        }
-    };
-
-    // Example: Fetch Data initially without filters
-    //fetchTableData();
-    
- 
-
-		    // Search Button Click
-		    document.getElementById("searchBtn").addEventListener("click", () => {
-		        let startDate = document.getElementById("startDate").value;
-		        let endDate = document.getElementById("endDate").value;
-		        
-		        if (!startDate || !endDate) {
-	     	        // Show SweetAlert if dates are missing
-	     	        Swal.fire({
-	     	            icon: 'warning', // Warning icon
-	     	            title: 'Please select both dates.',
-	     	            showConfirmButton: true, // Show a confirmation button
-	     	            timer: 3000 // Optional: Auto-close after 3 seconds
-	     	        });
-
-	     	        e.preventDefault(); // Prevent form submission if validation fails
-	     	        return;
-	     	    }
-		        
-		        fetchData(startDate, endDate);
-		        fetchTableData(startDate,endDate);
-		        
-		        
-		    });
-
-		    // Reset Button Click
-		    document.getElementById("resetBtn").addEventListener("click", () => {
-		        /* document.getElementById("startDate").value = "";
-		        document.getElementById("endDate").value = "";
-		        fetchData(); // Fetch data without date filters
-		        fetchTableData(); */
- 		        window.location.href = "/gcc/callcenterqaqcreports/qaqctasklist";		        
-		    });
-		    
-		 
-
-		    let today = new Date();
-
-			// Get the first day of the current month (this should give 2024-11-01 for November)
-			let firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
-
-			// Manually format the date as yyyy-mm-dd without relying on toISOString
-			let formattedFirstDay = firstDayOfMonth.getFullYear() + '-' + 
-			                        (firstDayOfMonth.getMonth() + 1).toString().padStart(2, '0') + '-' + 
-			                        firstDayOfMonth.getDate().toString().padStart(2, '0');
-
-			let formattedToday = today.getFullYear() + '-' + 
-			                     (today.getMonth() + 1).toString().padStart(2, '0') + '-' + 
-			                     today.getDate().toString().padStart(2, '0');
-
-		    // Set the date input values
-		    $('#startDate').val(formattedFirstDay);
-		    $('#endDate').val(formattedToday);
-		    
-		    $('#endDate').attr('min', formattedFirstDay); // Initial minimum for To Date
-		    $('#startDate').attr('max', formattedToday); // Initial maximum for From Date
-		    
-
-		    // Update To Date's min attribute when From Date changes
-		    $('#startDate').on('change', function () {
-		        const fromDate = $(this).val();
-		        $('#endDate').attr('min', fromDate); // Update min attribute for To Date
-
-		        // If To Date is earlier than the new From Date, adjust it
-		        const toDate = $('#endDate').val();
-		        if (new Date(toDate) < new Date(fromDate)) {
-		            $('#endDate').val(fromDate);
-		        }
-		    });
-
-		    // Update From Date's max attribute when To Date changes
-		    $('#endDate').on('change', function () {
-		        const toDate = $(this).val();
-		        $('#startDate').attr('max', toDate); // Update max attribute for From Date
-
-		        // If From Date is later than the new To Date, adjust it
-		        const fromDate = $('#startDate').val();
-		        if (new Date(fromDate) > new Date(toDate)) {
-		            $('#startDate').val(toDate);
-		        }
-		    });
-		    
-		    // Initial Load
-		   // Call fetch functions with default values
-		    //fetchData();
-		    //fetchTableData();
-		    fetchData(formattedFirstDay, formattedToday);
-		    fetchTableData(formattedFirstDay, formattedToday);
-		});
- 	 
- 	 function handleTaskButtonClick(TaskId)
- 	 {
- 		 //console.log("TaskId",TaskId);
- 		 		 
- 		 
- 		$('#agentperformance').modal({
-            backdrop: 'static',
-            keyboard: false
-        });
-        $('#agentperformance').modal('show');
-        
-     // Clear old data from the table
- 	    if ($.fn.DataTable.isDataTable('#agentperformanceDatatable')) {
- 	        $('#agentperformanceDatatable').DataTable().clear().destroy();
- 	    }
- 		 
-        $.ajax({
-            url: '/gcc/api/callcenterqaqc/qaqctasklist/agentdatacount?qaqc_id='+TaskId,
-            type: 'GET',
-            contentType: 'application/json',
-            success: function (response) {
-            	//console.log("response",response);
-            	if (response && response.length > 0) {
-            		
-	            	let CtableBody = $('#agentperformanceDatatable tbody');
-	            	CtableBody.empty();
-            	response.forEach((item, index) => {
-            		const modalHeader = `
-                        <h5 class="modal-title" id="exampleModalCenterLabel">
-                            Task Details - <span>Task ID: ${item.taskId}</span> and
-                            <span>Created Date: ${item.TaskCreatedDate}</span>
-                            
-                        </h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    `;
-                    $('.modal-header').html(modalHeader);
-                    
-                 // Updating the modal body with additional details
-                    const modalBodyDetails = `
-                    <div class="mt-1" style="font-size: 14px;">
-                        <div class="row pb-2">
-                            <div class="col-md-6"><strong>From Date:</strong> ${item.fromdate || 'N/A'}</div>
-                            <div class="col-md-6"><strong>To Date:</strong> ${item.todate || 'N/A'}</div>
-                        </div>
-                        <div class="row pb-2">
-                            <div class="col-md-6"><strong>Description:</strong> ${item.description || 'N/A'}</div>
-                            <div class="col-md-6"><strong>Call Category:</strong> ${item.call_category || 'N/A'}</div>
-                        </div>
-                        <div class="row pb-2">
-	                        <div class="col-md-6"><strong>Complaint Group:</strong> ${item.complaint_group || 'N/A'}</div>
-	                        <div class="col-md-6"><strong>Complaint Type:</strong> ${item.complaint_type || 'N/A'}</div>
-                    	</div>
-                    	<div class="row pb-2">
-	                        <div class="col-md-6"><strong>Complaint Mode:</strong> ${item.complaint_mode || 'N/A'}</div>
-	                        <div class="col-md-6"><strong>Complaint Zone:</strong> ${item.complaint_zone || 'N/A'}</div>
-                		</div>
-                		<div class="row pb-2">
-                			<div class="col-md-6"><strong>Complaint Region:</strong> ${item.complaint_region || 'N/A'}</div>
-                		</div>
-                	</div>
-                        <hr>
-                    `;
-                    $('.modal-info').html(modalBodyDetails); // Insert the details before the table
-                    
-            		let row = `
-            			<tr>
-                        <td class="text-center">${index + 1}</td>
-                        <td class="text-center">${item.agentName}</td>
-                        <td class="text-center">${item.assigned || 0}</td>
-                        <td class="text-center">${item.callstaken || 0}</td>
-                        <td class="text-center">${item.pending || 0}</td>
-                        <td class="text-center">${item.percentage || 0}%</td>
-                        <td class="text-center">${item.Completed || 0}</td>
-                        <td class="text-center">${item.Reopened || 0}</td>
-                        <td class="text-center">${item.Followup || 0}</td>
-                        <td class="text-center">${item.Others || 0}</td>
-                    </tr>
-                `;
-            		CtableBody.append(row); 
-            	});
-            	}
-            	else {
-                    $('#agentperformanceDatatable tbody').html(`
-                        <tr>
-                            <td colspan="10" class="text-center">No data available</td>
-                        </tr>
-                    `);
-                }
-            	 
-            },
-            error: function (xhr, status, error) {
-                console.error('Error in Fetching Task:', error);
-                $('#agentperformanceDatatable tbody').html(`
-                        <tr>
-                            <td colspan="10" class="text-center text-danger">Failed to load data</td>
-                        </tr>
-                    `);
-            }
-        });
- 		 
- 	 }
-
-/*  	$(document).ready(function () {
- 		
- 	// Event listener for From Date selection
-		   $("#startDate").on("change", function() {
-		       const startDate = $(this).val();  // Get the selected start date
-		       // Set the min value for To Date to be the selected From Date
-		       $("#endDate").attr("min", startDate);
-		   });
-
-		   // Event listener for To Date selection
-		   $("#endDate").on("change", function() {
-		       const endDate = $(this).val();  // Get the selected end date
-		       // Set the max value for From Date to be the selected To Date
-		       $("#startDate").attr("max", endDate);
-		   });
- 		
- 	}); */
-    
-	</script>
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/scpreport.html b/src/main/resources/templates/modules/callcenterqaqc/scpreport.html
deleted file mode 100644
index 282aafed..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/scpreport.html
+++ /dev/null
@@ -1,1040 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-/* #streetViewModal .modal-body {
-        max-height: 70vh;  
-        overflow-y: auto;  
-    } */
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Silt Catch Pit</h5>
-										<span>1913 Silt Catch Pit - Report Page</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 Silt Catch Pit</li>
-										<li class="breadcrumb-item active" aria-current="page">Report Page</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-1">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header pb-1 pt-2">
-									<span style="font-size: small;font-weight: bold;">Report Filters</span>
-									<span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-								</div>
-								<div class="card-body">
-									<div class="row">
-										<div class="col-2">
-											<label for="startDate" style="font-size:small;">From Date:</label>
-						                    <input type="date" id="startDate" class="form-control">
-										</div>
-										
-										<div class="col-2">
-											<label for="endDate" style="font-size: small;">To Date:</label>
-						                    <input type="date" id="endDate" class="form-control">
-										</div>
-										
-										<div class="col-3">
-											<label for="report_type" style="font-size: small;">Type of Report:</label>
-						                    <select id="report_type" class="form-control">
-						                    <option value="">Select</option>
-											<option value="abstract">Abstract</option>
-											<option value="detail">Detail</option>
-											</select>
-										</div>
-										
-										<div  class="col-5" id="filterContainer" style="display: none;">
-										
-										<div class="row">
-											<div class="col-6">
-												<label for="zone" style="font-size: small;">Zone:</label>
-							                    <select id="zone" class="form-control">
-							                    <option value="">Select</option>
-	
-												</select>
-											</div>
-											
-											<div class="col-6">
-												<label for="ward" style="font-size: small;">Ward:</label>
-							                    <select id="ward" class="form-control">
-							                    <option value="">Select</option>
-	
-												</select>
-											</div>
-										
-											</div>
-										</div>
-										
-										<!-- <div class="col-4">
-											<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center mt-1">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-										</div> -->
-									
-									
-								</div>
-								
-								 <div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-							</div>
-						</div>
-					</div>
-					</div>
-			
-					
-					<div class="row">
-									<div class="col-md-12">
-										<div class="card">
-										<div class="card-header pb-1 pt-2">
-											<span style="font-size: small;font-weight: bold;">Reports List</span>
-										</div>
-										<div class="card-body">
-										
-											<div class="table-responsive" id="table1" style="display: none;">
-
-												<table id="ReportDatatable1"
-											       class="table table-striped table-bordered table-hover dataTable"
-											       role="grid">
-											    <thead class="thead-dark">
-											        <!-- Main Header Row -->
-											        <tr role="row">
-											            <th rowspan="3" class="text-center no-sort">S.No</th>
-											            <th rowspan="3" class="text-center">Zone</th>
-											            <th rowspan="3" class="text-center no-sort">Total</th>
-											            <th rowspan="3" class="text-center no-sort">Cleaned</th>
-											            <th rowspan="3" class="text-center">Pending</th>
-											            <th colspan="8" class="text-center">1913 Verified</th>
-											        </tr>
-											
-											        <!-- Sub Header 1 -->
-											        <tr>
-											        	<th colspan="1" class="text-center">Verified</th>
-											            <th colspan="2" class="text-center">Is it Cleaned?</th>
-											            <th colspan="3" class="text-center">Lid Availability</th>
-											            <th colspan="2" class="text-center">Lid in good condition?</th>
-											        </tr>
-											
-											        <!-- Sub Header 2 -->
-											        <tr>
-											        	<th class="text-center">Completed</th>
-											            <th class="text-center">Yes</th>
-											            <th class="text-center">No</th>
-											            <th class="text-center">Available</th>
-											            <th class="text-center">Not Available</th>
-											            <th class="text-center">Image Not Clear</th>
-											            <th class="text-center">Yes</th>
-											            <th class="text-center">No</th>
-											        </tr>
-											    </thead>
-											
-											    <tbody>
-											        <!-- Rows will be dynamically inserted via JS/DataTable -->
-											    </tbody>
-											</table>
-
-
-											</div>
-											
-											<div class="table-responsive" id="table2" style="display: none;">
-												<table id="ReportDatatable2"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-											            <th rowspan="3" class="text-center no-sort">S.No</th>
-											            <th rowspan="3" class="text-center">Zone</th>
-											            <th rowspan="3" class="text-center">Ward</th>
-											            <th rowspan="3" class="text-center no-sort">Total</th>
-											            <th rowspan="3" class="text-center no-sort">Cleaned</th>
-											            <th rowspan="3" class="text-center">Pending</th>
-											            <th colspan="8" class="text-center">1913 Verified</th>
-											        </tr>
-											
-											        <!-- Sub Header 1 -->
-											        <tr>
-											        	<th colspan="1" class="text-center">Verified</th>
-											            <th colspan="2" class="text-center">Is it Cleaned?</th>
-											            <th colspan="3" class="text-center">Lid Availability</th>
-											            <th colspan="2" class="text-center">Lid in good condition?</th>
-											        </tr>
-											
-											        <!-- Sub Header 2 -->
-											        <tr>
-											        	<th class="text-center">Completed</th>
-											            <th class="text-center">Yes</th>
-											            <th class="text-center">No</th>
-											            <th class="text-center">Available</th>
-											            <th class="text-center">Not Available</th>
-											            <th class="text-center">Image Not Clear</th>
-											            <th class="text-center">Yes</th>
-											            <th class="text-center">No</th>
-											        </tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-											
-											<div class="table-responsive" id="table3" style="display: none;">
-												<table id="ReportDatatable3"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														 <tr role="row">
-											            <th rowspan="3" class="text-center no-sort">S.No</th>
-											            <th rowspan="3" class="text-center">Street Name</th>
-											            <th rowspan="3" class="text-center no-sort">Total</th>
-											            <th rowspan="3" class="text-center no-sort">Cleaned</th>
-											            <th rowspan="3" class="text-center">Pending</th>
-											            <th colspan="8" class="text-center">1913 Verified</th>
-											        </tr>
-											
-											        <!-- Sub Header 1 -->
-											        <tr>
-											        	<th colspan="1" class="text-center">Verified</th>
-											            <th colspan="2" class="text-center">Is it Cleaned?</th>
-											            <th colspan="3" class="text-center">Lid Availability</th>
-											            <th colspan="2" class="text-center">Lid in good condition?</th>
-											        </tr>
-											
-											        <!-- Sub Header 2 -->
-											        <tr>
-											        	<th class="text-center">Completed</th>
-											            <th class="text-center">Yes</th>
-											            <th class="text-center">No</th>
-											            <th class="text-center">Available</th>
-											            <th class="text-center">Not Available</th>
-											            <th class="text-center">Image Not Clear</th>
-											            <th class="text-center">Yes</th>
-											            <th class="text-center">No</th>
-											        </tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-											
-											
-											<div class="table-responsive" id="detailtable" style="display: none;">
-												<table id="ReportDatatable4"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														 <tr role="row">
-														 	<th  rowspan="2" class="text-center">S.No</th>
-															 <th rowspan="2"  class="text-center">Zone</th>
-														 	<th rowspan="2" class="text-center">Ward</th>
-														 	<th rowspan="2" class="text-center">Street Name</th>
-												        	<th rowspan="2" class="text-center">Completed</th>
-												        	<th colspan="2" class="text-center">Is it Cleaned?</th>
-											            	<th colspan="3" class="text-center">Lid Availability</th>
-											            	<th colspan="2" class="text-center">Lid in good condition?</th>
-												        </tr>
-												        <tr>	
-												            <th class="text-center">Yes</th>
-												            <th class="text-center">No</th>
-												            <th class="text-center">Available</th>
-												            <th class="text-center">Not Available</th>
-												            <th class="text-center">Image Not Clear</th>
-												            <th class="text-center">Yes</th>
-												            <th class="text-center">No</th>
-											        </tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-											
-											
-										</div>
-									 </div>
-									</div>
-									
-									
-									
-									
-								</div>
-								
-								
-								
-					
-				</div>
-
-			</div>
-			
-
-				
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-				
-				
-		<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-
-			
-		</div>
-	</div>
-
-
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-		
-	<script>
-	 $(document).ready(function() {
-		// Define base min date (18 May 2025)
-		    const minDate = new Date(2025, 4, 18); // month is 0-indexed → 4 = May
-		    const today = new Date();
-
-		    // Format to yyyy-MM-dd
-		    function formatDate(date) {
-		        const yyyy = date.getFullYear();
-		        const mm = String(date.getMonth() + 1).padStart(2, '0');
-		        const dd = String(date.getDate()).padStart(2, '0');
-		        return `${yyyy}-${mm}-${dd}`;
-		    }
-
-		    const minDateStr = formatDate(minDate);
-		    const todayStr = formatDate(today);
-
-		    // Initialize startDate
-		    $("#startDate").attr("min", minDateStr);
-		    $("#startDate").val(minDateStr);
-
-		    // Initialize endDate
-		    $("#endDate").val(todayStr);
-		    $("#endDate").attr("min", minDateStr);
-		    
-		    let startDateVal = $("#startDate").val();
-		    let endDateVal = $("#endDate").val();
-
-		    // When startDate changes, adjust endDate min value
-		    $("#startDate").on("change", function() {
-		       startDateVal = $(this).val();
-		        $("#endDate").attr("min", startDateVal);
-		        // If endDate < startDate, reset it to startDate
-		        if ($("#endDate").val() < startDateVal) {
-		            $("#endDate").val(startDateVal);
-		        }
-		    });
-
-		    // When endDate changes, ensure it's >= startDate
-		    $("#endDate").on("change", function() {
-		        endDateVal = $(this).val();
-		        const startDateVal = $("#startDate").val();
-		        if (endDateVal < startDateVal) {
-		            alert("End date cannot be earlier than start date.");
-		            $(this).val(startDateVal);
-		        }
-		    });
-		    
-		    $('#report_type').on('change', function() {
-		        const selectedType = $(this).val();
-
-		        if (selectedType === 'abstract') {
-		            $('#filterContainer').show();  // Show when 'abstract'
-		        } else {
-		            $('#filterContainer').hide();  // Hide for other values
-		            $("#zone").val('');
-		            $("#ward").val('');
-		        }
-		    });
-	  	   
-	  	   
-	  	  $.ajax({
-			    type: "GET",
-			    url: "/gcc/api/scp/getzones",
-			    dataType: "json",
-			    success: function (response) {
-			        console.log("Zone API Response:", response);
-			
-			        // Clear dropdown and add default option
-			        $("#zone").empty().append('<option value="">Select</option>');
-			
-			        // Check if status is success and data exists
-			        if (response.status === "success" && Array.isArray(response.data) && response.data.length > 0) {
-			            $.each(response.data, function (index, zone) {
-			                $("#zone").append(
-			                    $("<option>", {
-			                        value: zone.zone_name,          // matches backend key (id)
-			                        text: zone.zone_name     // matches backend key (zone_name)
-			                    })
-			                );
-			            });
-			        } 
-			        else if (response.status === "failure") {
-			            Swal.fire({
-			                icon: "warning",
-			                title: "No Data Found",
-			                text: response.message || "No zones available.",
-			                confirmButtonColor: "#f8bb86"
-			            });
-			        } 
-			        else {
-			            Swal.fire({
-			                icon: "error",
-			                title: "Unexpected Response",
-			                text: "Please try again later.",
-			                confirmButtonColor: "#d33"
-			            });
-			        }
-			    },
-			    error: function (xhr, status, error) {
-			        console.error("Zone API Error:", error);
-			        Swal.fire({
-			            icon: "error",
-			            title: "Error Loading Zones",
-			            text: "Unable to fetch zone list. Please check your connection.",
-			            confirmButtonColor: "#d33"
-			        });
-			    }
-			});
-
-
-		 
-		 // 🔹 On Zone Change → Load Ward Dropdown
-		    $("#zone").on("change", function () {
-		        // Get selected zone name (text instead of value)
-		        let zoneName = $("#zone option:selected").text().trim();
-
-		        if (zoneName === "" || zoneName === "Select") {
-		            $("#ward").empty().append('<option value="">Select</option>');
-		            return;
-		        }
-
-		        $.ajax({
-		            type: "GET",
-		            url: "/gcc/api/scp/getwardbyzone",
-		            data: { zone: zoneName }, // ✅ sending text (zone name) as 'zone'
-		            dataType: "json",
-		            success: function (response) {
-		                $("#ward").empty().append('<option value="">Select</option>');
-
-		                if (response.status === "success" && response.data && response.data.length > 0) {
-		                    $.each(response.data, function (index, ward) {
-		                        $("#ward").append(
-		                            $("<option>", {
-		                                value: ward.ward_name,  // adjust as per actual field name
-		                                text: ward.ward_name  // adjust as per actual field name
-		                            })
-		                        );
-		                    });
-		                } else {
-		                    console.warn("No wards found for selected zone.");
-		                }
-		            },
-		            error: function (xhr, status, error) {
-		                console.error("Failed to load wards:", error);
-		            }
-		        });
-		    });
-	 });
-	 
-	 
-	 $("#resetBtn").on("click", function (e) {
-		 location.reload();
-	 });
-	 
-	 
-	// 🔹 Search Button Click
-	 $("#searchBtn").on("click", function (e) {
-	     e.preventDefault(); // prevent form submit or page reload
-
-	     // Get input values
-	     let startDate = $("#startDate").val();
-	     let endDate = $("#endDate").val();
-
-	     let report_type = $('#report_type').val();
-	     console.log("report_type="+report_type);
-	     
-	     if(startDate === ''){
-	    	 Swal.fire({
-	                icon: 'warning',
-	                title: 'From Date is Missing',
-	                text: 'Please Select From Date.'
-	            });
-	    	 return;
-	     }
-	     
-	     if(endDate === ''){
-	    	 Swal.fire({
-	                icon: 'warning',
-	                title: 'To Date is Missing',
-	                text: 'Please Select To Date.'
-	            });
-	    	 return;
-	     }
-	     
-	     if(report_type === ''){
-	    	 Swal.fire({
-	                icon: 'warning',
-	                title: 'Report Type is Missing',
-	                text: 'Please Select Report Type.'
-	            });
-	    	 return;
-	     }
-	     
-	     if(report_type !== ''){
-		     
-		     if(report_type === 'abstract'){
-		    	 
-		    	 let zoneText = $("#zone option:selected").text().trim();
-			     let wardText = $("#ward option:selected").text().trim();
-			     
-			     if (zoneText === "Select") {
-			    	 zoneText="";
-			     }
-	
-			     if (wardText === "Select") {
-			    	 wardText="";
-			     }
-			     
-			     loadAbstractData(startDate,endDate,zoneText,wardText);
-			     $('#detailtable').hide();
-		     }
-		     else{
-		    	 loadDetailData(startDate,endDate);
-		    	 $('#table2').hide();
-	        		$('#table3').hide();
-	        		$('#table1').hide();
-		     }
-	     }
-	     
-	 });
-	
-	 function loadDetailData(startDate,endDate){
-		 $('#pageLoader').show(); 
-		 $.ajax({
-             type: "GET",
-             url: `/gcc/api/scp/getdetailreportdata`, 
-             data:{
-          	   startDate:startDate,
-          	   endDate:endDate
-             },
-             contentType: "application/json",
-             success: function (response) {
-            	 console.log("API Response:", response);
-         	    $('#pageLoader').hide();
-         	    
-         	   if (response.status === "success") {
-         		   
-         		  if (Array.isArray(response.data) && response.data.length > 0) {
-         			  
-         			 $('#detailtable').show();
-         			  
-         			 let table = $('#ReportDatatable4').DataTable({
-     	                destroy: true,
-     	                searching: true,
-     	                autoWidth: false,           	                
-     	                paging: true,
-     	                info: true,
-     	                data: response.data, 
-     	                responsive: true,
-     	                scrollX: true,
-     	                columns: [
-     	                    { 
-     	                        data: null, 
-     	                        render: (data, type, row, meta) => meta.row + 1, 
-     	                        className: 'text-center' 
-     	                    },
-     	                    { data: 'zone', defaultContent: '-', className: 'text-center' },
-     	                    { data: 'ward', defaultContent: '-', className: 'text-center' },
-     	                    { data: 'street_name', defaultContent: '-', className: 'text-center' },    	                    
-     	                    { data: 'Completed', defaultContent: '-', className: 'text-center' },   	                    
-     	                    { data: 'YesCount', defaultContent: '-', className: 'text-center' },
-   	                    	{ data: 'NoCount', defaultContent: '-', className: 'text-center' },
-   	                    	{ data: 'AvailableCount', defaultContent: '-', className: 'text-center' },
-   	                    	{ data: 'NotAvailableCount', defaultContent: '-', className: 'text-center' },
-   	                    	{data: 'ImageNotClearCount', defaultContent: '-', className: 'text-center' },
-   	                    	{data: 'LidGoodYesCount', defaultContent: '-', className: 'text-center' },
-   	                    	{data: 'LidGoodNoCount', defaultContent: '-', className: 'text-center' }
-     	                    		            	                    
-     	                ],
-     	                dom: 'Bfrtip',
-     	                buttons: [
-      		                  {
-      		                      extend: 'pageLength',
-      		                      className: 'btn btn-warning'
-      		                  },
-      		                  {
-      		                      title: 'Data export',
-      		                      extend: 'copyHtml5',
-      		                      text: 'Copy',
-      		                      className: 'btn btn-secondary',
-      		                      id: 'copyBtn'
-      		                  },
-      		                  {
-      		                      extend: 'excelHtml5',
-      		                      text: 'Excel',
-      		                      className: 'btn btn-secondary',
-      		                      id: 'excelBtn'
-      		                  },
-      		                  {
-      		                      extend: 'csvHtml5',
-      		                      text: 'CSV',
-      		                      className: 'btn btn-secondary',
-      		                      id: 'csvBtn'
-      		                  },
-      		                  {
-      		                      extend: 'pdfHtml5',
-      		                      text: 'PDF',
-      		                      className: 'btn btn-secondary',
-      		                      id: 'pdfBtn'
-      		                  }
-      		              ],
-      		             columnDefs: [
-      		                { targets: 'no-sort', orderable: false }
-      		            ],
-      		            lengthMenu: [
-      		                [50, 100, 200, 500, -1],
-      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-      		            ],
-      		            scrollY: '40vh',
-      		            scrollX: false,   	      		            
-      		       		responsive: false,
-                		searching: true,
-                		
-      		            });
- 	        		
- 	        		$(window).on('resize', function () {
- 	        		    table.columns.adjust().draw();
- 	        		});
-         		  }
-         		   
-         	   }
-         	  	else if (response.status === "nodata") {
-	  	        	$('#pageLoader').hide();
-	  	            Swal.fire({
-	  	                icon: 'warning',
-	  	                title: 'No Data',
-	  	                text: 'No data available for the selected criteria.'
-	  	            });
-	  	        }
-	      	    else if (response.status === "error") {
-	  	        	$('#pageLoader').hide();
-	  	            Swal.fire({
-	  	            	icon: 'error',
-	      	            title: 'Error',
-	      	            text: response.message || 'Something went wrong!'
-	  	            });
-	  	        }
-		      	  else {
-	      	    	$('#pageLoader').hide();
-	      	        Swal.fire({
-	      	            icon: 'error',
-	      	            title: 'Error',
-	      	            text: 'Something went wrong!'
-	      	        });
-	      	    }
-         	    
-             },
-             error: function (error) {
-                	$('#pageLoader').hide();
-                	Swal.fire({
-     	            icon: 'error',
-     	            title: 'Error',
-     	            text: 'Something went wrong!'
-     	        });
-                }
-		 });
-	 }
-	
-	 function loadAbstractData(startDate,endDate,zoneText,wardText){
-		 
-		 $('#pageLoader').show();
-		 $.ajax({
-               type: "GET",
-               url: `/gcc/api/scp/getreportdatabyfilters`, 
-               data:{
-            	   startDate:startDate,
-            	   endDate:endDate,
-            	   zone:zoneText,
-            	   ward:wardText
-               },
-               contentType: "application/json",
-               success: function (response) {
-            	    console.log("API Response:", response);
-            	    $('#pageLoader').hide();
-            	    if (response.status === "success") {
-            	    	 $('#viewContainer').hide();
-            	        console.log("Data Array:", response.data);
-            	        // Ensure details is an array and has at least one entry
-            	        if (Array.isArray(response.data) && response.data.length > 0) {
-            	        	
-            	        	if(response.table === "table1"){
-            	        		$('#table2').hide();
-            	        		$('#table3').hide();
-            	        		$('#table1').show();
-
-            	        		
-            	        		let table = $('#ReportDatatable1').DataTable({
-	            	                destroy: true,
-	            	                searching: true,
-	            	                autoWidth: false,           	                
-	            	                paging: true,
-	            	                info: true,
-	            	                data: response.data, 
-	            	                responsive: true,
-	            	                scrollX: true,
-	            	                columns: [
-	            	                    { 
-	            	                        data: null, 
-	            	                        render: (data, type, row, meta) => meta.row + 1, 
-	            	                        className: 'text-center' 
-	            	                    },
-	            	                    { data: 'CLASS', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Total', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Cleaned', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Pending', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Completed', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Yes', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'No', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Available', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Not Available', defaultContent: '-', className: 'text-center' },
-	            	                    {data: 'Image Not Clear', defaultContent: '-', className: 'text-center' },
-	            	                    {data: 'LidGoodYesCount', defaultContent: '-', className: 'text-center' },
-	           	                    	{data: 'LidGoodNoCount', defaultContent: '-', className: 'text-center' }		            	                    
-	            	                ],
-	            	                dom: 'Bfrtip',
-	            	                buttons: [
-	   	      		                  {
-	   	      		                      extend: 'pageLength',
-	   	      		                      className: 'btn btn-warning'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      title: 'Data export',
-	   	      		                      extend: 'copyHtml5',
-	   	      		                      text: 'Copy',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'copyBtn'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      extend: 'excelHtml5',
-	   	      		                      text: 'Excel',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'excelBtn'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      extend: 'csvHtml5',
-	   	      		                      text: 'CSV',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'csvBtn'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      extend: 'pdfHtml5',
-	   	      		                      text: 'PDF',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'pdfBtn'
-	   	      		                  }
-	   	      		              ],
-	   	      		             columnDefs: [
-	   	      		                { targets: 'no-sort', orderable: false }
-	   	      		            ],
-	   	      		            lengthMenu: [
-	   	      		                [50, 100, 200, 500, -1],
-	   	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-	   	      		            ],
-	   	      		            scrollY: '40vh',
-	   	      		            scrollX: false,   	      		            
-	   	      		       		responsive: false,
-	   	                		searching: true,
-	   	                		
-	   	      		            });
-            	        		
-            	        		$(window).on('resize', function () {
-            	        		    table.columns.adjust().draw();
-            	        		});
-            	        	}
-            	        	
-							if(response.table === "table2"){
-								$('#table3').hide();
-            	        		$('#table1').hide();
-								$('#table2').show();
-								
-								let table = $('#ReportDatatable2').DataTable({
-	            	                destroy: true,
-	            	                searching: true,
-	            	                autoWidth: false,           	                
-	            	                paging: true,
-	            	                info: true,
-	            	                data: response.data, 
-	            	                responsive: true,
-	            	                scrollX: true,
-	            	                columns: [
-	            	                    { 
-	            	                        data: null, 
-	            	                        render: (data, type, row, meta) => meta.row + 1, 
-	            	                        className: 'text-center' 
-	            	                    },
-	            	                    {   // 🔹 New column for Zone
-	            	                        data: null,
-	            	                        render: function() {
-	            	                            return zoneText || "-";
-	            	                        },
-	            	                        className: 'text-center'
-	            	                    },
-	            	                    { data: 'CLASS', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Total', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Cleaned', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Pending', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Completed', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Yes', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'No', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Available', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Not Available', defaultContent: '-', className: 'text-center' },
-	            	                    {data: 'Image Not Clear', defaultContent: '-', className: 'text-center' },
-	            	                    {data: 'LidGoodYesCount', defaultContent: '-', className: 'text-center' },
-	           	                    	{data: 'LidGoodNoCount', defaultContent: '-', className: 'text-center' }		            	                    
-	            	                ],
-	            	                dom: 'Bfrtip',
-	            	                buttons: [
-	   	      		                  {
-	   	      		                      extend: 'pageLength',
-	   	      		                      className: 'btn btn-warning'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      title: 'Data export',
-	   	      		                      extend: 'copyHtml5',
-	   	      		                      text: 'Copy',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'copyBtn'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      extend: 'excelHtml5',
-	   	      		                      text: 'Excel',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'excelBtn'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      extend: 'csvHtml5',
-	   	      		                      text: 'CSV',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'csvBtn'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      extend: 'pdfHtml5',
-	   	      		                      text: 'PDF',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'pdfBtn'
-	   	      		                  }
-	   	      		              ],
-	   	      		             columnDefs: [
-	   	      		                { targets: 'no-sort', orderable: false }
-	   	      		            ],
-	   	      		            lengthMenu: [
-	   	      		                [50, 100, 200, 500, -1],
-	   	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-	   	      		            ],
-	   	      		            scrollY: '40vh',
-	   	      		            scrollX: false,   	      		            
-	   	      		       		responsive: false,
-	   	                		searching: true,
-	   	                		
-	   	      		            });
-            	        		
-            	        		$(window).on('resize', function () {
-            	        		    table.columns.adjust().draw();
-            	        		});
-            	        	}
-							
-							if(response.table === "table3"){
-								$('#table1').hide();
-								$('#table2').hide();
-								$('#table3').show();
-								
-								
-								let table = $('#ReportDatatable3').DataTable({
-	            	                destroy: true,
-	            	                searching: true,
-	            	                autoWidth: false,           	                
-	            	                paging: true,
-	            	                info: true,
-	            	                data: response.data, 
-	            	                responsive: true,
-	            	                scrollX: true,
-	            	                columns: [
-	            	                    { 
-	            	                        data: null, 
-	            	                        render: (data, type, row, meta) => meta.row + 1, 
-	            	                        className: 'text-center' 
-	            	                    },
-	            	                    { 
-	            	                        data: 'CLASS', 
-	            	                        defaultContent: '-', 
-	            	                        className: 'text-center',
-	            	                        
-	            	                    },
-	            	                    { data: 'Total', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Cleaned', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Pending', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Completed', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Yes', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'No', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Available', defaultContent: '-', className: 'text-center' },
-	            	                    { data: 'Not Available', defaultContent: '-', className: 'text-center' },
-	            	                    {data: 'Image Not Clear', defaultContent: '-', className: 'text-center' },
-	            	                    {data: 'LidGoodYesCount', defaultContent: '-', className: 'text-center' },
-	           	                    	{data: 'LidGoodNoCount', defaultContent: '-', className: 'text-center' }
-	            	                    		            	                    
-	            	                ],
-	            	                dom: 'Bfrtip',
-	            	                buttons: [
-	   	      		                  {
-	   	      		                      extend: 'pageLength',
-	   	      		                      className: 'btn btn-warning'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      title: 'Data export',
-	   	      		                      extend: 'copyHtml5',
-	   	      		                      text: 'Copy',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'copyBtn'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      extend: 'excelHtml5',
-	   	      		                      text: 'Excel',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'excelBtn'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      extend: 'csvHtml5',
-	   	      		                      text: 'CSV',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'csvBtn'
-	   	      		                  },
-	   	      		                  {
-	   	      		                      extend: 'pdfHtml5',
-	   	      		                      text: 'PDF',
-	   	      		                      className: 'btn btn-secondary',
-	   	      		                      id: 'pdfBtn'
-	   	      		                  }
-	   	      		              ],
-	   	      		             columnDefs: [
-	   	      		                { targets: 'no-sort', orderable: false }
-	   	      		            ],
-	   	      		            lengthMenu: [
-	   	      		                [50, 100, 200, 500, -1],
-	   	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-	   	      		            ],
-	   	      		            scrollY: '40vh',
-	   	      		            scrollX: false,   	      		            
-	   	      		       		responsive: false,
-	   	                		searching: true,
-	   	                		
-	   	      		            });
-            	        		
-            	        		$(window).on('resize', function () {
-            	        		    table.columns.adjust().draw();
-            	        		});
-            	        		
-            	        	}
-
-            	        }
-            	        
-            	    }
-            	    else if (response.status === "nodata") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	                icon: 'warning',
-        	                title: 'No Data',
-        	                text: 'No data available for the selected criteria.'
-        	            });
-        	        }
-            	    else if (response.status === "error") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	            	icon: 'error',
-            	            title: 'Error',
-            	            text: response.message || 'Something went wrong!'
-        	            });
-        	        }
-            	    else {
-            	    	$('#pageLoader').hide();
-            	        Swal.fire({
-            	            icon: 'error',
-            	            title: 'Error',
-            	            text: 'Something went wrong!'
-            	        });
-            	    }
-            	},
-
-               error: function (error) {
-               	$('#pageLoader').hide();
-               	Swal.fire({
-    	            icon: 'error',
-    	            title: 'Error',
-    	            text: 'Something went wrong!'
-    	        });
-               }
-           });
-	 }
-	 
-	 
-	</script>
-
-		
-	
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/scpverification.html b/src/main/resources/templates/modules/callcenterqaqc/scpverification.html
deleted file mode 100644
index a856f732..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/scpverification.html
+++ /dev/null
@@ -1,1149 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-/* #streetViewModal .modal-body {
-        max-height: 70vh;  
-        overflow-y: auto;  
-    } */
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Silt Catch Pit</h5>
-										<span>1913 Silt Catch Pit - Verification Page</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 Silt Catch Pit</li>
-										<li class="breadcrumb-item active" aria-current="page">Verification Page</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-1">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header pb-1 pt-2">
-									<span style="font-size: small;font-weight: bold;">Report Filters</span>
-									<span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-								</div>
-								<div class="card-body">
-									<div class="row">
-										<div class="col-2">
-											<label for="startDate" style="font-size:small;">From Date:</label>
-						                    <input type="date" id="startDate" class="form-control">
-										</div>
-										
-										<div class="col-2">
-											<label for="endDate" style="font-size: small;">To Date:</label>
-						                    <input type="date" id="endDate" class="form-control">
-										</div>
-										
-										<div class="col-2">
-											<label for="zone" style="font-size: small;">Zone:</label>
-						                    <select id="zone" class="form-control">
-						                    <option value="">Select</option>
-
-											</select>
-										</div>
-										
-										<div class="col-2">
-											<label for="ward" style="font-size: small;">Ward:</label>
-						                    <select id="ward" class="form-control">
-						                    <option value="">Select</option>
-
-											</select>
-										</div>
-										
-										<div class="col-4">
-											<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center mt-1">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-										</div>
-									
-									
-								</div>
-								
-								<!-- <div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div> -->
-							</div>
-						</div>
-					</div>
-					</div>
-			
-					
-					<div class="row">
-									<div class="col-md-12">
-										<div class="card">
-										<div class="card-header pb-1 pt-2">
-											<span style="font-size: small;font-weight: bold;">Reports List</span>
-										</div>
-										<div class="card-body">
-										
-											<div class="table-responsive" id="table1" style="display: none;">
-												<table id="ReportDatatable1"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-															<th class="text-center no-sort">S.No</th>
-															<th class="text-center">Zone</th>
-															<th class="text-center no-sort">Total</th>
-															<th class="text-center no-sort">Cleaned</th>																																												
-															<th class="text-center">Pending</th>																																																										
-														</tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-											
-											<div class="table-responsive" id="table2" style="display: none;">
-												<table id="ReportDatatable2"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-															<th class="text-center">S.No</th>
-															<th class="text-center">Zone</th>
-															<th class="text-center">Ward</th>
-															<th class="text-center">Total</th>
-															<th class="text-center">Cleaned</th>																																												
-															<th class="text-center">Pending</th>																																																										
-														</tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-											
-											<div class="table-responsive" id="table3" style="display: none;">
-												<table id="ReportDatatable3"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-															<th class="text-center no-sort">S.No</th>
-															<th class="text-center">Street Name</th>
-															<th class="text-center no-sort">Total</th>
-															<th class="text-center no-sort">Cleaned</th>																																												
-															<th class="text-center">Pending</th>																																																										
-														</tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-											
-										</div>
-									 </div>
-									</div>
-									
-									
-									<div class="col-md-12" id="viewContainer" style="display: none;">
-										<div class="card">
-											hi
-											 
-										</div>
-									</div>
-									
-								</div>
-								
-								
-								
-					
-				</div>
-
-			</div>
-			
-			
-			
-			<!-- Modal -->
-				<div class="modal fade" id="streetViewModal" tabindex="-1" aria-labelledby="streetViewModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-				  <div class="modal-dialog modal-xl">
-				    <div class="modal-content">
-				      <div class="modal-header">
-				        <h5 class="modal-title" id="streetNameLabel">Details</h5>
-				       <button type="button" class="close"  data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-				      </div>
-				      <div class="modal-body">
-				        <!-- Dynamic content loads here -->
-				      </div>
-				      <div class="modal-footer">
-				        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-				
-				
-				<!-- Image Modal -->
-				<div class="modal fade" id="imageModal" tabindex="-1" role="dialog" aria-hidden="true">
-				  <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-				    <div class="modal-content">
-				      <div class="modal-body text-center p-0">
-				        <img id="modalImage" src="" class="img-fluid" alt="Preview" style="max-height: 80vh;"/>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-				
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-				
-				
-		<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-
-			
-		</div>
-	</div>
-
-
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-		<script>
-		
-		 $(document).ready(function() {
-			 
-			// Define base min date (18 May 2025)
-			    const minDate = new Date(2025, 4, 18); // month is 0-indexed → 4 = May
-			    const today = new Date();
-
-			    // Format to yyyy-MM-dd
-			    function formatDate(date) {
-			        const yyyy = date.getFullYear();
-			        const mm = String(date.getMonth() + 1).padStart(2, '0');
-			        const dd = String(date.getDate()).padStart(2, '0');
-			        return `${yyyy}-${mm}-${dd}`;
-			    }
-
-			    const minDateStr = formatDate(minDate);
-			    const todayStr = formatDate(today);
-
-			    // Initialize startDate
-			    $("#startDate").attr("min", minDateStr);
-			    $("#startDate").val(minDateStr);
-
-			    // Initialize endDate
-			    $("#endDate").val(todayStr);
-			    $("#endDate").attr("min", minDateStr);
-			    
-			    let startDateVal = $("#startDate").val();
-			    let endDateVal = $("#endDate").val();
-
-			    // When startDate changes, adjust endDate min value
-			    $("#startDate").on("change", function() {
-			       startDateVal = $(this).val();
-			        $("#endDate").attr("min", startDateVal);
-			        // If endDate < startDate, reset it to startDate
-			        if ($("#endDate").val() < startDateVal) {
-			            $("#endDate").val(startDateVal);
-			        }
-			    });
-
-			    // When endDate changes, ensure it's >= startDate
-			    $("#endDate").on("change", function() {
-			        endDateVal = $(this).val();
-			        const startDateVal = $("#startDate").val();
-			        if (endDateVal < startDateVal) {
-			            alert("End date cannot be earlier than start date.");
-			            $(this).val(startDateVal);
-			        }
-			    });
-			    
-			    loadData(startDateVal,endDateVal,"","");
-			    
-			 // 🔹 Load Zone Dropdown
-			    $.ajax({
-				    type: "GET",
-				    url: "/gcc/api/scp/getzones",
-				    dataType: "json",
-				    success: function (response) {
-				        console.log("Zone API Response:", response);
-				
-				        // Clear dropdown and add default option
-				        $("#zone").empty().append('<option value="">Select</option>');
-				
-				        // Check if status is success and data exists
-				        if (response.status === "success" && Array.isArray(response.data) && response.data.length > 0) {
-				            $.each(response.data, function (index, zone) {
-				                $("#zone").append(
-				                    $("<option>", {
-				                        value: zone.zone_name,          // matches backend key (id)
-				                        text: zone.zone_name     // matches backend key (zone_name)
-				                    })
-				                );
-				            });
-				        } 
-				        else if (response.status === "failure") {
-				            Swal.fire({
-				                icon: "warning",
-				                title: "No Data Found",
-				                text: response.message || "No zones available.",
-				                confirmButtonColor: "#f8bb86"
-				            });
-				        } 
-				        else {
-				            Swal.fire({
-				                icon: "error",
-				                title: "Unexpected Response",
-				                text: "Please try again later.",
-				                confirmButtonColor: "#d33"
-				            });
-				        }
-				    },
-				    error: function (xhr, status, error) {
-				        console.error("Zone API Error:", error);
-				        Swal.fire({
-				            icon: "error",
-				            title: "Error Loading Zones",
-				            text: "Unable to fetch zone list. Please check your connection.",
-				            confirmButtonColor: "#d33"
-				        });
-				    }
-				});
-
-
-			 
-			 // 🔹 On Zone Change → Load Ward Dropdown
-			    $("#zone").on("change", function () {
-			        // Get selected zone name (text instead of value)
-			        let zoneName = $("#zone option:selected").text().trim();
-
-			        if (zoneName === "" || zoneName === "Select") {
-			            $("#ward").empty().append('<option value="">Select</option>');
-			            return;
-			        }
-
-			        $.ajax({
-			            type: "GET",
-			            url: "/gcc/api/scp/getwardbyzone",
-			            data: { zone: zoneName }, // ✅ sending text (zone name) as 'zone'
-			            dataType: "json",
-			            success: function (response) {
-			                $("#ward").empty().append('<option value="">Select</option>');
-
-			                if (response.status === "success" && response.data && response.data.length > 0) {
-			                    $.each(response.data, function (index, ward) {
-			                        $("#ward").append(
-			                            $("<option>", {
-			                                value: ward.ward_name,  // adjust as per actual field name
-			                                text: ward.ward_name  // adjust as per actual field name
-			                            })
-			                        );
-			                    });
-			                } else {
-			                    console.warn("No wards found for selected zone.");
-			                }
-			            },
-			            error: function (xhr, status, error) {
-			                console.error("Failed to load wards:", error);
-			            }
-			        });
-			    });
-
-
-			 
-		 });
-		 
-		 $("#resetBtn").on("click", function (e) {
-			 location.reload();
-		 });
-		 
-		 
-		// 🔹 Search Button Click
-		 $("#searchBtn").on("click", function (e) {
-		     e.preventDefault(); // prevent form submit or page reload
-
-		     // Get input values
-		     let startDate = $("#startDate").val();
-		     let endDate = $("#endDate").val();
-
-		     // Get text (not value) for zone and ward
-		     let zoneText = $("#zone option:selected").text().trim();
-		     let wardText = $("#ward option:selected").text().trim();
-		     
-		     
-		     if (zoneText === "Select") {
-		    	 zoneText="";
-		     }
-
-		     if (wardText === "Select") {
-		    	 wardText="";
-		     }
-
-		     // 🔹 Call your custom data loading function
-		     loadData(startDate, endDate, zoneText, wardText);
-		 });
-
-		 
-		 function loadData(startDate,endDate,zone,ward){
-			 $('#pageLoader').show();
-			 $.ajax({
-	               type: "GET",
-	               url: `/gcc/api/scp/getdatabyfilters`, 
-	               data:{
-	            	   startDate:startDate,
-	            	   endDate:endDate,
-	            	   zone:zone,
-	            	   ward:ward
-	               },
-	               contentType: "application/json",
-	               success: function (response) {
-	            	    console.log("API Response:", response);
-	            	    $('#pageLoader').hide();
-	            	    if (response.status === "success") {
-	            	    	 $('#viewContainer').hide();
-	            	        console.log("Data Array:", response.data);
-	            	        // Ensure details is an array and has at least one entry
-	            	        if (Array.isArray(response.data) && response.data.length > 0) {
-	            	        	
-	            	        	if(response.table === "table1"){
-	            	        		$('#table2').hide();
-	            	        		$('#table3').hide();
-	            	        		$('#table1').show();
-	            	        		
-	            	        		
-	            	        		let table = $('#ReportDatatable1').DataTable({
-		            	                destroy: true,
-		            	                searching: true,
-		            	                autoWidth: false,           	                
-		            	                paging: true,
-		            	                info: true,
-		            	                data: response.data, 
-		            	                responsive: true,
-		            	                scrollX: true,
-		            	                columns: [
-		            	                    { 
-		            	                        data: null, 
-		            	                        render: (data, type, row, meta) => meta.row + 1, 
-		            	                        className: 'text-center' 
-		            	                    },
-		            	                    { data: 'CLASS', defaultContent: '-', className: 'text-center' },
-		            	                    { data: 'Total', defaultContent: '-', className: 'text-center' },
-		            	                    { data: 'Cleaned', defaultContent: '-', className: 'text-center' },
-		            	                    { data: 'Pending', defaultContent: '-', className: 'text-center' }
-		            	                    		            	                    
-		            	                ],
-		            	                dom: 'Bfrtip',
-		            	                buttons: [
-		   	      		                  {
-		   	      		                      extend: 'pageLength',
-		   	      		                      className: 'btn btn-warning'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      title: 'Data export',
-		   	      		                      extend: 'copyHtml5',
-		   	      		                      text: 'Copy',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'copyBtn'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      extend: 'excelHtml5',
-		   	      		                      text: 'Excel',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'excelBtn'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      extend: 'csvHtml5',
-		   	      		                      text: 'CSV',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'csvBtn'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      extend: 'pdfHtml5',
-		   	      		                      text: 'PDF',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'pdfBtn'
-		   	      		                  }
-		   	      		              ],
-		   	      		             columnDefs: [
-		   	      		                { targets: 'no-sort', orderable: false }
-		   	      		            ],
-		   	      		            lengthMenu: [
-		   	      		                [50, 100, 200, 500, -1],
-		   	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-		   	      		            ],
-		   	      		            scrollY: '40vh',
-		   	      		            scrollX: false,   	      		            
-		   	      		       		responsive: false,
-		   	                		searching: true,
-		   	                		
-		   	      		            });
-	            	        		
-	            	        		$(window).on('resize', function () {
-	            	        		    table.columns.adjust().draw();
-	            	        		});
-	            	        	}
-	            	        	
-								if(response.table === "table2"){
-									$('#table3').hide();
-	            	        		$('#table1').hide();
-									$('#table2').show();
-									
-									let table = $('#ReportDatatable2').DataTable({
-		            	                destroy: true,
-		            	                searching: true,
-		            	                autoWidth: false,           	                
-		            	                paging: true,
-		            	                info: true,
-		            	                data: response.data, 
-		            	                responsive: true,
-		            	                scrollX: true,
-		            	                columns: [
-		            	                    { 
-		            	                        data: null, 
-		            	                        render: (data, type, row, meta) => meta.row + 1, 
-		            	                        className: 'text-center' 
-		            	                    },
-		            	                    {   // 🔹 New column for Zone
-		            	                        data: null,
-		            	                        render: function() {
-		            	                            return zone || "-";
-		            	                        },
-		            	                        className: 'text-center'
-		            	                    },
-		            	                    { data: 'CLASS', defaultContent: '-', className: 'text-center' },
-		            	                    { data: 'Total', defaultContent: '-', className: 'text-center' },
-		            	                    { data: 'Cleaned', defaultContent: '-', className: 'text-center' },
-		            	                    { data: 'Pending', defaultContent: '-', className: 'text-center' }
-		            	                    		            	                    
-		            	                ],
-		            	                dom: 'Bfrtip',
-		            	                buttons: [
-		   	      		                  {
-		   	      		                      extend: 'pageLength',
-		   	      		                      className: 'btn btn-warning'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      title: 'Data export',
-		   	      		                      extend: 'copyHtml5',
-		   	      		                      text: 'Copy',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'copyBtn'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      extend: 'excelHtml5',
-		   	      		                      text: 'Excel',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'excelBtn'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      extend: 'csvHtml5',
-		   	      		                      text: 'CSV',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'csvBtn'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      extend: 'pdfHtml5',
-		   	      		                      text: 'PDF',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'pdfBtn'
-		   	      		                  }
-		   	      		              ],
-		   	      		             columnDefs: [
-		   	      		                { targets: 'no-sort', orderable: false }
-		   	      		            ],
-		   	      		            lengthMenu: [
-		   	      		                [50, 100, 200, 500, -1],
-		   	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-		   	      		            ],
-		   	      		            scrollY: '40vh',
-		   	      		            scrollX: false,   	      		            
-		   	      		       		responsive: false,
-		   	                		searching: true,
-		   	                		
-		   	      		            });
-	            	        		
-	            	        		$(window).on('resize', function () {
-	            	        		    table.columns.adjust().draw();
-	            	        		});
-	            	        	}
-								
-								if(response.table === "table3"){
-									$('#table1').hide();
-									$('#table2').hide();
-									$('#table3').show();
-									
-									
-									let table = $('#ReportDatatable3').DataTable({
-		            	                destroy: true,
-		            	                searching: true,
-		            	                autoWidth: false,           	                
-		            	                paging: true,
-		            	                info: true,
-		            	                data: response.data, 
-		            	                responsive: true,
-		            	                scrollX: true,
-		            	                columns: [
-		            	                    { 
-		            	                        data: null, 
-		            	                        render: (data, type, row, meta) => meta.row + 1, 
-		            	                        className: 'text-center' 
-		            	                    },
-		            	                    { 
-		            	                        data: 'CLASS', 
-		            	                        defaultContent: '-', 
-		            	                        className: 'text-center clickable-class',  // 👈 custom CSS class
-		            	                        render: function (data, type, row) {
-		            	                        	return `<span class="class-link" 
-		            	                             style="color: blue; cursor: pointer;" 
-		            	                             data-variable="${row.VARIABLE}">
-		            	                             ${data}
-		            	                        </span>`;
-		            	                        }
-		            	                    },
-		            	                    { data: 'Total', defaultContent: '-', className: 'text-center' },
-		            	                    { data: 'Cleaned', defaultContent: '-', className: 'text-center' },
-		            	                    { data: 'Pending', defaultContent: '-', className: 'text-center' }
-		            	                    		            	                    
-		            	                ],
-		            	                dom: 'Bfrtip',
-		            	                buttons: [
-		   	      		                  {
-		   	      		                      extend: 'pageLength',
-		   	      		                      className: 'btn btn-warning'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      title: 'Data export',
-		   	      		                      extend: 'copyHtml5',
-		   	      		                      text: 'Copy',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'copyBtn'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      extend: 'excelHtml5',
-		   	      		                      text: 'Excel',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'excelBtn'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      extend: 'csvHtml5',
-		   	      		                      text: 'CSV',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'csvBtn'
-		   	      		                  },
-		   	      		                  {
-		   	      		                      extend: 'pdfHtml5',
-		   	      		                      text: 'PDF',
-		   	      		                      className: 'btn btn-secondary',
-		   	      		                      id: 'pdfBtn'
-		   	      		                  }
-		   	      		              ],
-		   	      		             columnDefs: [
-		   	      		                { targets: 'no-sort', orderable: false }
-		   	      		            ],
-		   	      		            lengthMenu: [
-		   	      		                [50, 100, 200, 500, -1],
-		   	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-		   	      		            ],
-		   	      		            scrollY: '40vh',
-		   	      		            scrollX: false,   	      		            
-		   	      		       		responsive: false,
-		   	                		searching: true,
-		   	                		
-		   	      		            });
-	            	        		
-	            	        		$(window).on('resize', function () {
-	            	        		    table.columns.adjust().draw();
-	            	        		});
-	            	        		
-	            	        		$('#ReportDatatable3 tbody').off('click').on('click', '.class-link', function () {
-	            	        			
-	            	        			let rowData = table.row($(this).closest('tr')).data();
-	            	        			let className = rowData.CLASS;
-	            	        		    let variableValue = $(this).data('variable'); 
-
-	            	        		    console.log("Clicked CLASS:", className);
-	            	        		    console.log("VARIABLE value:", variableValue);
-	            	        		    
-	            	        		    // Show the container (if hidden)
-	            	        		    $('#viewContainer').slideDown('slow');
-
-	            	        		    // Optional: Scroll smoothly to that container
-	            	        		    $('html, body').animate({
-	            	        		        scrollTop: $('#viewContainer').offset().top - 100 // adjust offset for header space
-	            	        		    }, 600);
-	            	        		    
-	            	        		    // Example: you can update the container content dynamically
-	            	        		    $('#viewContainer .card').html(`
-	            	        		        <div class="p-3">
-	            	        		            <h6 style="font-weight: bold;">${className} Details</h6>	            	        		            
-	            	        		        </div>
-	            	        		        <div class="p-3">
-	            	        		        <div id="modalBodyContent"></div>
-	            	        		        </div>
-	            	        		    `);
-	            	        		    
-	            	        		    getStreetDetails(startDate,endDate,variableValue,className);
-	            	        		});
-	            	        	}
-
-	            	        }
-	            	        
-	            	    }
-	            	    else if (response.status === "nodata") {
-	        	        	$('#pageLoader').hide();
-	        	            Swal.fire({
-	        	                icon: 'warning',
-	        	                title: 'No Data',
-	        	                text: 'No data available for the selected criteria.'
-	        	            });
-	        	        }
-	            	    else if (response.status === "error") {
-	        	        	$('#pageLoader').hide();
-	        	            Swal.fire({
-	        	            	icon: 'error',
-	            	            title: 'Error',
-	            	            text: response.message || 'Something went wrong!'
-	        	            });
-	        	        }
-	            	    else {
-	            	    	$('#pageLoader').hide();
-	            	        Swal.fire({
-	            	            icon: 'error',
-	            	            title: 'Error',
-	            	            text: 'Something went wrong!'
-	            	        });
-	            	    }
-	            	},
-
-	               error: function (error) {
-	               	$('#pageLoader').hide();
-	               	Swal.fire({
-	    	            icon: 'error',
-	    	            title: 'Error',
-	    	            text: 'Something went wrong!'
-	    	        });
-	               }
-	           });
-			 	 
-		 }
-		 
-		 $(document).on('click', '.preview-img', function() {
-			  const src = $(this).attr('src');
-			  $('#modalImage').attr('src', src);
-			  $('#imageModal').modal('show');
-			});
-		 
-		 function getStreetDetails(startDate, endDate, variableValue, className) {
-			 $('#pageLoader').show();
-			    $.ajax({
-			        type: "GET",
-			        url: "/gcc/api/scp/getstreetdetails",
-			        data: { startDate: startDate, endDate: endDate, variable: variableValue },
-			        success: function (res) {
-			        	$('#pageLoader').hide();
-			            console.log("Response for VARIABLE:", res);
-
-			            let modalBody = $("#modalBodyContent");
-			            modalBody.empty(); // Clear previous content
-
-			            if (res.status === "success" && res.data.length > 0) {
-			                res.data.forEach(item => {
-			                    // Create a container div for each street
-			                    let streetDiv = $('<div class="mb-4 p-3 border rounded"></div>');
-
-			                    // Add street info
-			                    let infoHtml = `
-			                    	<div style="display: flex; flex-wrap: nowrap; gap: 8px; align-items: center;">
-			                    	  <div style="flex: 0 0 10%;"><strong>Zone:</strong> ${item.zone || '-'}</div>
-			                    	  <div style="flex: 0 0 10%;"><strong>Ward:</strong> ${item.ward || '-'}</div>
-			                    	  <div style="flex: 0 0 50%;"><strong>Street Name:</strong> ${item.streetname || '-'}</div>
-			                    	  <div style="flex: 0 0 30%;"><strong>Last Feedback:</strong> ${item.last_feedback_date || '-'}</div>
-			                    	</div>
-
-								`;
-								streetDiv.append(infoHtml);
-
-			                   
-			                   // Images container
-								let imagesHtml = `
-								<hr>
-								<div class="d-flex mt-2">
-								  <div class="me-2 text-center" style="flex:1;">
-								    <p><strong>Before</strong></p>
-								    ${
-								      item.before_filepath 
-								      ? (() => {
-								          let beforePath = item.before_filepath.split(",")[0].trim();
-								          return `<img src="${beforePath}" alt="Before Image" 
-								                       class="preview-img img-thumbnail" 
-								                       data-toggle="modal" data-target="#imageModal"
-								                       style="width:250px; height:200px; object-fit:contain; cursor:pointer;"/>`;
-								        })()
-								      : `<p>No source</p>`
-								    }	
-								  </div>
-								  <div class="text-center" style="flex:1;">
-								    <p><strong>After</strong></p>
-								    ${
-								      item.after_filepath 
-								      ? (() => {
-								          let afterPath = item.after_filepath.split(",")[0].trim();
-								          return `<img src="${afterPath}" alt="After Image" 
-								                       class="preview-img img-thumbnail" 
-								                       data-toggle="modal" data-target="#imageModal"
-								                       style="width:250px; height:200px; object-fit:contain; cursor:pointer;"/>`;
-								        })()
-								      : `<p>No source</p>`
-								    }
-								  </div>
-								</div>
-								`;
-								
-								streetDiv.append(imagesHtml);
-
-			                    
-			                    // ✅ Questions Section
-			                    if (item.questions_part && item.questions_part.length > 0) {
-								    let hasUnanswered = false;
-								    let questionsHtml = `
-								        <div class="questions-section mt-3 p-2 border rounded">
-								            <h6><strong>Questions:</strong></h6>
-								            <div class="row">`; // ✅ start row
-								
-								            item.questions_part.forEach((q, index) => {
-								            let qid = q.question_id;
-								            let answerType = q.answer_type;
-								            let masterValues = q.answer_master || [];
-								            let existingAnswer = q.answers?.answer || null;
-								            let scpId = q.answers?.scp_id;
-
-								            let disabled = existingAnswer ? "disabled" : "";
-
-								            // ✅ each question-answer block
-								            if (answerType === "radio") {
-								                questionsHtml += `
-								                    <div class="col-6">
-								                        <div class="mt-2">
-								                            <p><strong>${q.question}</strong></p>`;
-
-								                masterValues.forEach(val => {
-								                    let checked = existingAnswer === val ? "checked" : "";
-								                    questionsHtml += `
-								                        <label class="me-3">
-								                            <input type="radio" name="q_${scpId}_${qid}" value="${val}" ${checked} ${disabled}>
-								                            ${val}
-								                        </label>`;
-								                });
-
-								                questionsHtml += `
-								                        </div>
-								                    </div>`;
-								            }
-
-								            else if (answerType === "dropdown") {
-								                questionsHtml += `
-								                    <div class="col-6">
-								                        <div class="mt-2">
-								                            <p><strong>${q.question}</strong></p>
-								                            <select name="q_${scpId}_${qid}" class="form-control main-dropdown" style="width:50%;" ${disabled}>
-								                                <option value="">Select</option>`;
-
-								                masterValues.forEach(val => {
-								                    let selected = existingAnswer === val ? "selected" : "";
-								                    questionsHtml += `<option value="${val}" ${selected}>${val}</option>`;
-								                });
-
-								                questionsHtml += `
-								                            </select>
-								                        </div>
-								                    </div>`;
-								            }
-
-								            else if (answerType === "subdropdown-q2") {
-								                // 👇 wrap both question text + dropdown inside hidden container
-								                let parentQid = "2"; // can make dynamic later
-								                questionsHtml += `
-								                    <div class="col-6 subdropdown-container" data-parent="${parentQid}" style="display:none;">
-								                        <div class="mt-2">
-								                            <p><strong>${q.question}</strong></p>
-								                            <select name="q_${scpId}_${qid}" class="form-control sub-dropdown" style="width:50%;" ${disabled}>
-								                                <option value="">Select</option>`;
-
-								                masterValues.forEach(val => {
-								                    let selected = existingAnswer === val ? "selected" : "";
-								                    questionsHtml += `<option value="${val}" ${selected}>${val}</option>`;
-								                });
-
-								                questionsHtml += `
-								                            </select>
-								                        </div>
-								                    </div>`;
-								            }
-
-								            // ✅ start new row after every 2 questions
-								            if ((index + 1) % 2 === 0 && index !== item.questions_part.length - 1) {
-								                questionsHtml += `</div><div class="row">`;
-								            }
-
-								            // detect if any unanswered
-								            if (!existingAnswer) hasUnanswered = true;
-								        });
-
-								
-								    questionsHtml += `</div>`; // ✅ close final .row
-								
-								    // ✅ Show Submit button only if at least one unanswered
-								    if (hasUnanswered) {
-								        questionsHtml += `
-								            <div class="text-center mt-3">
-									        	<button 
-										            class="btn btn-primary btn-submit-feedback" 
-										            data-scp="${item.id}"
-										            data-zone="${item.zone || ''}"
-										            data-ward="${item.ward || ''}"
-										            data-streetid="${item.streetid || ''}"
-										            data-streetname="${item.streetname || ''}"
-										            data-lastfeedback="${item.last_feedback_date || ''}">
-										            Submit
-									        </button>
-								            </div>
-								        `;
-								    }
-								
-								    questionsHtml += `</div>`;
-								    streetDiv.append(questionsHtml);
-								}
-
-
-			                    modalBody.append(streetDiv);
-			                });
-			                		                
-			            } else {
-			                modalBody.html('<p>No data available for this selection.</p>');
-			                //$("#streetViewModal").modal('show');
-			            }
-			        },
-			        error: function (xhr) {
-			        	$('#pageLoader').hide();
-			            console.error("Error fetching data:", xhr);
-			            $("#modalBodyContent").html('<p class="text-danger">Error fetching data.</p>');
-			            //$("#streetViewModal").modal('show');
-			        }
-			    });
-			}
-		 
-		// 🔹 When parent dropdown changes (e.g., Lid Availability?)
-		 $(document).off('change', '.main-dropdown').on('change', '.main-dropdown', function() {
-		     const selectedVal = $(this).val();
-		     const nameAttr = $(this).attr('name');
-		     const match = nameAttr.match(/q_([^_]+)_(\d+)/);
-		     if (!match) return;
-
-		     const parentQid = match[2];
-		     const section = $(this).closest('.questions-section');
-
-		     // Find dependent subdropdowns
-		     section.find(`.subdropdown-container[data-parent="${parentQid}"]`).each(function() {
-		         if (selectedVal === "Available") {
-		             $(this).show();
-		         } else {
-		             $(this).hide().find('select').val('');
-		         }
-		     });
-		 });
-
-		 
-		 $(document).off('click', '.btn-submit-feedback').on('click', '.btn-submit-feedback', function() {
-
-			 const scpId = $(this).data('scp');
-			    const section = $(this).closest('.questions-section');
-			    const zone = $(this).data('zone');
-			    const ward = $(this).data('ward');
-			    const streetId = $(this).data('streetid');
-			    const streetName = $(this).data('streetname');
-			    const lastfeedback = $(this).data('lastfeedback');
-			    const answers = [];
-			    let userId = document.getElementById('userIdSpan').textContent;
-			    const submitBtn = $(this);
-			    submitBtn.prop('disabled', true);
-
-			    // ✅ Count only visible, non-disabled questions
-			    const visibleQuestions = new Set(
-			        section.find('[name^="q_"]:visible:not(:disabled)').map(function() {
-			            return $(this).attr('name');
-			        }).get()
-			    ).size;
-
-			    // ✅ Collect selected answers
-			    section.find('input[type="radio"]:checked, select').each(function() {
-			        const nameAttr = $(this).attr('name');
-			        if (!nameAttr) return;
-			        const match = nameAttr.match(/q_([^_]+)_(\d+)/);
-			        if (match) {
-			            const questionId = match[2];
-			            const answerValue = $(this).val();
-			            if (answerValue) {
-			                answers.push({
-			                    scp_id: scpId,
-			                    question_id: questionId,
-			                    answer: answerValue,
-			                    zone: zone,
-			                    ward: ward,
-			                    street_id: streetId,
-			                    street_name: streetName,
-			                    lastfeedback: lastfeedback,
-			                    agent_id: userId
-			                });
-			            }
-			        }
-			    });
-
-			    // ✅ Check if all visible questions are answered
-			    if (answers.length < visibleQuestions) {
-			        Swal.fire("Warning", "Please answer all questions before submitting.", "warning");
-			        submitBtn.prop('disabled', false);
-			        return;
-			    }
-
-			    // ✅ Subdropdown logic (optional ones ignored)
-			    let missingSubAnswers = false;
-			    section.find('.subdropdown-container:visible select').each(function() {
-			        const isRequired = $(this).data('required') === true; // optional unless required
-			        if (isRequired && !$(this).val()) {
-			            missingSubAnswers = true;
-			        }
-			    });
-
-			    if (missingSubAnswers) {
-			        Swal.fire("Warning", "Please answer all questions before submitting.", "warning");
-			        submitBtn.prop('disabled', false);
-			        return;
-			    }
-
-			    console.log("✅ Submitting answers:", answers);
-			    
-			     $('#pageLoader').show();
-			    $.ajax({
-			        type: "POST",
-			        url: "/gcc/api/scp/saveanswer",
-			        contentType: "application/json",
-			        data: JSON.stringify(answers),
-			        success: function(response) {
-			        	$('#pageLoader').hide();
-			        	if (response.status === "success") {
-			        		Swal.fire({
-			                    title: "Success",
-			                    text: "Submitted successfully!",
-			                    icon: "success",
-			                    allowOutsideClick: false,
-			                    allowEscapeKey: false,
-			                    allowEnterKey: false
-			                }).then(() => {
-			                    			                    
-			                    // ✅ Remove the entire section for this scpId after user clicks OK
-			                    const streetDiv = submitBtn.closest('.mb-4'); // your main streetDiv wrapper
-			                    streetDiv.remove();
-
-			                    // ✅ Optional: If no records left, show placeholder message
-			                    if ($("#modalBodyContent").children().length === 0) {
-			                        $("#modalBodyContent").html('<p>No pending records available.</p>');
-			                    }
-			                    
-			                });
-			            }
-			        	else if(response.status === "duplicate"){
-			            	submitBtn.prop('disabled', false);
-			            	Swal.fire({
-			                    title: "Duplicate Data",
-			                    text: response.message,
-			                    icon: "warning",
-			                    allowOutsideClick: false,
-			                    allowEscapeKey: false,
-			                    allowEnterKey: false
-			                }).then(() => {
-			                    			                    
-			                    location.reload();
-			                    
-			                });
-			            }
-			        	
-			        	else {
-			        		
-			            	submitBtn.prop('disabled', false);
-			            	Swal.fire({
-			                    title: "Error",
-			                    text: response.message || "Failed to submit feedback.",
-			                    icon: "error"			                   
-			                });
-			            }
-			        },
-			        error: function() {
-			        	
-			        	submitBtn.prop('disabled', false);
-			        	$('#pageLoader').hide();
-			            Swal.fire("Error", "Failed to submit feedback.", "error");
-			        }
-			    }); 
-			    
-			});
-
-
-		
-		</script>
-	
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/socialmediacomplaints.html b/src/main/resources/templates/modules/callcenterqaqc/socialmediacomplaints.html
deleted file mode 100644
index 8812db6c..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/socialmediacomplaints.html
+++ /dev/null
@@ -1,1486 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-#modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-    .width1{
-    	width: 100px;
-    }
-    .width2{
-    	width: 120px;
-    }
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>SocialMedia Complaints</h5>
-										<span>View Social Media Complaints</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 Social Media</li>
-										<li class="breadcrumb-item active" aria-current="page">Social Media Complaints</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Select Filters</span>
-								</div>
-								<div class="card-body">
-									<div class="row">
-										<div class="col-sm-2 mb-2">
-											<label for="startDate" style="font-size: medium;">From Date:</label>
-						                    <input type="date" id="startDate" class="form-control">
-										</div>
-										<div class="col-sm-2 mb-2">
-											<label for="endDate" style="font-size: medium;">To Date:</label>
-						                    <input type="date" id="endDate" class="form-control">
-										</div>
-										
-										<div class="col-sm-2 mb-2">
-								            <label for="regiondropdown" style="font-size: medium;">Region:</label>
-								            <select id="regiondropdown" class="form-control">
-								            <option value="">Select</option>
-								            <option value="North Region">North Region</option>
-								            <option value="Central Region">Central Region</option>
-								            <option value="South Region">South Region</option>
-								            
-											</select>
-										</div>
-										
-										<div class="col-sm-2 mb-2">
-								            <label for="stsdropdown" style="font-size: medium;">Status:</label>
-								            <select id="stsdropdown" class="form-control">
-								            <option value="total">Select</option>
-								            <option value="processing">Processing</option>
-								            <option value="reopened">Reopened</option>
-								            <option value="redressed">Action Taken 1</option>
-								            <option value="closed" selected>Action Taken 2</option>
-								            <option value="completed">Completed</option>
-											</select>
-										</div>
-										
-										<div class="col-sm-2 mb-2">
-								            <label for="dropdown4" style="font-size: medium;">Group:</label>
-								            <select id="dropdown4" class="form-control">
-								            <option value="">Select</option>
-								               <!--  <option value="">general</option> -->
-								                <!-- Add options here -->
-											</select>
-										</div>
-															
-									
-										<div class="col-sm-2 mb-2">
-											 <label for="dropdown1"  style="font-size: medium;">Type:</label>
-						                     <select id="dropdown1" class="form-control">
-							                 <option value="">Select</option>
-							            	 <!-- <option value="Cleanliness in Parks">Cleanliness in Parks</option> -->
-
-											</select>
-										</div>
-										<div class="col-sm-2 mb-2">
-											<label for="dropdown2" style="font-size: medium;">Zone:</label>
-						                    <select id="dropdown2" class="form-control">
-						                    <option value="">Select</option>
-						                    <!-- <option value="N01">N01</option> -->
-												<!-- <option value="ALL">ALL</option> -->
-
-											</select>
-										</div>
-										
-										</div>
-										
-									
-									
-									<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-			
-					
-						<div class="row mt-4">
-								<div class="col-md-12">
-									<div class="card">
-									<div class="card-header">
-										<h3 style="font-weight: bold;font-size: large;"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-	  										<span th:text="${agent_name}" style="font-weight: bold; font-size: large;"></span>'s Complaints List</h3>
-									</div>
-									<div class="card-body">
-										<div class="table-responsive">
-	
-											<table id="ReportDatatable"
-												class="table table-striped table-bordered table-hover dataTable"
-												role="grid">
-												<thead class="thead-dark">
-													<tr role="row">
-	
-														<th class="text-center no-sort">S.No</th>																														
-														<th class="text-center">Reg Date</th>
-														<th class="text-center no-sort">Complaint No</th>
-														<th class="text-center">ComplaintType</th>
-														<th class="text-center">View</th>																																											
-														<th class="text-center">Officer Name</th>	
-														<th class="text-center">Officer Mobile no</th>	
-														<th class="text-center width1">Status</th>		
-														<th class="text-center width2">Remarks</th>																									
-														<th class="text-center">Action</th>																												
-													</tr>
-												</thead>
-												<tbody>
-	
-												</tbody>
-											</table>
-										</div>
-									</div>
-								 </div>
-								</div>
-							</div>
-					
-				</div>
-
-			</div>
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-	<!-- Modal -->
-	<div class="modal fade" id="detailsModal" tabindex="-1" role="dialog"
-		aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="detailsModalLabel">Complaint
-						Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body" id="modalBody">
-					<!-- Details will be populated here -->
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary"
-						data-dismiss="modal">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<!-- in the code use to show the download different type microsoft -->
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">
-	document.addEventListener("DOMContentLoaded", function () {
-	    const complaintTypeDropdown = document.getElementById('dropdown1');
-	    const complaintGroupDropdown = document.getElementById('dropdown4');
-	    const complaintModeDropdown = document.getElementById('dropdown3');
-	    const complaintZoneDropdown = document.getElementById('dropdown2');
-	    const regionDropdown = document.getElementById('regiondropdown');
-	    let allZones = [];
-
-	    // Load Complaint Groups
-	    fetch('/gcc/api/callcenterqaqc/getComplaintGroup') 
-	        .then(response => response.json())
-	        .then(data => {
-	            // Clear existing options
-	            complaintGroupDropdown.innerHTML = `<option value="">Select</option>`;
-
-	            // Add options from the API response
-	            data.forEach(complaintGroupName => {
-	                complaintGroupDropdown.innerHTML += `<option value="${complaintGroupName}">${complaintGroupName}</option>`;
-	            });
-	        })
-	        .catch(error => {
-	            console.error('Error fetching complaint groups:', error);
-	        });
-
-	    // Event Listener for Complaint Group Change
-	    complaintGroupDropdown.addEventListener('change', function () {
-	        const selectedGroup = complaintGroupDropdown.value;
-
-	        if (selectedGroup) {
-	            // Fetch Complaint Types based on selected group
-	            fetch(`/gcc/api/callcenterqaqc/getComplaintTypesByGroup?group=${encodeURIComponent(selectedGroup)}`)
-	                .then(response => response.json())
-	                .then(data => {
-	                    // Clear existing options
-	                    complaintTypeDropdown.innerHTML = `<option value="">Select</option>`;
-
-	                    // Add options from the API response
-	                    data.forEach(complaintTypeName => {
-	                        complaintTypeDropdown.innerHTML += `<option value="${complaintTypeName}">${complaintTypeName}</option>`;
-	                    });
-	                })
-	                .catch(error => {
-	                    console.error('Error fetching complaint types:', error);
-	                });
-	        } else {
-	            // Clear complaint type dropdown if no group is selected
-	            complaintTypeDropdown.innerHTML = `<option value="">Select</option>`;
-	        }
-	    });
-	    	    
-	    
-	 // Load all zones and store them globally
-	    fetch('/gcc/api/callcenterqaqc/getZones') 
-	        .then(response => response.json())
-	        .then(data => {
-	            allZones = data; // Store zones globally
-	            updateZoneDropdown(); // Populate zones initially
-	        })
-	        .catch(error => console.error('Error fetching complaint zones:', error));
-
-	    // Event Listener for Region Dropdown Change
-	    regionDropdown.addEventListener('change', updateZoneDropdown);
-
-	    // Function to update Zone Dropdown based on Region selection
-	    function updateZoneDropdown() {
-	        const selectedRegion = regionDropdown.value;
-	        complaintZoneDropdown.innerHTML = `<option value="">Select</option>`;
-
-	        let filteredZones = [];
-
-	        if (selectedRegion === "North Region") {
-	            filteredZones = allZones.filter(zone => zone >= "N01" && zone <= "N05");
-	        } else if (selectedRegion === "Central Region") {
-	            filteredZones = allZones.filter(zone => zone >= "N06" && zone <= "N10");
-	        } else if (selectedRegion === "South Region") {
-	            filteredZones = allZones.filter(zone => zone >= "N11" && zone <= "N15");
-	        } else {
-	            // Show all if no region is selected
-	            filteredZones = allZones;
-	        }
-
-	        filteredZones.forEach(zone => {
-	            complaintZoneDropdown.innerHTML += `<option value="${zone}">${zone}</option>`;
-	        });
-	    }
-	 
-	    const today = new Date();
-	    const year = today.getFullYear();
-	    const month = String(today.getMonth() + 1).padStart(2, '0'); // Months are 0-indexed
-	    const day = String(today.getDate()).padStart(2, '0');
-
-	    // Calculate the first day of the current month
-	    const startOfMonth = `${year}-${month}-01`; // yyyy-MM-dd format
-	    const todayFormatted = `${year}-${month}-${day}`; // yyyy-MM-dd format
-
-	    const startDateField = document.getElementById('startDate');
-	    const endDateField = document.getElementById('endDate');
-		
-		// Event listener for To Date
-		   endDateField.addEventListener('change', function () {
-		       if (endDateField.value) {
-		           startDateField.max = endDateField.value; // Set max value for From Date
-		       } else {
-		           startDateField.removeAttribute('max'); // Remove max if To Date is cleared
-		       }
-
-		       // Validate From Date against updated To Date
-		       if (startDateField.value && new Date(startDateField.value) > new Date(endDateField.value)) {
-		           startDateField.value = ''; // Clear invalid From Date
-		           alert("From Date cannot be after To Date.");
-		       }
-		   });
-
-		   // Event listener for From Date
-		   startDateField.addEventListener('change', function () {
-		       if (startDateField.value) {
-		           endDateField.min = startDateField.value; // Set min value for To Date
-		       } else {
-		           endDateField.removeAttribute('min'); // Remove min if From Date is cleared
-		       }
-
-		       // Validate To Date against updated From Date
-		       if (endDateField.value && new Date(endDateField.value) < new Date(startDateField.value)) {
-		           endDateField.value = ''; // Clear invalid To Date
-		           alert("To Date cannot be before From Date.");
-		       }
-		   });
-
-	    // Set the default date values in the input fields
-	    if (startDateField && endDateField) {
-	        startDateField.value = startOfMonth; // yyyy-MM-dd format required for input[type="date"]
-	        endDateField.value = todayFormatted; // yyyy-MM-dd format required for input[type="date"]
-	    } else {
-	        console.error("Start date or end date input field not found!");
-	    }
-
-	    // Call the search logic directly to load default data on page load
-	    //loadDashboardData(formatDateForAPI(startOfMonth), formatDateForAPI(todayFormatted));
-
-	    
-	});
-	
-	 $(document).ready(function() {
-		 
-		 let a1Dropdowns = [];
-		    let a2Dropdowns = [];
-
-		    // A1 Dropdown API
-		    function loadA1Dropdowns() {
-		        return $.ajax({
-		            url: '/gcc/api/callcenterqaqc/socialmedia/getA1dropdowns',
-		            type: 'GET',
-		            success: function(response) {
-
-		                if (response.status === "success") {
-		                    a1Dropdowns = response.data;
-		                }
-		            }
-		        });
-		    }
-
-		    // A2 Dropdown API
-		    function loadA2Dropdowns() {
-		        return $.ajax({
-		            url: '/gcc/api/callcenterqaqc/socialmedia/getA2dropdowns',
-		            type: 'GET',
-		            success: function(response) {
-
-		                if (response.status === "success") {
-		                    a2Dropdowns = response.data;
-		                }
-		            }
-		        });
-		    }
-
-		    // LOAD BOTH APIs INITIALY
-		    $.when(
-		        loadA1Dropdowns(),
-		        loadA2Dropdowns()
-		    ).done(function () {
-
-		        console.log("A1 Dropdowns Loaded", a1Dropdowns);
-		        console.log("A2 Dropdowns Loaded", a2Dropdowns);
-
-		    });
-		    
-		    $(document).on('change', '.action-dropdown', function () {
-
-		        let selectedValue = $(this).val();
-
-		        let followupDateField = $(this)
-		            .closest('.action-container')
-		            .find('.followup-date');
-
-		        if (selectedValue === "FOLLOWUP") {
-
-		            followupDateField.show();
-
-		        } else {
-
-		            followupDateField.hide();
-		            followupDateField.val('');
-
-		        }
-		    });
-
-     	var table = $('#ReportDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '100vh',
-             fixedColumns: {
-                 left: 1,
-                 right: 1
-             },
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: true,
-             responsive: true,
-             searching: true,
-             select: false,
-             processing: false
-         });
-     	
-     // Event listener for From Date selection
-  	   $("#startDate").on("change", function() {
-  	       const startDate = $(this).val();  // Get the selected start date
-  	       // Set the min value for To Date to be the selected From Date
-  	       $("#endDate").attr("min", startDate);
-  	   });
-
-  	   // Event listener for To Date selection
-  	   $("#endDate").on("change", function() {
-  	       const endDate = $(this).val();  // Get the selected end date
-  	       // Set the max value for From Date to be the selected To Date
-  	       $("#startDate").attr("max", endDate);
-  	   });
-  	   
-  	 	document.getElementById('resetBtn').addEventListener('click', function () {
-      	event.preventDefault();
-      	
-      	window.location.href="/gcc/callcenterqaqcsocialmedia/socialmediacomplaints";
-      	
-      	});
-  	 	
-  	 	document.getElementById('searchBtn').addEventListener('click', function (e) {
-  	 		
-  	 		
-  	 		let startDate = document.getElementById('startDate').value;
-     	    let endDate = document.getElementById('endDate').value;
-     	    
-     	    let status = document.getElementById('stsdropdown').value;
-     	    let group= document.getElementById('dropdown4').value;
-     	 	let type= document.getElementById('dropdown1').value;    	    
-     	    let zone= document.getElementById('dropdown2').value;
-     	   let region=document.getElementById('regiondropdown').value;
-     	    
-     	   console.log("startdate: ",startDate);
-    	   console.log("enddate: ",endDate);
-    	   console.log("status: ",status);
-    	   console.log("group: ",group);
-    	   console.log("type: ",type);
-    	   console.log("region: ",region);
-    	  
-    	   console.log("zone: ",zone);
-    	   if (!startDate && !endDate) {
-    	        Swal.fire({
-    	            icon: 'warning',
-    	            title: 'Error',
-    	            text: 'Please Select Both From Date and To Date',
-    	            showConfirmButton: true,
-    	            timer: 3000
-    	        });
-    	        e.preventDefault(); // Prevent the default action
-    	        return; // Stop further execution
-    	    }
-    	   const params = new URLSearchParams({
-    	        startDate: startDate,
-    	        endDate: endDate,
-    	        status: status,
-    	        group: group,
-    	        type: type,
-    	        region:region,
-    	        zone: zone
-    	    });
-    	   $('#pageLoader').show();
-    	   $.ajax({
-               type: "GET",
-               url: `/gcc/api/callcenterqaqc/socialmedia/getsocialmediacomps?${params.toString()}`, // Append query string to URL
-               contentType: "application/json",
-               success: function (response) {
-            	    console.log("API Response:", response);
-            	    $('#pageLoader').hide();
-            	    
-            	    if (response.status === "success") {
-            	    	
-            	    	const tableHeader = `
-                            <tr>
-                                <th class="text-center no-sort">S.No</th>
-                                <th class="text-center">Reg Date</th>
-                                <th class="text-center no-sort">Complaint No</th>
-                                <th class="text-center">Complaint Type</th>
-                                <th class="text-center">View</th>
-                                <th class="text-center">Officer Name</th>
-                                <th class="text-center">Officer Mobile no</th>
-                                
-                                ${
-                                    status === "closed" 
-                                    ? `
-                                    	<th class="text-center width1">Status</th>
-                                        <th class="text-center width2">Remarks</th>
-                                        <th class="text-center">Action</th>
-                                      `
-                                    : ''
-                                }
-                            </tr>
-                        `;
-                        
-                        $('#ReportDatatable thead').html(tableHeader); // Dynamically update <thead>
-            	    	
-                        console.log("Details Array:", response.details);
-
-                        // Ensure details is an array and has at least one entry
-                        if (Array.isArray(response.details) && response.details.length > 0) {
-                            // Dynamically configure columns based on the status
-                            let columns = [
-    { 
-        data: null, 
-        render: (data, type, row, meta) => meta.row + 1, 
-        className: 'text-center' 
-    },
-    { data: 'Complaint Opened Date', defaultContent: '-', className: 'text-center' },
-    { data: 'Complaint Number', defaultContent: '-', className: 'text-center' },
-    { data: 'Complaint Type', defaultContent: '-', className: 'text-center' },
-    { 
-        data: 'Complaint Number', 
-        render: function(data) {
-            return `<button type="button" class="btn btn-info" data-complaint-number="${data}">View</button>`;
-        }, 
-        className: 'text-center' 
-    },
-    { data: 'Assign To', defaultContent: '-', className: 'text-center' },
-    { data: 'Official Contact Number', defaultContent: '-', className: 'text-center' },
-    {
-        data: '',
-        defaultContent: '-',
-        className: 'text-center',
-        render: function(data, type, row) {
-
-            let dropdownData = [];
-
-            // REDRESSED -> A1
-            if (status === "redressed") {
-                dropdownData = a1Dropdowns;
-            }
-
-            // CLOSED -> A2
-            if (status === "closed") {
-                dropdownData = a2Dropdowns;
-            }
-
-            if (status === "closed" || status === "redressed") {
-
-                let options = `<option value="">Select</option>`;
-
-                dropdownData.forEach(function(item) {
-
-                    options += `
-                        <option value="${item.call_status}">
-                            ${item.call_status}
-                        </option>
-                    `;
-                });
-
-                return `
-                <div class="action-container">
-
-                    <select class="form-control action-dropdown">
-                        ${options}
-                    </select>
-
-                    <input 
-                        type="date" 
-                        class="form-control followup-date mt-2" 
-                        style="display:none;"
-                        min="${new Date(Date.now() + 86400000).toISOString().split('T')[0]}"
-                    >
-
-                </div>
-            `;
-            }
-
-            return '-';
-        }
-    },
-    {
-        data: null,
-        defaultContent: '-',
-        render: function(data, type, row) {
-
-            return (status === "closed" || status === "redressed")
-                ? `<input type="text" class="form-control" id="remarks" placeholder="Enter remarks">`
-                : '-';
-        },
-        className: 'text-center'
-    },
-    { 
-        data: 'Complaint Number', 
-        render: function(data) {
-            return (status === "closed" || status === "redressed")
-                ? `<button type="button" class="btn btn-success" data-complaint-number="${data}">Submit</button>` 
-                : '-';
-        }, 
-        className: 'text-center' 
-    }
-];
-
-
-                            // Initialize the DataTable
-                            $('#ReportDatatable').DataTable({
-                                destroy: true,
-                                searching: true,
-                                autoWidth: true,
-                                responsive: true,
-                                paging: true,
-                                info: true,
-                                data: response.details,
-                                columns: columns,
-                                dom: 'Bfrtip',
-                                buttons: [
-                                    {
-                                        extend: 'pageLength',
-                                        className: 'btn btn-warning'
-                                    },
-                                    {
-                                        title: 'Data export',
-                                        extend: 'copyHtml5',
-                                        text: 'Copy',
-                                        className: 'btn btn-secondary',
-                                        id: 'copyBtn'
-                                    },
-                                    {
-                                        extend: 'excelHtml5',
-                                        text: 'Excel',
-                                        className: 'btn btn-secondary',
-                                        id: 'excelBtn'
-                                    },
-                                    {
-                                        extend: 'csvHtml5',
-                                        text: 'CSV',
-                                        className: 'btn btn-secondary',
-                                        id: 'csvBtn'
-                                    },
-                                    {
-                                        extend: 'pdfHtml5',
-                                        text: 'PDF',
-                                        className: 'btn btn-secondary',
-                                        id: 'pdfBtn'
-                                    }
-                                ],
-                                columnDefs: [
-                                    { targets: 'no-sort', orderable: false }
-                                ],
-                                lengthMenu: [
-                                    [50, 100, 200, 500, -1],
-                                    ['50 rows', '100 rows', '200 rows', 'Show all']
-                                ],
-                                scrollY: '100vh',
-                                fixedColumns: {
-                                    left: 1,
-                                    right: 1
-                                }
-                            });
-                        }
-                    }
-            	    else if (response.status === "nodata") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	                icon: 'warning',
-        	                title: 'No Data',
-        	                text: 'No data available for the selected criteria.'
-        	            });
-        	        }
-            	    else if (response.status === "error") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	            	icon: 'error',
-            	            title: 'Error',
-            	            text: response.message
-        	            });
-        	        }
-            	    else {
-            	    	$('#pageLoader').hide();
-            	        Swal.fire({
-            	            icon: 'error',
-            	            title: 'Error',
-            	            text: response.message
-            	        });
-            	    }
-            	},
-
-               error: function (error) {
-               	$('#pageLoader').hide();
-               	Swal.fire({
-    	            icon: 'error',
-    	            title: 'Error',
-    	            text: response.message
-    	        });
-               }
-           });
-    	   
-  	 	});
-  	 	
-  	 	
-  	 	$(document).on('click', '.btn-info', function () {
-  	 	    // Retrieve the complaint number from the data attribute
-  	 	    var complaintNumber = $(this).data('complaint-number');
-  	 	    console.log("complaintNumber===="+complaintNumber);
-  	 	    // Call the viewDetails function with the complaint number
-  	 	    viewDetails(complaintNumber);
-  	 	});
-  	 	
-  	 	$(document).on('click', '.btn.btn-success', function () {
-  	 	    // Retrieve the complaint number from the data attribute
-  	 	    var complaintNumber = $(this).data('complaint-number');
-  	 	    //console.log("complaintNumberP===="+complaintNumber);
-  	 	    // Call the viewDetails function with the complaint number
-  	 	    CloseComplaints(complaintNumber);
-  	 	 
-  	 	});
-     	
-     });
-	 
-	 function viewDetails(complaintNumber) {
-	 	    document.getElementById('modalBody').innerHTML = '<p style="text-align:center;">Please wait, loading data...</p>';
-	 	    $('#detailsModal').modal('show');
-
-	 	    // Fetch the main complaint details
-	 	    $.ajax({
-	 	        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails',
-	 	        type: 'GET',
-	            data:{complaintNumber:complaintNumber},
-	 	        success: function (data) {
-	 	            //console.log('Complaint Data:', data);
-
-	 	            // Fetch agent response details
-	 	            $.ajax({
-	 	                url: '/gcc/api/callcenterqaqc/agent/attendedcomplaintshistory',
-	 	                type: 'GET',
-	 	                data: { complaintNumber },
-	 	                success: function (agentResponse) {
-	 	                    //console.log('Agent Response:', agentResponse);
-
-	 	                    // Use the logic for building complaint and agent details as HTML
-	 	                    const detailsHtml = generateDetailsHtml(data, agentResponse);
-
-	 	                    // Update modal content
-	 	                    document.getElementById('modalBody').innerHTML = detailsHtml;
-	 	                    
-	 	                // // Show only for REGISTERED or FORWARDED complaints
-	 	                   loadRegCompSection(data.complaintid, data.currentStatus);
-	 	                },
-	 	                error: function () {
-	 	                    document.getElementById('modalBody').innerHTML = '<p>Error loading agent details. Please try again later.</p>';
-	 	                }
-	 	            });
-	 	        },
-	 	        error: function () {
-	 	            document.getElementById('modalBody').innerHTML = '<p>Error loading complaint details. Please try again later.</p>';
-	 	        }
-	 	    });
-	 	}
-	 
-	 function submitRegClosingComplaint(complaintNumber,currentStatus) {
-
-		    const reg_remarks = $('#closingRemarks').val().trim();
-		    const fileInput = $('#resolvedImage')[0];
-		    const cby = document.getElementById('userIdSpan').textContent;
-
-		    // Remarks Validation
-		    if (reg_remarks === '') {
-		        Swal.fire({
-		            icon: 'warning',
-		            title: 'Remarks Required',
-		            text: 'Please enter remarks.'
-		        });
-		        return;
-		    }
-
-		    // File Validation
-		    if (!fileInput.files || fileInput.files.length === 0) {
-		        Swal.fire({
-		            icon: 'warning',
-		            title: 'Image Required',
-		            text: 'Please select a resolved image.'
-		        });
-		        return;
-		    }
-
-		    const file = fileInput.files[0];
-
-		    // Allowed Extensions
-		    const allowedTypes = [
-		        'image/jpeg',
-		        'image/jpg',
-		        'image/png'
-		    ];
-
-		    if (!allowedTypes.includes(file.type)) {
-		        Swal.fire({
-		            icon: 'error',
-		            title: 'Invalid File',
-		            text: 'Only JPG, JPEG and PNG images are allowed.'
-		        });
-		        return;
-		    }
-
-		    // 10 MB Validation
-		    const maxSize = 10 * 1024 * 1024; // 10MB
-
-		    if (file.size > maxSize) {
-		        Swal.fire({
-		            icon: 'error',
-		            title: 'File Too Large',
-		            text: 'Image size should not exceed 10 MB.'
-		        });
-		        return;
-		    }
-
-		    let formData = new FormData();
-
-		    formData.append('complaintNumber', complaintNumber);
-		    formData.append('remarks', reg_remarks);
-		    formData.append('resolvedImage', file);
-		    formData.append('cby', cby);
-
-		    Swal.fire({
-		        title: 'Are you sure?',
-		        text: 'You want to submit this complaint for closing approval?',
-		        icon: 'question',
-		        showCancelButton: true,
-		        confirmButtonText: 'Yes, Submit'
-		    }).then((result) => {
-
-		        if (result.isConfirmed) {
-
-		            $.ajax({
-		                url: '/gcc/api/callcenterqaqc/socialmedia/submitRegClosingComplaint',
-		                type: 'POST',
-		                data: formData,
-		                processData: false,
-		                contentType: false,
-
-		                beforeSend: function () {
-		                    Swal.fire({
-		                        title: 'Please Wait...',
-		                        text: 'Uploading data...',
-		                        allowOutsideClick: false,
-		                        didOpen: () => {
-		                            Swal.showLoading();
-		                        }
-		                    });
-		                },
-
-		                success: function (response) {
-
-		                    Swal.close();
-
-		                    if (response.status === 'SUCCESS') {
-
-		                        Swal.fire({
-		                            icon: 'success',
-		                            title: 'Success',
-		                            text: response.message
-		                        }).then(() => {
-
-		                            loadRegCompSection(complaintNumber, currentStatus);
-
-		                        });
-
-		                    } else {
-
-		                        Swal.fire({
-		                            icon: 'error',
-		                            title: 'Failed',
-		                            text: response.message
-		                        });
-
-		                    }
-		                },
-
-		                error: function () {
-
-		                    Swal.close();
-
-		                    Swal.fire({
-		                        icon: 'error',
-		                        title: 'Error',
-		                        text: 'Server error occurred. Please try again.'
-		                    });
-
-		                }
-		                
-		            });
-		        }
-		    });
-		}
-	 
-	 function loadRegCompSection(complaintNumber, currentStatus) {
-
-		    // Hide by default
-		    $('#regCompHtml').html('');
-
-		    // // Show only for REGISTERED or FORWARDED complaints
-		   const allowedStatuses = ['REGISTERED', 'FORWARDED'];
-
-			if (!allowedStatuses.includes(currentStatus)) {
-			    return;
-			}
-
-		    $.ajax({
-		        url: '/gcc/api/callcenterqaqc/socialmedia/checkregisteredcomplaint',
-		        type: 'GET',
-		        data: {
-		            complaintNumber: complaintNumber
-		        },
-		        success: function(response) {
-
-		            let html = '';
-
-		            // Case 1
-		            if (response.status === 'NOT_FOUND') {
-
-		                html = `
-		                    <hr>
-		                    <h4>Registered Complaint Closing Details</h4>
-
-		                    <div class="form-group">
-		                        <label><strong>Remarks</strong></label>
-		                        <textarea class="form-control"
-		                                  id="closingRemarks"
-		                                  rows="3"></textarea>
-		                    </div>
-
-		                    <div class="form-group mt-2">
-		                        <label><strong>Resolved Image</strong></label>
-		                        <input type="file"
-		                               class="form-control"
-		                               id="resolvedImage"
-		                               accept="image/*">
-		                    </div>
-
-		                    <div  class="text-center">
-		                    <button class="btn btn-primary mt-3"
-		                    	onclick="submitRegClosingComplaint('${complaintNumber}','${currentStatus}')">
-		                        Submit to Approval
-		                    </button>
-		                     </div>
-		                `;
-		            }
-
-		            // Case 2
-		            else if (response.status === 'PENDING_APPROVAL') {
-
-		                html = `
-		                    <hr>
-		                    <div class="alert alert-warning">
-		                        This Complaint submitted to Admin For Closing Purpose
-		                    </div>
-		                `;
-		            }
-
-		            // Case 3
-		            else if (response.status === 'PROCESSED') {
-
-		                html = '';
-		            }
-
-		            $('#regCompHtml').html(html);
-		        },
-		        error: function() {
-		            $('#regCompHtml').html(
-		                '<div class="alert alert-danger">Unable to load Registered closing details.</div>'
-		            );
-		        }
-		    });
-		}
-
-	 	// Function to generate complaint and agent details HTML
-	function generateDetailsHtml(data, agentResponse) {
-	 		
-	 	// Helper function to format date to yyyy-mm-dd
-	         function formatDate(dateStr) {
-	             if (!dateStr) return 'N/A';
-	             const date = new Date(dateStr);
-	             return date.toISOString().split('T')[0]; // Formats to yyyy-mm-dd
-	         }
-	// Format complaint messages
-	let messagesHtml = '';
-	if (data.comments && data.comments.length > 0) {
-	    data.comments.forEach((comment) => {
-	        const commentImageLink = comment.Comp_Image && comment.Comp_Image !== "No image available"
-	            ? `<a href="${comment.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">View Image</a>`
-	            : '<p style="color: red;">No image available for this comment.</p>';
-
-	        messagesHtml += `
-	            <div class="comment mb-4">
-	                <div class="row">
-	                    <div class="col-2 text-center">
-	                        <p class="text-muted">${comment.comment_date}</p>
-	                    </div>
-	                    <div class="col-10">
-	                        <p><strong>${comment.user || 'N/A'}</strong> Says:</p>
-	                        <p>${comment.message || 'No message available'}</p>
-	                        <div class="user-image">${commentImageLink}</div>
-	                    </div>
-	                </div>
-	            </div>
-	        `;
-	    });
-	} else {
-	    messagesHtml = '<p>No comments available.</p>';
-	}
-
-	// Format agent responses
-	let agentRepliedHtml = '';
-	if (agentResponse.length > 0) {
-	    agentResponse.forEach((agentItem) => {
-	        agentRepliedHtml += `
-	            <div class="comment mb-4">
-	                <div class="row">
-	                    <div class="col-2 text-center">
-	                        <p class="text-muted"><strong>${formatDate(agentItem.created_date) || 'N/A'}</strong></p>
-	                    </div>
-	                    <div class="col-10">
-	                        <p><strong>${agentItem.agent_name || 'N/A'}</strong>, Says: ${agentItem.call_status || 'N/A'}</p>
-	                        <p><strong>Remarks: </strong>${agentItem.remarks || 'N/A'}</p>
-	                        <p><strong>Remainder Date: </strong> ${formatDate(agentItem.remainder_date) || 'N/A'}</p>
-	                    </div>
-	                </div>
-	            </div>
-	        `;
-	    });
-	} else {
-	    agentRepliedHtml = '<p>No agent replied messages available.</p>';
-	}
-
-	// Check for user images
-	const userImages = data.userimages && data.userimages.length > 0 ? data.userimages[0] : {};
-	const imageLink = userImages.Comp_Image && userImages.Comp_Image !== "null" && userImages.Comp_Image !== ""
-	    ? `<a href="${userImages.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">UserImages: View Image</a>`
-	    : '<p style="color: red;">UserImages: No image available.</p>';
-
-	// Combine all sections into the final HTML
-	const detailsHtml = `
-	    <div class="row">
-	        <div class="col-md-12">
-	            <h4>Complaint Person's Details:</h4>
-	            <div class="row">
-	                <div class="col-6">
-	                    <p><strong>Complaint Number:</strong> ${data.complaintid || 'N/A'}</p>
-	                </div>
-	                <div class="col-6">
-	                    <p><strong>Complaint Date:</strong> ${data.complaintdate}</p>
-	                </div>
-	            </div>
-	            <div class="row">
-	                <div class="col-6">
-	                    <p><strong>Complainant's Name:</strong> ${data.complainantName || 'N/A'}</p>
-	                </div>
-	                <div class="col-6">
-	                    <p><strong>Phone Number:</strong> ${data.mobileNumber || 'N/A'}</p>
-	                </div>
-	            </div>
-	            <div class="row">
-	                <div class="col-6">
-	                    <p><strong>Zone:</strong> ${data.Zone || 'N/A'}</p>
-	                </div>
-	                <div class="col-6">
-	                    <p><strong>Division:</strong> ${data.Division || 'N/A'}</p>
-	                </div>
-	            </div>
-	            <div class="row">
-	                <div class="col-6">
-	                    <p><strong>Gender:</strong> ${data.gender || 'N/A'}</p>
-	                </div>
-	                <div class="col-6">
-	                    <p><strong>Complainant's Address:</strong> ${data.Street || 'N/A'}, ${data.Area || 'N/A'}, ${data.Landmark || 'N/A'}, ${data.Location || 'N/A'}</p>
-	                </div>
-	            </div>
-	        </div>
-	    </div>
-	    <hr>
-	    <h4>Complaint Details:</h4>
-	    <div class="row">
-	        <div class="col-6">
-	            <p><strong>Complaint Dept:</strong> ${data.deptname || 'N/A'}</p>
-	        </div>
-	        <div class="col-6">
-	            <p><strong>Complaint Mode:</strong> ${data.compmode || 'N/A'}</p>
-	        </div>
-	    </div>
-	    <div class="row">
-	        <div class="col-6">
-	            <p><strong>Complaint Type:</strong> ${data.complaintType || 'N/A'}</p>
-	        </div>
-	        <div class="col-6">
-	            <p><strong>Details of Complaint:</strong> ${data.description || 'N/A'}</p>
-	        </div>
-	    </div>
-	    <div class="row">
-	        <div class="col-6">
-	            <p><strong>Current Status:</strong> ${data.currentStatus || 'N/A'}</p>
-	        </div>
-	        <div class="col-6">
-	            <p><strong style="color:blue;">Official Mobile:</strong> ${data.OfficialMobile || 'N/A'}</p>
-	        </div>
-	    </div>
-	    <div class="row">
-	    <div class="col-6">
-	        <p><strong>Last Updated Date:</strong> ${data.greatestDate || 'N/A'}</p>
-	    </div>
-	    
-	</div>
-	    <hr>
-	    <h4>Complaint Messages:</h4>
-	    ${messagesHtml}
-	    <hr>
-	    <h4>Agent Replied Messages:</h4>
-	    ${agentRepliedHtml}
-	    <hr>
-	    ${imageLink}
-	    <div id="regCompHtml"></div>
-	`;
-
-	return detailsHtml;
-	}
-	 	
-	/* function CloseComplaints(complaintNumber) {
-		var userId = document.getElementById('userIdSpan').textContent;
-		console.log("userId="+userId);
-		$('.btn.btn-success').prop('disabled', true);
-		 $.ajax({
-	        url: '/gcc/api/callcenterqaqc/socialmedia/update',
-	        type: 'POST',
-	        data: {	            
-	            complaintNumber: complaintNumber,	            	        	            
-	            userId:userId
-	        },	        
-	        success: function (response) {
-	            if (response === "Success") {
-	            	//console.log("Success");
-	            	
-            	               	   
-	                Swal.fire({
-	                    icon: 'success',
-	                    title: 'Success',
-	                    text: 'Complaint updated successfully!',
-	                    allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                    allowEscapeKey: false, // Disable escape key to close the modal
-	                    allowEnterKey: false, // Disable enter key to close the modal
-	                    showConfirmButton: true, // Ensure the confirm button is visible
-	                }).then((result) => {
-	                    if (result.isConfirmed) {
-	                    	console.log("ok button");
-	                    	$('.btn.btn-success').prop('disabled', false);
-                    	
-	                    	// Get the DataTable instance
-	                        const table = $('#ReportDatatable').DataTable();
-
-	                        // Find the row with the clicked button
-	                        let row = $(`.btn[data-complaint-number='${complaintNumber}']`).closest('tr');
-	                        
-	                        // Remove the row
-	                        table.row(row).remove();
-
-	                        // Reindex the "S.No" column
-	                        table.rows().every(function (index) {
-	                            const row = this.node();
-	                            $(row).find('td:first-child').text(index + 1); // Update "S.No"
-	                        });
-
-	                        // Redraw the table
-	                        table.draw(false);
-	                	    
-	                    }
-	                });
-	            } 
-	            else if (response === "error") {
-	            	$('.btn.btn-success').prop('disabled', false);
-	            	Swal.fire("Error", "Please try again later.", "error");
-	            }
-	            else {
-	            	$('.btn.btn-success').prop('disabled', false);
-	                Swal.fire("Error", "Failed to update complaint. Please try again.", "error");
-	            }
-	        },
-	        error: function (xhr, status, error) {
-	        	$('.btn.btn-success').prop('disabled', false);
-	            Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
-	        }
-	        
-	    });
-		
-	} */
-	
-	function CloseComplaints(complaintNumber) {
-	    const userId = document.getElementById('userIdSpan').textContent;
-	    console.log("userId=" + userId);
-	    
-	    // Find the closest table row and get the specific action and remarks
-	    const row = $(`button[data-complaint-number="${complaintNumber}"]`).closest('tr');
-	    const actionValue = row.find('select').val(); // Select dropdown within the same row
-	    const remarksValue = row.find('#remarks').val();
-	    const remainderDate = row.find('.followup-date').val();
-
-	   
-		console.log("complaintNumber:",complaintNumber)	    
-		console.log("Action:", actionValue);
-	    console.log("Remarks:", remarksValue);
-	    console.log("Remainder Date:", remainderDate);
-
-	 // Check if action is empty
-	    if (actionValue === "") {
-	        Swal.fire({
-	            icon: 'warning',
-	            title: 'Action Required',
-	            text: 'Please select an action.'
-	           
-	        });
-	        return; // Stop execution if no action is selected
-	    }
-	 
-	    if (actionValue === "REOPEN" && remarksValue.trim() === "") {
-	        Swal.fire({
-	            icon: 'warning',
-	            title: 'Remarks Required',
-	            text: 'Please enter remarks.'
-	            
-	        });
-	        return; // Stop execution if remarks are empty
-	    }
-	    
-	    if (actionValue === "FOLLOWUP" && remainderDate === "") {
-
-	        Swal.fire({
-	            icon: 'warning',
-	            title: 'Date Required',
-	            text: 'Please select followup date.'
-	        });
-
-	        return;
-	    }
-	    
-	    if (actionValue === "FOLLOWUP" && remarksValue.trim() === "") {
-	        Swal.fire({
-	            icon: 'warning',
-	            title: 'Remarks Required',
-	            text: 'Please enter remarks.'
-	            
-	        });
-	        return; // Stop execution if remarks are empty
-	    }
-	    
-	    
-	    
-	    Swal.fire({
-	        title: 'Are you sure to update?',
-	        text: 'This action will update the complaint.',
-	        icon: 'warning',	
-	        allowOutsideClick: false,
-            allowEscapeKey: false,
-            allowEnterKey: false,
-            confirmButtonColor: 'blue',
-		    cancelButtonColor: 'red',
-	        showCancelButton: true, // Enable cancel button
-	        confirmButtonText: 'Yes', // Text for the confirmation button
-	        cancelButtonText: 'No',  // Text for the cancel button
-	        reverseButtons: false // Optional: makes the "No" button appear first
-	    }).then((result) => {
-	        if (result.isConfirmed) {
-	        	$('#pageLoader').show();
-	            // User clicked "Yes"
-	            $('.btn.btn-success').prop('disabled', true);
-	            $.ajax({
-	                url: '/gcc/api/callcenterqaqc/socialmedia/update',
-	                type: 'POST',
-	                data: {
-	                    complaintNumber: complaintNumber,
-	                    userId: userId,
-	                    action: actionValue,      // Add selected action to the request data
-	                    remarks: remarksValue,     // Add remarks to the request data
-	                    remainderDate: remainderDate
-	                },
-	                success: function (response) {
-	                	$('#pageLoader').hide();
-	                    if (response === "Success") {
-	                        Swal.fire({
-	                            icon: 'success',
-	                            title: 'Success',
-	                            text: 'Complaint updated successfully!',
-	                            allowOutsideClick: false,
-	                            allowEscapeKey: false,
-	                            allowEnterKey: false,
-	                            showConfirmButton: true,
-	                        }).then(() => {
-	                            $('.btn.btn-success').prop('disabled', false);
-
-	                            // Get the DataTable instance
-	                            const table = $('#ReportDatatable').DataTable();
-
-	                            // Find the row with the clicked button
-	                            let row = $(`.btn[data-complaint-number='${complaintNumber}']`).closest('tr');
-	                            
-	                            // Remove the row
-	                            table.row(row).remove();
-
-	                            // Reindex the "S.No" column
-	                            table.rows().every(function (index) {
-	                                const row = this.node();
-	                                $(row).find('td:first-child').text(index + 1);
-	                            });
-
-	                            // Redraw the table
-	                            table.draw(false);
-	                        });
-	                    } else if (response === "error") {
-	                        $('.btn.btn-success').prop('disabled', false);
-	                        Swal.fire("Error", "Please try again later.", "error");
-	                    }else if (response === "erpname") {
-	                        $('.btn.btn-success').prop('disabled', false);
-	                        Swal.fire("Error", "Issue in ERP_Username", "error");
-	                    }
-	                    else if (response === "save") {
-	                        $('.btn.btn-success').prop('disabled', false);
-	                        Swal.fire("Error", "In Erp updated, but issue in saving", "error");
-	                    }
-	                    else {
-	                        $('.btn.btn-success').prop('disabled', false);
-	                        Swal.fire("Error", "Failed to update complaint. Please try again.", "error");
-	                    }
-	                },
-	                error: function (xhr, status, error) {
-	                	$('#pageLoader').hide();
-	                    $('.btn.btn-success').prop('disabled', false);
-	                    Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
-	                }
-	            });
-	        } else if (result.isDismissed) {
-	            // User clicked "No" or dismissed the dialog
-	            console.log("Update action cancelled by the user.");
-	        }
-	    });
-	}
-
-	</script>
-	
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/socialmediacompletedlist.html b/src/main/resources/templates/modules/callcenterqaqc/socialmediacompletedlist.html
deleted file mode 100644
index 2c59f4e5..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/socialmediacompletedlist.html
+++ /dev/null
@@ -1,756 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-#modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>SocialMedia Complaints</h5>
-										<span>View Social Media Completed Complaints</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 Social Media</li>
-										<li class="breadcrumb-item active" aria-current="page">Completed List</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Select Filters</span>
-								</div>
-								<div class="card-body">
-									<div class="row">
-										<div class="col-sm-3 mb-2">
-											<label for="startDate" style="font-size: medium;">From Date:</label>
-						                    <input type="date" id="startDate" class="form-control">
-										</div>
-										<div class="col-sm-3 mb-2">
-											<label for="endDate" style="font-size: medium;">To Date:</label>
-						                    <input type="date" id="endDate" class="form-control">
-										</div>
-										
-										<div class="col-sm-3 mb-2">
-											<label for="status" style="font-size: medium;">Status:</label>
-						                    <select id="status" class="form-control">
-						                    <option value="ALL">Select</option>
-						                    <option value="COMPLETED">Completed</option>
-						                    <option value="REOPEN">Reopened</option>
-						                    <option value="FOLLOWUP">Followup</option>
-											</select>
-										</div>
-
-										<div class="col-sm-3 mb-2">
-											<label for="dropdown2" style="font-size: medium;">Zone:</label>
-						                    <select id="dropdown2" class="form-control">
-						                    <option value="">Select</option>
-						                    
-											</select>
-										</div>
-										
-										</div>
-									
-									
-									<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-			
-					
-					<div class="row mt-4">
-									<div class="col-md-12">
-										<div class="card">
-										<div class="card-header">
-											<h3 style="font-weight: bold;font-size: large;"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-    <span th:text="${agent_name}" style="font-weight: bold; font-size: large;"></span>'s Completed List</h3>
-										</div>
-										<div class="card-body">
-											<div class="table-responsive">
-
-												<table id="ReportDatatable"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-
-															<th class="text-center no-sort">S.No</th>																														
-															<th class="text-center">Reg Date</th>
-															<th class="text-center no-sort">Complaint No</th>
-															<th class="text-center no-sort">zone</th>
-															<th class="text-center">ComplaintType</th>																												
-															<th class="text-center no-sort">Public Name</th>
-															<th class="text-center">Public Mobile no</th>															
-															<th class="text-center">Officer Name</th>																													
-															<th class="text-center">Status</th>		
-															<th class="text-center">View</th>																										
-														</tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-										</div>
-									 </div>
-									</div>
-								</div>
-					
-				</div>
-
-			</div>
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-	<!-- Modal -->
-	<div class="modal fade" id="detailsModal" tabindex="-1" role="dialog"
-		aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="detailsModalLabel">Complaint
-						Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body" id="modalBody">
-					<!-- Details will be populated here -->
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary"
-						data-dismiss="modal">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<!-- in the code use to show the download different type microsoft -->
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">
-	document.addEventListener("DOMContentLoaded", function () {
-	    
-	    const complaintZoneDropdown = document.getElementById('dropdown2');
-    
-	    
-	 // Load all zones 
-	    fetch('/gcc/api/callcenterqaqc/getZones') 
-	    .then(response => response.json())
-	    .then(data => {
-	        // Clear existing options
-	        complaintZoneDropdown.innerHTML = `<option value="">Select</option>`;
-
-	        // Add options from the API response
-	        data.forEach(complaintZone => {
-	        	complaintZoneDropdown.innerHTML += `<option value="${complaintZone}">${complaintZone}</option>`;
-	        });
-	    })
-	    .catch(error => {
-	        console.error('Error fetching complaint groups:', error);
-	    });
-	 
-	    
-
-	    const startDateField = document.getElementById('startDate');
-	    const endDateField = document.getElementById('endDate');
-		
-		// Event listener for To Date
-		   endDateField.addEventListener('change', function () {
-		       if (endDateField.value) {
-		           startDateField.max = endDateField.value; // Set max value for From Date
-		       } else {
-		           startDateField.removeAttribute('max'); // Remove max if To Date is cleared
-		       }
-
-		       // Validate From Date against updated To Date
-		       if (startDateField.value && new Date(startDateField.value) > new Date(endDateField.value)) {
-		           startDateField.value = ''; // Clear invalid From Date
-		           alert("From Date cannot be after To Date.");
-		       }
-		   });
-
-		   // Event listener for From Date
-		   startDateField.addEventListener('change', function () {
-		       if (startDateField.value) {
-		           endDateField.min = startDateField.value; // Set min value for To Date
-		       } else {
-		           endDateField.removeAttribute('min'); // Remove min if From Date is cleared
-		       }
-
-		       // Validate To Date against updated From Date
-		       if (endDateField.value && new Date(endDateField.value) < new Date(startDateField.value)) {
-		           endDateField.value = ''; // Clear invalid To Date
-		           alert("To Date cannot be before From Date.");
-		       }
-		   });
-
-
-	    
-	});
-
-	$(document).ready(function() {
-	
-		var table = $('#ReportDatatable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [
-                { targets: 'no-sort', orderable: false }
-            ],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', 'Show all']
-            ],
-            scrollY: '100vh',
-            fixedColumns: {
-                left: 1,
-                right: 1
-            },
-            buttons: [
-                {
-                    extend: 'pageLength',
-                    className: 'btn btn-warning'
-                },
-                {
-                    title: 'Data export',
-                    extend: 'copyHtml5',
-                    text: 'Copy',
-                    className: 'btn btn-secondary',
-                    id: 'copyBtn'
-                },
-                {
-                    extend: 'excelHtml5',
-                    text: 'Excel',
-                    className: 'btn btn-secondary',
-                    id: 'excelBtn'
-                },
-                {
-                    extend: 'csvHtml5',
-                    text: 'CSV',
-                    className: 'btn btn-secondary',
-                    id: 'csvBtn'
-                },
-                {
-                    extend: 'pdfHtml5',
-                    text: 'PDF',
-                    className: 'btn btn-secondary',
-                    id: 'pdfBtn'
-                }
-            ],
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false
-        });
-		
-		document.getElementById('resetBtn').addEventListener('click', function () {
-	      	event.preventDefault();
-	      	
-	      	window.location.href="/gcc/callcenterqaqcsocialmedia/smfinishedcomplaints";
-	      	
-	      	});
-		
-		document.getElementById('searchBtn').addEventListener('click', function (e) {
-  	 		
-  	 		
-  	 		let startDate = document.getElementById('startDate').value;
-     	    let endDate = document.getElementById('endDate').value;
-    	    
-     	    let zone= document.getElementById('dropdown2').value;
-     	   let status= document.getElementById('status').value;
-     	   
-     	   console.log("startdate: ",startDate);
-    	   console.log("enddate: ",endDate);
-    	   console.log("status: ",status);
-    	   console.log("zone: ",zone);
-    	   
-    	   if (!startDate && !endDate) {
-    	        Swal.fire({
-    	            icon: 'warning',
-    	            title: 'Error',
-    	            text: 'Please Select Both From Date and To Date',
-    	            showConfirmButton: true,
-    	            timer: 3000
-    	        });
-    	        e.preventDefault(); // Prevent the default action
-    	        return; // Stop further execution
-    	    }
-    	   const params = new URLSearchParams({
-    	        startDate: startDate,
-    	        endDate: endDate,  
-    	        status:status,
-    	        zone: zone
-    	    });
-    	   $('#pageLoader').show();
-    	   $.ajax({
-               type: "GET",
-               url: `/gcc/api/callcenterqaqc/socialmedia/socialmediacompletedlist?${params.toString()}`, // Append query string to URL
-               contentType: "application/json",
-               success: function (response) {
-            	    console.log("API Response:", response);
-            	    $('#pageLoader').hide();
-            	    if (response.status === "success") {
-            	        console.log("Details Array:", response.details);
-            	        // Ensure details is an array and has at least one entry
-            	        if (Array.isArray(response.details) && response.details.length > 0) {
-            	            let table = $('#ReportDatatable').DataTable({
-            	                destroy: true,
-            	                searching: true,
-            	                autoWidth: true,
-            	                responsive: true,
-            	                paging: true,
-            	                info: true,
-            	                data: response.details,           	                
-            	                columns: [
-            	                    { 
-            	                        data: null, 
-            	                        render: (data, type, row, meta) => meta.row + 1, 
-            	                        className: 'text-center' 
-            	                    },
-            	                   					
-            	                    { data: 'complaint_date', defaultContent: '-', className: 'text-center' },
-                                    { data: 'complaint_number', defaultContent: '-', className: 'text-center' },
-                                    { data: 'zone', defaultContent: '-', className: 'text-center' },
-                                    { data: 'complaint_type', defaultContent: '-', className: 'text-center' },                                   
-                                    { data: 'complaint_person_name', defaultContent: '-', className: 'text-center' },
-                                    { data: 'complaint_mobilenumber', defaultContent: '-', className: 'text-center' },
-                                    { data: 'official_name', defaultContent: '-', className: 'text-center' },
-                                    {
-                                        data: null,
-                                        defaultContent: '-',
-                                        className: 'text-center',
-                                        render: function(data, type, row) {
-
-                                            if (row.call_status === "FOLLOWUP") {
-
-                                                return `
-                                                    <div>
-                                                        <div><b>${row.call_status}</b></div>
-                                                        <div class="text-danger">
-                                                            ${row.formatted_fdate}
-                                                        </div>
-                                                    </div>
-                                                `;
-                                            }
-
-                                            return row.call_status || '-';
-                                        }
-                                    },
-                                    { 
-                                        data: 'complaint_number', 
-                                        render: function(data, type, row) {
-                                            return `
-                                                <td class="text-center">
-                                                    <button type="button" class="btn btn-info" data-complaint-number="${data}">
-                                                        View
-                                                    </button>
-                                                </td>`;
-                                        }, 
-                                        className: 'text-center' 
-                                    }
-            	                ],
-            	                dom: 'Bfrtip',
-            	                buttons: [
-   	      		                  {
-   	      		                      extend: 'pageLength',
-   	      		                      className: 'btn btn-warning'
-   	      		                  },
-   	      		                  {
-   	      		                      title: 'Data export',
-   	      		                      extend: 'copyHtml5',
-   	      		                      text: 'Copy',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'copyBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'excelHtml5',
-   	      		                      text: 'Excel',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'excelBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'csvHtml5',
-   	      		                      text: 'CSV',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'csvBtn'
-   	      		                  },
-   	      		                  {
-   	      		                      extend: 'pdfHtml5',
-   	      		                      text: 'PDF',
-   	      		                      className: 'btn btn-secondary',
-   	      		                      id: 'pdfBtn'
-   	      		                  }
-   	      		              ],
-   	      		             columnDefs: [
-   	      		                { targets: 'no-sort', orderable: false }
-   	      		            ],
-   	      		            lengthMenu: [
-   	      		                [50, 100, 200, 500, -1],
-   	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-   	      		            ],
-   	      		            scrollY: '100vh',
-   	      		            fixedColumns: {
-   	      		                left: 1,
-   	      		                right: 1
-   	      		            }
-   	      		            });
-            	        }
-            	        
-            	    }
-            	    else if (response.status === "nodata") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	                icon: 'warning',
-        	                title: 'No Data',
-        	                text: 'No data available for the selected criteria.'
-        	            });
-        	        }
-            	    else if (response.status === "error") {
-        	        	$('#pageLoader').hide();
-        	            Swal.fire({
-        	            	icon: 'error',
-            	            title: 'Error',
-            	            text: response.message
-        	            });
-        	        }
-            	    else {
-            	    	$('#pageLoader').hide();
-            	        Swal.fire({
-            	            icon: 'error',
-            	            title: 'Error',
-            	            text: response.message
-            	        });
-            	    }
-            	},
-
-               error: function (error) {
-               	$('#pageLoader').hide();
-               	Swal.fire({
-    	            icon: 'error',
-    	            title: 'Error',
-    	            text: response.message
-    	        });
-               }
-           });
-    	   
-  	 	});
-		
-		$(document).on('click', '.btn-info', function () {
-  	 	    // Retrieve the complaint number from the data attribute
-  	 	    var complaintNumber = $(this).data('complaint-number');
-  	 	    console.log("complaintNumber===="+complaintNumber);
-  	 	    // Call the viewDetails function with the complaint number
-  	 	    viewDetails(complaintNumber);
-  	 	});
-	
-	});
-	function viewDetails(complaintNumber) {
- 	    document.getElementById('modalBody').innerHTML = '<p style="text-align:center;">Please wait, loading data...</p>';
- 	    $('#detailsModal').modal('show');
-
- 	    // Fetch the main complaint details
- 	    $.ajax({
- 	        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails',
- 	        type: 'GET',
-            data:{complaintNumber:complaintNumber},
- 	        success: function (data) {
- 	            //console.log('Complaint Data:', data);
-
- 	            // Fetch agent response details
- 	            $.ajax({
- 	                url: '/gcc/api/callcenterqaqc/agent/attendedcomplaintshistory',
- 	                type: 'GET',
- 	                data: { complaintNumber },
- 	                success: function (agentResponse) {
- 	                    //console.log('Agent Response:', agentResponse);
-
- 	                    // Use the logic for building complaint and agent details as HTML
- 	                    const detailsHtml = generateDetailsHtml(data, agentResponse);
-
- 	                    // Update modal content
- 	                    document.getElementById('modalBody').innerHTML = detailsHtml;
- 	                },
- 	                error: function () {
- 	                    document.getElementById('modalBody').innerHTML = '<p>Error loading agent details. Please try again later.</p>';
- 	                }
- 	            });
- 	        },
- 	        error: function () {
- 	            document.getElementById('modalBody').innerHTML = '<p>Error loading complaint details. Please try again later.</p>';
- 	        }
- 	    });
- 	}
-
- 	// Function to generate complaint and agent details HTML
-function generateDetailsHtml(data, agentResponse) {
- 		
- 	// Helper function to format date to yyyy-mm-dd
-         function formatDate(dateStr) {
-             if (!dateStr) return 'N/A';
-             const date = new Date(dateStr);
-             return date.toISOString().split('T')[0]; // Formats to yyyy-mm-dd
-         }
-// Format complaint messages
-let messagesHtml = '';
-if (data.comments && data.comments.length > 0) {
-    data.comments.forEach((comment) => {
-        const commentImageLink = comment.Comp_Image && comment.Comp_Image !== "No image available"
-            ? `<a href="${comment.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">View Image</a>`
-            : '<p style="color: red;">No image available for this comment.</p>';
-
-        messagesHtml += `
-            <div class="comment mb-4">
-                <div class="row">
-                    <div class="col-2 text-center">
-                        <p class="text-muted">${comment.comment_date}</p>
-                    </div>
-                    <div class="col-10">
-                        <p><strong>${comment.user || 'N/A'}</strong> Says:</p>
-                        <p>${comment.message || 'No message available'}</p>
-                        <div class="user-image">${commentImageLink}</div>
-                    </div>
-                </div>
-            </div>
-        `;
-    });
-} else {
-    messagesHtml = '<p>No comments available.</p>';
-}
-
-// Format agent responses
-let agentRepliedHtml = '';
-if (agentResponse.length > 0) {
-    agentResponse.forEach((agentItem) => {
-        agentRepliedHtml += `
-            <div class="comment mb-4">
-                <div class="row">
-                    <div class="col-2 text-center">
-                        <p class="text-muted"><strong>${formatDate(agentItem.created_date) || 'N/A'}</strong></p>
-                    </div>
-                    <div class="col-10">
-                        <p><strong>${agentItem.agent_name || 'N/A'}</strong>, Says: ${agentItem.call_status || 'N/A'}</p>
-                        <p><strong>Remarks: </strong>${agentItem.remarks || 'N/A'}</p>
-                        <p><strong>Remainder Date: </strong> ${formatDate(agentItem.remainder_date) || 'N/A'}</p>
-                    </div>
-                </div>
-            </div>
-        `;
-    });
-} else {
-    agentRepliedHtml = '<p>No agent replied messages available.</p>';
-}
-
-// Check for user images
-const userImages = data.userimages && data.userimages.length > 0 ? data.userimages[0] : {};
-const imageLink = userImages.Comp_Image && userImages.Comp_Image !== "null" && userImages.Comp_Image !== ""
-    ? `<a href="${userImages.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">UserImages: View Image</a>`
-    : '<p style="color: red;">UserImages: No image available.</p>';
-
-// Combine all sections into the final HTML
-const detailsHtml = `
-    <div class="row">
-        <div class="col-md-12">
-            <h4>Complaint Person's Details:</h4>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Complaint Number:</strong> ${data.complaintid || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Complaint Date:</strong> ${data.complaintdate}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Complainant's Name:</strong> ${data.complainantName || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Phone Number:</strong> ${data.mobileNumber || 'N/A'}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Zone:</strong> ${data.Zone || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Division:</strong> ${data.Division || 'N/A'}</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
-                    <p><strong>Gender:</strong> ${data.gender || 'N/A'}</p>
-                </div>
-                <div class="col-6">
-                    <p><strong>Complainant's Address:</strong> ${data.Street || 'N/A'}, ${data.Area || 'N/A'}, ${data.Landmark || 'N/A'}, ${data.Location || 'N/A'}</p>
-                </div>
-            </div>
-        </div>
-    </div>
-    <hr>
-    <h4>Complaint Details:</h4>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Complaint Dept:</strong> ${data.deptname || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong>Complaint Mode:</strong> ${data.compmode || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Complaint Type:</strong> ${data.complaintType || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong>Details of Complaint:</strong> ${data.description || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-6">
-            <p><strong>Current Status:</strong> ${data.currentStatus || 'N/A'}</p>
-        </div>
-        <div class="col-6">
-            <p><strong style="color:blue;">Official Mobile:</strong> ${data.OfficialMobile || 'N/A'}</p>
-        </div>
-    </div>
-    <div class="row">
-    <div class="col-6">
-        <p><strong>Last Updated Date:</strong> ${data.greatestDate || 'N/A'}</p>
-    </div>
-    
-</div>
-    <hr>
-    <h4>Complaint Messages:</h4>
-    ${messagesHtml}
-    <hr>
-    <h4>Agent Replied Messages:</h4>
-    ${agentRepliedHtml}
-    <hr>
-    ${imageLink}
-`;
-
-return detailsHtml;
-}
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/socialmediaregcompclosing.html b/src/main/resources/templates/modules/callcenterqaqc/socialmediaregcompclosing.html
deleted file mode 100644
index dc1385bc..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/socialmediaregcompclosing.html
+++ /dev/null
@@ -1,805 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-#modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-    .width1{
-    	width: 100px;
-    }
-    .width2{
-    	width: 120px;
-    }
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>SocialMedia Complaints</h5>
-										<span>Closing Social Media Registered Complaints</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 Social Media</li>
-										<li class="breadcrumb-item active" aria-current="page">Close Reg Complaints</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Complaints List</span>
-									<span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-								</div>
-								<div class="card-body">
-								
-									<div class="table-responsive">
-	
-											<table id="ReportDatatable"
-												class="table table-striped table-bordered table-hover dataTable"
-												role="grid">
-												<thead class="thead-dark">
-													<tr role="row">
-	
-														<th class="text-center no-sort">S.No</th>																														
-														
-														<th class="text-center no-sort">Complaint No</th>
-														<th class="text-center">Agent</th>
-														<th class="text-center">Agent Submitted Date</th>														
-														<th class="text-center">View</th>																																																																								
-													</tr>
-												</thead>
-												<tbody>
-	
-												</tbody>
-											</table>
-										</div>	
-																								
-								</div>
-							</div>
-						</div>
-					</div>
-			
-											 
-					
-				</div>
-
-			</div>
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-	<!-- Modal -->
-	<div class="modal fade" id="detailsModal" tabindex="-1" role="dialog"
-		aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="detailsModalLabel">Complaint
-						Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body" id="modalBody">
-					<!-- Details will be populated here -->
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary"
-						data-dismiss="modal">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<!-- in the code use to show the download different type microsoft -->
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">
-	
-	 $(document).ready(function() {
-		 
-		 var table = $('#ReportDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '100vh',
-             fixedColumns: {
-                 left: 1,
-                 right: 1
-             },
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: true,
-             responsive: true,
-             searching: true,
-             select: false,
-             processing: false
-         });
-		 
-		 $('#pageLoader').show();
-		 
-		 $.ajax({
-			 type: "GET",
-             url: `/gcc/api/callcenterqaqc/socialmedia/getfilteredregcomps`, 
-             success: function (response) {
-            	 $('#pageLoader').hide();
-            	 if (response.status === "success") {
-            		            		 
-            		 console.log("Details Array:", response.details);
-
-                     // Ensure details is an array and has at least one entry
-                     if (Array.isArray(response.details) && response.details.length > 0) {
-                         let columns = [
-								 { 
-								     data: null, 
-								     render: (data, type, row, meta) => meta.row + 1, 
-								     className: 'text-center' 
-								 },								
-								 { data: 'complaintnumber', defaultContent: '-', className: 'text-center' },
-								 { data: 'agent_name', defaultContent: '-', className: 'text-center' },
-								 { data: 'submitted_date', defaultContent: '-', className: 'text-center' },
-								 
-								 { 
-								     data: null, 
-								     render: function(data, type, row) {
-								    	 return `
-								            <button
-								                type="button"
-								                class="btn btn-info btn-view"
-								                data-complaint-number="${row.complaintnumber}"
-								                data-remarks="${row.remarks || ''}"
-								                data-img="${row.img_full_path || ''}">
-								                View
-								            </button>
-								        `;
-								     }, 
-								     className: 'text-center' 
-								 }
-								
-							];
-
-
-                         // Initialize the DataTable
-                         $('#ReportDatatable').DataTable({
-                             destroy: true,
-                             searching: true,
-                             autoWidth: true,
-                             responsive: true,
-                             paging: true,
-                             info: true,
-                             data: response.details,
-                             columns: columns,
-                             dom: 'Bfrtip',
-                             buttons: [
-                                 {
-                                     extend: 'pageLength',
-                                     className: 'btn btn-warning'
-                                 },
-                                 {
-                                     title: 'Data export',
-                                     extend: 'copyHtml5',
-                                     text: 'Copy',
-                                     className: 'btn btn-secondary',
-                                     id: 'copyBtn'
-                                 },
-                                 {
-                                     extend: 'excelHtml5',
-                                     text: 'Excel',
-                                     className: 'btn btn-secondary',
-                                     id: 'excelBtn'
-                                 },
-                                 {
-                                     extend: 'csvHtml5',
-                                     text: 'CSV',
-                                     className: 'btn btn-secondary',
-                                     id: 'csvBtn'
-                                 },
-                                 {
-                                     extend: 'pdfHtml5',
-                                     text: 'PDF',
-                                     className: 'btn btn-secondary',
-                                     id: 'pdfBtn'
-                                 }
-                             ],
-                             columnDefs: [
-                                 { targets: 'no-sort', orderable: false }
-                             ],
-                             lengthMenu: [
-                                 [50, 100, 200, 500, -1],
-                                 ['50 rows', '100 rows', '200 rows', 'Show all']
-                             ],
-                             scrollY: '100vh',
-                             fixedColumns: {
-                                 left: 1,
-                                 right: 1
-                             }
-                         });
-                     }
-            		 
-            	 }
-            	 else if (response.status === "nodata") {
-     	        	$('#pageLoader').hide();
-     	            Swal.fire({
-     	                icon: 'warning',
-     	                title: 'No Data',
-     	                text: 'No data available.'
-     	            });
-     	        }
-         	    else if (response.status === "error") {
-     	        	$('#pageLoader').hide();
-     	            Swal.fire({
-     	            	icon: 'error',
-         	            title: 'Error',
-         	            text: response.message
-     	            });
-     	        }
-         	    else {
-         	    	$('#pageLoader').hide();
-         	        Swal.fire({
-         	            icon: 'error',
-         	            title: 'Error',
-         	            text: response.message
-         	        });
-         	    }
-             },
-             error: function (error) {
-                	$('#pageLoader').hide();
-                	Swal.fire({
-     	            icon: 'error',
-     	            title: 'Error',
-     	            text: response.message
-     	        });
-             }
-		 });
-		 
-	 });
-	 
-	 $(document).on('click', '.btn-info', function () {
-		 const complaintNumber = $(this).data('complaint-number');
-		    const remarks = $(this).data('remarks');
-		    const imgFullPath = $(this).data('img');
-
-		    viewDetails(complaintNumber, remarks, imgFullPath);
-	 	});
-	 
-	 function viewDetails(complaintNumber, remarks, imgFullPath) {
-	 	    document.getElementById('modalBody').innerHTML = '<p style="text-align:center;">Please wait, loading data...</p>';
-	 	    $('#detailsModal').modal('show');
-
-	 	    // Fetch the main complaint details
-	 	    $.ajax({
-	 	        url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getComplaintDetails',
-	 	        type: 'GET',
-	            data:{complaintNumber:complaintNumber},
-	 	        success: function (data) {
-	 	            //console.log('Complaint Data:', data);
-
-	 	            // Fetch agent response details
-	 	            $.ajax({
-	 	                url: '/gcc/api/callcenterqaqc/agent/attendedcomplaintshistory',
-	 	                type: 'GET',
-	 	                data: { complaintNumber },
-	 	                success: function (agentResponse) {
-	 	                    //console.log('Agent Response:', agentResponse);
-
-	 	                    // Use the logic for building complaint and agent details as HTML
-	 	                    const detailsHtml = generateDetailsHtml(data, agentResponse,remarks,imgFullPath);
-
-	 	                    // Update modal content
-	 	                    document.getElementById('modalBody').innerHTML = detailsHtml;
-	 	                    
-	 	               
-	 	                },
-	 	                error: function () {
-	 	                    document.getElementById('modalBody').innerHTML = '<p>Error loading agent details. Please try again later.</p>';
-	 	                }
-	 	            });
-	 	        },
-	 	        error: function () {
-	 	            document.getElementById('modalBody').innerHTML = '<p>Error loading complaint details. Please try again later.</p>';
-	 	        }
-	 	    });
-	 	}
-	 
-	 function generateDetailsHtml(data, agentResponse,remarks,imgFullPath) {
-	 		
-		 	// Helper function to format date to yyyy-mm-dd
-		         function formatDate(dateStr) {
-		             if (!dateStr) return 'N/A';
-		             const date = new Date(dateStr);
-		             return date.toISOString().split('T')[0]; // Formats to yyyy-mm-dd
-		         }
-		// Format complaint messages
-		let messagesHtml = '';
-		if (data.comments && data.comments.length > 0) {
-		    data.comments.forEach((comment) => {
-		        const commentImageLink = comment.Comp_Image && comment.Comp_Image !== "No image available"
-		            ? `<a href="${comment.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">View Image</a>`
-		            : '<p style="color: red;">No image available for this comment.</p>';
-
-		        messagesHtml += `
-		            <div class="comment mb-4">
-		                <div class="row">
-		                    <div class="col-2 text-center">
-		                        <p class="text-muted">${comment.comment_date}</p>
-		                    </div>
-		                    <div class="col-10">
-		                        <p><strong>${comment.user || 'N/A'}</strong> Says:</p>
-		                        <p>${comment.message || 'No message available'}</p>
-		                        <div class="user-image">${commentImageLink}</div>
-		                    </div>
-		                </div>
-		            </div>
-		        `;
-		    });
-		} else {
-		    messagesHtml = '<p>No comments available.</p>';
-		}
-
-		// Format agent responses
-		let agentRepliedHtml = '';
-		if (agentResponse.length > 0) {
-		    agentResponse.forEach((agentItem) => {
-		        agentRepliedHtml += `
-		            <div class="comment mb-4">
-		                <div class="row">
-		                    <div class="col-2 text-center">
-		                        <p class="text-muted"><strong>${formatDate(agentItem.created_date) || 'N/A'}</strong></p>
-		                    </div>
-		                    <div class="col-10">
-		                        <p><strong>${agentItem.agent_name || 'N/A'}</strong>, Says: ${agentItem.call_status || 'N/A'}</p>
-		                        <p><strong>Remarks: </strong>${agentItem.remarks || 'N/A'}</p>
-		                        <p><strong>Remainder Date: </strong> ${formatDate(agentItem.remainder_date) || 'N/A'}</p>
-		                    </div>
-		                </div>
-		            </div>
-		        `;
-		    });
-		} else {
-		    agentRepliedHtml = '<p>No agent replied messages available.</p>';
-		}
-
-		// Check for user images
-		const userImages = data.userimages && data.userimages.length > 0 ? data.userimages[0] : {};
-		const imageLink = userImages.Comp_Image && userImages.Comp_Image !== "null" && userImages.Comp_Image !== ""
-		    ? `<a href="${userImages.Comp_Image}" target="_blank" style="color: green; text-decoration: underline;">UserImages: View Image</a>`
-		    : '<p style="color: red;">UserImages: No image available.</p>';
-
-		// Combine all sections into the final HTML
-		const detailsHtml = `
-		    <div class="row">
-		        <div class="col-md-12">
-		            <h4>Complaint Person's Details:</h4>
-		            <div class="row">
-		                <div class="col-6">
-		                    <p><strong>Complaint Number:</strong> ${data.complaintid || 'N/A'}</p>
-		                </div>
-		                <div class="col-6">
-		                    <p><strong>Complaint Date:</strong> ${data.complaintdate}</p>
-		                </div>
-		            </div>
-		            <div class="row">
-		                <div class="col-6">
-		                    <p><strong>Complainant's Name:</strong> ${data.complainantName || 'N/A'}</p>
-		                </div>
-		                <div class="col-6">
-		                    <p><strong>Phone Number:</strong> ${data.mobileNumber || 'N/A'}</p>
-		                </div>
-		            </div>
-		            <div class="row">
-		                <div class="col-6">
-		                    <p><strong>Zone:</strong> ${data.Zone || 'N/A'}</p>
-		                </div>
-		                <div class="col-6">
-		                    <p><strong>Division:</strong> ${data.Division || 'N/A'}</p>
-		                </div>
-		            </div>
-		            <div class="row">
-		                <div class="col-6">
-		                    <p><strong>Gender:</strong> ${data.gender || 'N/A'}</p>
-		                </div>
-		                <div class="col-6">
-		                    <p><strong>Complainant's Address:</strong> ${data.Street || 'N/A'}, ${data.Area || 'N/A'}, ${data.Landmark || 'N/A'}, ${data.Location || 'N/A'}</p>
-		                </div>
-		            </div>
-		        </div>
-		    </div>
-		    <hr>
-		    <h4>Complaint Details:</h4>
-		    <div class="row">
-		        <div class="col-6">
-		            <p><strong>Complaint Dept:</strong> ${data.deptname || 'N/A'}</p>
-		        </div>
-		        <div class="col-6">
-		            <p><strong>Complaint Mode:</strong> ${data.compmode || 'N/A'}</p>
-		        </div>
-		    </div>
-		    <div class="row">
-		        <div class="col-6">
-		            <p><strong>Complaint Type:</strong> ${data.complaintType || 'N/A'}</p>
-		        </div>
-		        <div class="col-6">
-		            <p><strong>Details of Complaint:</strong> ${data.description || 'N/A'}</p>
-		        </div>
-		    </div>
-		    <div class="row">
-		        <div class="col-6">
-		            <p><strong>Current Status:</strong> ${data.currentStatus || 'N/A'}</p>
-		        </div>
-		        <div class="col-6">
-		            <p><strong style="color:blue;">Official Mobile:</strong> ${data.OfficialMobile || 'N/A'}</p>
-		        </div>
-		    </div>
-		    <div class="row">
-		    <div class="col-6">
-		        <p><strong>Last Updated Date:</strong> ${data.greatestDate || 'N/A'}</p>
-		    </div>
-		    
-		</div>
-		    <hr>
-		    <h4>Complaint Messages:</h4>
-		    ${messagesHtml}
-		    <hr>
-		    <h4>Agent Replied Messages:</h4>
-		    ${agentRepliedHtml}
-		    <hr>
-		    ${imageLink}
-		    
-		    <hr>
-
-		    <h4>Registered Complaint Closing Details</h4>
-
-		    <div class="row">
-		        <div class="col-md-12">
-
-		            <p>
-		                <strong>Resolved Image:</strong>
-		                ${
-		                    imgFullPath
-		                    ? `<a href="${imgFullPath}"
-		                          target="_blank"
-		                          style="color:blue;text-decoration:underline;">
-		                          View Resolved Image
-		                       </a>`
-		                    : 'No Image Available'
-		                }
-		            </p>
-
-		            <p>
-		                <strong>Remarks:</strong>
-		                ${remarks || 'N/A'}
-		            </p>
-
-		            <div class="d-flex justify-content-center mt-3">
-				            <button
-						            type="button"
-						            class="btn btn-success"
-						            onclick="approveComplaint(
-						                '${data.complaintid}',
-						                '${remarks ? remarks.replace(/'/g, "\\'") : ""}',
-						                '${imgFullPath || ""}'
-						            )">
-				             Complaint Close
-				        </button>
-				             
-				        <button
-				             type="button"
-				             class="btn btn-danger ml-2"
-				             onclick="rejectComplaint(
-				                 '${data.complaintid}'
-				             )">
-				             Reject
-				         </button>
-		            </div>
-
-		        </div>
-		    </div>
-		    
-		`;
-
-		return detailsHtml;
-		}
-	 
-	 function rejectComplaint(complaintId) {
-		 const userid = document.getElementById('userIdSpan').textContent;
-		 
-		 Swal.fire({
-		        title: 'Are you sure?',
-		        text: 'You want to Reject this complaint?',
-		        icon: 'question',
-		        showCancelButton: true,
-		        confirmButtonText: 'Yes, Reject',
-		        cancelButtonText: 'Cancel'
-		    }).then((result) => {
-
-		        if (result.isConfirmed) {
-
-		            $.ajax({
-		                url: '/gcc/api/callcenterqaqc/socialmedia/rejectComplaint',
-		                type: 'POST',
-		                data: {
-		                    complaintId: complaintId,		                    
-		                    userid:userid
-		                },
-
-		                beforeSend: function () {
-		                    Swal.fire({
-		                        title: 'Please Wait...',
-		                        text: 'Processing approval...',
-		                        allowOutsideClick: false,
-		                        didOpen: () => {
-		                            Swal.showLoading();
-		                        }
-		                    });
-		                },
-
-		                success: function (response) {
-
-		                    Swal.close();
-
-		                    if (response.status === 'SUCCESS') {
-
-		                        Swal.fire({
-		                            icon: 'success',
-		                            title: 'Success',
-		                            text: response.message
-		                        }).then(() => {
-
-		                            $('#detailsModal').modal('hide');
-
-		                            // reload datatable data if required
-		                            location.reload();
-		                        });
-
-		                    } else {
-
-		                        Swal.fire({
-		                            icon: 'error',
-		                            title: 'Failed',
-		                            text: response.message
-		                        });
-		                    }
-		                },
-
-		                error: function () {
-
-		                    Swal.close();
-
-		                    Swal.fire({
-		                        icon: 'error',
-		                        title: 'Error',
-		                        text: 'Server error occurred.'
-		                    });
-		                }
-		            });
-		        }
-		    });
-	 }
-	 
-	 function approveComplaint(complaintId, remarks, imgFullPath) {
-		 
-		 const userid = document.getElementById('userIdSpan').textContent;
-		 //console.log("userid===="+userid);
-
-		    Swal.fire({
-		        title: 'Are you sure?',
-		        text: 'You want to Close this complaint?',
-		        icon: 'question',
-		        showCancelButton: true,
-		        confirmButtonText: 'Yes, Close',
-		        cancelButtonText: 'Cancel'
-		    }).then((result) => {
-
-		        if (result.isConfirmed) {
-
-		            $.ajax({
-		                url: '/gcc/api/callcenterqaqc/socialmedia/approveComplaint',
-		                type: 'POST',
-		                data: {
-		                    complaintId: complaintId,
-		                    remarks: remarks,
-		                    imgFullPath: imgFullPath,
-		                    userid:userid
-		                },
-
-		                beforeSend: function () {
-		                    Swal.fire({
-		                        title: 'Please Wait...',
-		                        text: 'Processing approval...',
-		                        allowOutsideClick: false,
-		                        didOpen: () => {
-		                            Swal.showLoading();
-		                        }
-		                    });
-		                },
-
-		                success: function (response) {
-
-		                    Swal.close();
-
-		                    if (response.status === 'SUCCESS') {
-
-		                        Swal.fire({
-		                            icon: 'success',
-		                            title: 'Approved',
-		                            text: response.message
-		                        }).then(() => {
-
-		                            $('#detailsModal').modal('hide');
-
-		                            // reload datatable data if required
-		                            location.reload();
-		                        });
-
-		                    } else {
-
-		                        Swal.fire({
-		                            icon: 'error',
-		                            title: 'Failed',
-		                            text: response.message
-		                        });
-		                    }
-		                },
-
-		                error: function () {
-
-		                    Swal.close();
-
-		                    Swal.fire({
-		                        icon: 'error',
-		                        title: 'Error',
-		                        text: 'Server error occurred.'
-		                    });
-		                }
-		            });
-		        }
-		    });
-		}
-
-	</script>
-	
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/unattendedclosing.html b/src/main/resources/templates/modules/callcenterqaqc/unattendedclosing.html
deleted file mode 100644
index c90820ef..00000000
--- a/src/main/resources/templates/modules/callcenterqaqc/unattendedclosing.html
+++ /dev/null
@@ -1,649 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>QAQC Unattended List</h5>
-										<span>1913 QAQC Unattended List</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">1913 QAQC</li>
-										<li class="breadcrumb-item active" aria-current="page">Admin QAQC</li>
-										<li class="breadcrumb-item active" aria-current="page">Unattended</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-									<span style="font-size: medium;font-weight: bold;">Closing Unattended Complaints&nbsp;(<span class="text-danger">You can receive and close only 100 complaints at a time</span>):</span>
-									
-								</div>
-								
-								
-								<div class="card-body">
-								<span class="text-danger" style="font-size: medium;font-weight: bold;">Use after 7.00 pm</span><br>
-									<div class="row">
-										<!-- <div class="col-sm-2 mb-2">
-											<label for="startDate" style="font-size: medium;">From Date:</label>
-						                    <input type="date" id="startDate" class="form-control">
-										</div>
-										<div class="col-sm-2 mb-2">
-											<label for="endDate" style="font-size: medium;">To Date:</label>
-						                    <input type="date" id="endDate" class="form-control">
-										</div> -->
-										
-										<div class="col-sm-3 mb-2">
-								            <label for="unattended_count" style="font-size: medium;">Enter Minimum no of unattended counts:</label>
-								            <input type="number" id="unattended_count" class="form-control" >
-								            <!-- <select id="stsdropdown" class="form-control">
-								            <option value="total">Select</option>
-								            <option value="processing">Processing</option>
-								            <option value="reopened">Reopened</option>
-								            <option value="redressed">Action Taken 1</option>
-								            <option value="closed">Action Taken 2</option>
-								            <option value="completed">Final Closure</option>
-											</select> -->
-										</div>
-										
-										<!-- <div class="col-sm-2 mb-2">
-								            <label for="dropdown4" style="font-size: medium;">Group:</label>
-								            <select id="dropdown4" class="form-control">
-								            <option value="">Select</option>
-								                <option value="">general</option>
-								                Add options here
-											</select>
-										</div> -->
-															
-									
-										<!-- <div class="col-sm-2 mb-2">
-											 <label for="dropdown1"  style="font-size: medium;">Type:</label>
-						                     <select id="dropdown1" class="form-control">
-							                 <option value="">Select</option>
-							            	 <option value="Cleanliness in Parks">Cleanliness in Parks</option>
-
-											</select>
-										</div> -->
-
-										<!-- <div class="col-sm-2 mb-2">
-								            <label for="dropdown3" style="font-size: medium;">Mode:</label>
-								            <select id="dropdown3" class="form-control">
-								                <option value="">Select</option>
-								                <option value="">INTERNET</option>
-
-											</select>
-										</div> -->
-										</div>
-										<!-- <div class="row mt-2">
-										<div class="col-sm-2 mb-2">
-											<label for="dropdown2" style="font-size: medium;">Zone:</label>
-						                    <select id="dropdown2" class="form-control">
-						                    <option value="">Select</option>
-						                    <option value="N01">N01</option>
-												<option value="ALL">ALL</option>
-
-											</select>
-										</div>
-										</div> -->
-									
-									
-									<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-			
-					
-					<div class="row mt-4">
-									<div class="col-md-12">
-										<div class="card">
-										<div class="card-header">
-											<span style="font-size: medium;font-weight: bold;">Unattended List</span>
-										</div>
-										<div class="card-body">
-											<div class="table-responsive">
-
-												<table id="ReportDatatable"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-
-															<th class="text-center no-sort">S.No</th>																														
-															<th class="text-center">Reg Date</th>
-															<th class="text-center no-sort">Complaint No</th>
-															<th class="text-center">ComplaintGroup</th>
-															<th class="text-center">ComplaintType</th>	
-															<th class="text-center">Mode</th>													
-															<th class="text-center no-sort">Public Name</th>
-															<th class="text-center">Public Mobile no</th>																												
-																																												
-														</tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-										</div>
-									 </div>
-									</div>
-								</div>
-								
-								<div id="submitcard" style="display: none;">
-									<div class="card pl-4 pr-4">
-										<div class="row mt-4">
-											<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>
-							               </div>
-						               </div>
-						               <div class="row mb-2 mt-3">
-								            <div class="col-md-12 d-flex justify-content-center">
-								                <button type="button" class="btn btn-primary" id="closebutton">Mark as Completed</button>
-								            </div>
-				            			</div>
-									</div>
-								</div>
-					
-				</div>
-
-			</div>
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-
-	<!-- in the code use to show the download different type microsoft -->
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script
-		src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">
-	
-/* 	document.addEventListener("DOMContentLoaded", function () {
-	    const complaintTypeDropdown = document.getElementById('dropdown1');
-	    const complaintGroupDropdown = document.getElementById('dropdown4');
-	    const complaintModeDropdown = document.getElementById('dropdown3');
-//	    const complaintZoneDropdown = document.getElementById('dropdown2');
-
-	    // Load Complaint Groups
-	    fetch('/gcc/api/callcenterqaqc/getComplaintGroup') 
-	        .then(response => response.json())
-	        .then(data => {
-	            // Clear existing options
-	            complaintGroupDropdown.innerHTML = `<option value="">Select</option>`;
-
-	            // Add options from the API response
-	            data.forEach(complaintGroupName => {
-	                complaintGroupDropdown.innerHTML += `<option value="${complaintGroupName}">${complaintGroupName}</option>`;
-	            });
-	        })
-	        .catch(error => {
-	            console.error('Error fetching complaint groups:', error);
-	        });
-
-	    // Event Listener for Complaint Group Change
-	    complaintGroupDropdown.addEventListener('change', function () {
-	        const selectedGroup = complaintGroupDropdown.value;
-
-	        if (selectedGroup) {
-	            // Fetch Complaint Types based on selected group
-	            fetch(`/gcc/api/callcenterqaqc/getComplaintTypesByGroup?group=${encodeURIComponent(selectedGroup)}`)
-	                .then(response => response.json())
-	                .then(data => {
-	                    // Clear existing options
-	                    complaintTypeDropdown.innerHTML = `<option value="">Select</option>`;
-
-	                    // Add options from the API response
-	                    data.forEach(complaintTypeName => {
-	                        complaintTypeDropdown.innerHTML += `<option value="${complaintTypeName}">${complaintTypeName}</option>`;
-	                    });
-	                })
-	                .catch(error => {
-	                    console.error('Error fetching complaint types:', error);
-	                });
-	        } else {
-	            // Clear complaint type dropdown if no group is selected
-	            complaintTypeDropdown.innerHTML = `<option value="">Select</option>`;
-	        }
-	    });
-	    
-	    
-	    // Load all Modes 
-	    fetch('/gcc/api/callcenterqaqc/getModes') 
-	    .then(response => response.json())
-	    .then(data => {
-	        // Clear existing options
-	        complaintModeDropdown.innerHTML = `<option value="">Select</option>`;
-
-	        // Add options from the API response
-	        data.forEach(complaintMode => {
-	        	complaintModeDropdown.innerHTML += `<option value="${complaintMode}">${complaintMode}</option>`;
-	        });
-	    })
-	    .catch(error => {
-	        console.error('Error fetching complaint groups:', error);
-	    });
-	    
-	    
-	 // Load all zones 
- 	    fetch('/gcc/api/callcenterqaqc/getZones') 
-	    .then(response => response.json())
-	    .then(data => {
-	        // Clear existing options
-	        complaintZoneDropdown.innerHTML = `<option value="">Select</option>`;
-
-	        // Add options from the API response
-	        data.forEach(complaintZone => {
-	        	complaintZoneDropdown.innerHTML += `<option value="${complaintZone}">${complaintZone}</option>`;
-	        });
-	    })
-	    .catch(error => {
-	        console.error('Error fetching complaint groups:', error);
-	    }); 
-	    
-	}); */
-	
-	
-	$(document).ready(function() {
-
-     	var table = $('#ReportDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '50vh',
-             fixedColumns: {
-                 left: 1,
-                 right: 1
-             },
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: true,
-             responsive: true,
-             searching: true,
-             select: false,
-             processing: false
-         });
-     	       
-   	   
-   	 	document.getElementById('resetBtn').addEventListener('click', function () {
-       	event.preventDefault();
-       	
-       	window.location.href="/gcc/callcenterqaqc/admin/unattendedcomplaints";
-       	
-       	});
-   	 	
-   	 	
-   	 	
-   	 document.getElementById('searchBtn').addEventListener('click', function (e) {
-	    
-  	    let ucount = document.getElementById('unattended_count').value;
-	    
-  	   
- 	   console.log("ucount: ",ucount);
-
- 	   	   
- 	  if (ucount=="") {
-	        Swal.fire({
-	            icon: 'info',
-	            title: 'Info',
-	            text: 'Enter Unattended Count',
-	            showConfirmButton: true,
-	            timer: 3000
-	        });
-	        e.preventDefault(); // Prevent the default action
-	        return; // Stop further execution
-	    }
- 	 if (ucount=="0") {
-	        Swal.fire({
-	            icon: 'info',
-	            title: 'Info',
-	            text: 'You Entered 0 Count',
-	            showConfirmButton: true,
-	            timer: 3000
-	        });
-	        e.preventDefault(); // Prevent the default action
-	        return; // Stop further execution
-	    }
- 	  
- 	 let entryDetails = { 			
- 			ucount:ucount 			
-   	    };
-   	    
-   	    console.log("entryDetails:",entryDetails);
- 	    $('#pageLoader').show();
- 	   $.ajax({
-            type: "GET",
-            url: `/gcc/api/callcenterqaqc/getunattendedcount?ucount=${ucount}`,            
-            success: function (response) {
-         	    //console.log("API Response:", response);
-         	    $('#pageLoader').hide();
-         	    if (response.status === "success") {
-         	    	$("#submitcard").show();
-         	    	console.log("Details Array:", response.details);
-         	        // Ensure details is an array and has at least one entry
-         	        if (Array.isArray(response.details) && response.details.length > 0) {
-         	            let table = $('#ReportDatatable').DataTable({
-         	                destroy: true,
-         	                searching: true,
-         	                autoWidth: true,
-         	                responsive: true,
-         	                paging: true,
-         	                info: true,
-         	                data: response.details,           	                
-         	                columns: [
-         	                    { 
-         	                        data: null, 
-         	                        render: (data, type, row, meta) => meta.row + 1, 
-         	                        className: 'text-center' 
-         	                    },         	                            	                   								
-         	                    { data: 'complaint_date', defaultContent: '-', className: 'text-center' },
-         	                    { data: 'complaint_number', defaultContent: '-', className: 'text-center' },
-         	                    { data: 'complaint_group', defaultContent: '-', className: 'text-center' },
-         	                    { data: 'complaint_type', defaultContent: '-', className: 'text-center' },
-         	                    { data: 'complaint_mode', defaultContent: '-', className: 'text-center' },
-         	                    { data: 'complaint_person_name', defaultContent: '-', className: 'text-center' },
-         	                    { data: 'complaint_mobilenumber', defaultContent: '-', className: 'text-center' },
-         	                             	                       	                   
-         	                ],
-         	                dom: 'Bfrtip',
-         	                buttons: [
-	      		                  {
-	      		                      extend: 'pageLength',
-	      		                      className: 'btn btn-warning'
-	      		                  },
-	      		                  {
-	      		                      title: 'Data export',
-	      		                      extend: 'copyHtml5',
-	      		                      text: 'Copy',
-	      		                      className: 'btn btn-secondary',
-	      		                      id: 'copyBtn'
-	      		                  },
-	      		                  {
-	      		                      extend: 'excelHtml5',
-	      		                      text: 'Excel',
-	      		                      className: 'btn btn-secondary',
-	      		                      id: 'excelBtn'
-	      		                  },
-	      		                  {
-	      		                      extend: 'csvHtml5',
-	      		                      text: 'CSV',
-	      		                      className: 'btn btn-secondary',
-	      		                      id: 'csvBtn'
-	      		                  },
-	      		                  {
-	      		                      extend: 'pdfHtml5',
-	      		                      text: 'PDF',
-	      		                      className: 'btn btn-secondary',
-	      		                      id: 'pdfBtn'
-	      		                  }
-	      		              ],
-	      		             columnDefs: [
-	      		                { targets: 'no-sort', orderable: false }
-	      		            ],
-	      		            lengthMenu: [
-	      		                [50, 100, 200, 500, -1],
-	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-	      		            ],
-	      		            scrollY: '50vh',
-	      		            fixedColumns: {
-	      		                left: 1,
-	      		                right: 1
-	      		            }
-	      		            });
-         	        }
-         	        
-         	    }
-         	    else if (response.status === "nodata") {
-     	        	
-     	        	$("#submitcard").hide();
-     	            Swal.fire({
-     	                icon: 'warning',
-     	                title: 'No Data',
-     	                text: 'No data available for the count.'
-     	            });
-     	        }        	   
-         	    else {
-         	    	
-         	    	$("#submitcard").hide();
-         	        Swal.fire({
-         	            icon: 'error',
-         	            title: 'Error',
-         	           text: response.message
-         	        });
-         	    }
-         	},
-
-            error: function (error) {
-            	
-            	$("#submitcard").hide();
-            	Swal.fire({
- 	            icon: 'error',
- 	            title: 'Error',
- 	            text: error.responseJSON?.message
- 	        });
-            }
-        }); 
- 	   
-	 	});
-   	 
-   	document.getElementById('closebutton').addEventListener('click', function (e) {
-   		
-   		let userId = document.getElementById('userIdSpan').textContent;
-	    console.log("userId=" + userId);
-	    let remarks = $('#remarks').val().trim();
-	    
-	 // Get all complaint numbers from the DataTable
-	    let table = $('#ReportDatatable').DataTable();
-	    let complaintNumbers = table
-	        .column(2) // Assuming 'complaint_number' is in the 3rd column (index 2)
-	        .data()
-	        .toArray(); // Convert to an array
-   		
-   		let compDetails = {
-   	  	    	
-   	  	        remarks:remarks,
-   	  	  	 	userId:userId,
-   	  	  		complaintNumbers: complaintNumbers // Add the list of complaint numbers
-   	  	    };
-   	  	    
-   	  	    console.log("compDetails:",compDetails);
-
-   	  // Regular expression to allow only letters, numbers, and spaces (No special characters)
-   	     let regex = /^[a-zA-Z0-9\s]+$/;
-
-   	     if (!compDetails.remarks || compDetails.remarks === '') {
-   	         Swal.fire({
-   	             icon: 'info',
-   	             title: 'Info',
-   	             text: 'Remarks are required to complete complaints.',
-   	             confirmButtonText: 'OK'
-   	         });
-   	         return; // Stop execution
-   	     }
-
-   	     if (!regex.test(compDetails.remarks)) {
-   	         Swal.fire({
-   	             icon: 'error',
-   	             title: 'Invalid Input',
-   	             text: 'Remarks should not contain special characters.',
-   	             confirmButtonText: 'OK'
-   	         });
-   	         return; // Stop execution
-   	     }
-   	  	
-   	  	
-		$('#closebutton').prop('disabled', true).text('Processing...');
-		$('#pageLoader').show();
-  	    $.ajax({
-  	        url: '/gcc/api/callcenterqaqc/closingunattendedcomplaints',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(compDetails),
-  	      success: function (response) {
-  	    	$('#pageLoader').hide();
-  	        $('#closebutton').prop('disabled', false).text('Mark as Completed');
-  	        
-  	        if (response.status === "success") {
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response.message,
-  	                allowOutsideClick: false,
-  	                allowEscapeKey: false,
-  	                allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-  	                if (result.isConfirmed) {
-  	                    window.location.href = "/gcc/callcenterqaqc/admin/unattendedcomplaints";
-  	                }
-  	            });
-  	        } else if (response.status === "partial_success") {
-  	            Swal.fire({
-  	                icon: 'warning',
-  	                title: 'Partial Success',
-  	                text: response.message + " Completed: " + response.completedCount + ", Failed: " + response.failedCount,
-  	                allowOutsideClick: false,
-  	                allowEscapeKey: false,
-  	                allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            });
-  	        } else {
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: response.message,
-  	                confirmButtonText: 'OK'
-  	            });
-  	        }
-  	    },
-  	  error: function (xhr) {
-  		$('#pageLoader').hide();
-          $('#closebutton').prop('disabled', false).text('Mark as Completed');
-
-          let errorMessage = "An unknown error occurred.";
-          if (xhr.responseJSON && xhr.responseJSON.message) {
-              errorMessage = xhr.responseJSON.message;
-          }
-
-          Swal.fire({
-              icon: 'error',
-              title: 'Error',
-              text: errorMessage,
-              confirmButtonText: 'OK'
-          });
-
-          console.error('Error:', xhr.responseText);
-      }
-  	    
-  	    });
-   		
-   	});
-   	
-     	
-	});
-  	 	
-	 
-	 
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/cdwaste/approval.html b/src/main/resources/templates/modules/cdwaste/approval.html
deleted file mode 100644
index de7fc464..00000000
--- a/src/main/resources/templates/modules/cdwaste/approval.html
+++ /dev/null
@@ -1,401 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<style>
-
-/* Main container */
-.container {
-    display: flex;
-    flex-direction: column;
-    gap: 15px;
-    width: 100%;
-}
-
-/* Row container to align 2 fields per row */
-.labelitems {
-    display: flex;
-    justify-content: space-between; /* Evenly distributes fields */
-    gap: 15px;
-}
-
-/* Individual field wrapper */
-.field-container {
-    display: flex;
-    align-items: center;
-    flex: 1; /* Ensures equal spacing */
-}
-
-/* Label styling */
-.field-label {
-    width: 120px;
-    font-weight: bold;
-    font-size:14px;
-}
-
-/* Input box styling */
-.field-input {
-    width: 200px; /* Adjusted width */
-    padding: 5px;
-    border: 1px solid #ccc;
-    border-radius: 5px;
-    background-color: #f9f9f9;
-    font-size: 14px;
-}
-
-.modal-body {
-    max-height: 70vh; 
-    overflow-y: auto; 
-    overflow-x: hidden; 
-    padding-right: 15px; 
-}
-
-</style>
-
-
-<body>
-    <div class="wrapper">
-        <!-- Header -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-        <div class="page-wrap">
-            <!-- Left Menu -->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fas fa-th-large bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>C & D Waste Collectors </h5>
-                                        <span>Approval</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item">C & D Waste Collectors</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Approval</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                    <hr>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="card">
-                             <div class="card-header" >
-				                				                
-				          <h5 style="font-weight:bold;">Approved List</h5>
-				                
-				            </div>
-                                <div class="card-block">
-                                    <div>
-                                        <table id="worksDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                           <thead class="thead-dark">
-        <tr role="row">
-            <th class="text-center">S.No</th> <!-- Auto-increment index -->
-            <th class="text-center">Name</th>
-            <th class="text-center">Mobile No</th>
-            <th class="text-center">Address</th>
-            <th class="text-center">Vehicle Number</th>
-            <th class="text-center">Vehicle Type</th>
-           <!--  <th class="text-center">Accepted Date</th> -->
-            <th class="text-center">Accepted By</th>
-            <th class="text-center">Register ID</th>
-            <th class="text-center">Actions</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr th:each="approval, i : ${approvalDetails}">
-            <td class="text-center" th:text="${i.count}">0</td> <!-- Index counter -->
-            <td class="text-center" th:text="${approval.name}">Name</td>
-            <td class="text-center" th:text="${approval.mobile_no}">Mobile No</td>
-            <td class="text-center" th:text="${approval.address}">Address</td>
-            <td class="text-center" th:text="${approval.vehicle_num}">Vehicle Number</td>
-            <td class="text-center" th:text="${approval.vehicletype}">Vehicle Type</td>
-            <!-- <td class="text-center" th:text="${approval.accept}">Accepted Date</td> -->
-            <td class="text-center" th:text="${approval.acceptedby}">Accepted By</td>
-            <td class="text-center" th:text="${approval.register_id}">Register ID</td>
-            <td class="text-center">
-             <button class="btn btn-info" 
-				 th:attr="onclick='showModal(' + ${approval['register_id']} + ')'" 
-							             th:text="'View Details'">
-							                    </button>
-							                     </td>
-        </tr>
-    </tbody>
-   
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                
-                <div class="modal fade" id="detailModal" tabindex="-1" role="dialog" aria-labelledby="detailModalLabel" aria-hidden="true">
-						    <div class="modal-dialog modal-lg" role="document">
-						        <div class="modal-content">
-						            <div class="modal-header">
-						                <h5 class="modal-title" id="detailModalLabel">Register id: <span id="modal_register_id"></span></h5>
-						                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						                    <span aria-hidden="true">&times;</span>
-						                </button>
-						            </div>
-						            <div class="modal-body">
-						                <div id="cduserinfoHTML">
-						                </div>
-						                 <hr>
-						                <div class="row labelitems">
-						                    <div class="col-md-12">
-						                        <p><strong>Adhaar Photo/Document:</strong></p>
-						                        <div id="modal_adhaar_container"></div>
-						                    </div>
-						                    <div class="col-md-12">
-						                        <p><strong>User Photo:</strong></p>
-						                        <div id="modal_user_photo_container"></div>
-						                    </div>
-						                    <div class="col-md-12">
-						                        <p><strong>RC Book Document:</strong></p>
-						                        <div id="modal_vehicle_doc_container"></div>
-						                    </div>
-						                    <div class="col-md-12">
-						                        <p><strong>Lease Vehicle Document:</strong></p>
-						                        <div id="modal_leasevehicle_doc_container"></div>
-						                    </div>
-						                </div>
-						
-						                <!-- Rejection Section -->
-						                 <!--<div id="rejectionSection" style="display: none; margin-top: 20px;">
-						                    <p><strong>Reason for Rejection <span class="text-danger">*</span></strong></p>
-						                    <textarea id="rejectionReason" rows="4" class="form-control"></textarea>
-						                    <button type="button" class="btn btn-danger mt-2" onclick="confirmRejection()">Confirm</button>
-						                </div> -->
-						            </div>
-						            <div class="modal-footer">
-						                
-						                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-						            </div>
-						        </div>
-						    </div>
-						</div>
-                
-                
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-   
-
-    <!-- Include jQuery and Bootstrap JavaScript -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script type="text/javascript">
-    $(document).ready(function() {
-
-    	var table = $('#worksDatatable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [
-                { targets: 'no-sort', orderable: false }
-            ],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', 'Show all']
-            ],
-            scrollY: '50vh',
-            fixedColumns: {
-                left: 1,
-                right: 1
-            },
-            buttons: [
-                {
-                    extend: 'pageLength',
-                    className: 'btn btn-warning'
-                },
-                {
-                    title: 'Data export',
-                    extend: 'copyHtml5',
-                    text: 'Copy',
-                    className: 'btn btn-secondary',
-                    id: 'copyBtn'
-                },
-                {
-                    extend: 'excelHtml5',
-                    text: 'Excel',
-                    className: 'btn btn-secondary',
-                    id: 'excelBtn'
-                },
-                {
-                    extend: 'csvHtml5',
-                    text: 'CSV',
-                    className: 'btn btn-secondary',
-                    id: 'csvBtn'
-                },
-                {
-                    extend: 'pdfHtml5',
-                    text: 'PDF',
-                    className: 'btn btn-secondary',
-                    id: 'pdfBtn'
-                }
-            ],
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false
-        });
-       
-    });
-    
-    //function to show the view details
-    
-    function showModal(registerId) {
-        $.ajax({
-            url: '/gcc/api/registration/pendingbyid?registerId=' + registerId,
-            method: 'GET',
-            dataType: 'json',
-            success: function(data) {
-                console.log(data);
-                // Check if data is not empty
-                if (data.length > 0) {
-                    // Access the first item in the array
-                    const userData = data[0]; // Get the first object from the array
-                    
-                    const formattedAcceptedDate = userData.accepteddate ? userData.accepteddate.split('T')[0] : '';
-
-	                
-                    let userinfo = `
-                    	<div style="display: flex; flex-direction: column; gap: 15px;">
-                	    <div class="container">
-                	        <!-- First Row -->
-                	        <div class="row">
-                	            <div class="field-container">
-                	                <label class="field-label">Name:</label>
-                	                <input type="text" id="modal_name" value="${userData.name}" readonly class="field-input">
-                	            </div>
-
-                	            <div class="field-container">
-                	                <label class="field-label">Mobile No:</label>
-                	                <input type="text" id="modal_mobile_no" value="${userData.mobile_no}" readonly class="field-input">
-                	            </div>
-                	        </div>
-
-                	        <!-- Second Row -->
-                	        <div class="row">
-                	            <div class="field-container">
-                	                <label class="field-label">Address:</label>
-                	                <input type="text" id="modal_address" value="${userData.address}" readonly class="field-input">
-                	            </div>
-
-                	            <div class="field-container">
-                	                <label class="field-label">Vehicle No:</label>
-                	                <input type="text" id="modal_vehicle_num" value="${userData.vehicle_num}" readonly class="field-input">
-                	            </div>
-                	        </div>
-
-                	        <!-- Third Row -->
-                	        <div class="row">
-                	            <div class="field-container">
-                	                <label class="field-label">Vehicle Type:</label>
-                	                <input type="text" id="modal_vehicletype" value="${userData.vehicletype}" readonly class="field-input">
-                	            </div>
-
-                	            <div class="field-container">
-                	                <label class="field-label">Ref Num:</label>
-                	                <input type="text" id="modal_ref_num" value="${userData.reference_num}" readonly class="field-input">
-                	            </div>
-                	        </div>
-                	        
-                	        <!-- Fourth Row -->
-                	        <div class="row">
-                	            <div class="field-container">
-                	                <label class="field-label">Accepted Date:</label>
-                	                <input type="date" id="modal_accepteddate" value="${formattedAcceptedDate}" readonly class="field-input">
-                	            </div>
-                	        </div>
-                	        
-                	    </div>
-                	</div>`;
-
-                    $("#cduserinfoHTML").html(userinfo);
-                    $("#modal_register_id").html(userData.register_id);
-
-                    console.log(userData.adhaarurl);
-				    
-                    // Display the files (Adhaar, User Photo, Vehicle Document)
-                    if (userData.adhaarurl!=null) {
-                    	displayFile('modal_adhaar_container', userData.adhaarurl);
-                    }
-                    if (userData.user_photourl) {
-                    	displayFile('modal_user_photo_container', userData.user_photourl);
-                    }
-                    if (userData.rcbookurl) {
-                    	displayFile('modal_vehicle_doc_container', userData.rcbookurl);
-                    }
-                    if (userData.leasedocurl) {
-                    	displayFile('modal_leasevehicle_doc_container', userData.leasedocurl);
-                    }
-                    
-                    // Hide rejection section initially
-                   /*  document.getElementById('rejectionSection').style.display = 'none';
-                    document.getElementById('rejectionReason').value = ''; // Clear previous input */
-                    // Show the modal
-                    $('#detailModal').modal({
-                        backdrop: 'static',
-                        keyboard: false
-                    });
-                } else {
-                    // Handle case where no data is returned
-                    alert('No data found for this registration ID.');
-                }
-            },
-            error: function(err) {
-                console.error(err);
-                alert('Failed to fetch data');
-            }
-        });
-    }
-    
-    //display file function
-    
-		    function displayFile(containerId, filePath) {
-		    const container = document.getElementById(containerId);
-		
-		    // Ensure the container exists before proceeding
-		    if (!container) {
-		        console.error(`Element with ID '${containerId}' not found.`);
-		        return;
-		    }
-		
-		    // Ensure filePath is valid before attempting to display
-		    if (!filePath) {
-		        container.innerHTML = '<p class="text-danger">No document available</p>';
-		        return;
-		    }
-		
-		    const fileExtension = filePath.split('.').pop().toLowerCase();
-		    console.log('Full Path:', filePath);
-		
-		    if (fileExtension === 'pdf') {
-		        container.innerHTML = `<embed src="${filePath}" type="application/pdf" width="100%" height="500px" />`;
-		    } else {
-		        container.innerHTML = `<img src="${filePath}" alt="Document" class="img-fluid img-thumbnail" />`;
-		    }
-		}
-
-    </script>
-</body>
-</html>
diff --git a/src/main/resources/templates/modules/cdwaste/pending.html b/src/main/resources/templates/modules/cdwaste/pending.html
deleted file mode 100644
index dd0e8e5e..00000000
--- a/src/main/resources/templates/modules/cdwaste/pending.html
+++ /dev/null
@@ -1,537 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<style>
-
-/* Main container */
-.container {
-    display: flex;
-    flex-direction: column;
-    gap: 15px;
-    width: 100%;
-}
-
-/* Row container to align 2 fields per row */
-.labelitems {
-    display: flex;
-    justify-content: space-between; /* Evenly distributes fields */
-    gap: 15px;
-}
-
-/* Individual field wrapper */
-.field-container {
-    display: flex;
-    align-items: center;
-    flex: 1; /* Ensures equal spacing */
-}
-
-/* Label styling */
-.field-label {
-    width: 120px;
-    font-weight: bold;
-    font-size:14px;
-}
-
-/* Input box styling */
-.field-input {
-    width: 200px; /* Adjusted width */
-    padding: 5px;
-    border: 1px solid #ccc;
-    border-radius: 5px;
-    background-color: #f9f9f9;
-    font-size: 14px;
-}
-
-.modal-body {
-    max-height: 70vh; 
-    overflow-y: auto; /* Enables vertical scrolling */
-    overflow-x: hidden; /* Hides horizontal scrolling */
-    padding-right: 15px; /* Prevents content cutoff */
-}
-
-
-</style>
-<body>
-    <div class="wrapper">
-        <!-- Header -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-        <div class="page-wrap">
-            <!-- Left Menu -->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fas fa-th-large bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>C & D Waste Collectors </h5>
-                                        <span>Pending</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item">C & D Waste Collectors</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pending</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                    <hr>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="card">
-                             <div class="card-header">
-				                				                
-         				          <h5 style="font-weight:bold;"> Pending List</h5>
-				                
-				            </div>
-				            
-							<div class="card-block">
-							    <!-- Show the table structure -->
-							    <table id="worksDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-							        <thead class="thead-dark">
-							            <tr role="row">
-							                <th class="text-center">S.NO</th> <!-- Auto-incrementing index -->
-							                <th class="text-center">Name</th>
-							                <th class="text-center">Mobile No</th>
-							                <th class="text-center">Address</th>
-							                <th class="text-center">Actions</th>
-							            </tr>
-							        </thead>
-							        <tbody>
-							            <!-- Check if userDetails is empty or null -->
-							           
-							            <!-- Iterate over userDetails to display pending registrations -->
-							            <tr th:each="pendinglist, status : ${userDetails}">
-							                <td class="text-center" th:text="${status.index + 1}">1</td> <!-- Auto-incrementing index -->
-							                <td class="text-center" th:text="${pendinglist['name']}">Name</td>
-							                <td class="text-center" th:text="${pendinglist['mobile_no']}">Mobile No</td>
-							                <td class="text-center" th:text="${pendinglist['address']}">Address</td>
-							                <td class="text-center">
-							                    <button class="btn btn-info" 
-							                            th:attr="onclick='showModal(' + ${pendinglist['register_id']} + ')'" 
-							                            th:text="'View Details'">
-							                    </button>
-							                </td>
-							            </tr>
-							        </tbody>
-							       
-							    </table>
-							</div>
-
-
-
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                
-                <!-- Modal -->
-					<!-- Modal -->
-				<div class="modal fade" id="detailModal" tabindex="-1" role="dialog" aria-labelledby="detailModalLabel" aria-hidden="true">
-						    <div class="modal-dialog modal-lg modal-dialog-scrollable" role="document">
-						        <div class="modal-content">
-						            <div class="modal-header">
-						                <h5 class="modal-title" id="detailModalLabel">Register id: <span id="modal_register_id"></span></h5>
-						                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						                    <span aria-hidden="true">&times;</span>
-						                </button>
-						            </div>
-						            <div class="modal-body">
-						                <div id="cduserinfoHTML">
-						                </div>
-						                <hr>
-						                <div class="row labelitems" >
-						                    <div class="col-md-12">
-						                        <p><strong>Adhaar Photo/Document:</strong></p>
-						                        <div id="modal_adhaar_container"></div>
-						                    </div>
-						                   
-						                    <div class="col-md-12">
-						                        <p><strong>User Photo:</strong></p>
-						                        <div id="modal_user_photo_container"></div>
-						                    </div>
-						                    
-						                    <div class="col-md-12">
-						                        <p><strong>RC Book Document:</strong></p>
-						                        <div id="modal_vehicle_doc_container"></div>
-						                    </div>
-					
-						                    <div class="col-md-12">
-						                        <p><strong>Lease Vehicle Document:</strong></p>
-						                        <div id="modal_leasevehicle_doc_container"></div>
-						                    </div>
-						                </div>
-						               	             
-						
-						                <!-- Rejection Section -->
-						                <div id="rejectionSection" style="display: none; margin-top: 20px;">
-						                    <p><strong>Reason for Rejection <span class="text-danger">*</span></strong></p>
-						                    <textarea id="rejectionReason" rows="4" class="form-control"></textarea>
-						                    <button type="button" class="btn btn-danger mt-2" onclick="confirmRejection()">Confirm</button>
-						                </div>
-						            </div>
-						            <div class="modal-footer">
-						                <button type="button" class="btn btn-success" onclick="acceptAction()" id="acceptbutton">Accept</button>
-						                <button type="button" class="btn btn-warning" onclick="showRejectionSection()" id="rejectbutton">Reject</button>
-						                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-						            </div>
-						        </div>
-						    </div>
-						</div>
-
-
-			                
-			                
-			                
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-   
-
-    <!-- Include jQuery and Bootstrap JavaScript -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script type="text/javascript">
-    $(document).ready(function() {
-        // Initialize the DataTable
-        var table = $('#worksDatatable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [
-                { targets: 'no-sort', orderable: false } // Disable sorting for certain columns
-            ],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', 'Show all']
-            ],
-            scrollY: '50vh',
-            fixedColumns: {
-                left: 1,
-                right: 1
-            },
-            buttons: [
-                {
-                    extend: 'pageLength',
-                    className: 'btn btn-warning'
-                },
-                {
-                    title: 'Data export',
-                    extend: 'copyHtml5',
-                    text: 'Copy',
-                    className: 'btn btn-secondary',
-                    id: 'copyBtn'
-                },
-                {
-                    extend: 'excelHtml5',
-                    text: 'Excel',
-                    className: 'btn btn-secondary',
-                    id: 'excelBtn'
-                },
-                {
-                    extend: 'csvHtml5',
-                    text: 'CSV',
-                    className: 'btn btn-secondary',
-                    id: 'csvBtn'
-                },
-                {
-                    extend: 'pdfHtml5',
-                    text: 'PDF',
-                    className: 'btn btn-secondary',
-                    id: 'pdfBtn'
-                }
-            ],
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false,
-            language: {
-                emptyTable: "No pending registrations available." // Custom message for empty tables
-            }
-        });
-        
-    });
-
-    
-    function showModal(registerId) {
-        $.ajax({
-            url: '/gcc/api/registration/pendingbyid?registerId=' + registerId,
-            method: 'GET',
-            dataType: 'json',
-            success: function(data) {
-                console.log(data);
-                // Check if data is not empty
-                if (data.length > 0) {
-                    // Access the first item in the array
-                    const userData = data[0]; // Get the first object from the array
-	                
-                    let userinfo = `
-                    	<div style="display: flex; flex-direction: column; gap: 15px;">
-                    	    <div class="container">
-                    	        <!-- First Row -->
-                    	        <div class="row">
-                    	            <div class="field-container">
-                    	                <label class="field-label">Name:</label>
-                    	                <input type="text" id="modal_name" value="${userData.name}" readonly class="field-input">
-                    	            </div>
-
-                    	            <div class="field-container">
-                    	                <label class="field-label">Mobile No:</label>
-                    	                <input type="text" id="modal_mobile_no" value="${userData.mobile_no}" readonly class="field-input">
-                    	            </div>
-                    	        </div>
-
-                    	        <!-- Second Row -->
-                    	        <div class="row">
-                    	            <div class="field-container">
-                    	                <label class="field-label">Address:</label>
-                    	                <input type="text" id="modal_address" value="${userData.address}" readonly class="field-input">
-                    	            </div>
-
-                    	            <div class="field-container">
-                    	                <label class="field-label">Vehicle No:</label>
-                    	                <input type="text" id="modal_vehicle_num" value="${userData.vehicle_num}" readonly class="field-input">
-                    	            </div>
-                    	        </div>
-
-                    	        <!-- Third Row -->
-                    	        <div class="row">
-                    	            <div class="field-container">
-                    	                <label class="field-label">Vehicle Type:</label>
-                    	                <input type="text" id="modal_vehicletype" value="${userData.vehicletype}" readonly class="field-input">
-                    	            </div>
-
-                    	            <div class="field-container">
-                    	                <label class="field-label">Ref Num:</label>
-                    	                <input type="text" id="modal_ref_num" value="${userData.reference_num}" readonly class="field-input">
-                    	            </div>
-                    	        </div>
-                    	    </div>
-                    	</div>`;
-
-				      
-				                $("#cduserinfoHTML").html(userinfo);
-				                
-				                $("#modal_register_id").html(userData.register_id);
-				    
-				    console.log(userData.adhaarurl);
-				    
-                    // Display the files (Adhaar, User Photo, Vehicle Document)
-                    if (userData.adhaarurl!=null) {
-                    	displayFile('modal_adhaar_container', userData.adhaarurl);
-                    }
-                    if (userData.user_photourl) {
-                    	displayFile('modal_user_photo_container', userData.user_photourl);
-                    }
-                    //if (userData.rcbookurl) {
-                    	displayFile('modal_vehicle_doc_container', userData.rcbookurl);
-                    //}
-                    if (userData.leasedocurl) {
-                    	displayFile('modal_leasevehicle_doc_container', userData.leasedocurl);
-                    }
-                    
-                    // Hide rejection section initially
-                    document.getElementById('rejectionSection').style.display = 'none';
-                    document.getElementById('rejectionReason').value = ''; // Clear previous input
-                    // Show the modal
-                    $('#detailModal').modal({
-                        backdrop: 'static',
-                        keyboard: false
-                    });
-                } else {
-                    // Handle case where no data is returned
-                    alert('No data found for this registration ID.');
-                }
-            },
-            error: function(err) {
-                console.error(err);
-                alert('Failed to fetch data');
-            }
-        });
-    }
-
- // Function to handle Accept action
-    function acceptAction() {
-        const registerId = document.getElementById('modal_register_id').innerText; // Get register_id from the modal
-        const rowElement = document.querySelector(`tr[data-register-id="${registerId}"]`); // Find the row by register_id
-        const mobileNo = document.getElementById('modal_mobile_no').innerText;
-        
-        const refNum = document.getElementById('modal_ref_num').innerText;
-        
-        $('#acceptbutton').prop('disabled', true);
-        
-        $.ajax({
-            url: '/gcc/api/registration/acceptbyid',
-            method: 'POST',
-            data: {
-                registerId: registerId
-            },
-            success: function(response) {
-            	$('#acceptbutton').prop('disabled', false);
-                console.log(response);
-				
-                // URL for accepted registration message
-                const acceptMessageUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${mobileNo}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=Welcome+to+Greater+Chennai+Corporation%2C+%0A%0AYour+Registered+ID+is+%2A${registerId}%2A+.%0AYour+C%26D+waste+registration+has+been+approved+successfully.+%0A%0AFor+downloading+your+ID+card%2C+kindly+click+on+the+button+below+%F0%9F%91%87&media_url=https%3A%2F%2Fres.cloudinary.com%2Fdpub5muar%2Fimage%2Fupload%2Fv1729597847%2Fq2ihjs99puhhwkjzajyo.png&isTemplate=true&buttonUrlParam=userdetail%3Fregister_id%3D${refNum}`; 
-                //https://gccservices.chennaicorporation.gov.in/volunteer/wastecollectors/https://gccservices.chennaicorporation.gov.in/volunteer/wastecollectors/userdetail?register_id=5
-                	
-                // Call the WhatsApp function to send acceptance message
-                sendWhatsAppMessage(mobileNo, acceptMessageUrl);
-                
-                Swal.fire({
-                    title: 'Success!',
-                    text: 'Registration Accepted Successfully',
-                    icon: 'success',
-                    confirmButtonText: 'OK'
-                }).then((result) => {
-                    if (result.isConfirmed) {
-                        $('#detailModal').modal('hide'); // Close the modal after success
-                        location.reload(); // Reload page (optional)
-                       
-                    }
-                });
-            },
-            error: function(error) {
-            	$('#acceptbutton').prop('disabled', false);
-                console.error(error);
-                Swal.fire({
-                    title: 'Error!',
-                    text: 'Failed to Accept Registration',
-                    icon: 'error',
-                    confirmButtonText: 'OK'
-                });
-            }
-        });
-    }
-
-    
-    
-    function showRejectionSection() {
-        // Show the rejection section when Reject button is clicked
-        document.getElementById('rejectionSection').style.display = 'block';
-    }
-
-    function confirmRejection() {
-        const registerId = document.getElementById('modal_register_id').innerText; // Get register_id from the modal
-        const rejectionReason = document.getElementById('rejectionReason').value; // Get the rejection reason
-        const mobileNo = document.getElementById('modal_mobile_no').innerText; // Get mobile number from the modal
-        const refNum = document.getElementById('modal_ref_num').innerText;
-
-        if (!rejectionReason) {
-            Swal.fire({
-                title: 'Info',
-                text: 'Please provide a reason for rejection.',
-                icon: 'info',
-                confirmButtonText: 'OK'
-            });
-            return; // Stop if no reason is provided
-        }
-        
-        
-        $('#rejectbutton').prop('disabled', true);
-        
-
-        $.ajax({
-            url: '/gcc/api/registration/rejectbyid', // API endpoint for rejection
-            method: 'POST',
-            data: {
-                registerId: registerId, // Pass registerId as request param
-                reason: rejectionReason // Pass the rejection reason
-            },
-            success: function(response) {
-            	
-            	$('#rejectbutton').prop('disabled', false);
-            	 // URL for rejected registration
-                const rejectMessageUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${mobileNo}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=Welcome+to+Greater+Chennai+Corporation%2C%0A%0AYour+Registered+ID+is+%2A${registerId}%2A+.%0AYour+C%26D+waste+registration+has+been+Rejected.+%0A%0AKindly+click+on+the+button+below+for+viewing+the+status%F0%9F%91%87&media_url=https%3A%2F%2Fres.cloudinary.com%2Fdpub5muar%2Fimage%2Fupload%2Fv1729598221%2Fci7ybspyanctl9lackby.jpg&isTemplate=true&buttonUrlParam=userdetail%3Fregister_id%3D${refNum}`;
-                
-                //const acceptMessageUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${mobileNo}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=Welcome+to+Greater+Chennai+Corporation%2C+%0A%0AYour+Registered+ID+is+%2A${registerId}%2A+.%0AYour+C%26D+waste+registration+has+been+approved+successfully.+%0A%0AFor+downloading+your+ID+card%2C+kindly+click+on+the+button+below+%F0%9F%91%87&media_url=https%3A%2F%2Fgccservices.in%2Fgcc%2Ffiles%2Fc_d%2F1_approved.jpg&isTemplate=true&buttonUrlParam=userdetail%3Fregister_id%3D${registerId}`;
-                sendWhatsAppMessage(mobileNo, rejectMessageUrl); // Call the WhatsApp function to send rejection message
-                Swal.fire({
-                    title: 'Success!',
-                    text: 'Registration Rejected!!',
-                    icon: 'success',
-                    confirmButtonText: 'OK'
-                }).then((result) => {
-                    if (result.isConfirmed) {
-                        $('#detailModal').modal('hide'); // Close the modal after success
-                        location.reload(); // Reload page (optional)
-                       
-                    }
-                });
-            },
-            error: function(error) {
-            	$('#rejectbutton').prop('disabled', false);
-                console.error(error);
-                Swal.fire({
-                    title: 'Error!',
-                    text: 'Failed to Reject Registration',
-                    icon: 'error',
-                    confirmButtonText: 'OK'
-                });
-            }
-        });
-    }
-
-    function displayFile(containerId, filePath) {
-        const container = document.getElementById(containerId);
-        
-        // Check if filePath is defined and not null
-        if (filePath) {
-            const fileExtension = filePath.split('.').pop().toLowerCase();
-            const fullPath = filePath; // Construct full URL
-            console.log('Full Path:', fullPath); 
-
-            if (fileExtension === 'pdf') {
-                container.innerHTML = `<embed src="${fullPath}" type="application/pdf" width="100%" height="500px" />`;
-            } else {
-                container.innerHTML = `<img src="${fullPath}" alt="Document" class="img-fluid img-thumbnail" />`;
-            }
-        } else {
-            // If filePath is undefined or null, display a default message
-            container.innerHTML = 'No document available';
-        }
-    }
-    
-    
-    function sendWhatsAppMessage(cellnumber, msgUrl) {
-        // Send the WhatsApp message
-        $.ajax({
-            url: '/gcc/api/cd/whatsapp/send-whatsapp-message', // Replace with your service path
-            type: 'POST',
-            data: { msgUrl: msgUrl },
-           
-            error: function(xhr, status, error) {
-                console.error('Error sending WhatsApp message:', error);
-                Swal.fire({
-                    title: 'Error!',
-                    text: 'Message Not sent!',
-                    icon: 'error',
-                    timer: 2000,
-                    showConfirmButton: false
-                });
-            }
-        });
-    }
-
-
-    </script>
-</body>
-</html>
-
-
diff --git a/src/main/resources/templates/modules/cdwaste/receipt.html b/src/main/resources/templates/modules/cdwaste/receipt.html
deleted file mode 100644
index 83249e7b..00000000
--- a/src/main/resources/templates/modules/cdwaste/receipt.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!-- Pre-loader end -->
-<div id="pcoded" class="pcoded">
-	<div class="pcoded-container">
-		<!-- Menu header -->
-		<div class="nav-display">
-			<nav th:replace="~{fragments/nav-user :: nav}"></nav>
-		</div>
-		<!-- Main content -->
-		<div class="container-fluid" style="margin-top: 4%;padding: 15px;">
-			<div class="row">
-				<div class="col-md-12 col-sm-12">
-					<div class="card " style="width:auto">
-
-						<div class="card-body">
-							<table>
-
-								<tr style="height:70px;">
-									<td colspan="4" style="text-align: center;">
-										<span><img src="\assets\media\images\logo.png"
-												style="width:45px;height:45px;text-align: left;"></span>
-										<span>
-											<h6 style="text-align: center;font-weight: bold;">Greater Chennai Corporation</h6>
-											<h6 style="text-align: center;font-weight: bold;">C & D Waste Collectors</h6>
-											<h6 style="text-align: center;font-weight: bold;">Acknowledgement Form</h6>
-										</span>
-									</td>
-								</tr>
-								<tr>
-									<th>User Name:</th>
-									<th>Mobile No:</th>
-									<th>User Type:</th>
-									<th>Email:</th>
-								</tr>
-								<tr>
-									<td id="uName" th:text="${bookingsDetails.users.name}"></td>
-									<td id="mobile" th:text="${bookingsDetails.users.mobileNo}"></td>
-									<td id="uType" th:text="${bookingsDetails.users.usertype}"></td>
-									<td id="eMail" th:text="${bookingsDetails.users.email}"></td>
-								</tr>
-								<tr>
-									<th style="font-weight: bold;">Hall Details:</th>
-								</tr>
-								<tr>
-									<th>Hall Name:</th>
-									<th>Address:</th>
-									<th>Zone:</th>
-									<th>Division:</th>
-								</tr>
-								<tr>
-									<td id="hallname" th:text="${bookingsDetails.hallDetails.hallName}">
-									</td>
-									<td><span id="address">
-											<span th:text="${bookingsDetails.hallDetails.doorNo}"></span>,
-											<span th:text="${bookingsDetails.hallDetails.street}"></span>,
-											<span th:text="${bookingsDetails.hallDetails.area}"></span>,
-											<span th:text="${bookingsDetails.hallDetails.pinCode}"></span>
-										</span></td>
-									<td id="zone" th:text="${bookingsDetails.hallDetails.zone}"></td>
-									<td id="division" th:text="${bookingsDetails.hallDetails.division}">
-									</td>
-								</tr>
-								<tr>
-									<th style="font-weight: bold;">Booking Details:</th>
-								</tr>
-								<tr>
-									<th>Booking Id:</th>
-									<th>Booking Date:</th>
-									<th>Starting Date:</th>
-									<th>Ending Date:</th>
-								</tr>
-								<tr>
-									<td id="bookId" th:text="${bookingsDetails.bookingId}"></td>
-									<td id="bookDate" th:text="${bookingsDetails.bookingDate}"></td>
-									<td id="startDate" th:text="${bookingsDetails.startDate}"></td>
-									<td id="endDate" th:text="${bookingsDetails.endDate}"></td>
-								</tr>
-								<tr>
-									<th>Starting Slot:</th>
-									<th>Ending Slot:</th>
-									<th>Booking Status:</th>
-									<th>Reason For Booking:</th>
-								</tr>
-								<tr>
-									<td id="startingSlot"
-										th:text="${bookingsDetails.startingSlot == 1 ? 'Morning' : 'Evening'}">
-									</td>
-									<td id="endingSlot"
-										th:text="${bookingsDetails.endingSlot == 1 ? 'Morning' : 'Evening'}">
-									</td>
-									<td id="bookStatus" th:text="${bookingsDetails.bookingStatus}"></td>
-									<td id="reason" th:text="${bookingsDetails.reason}"></td>
-								</tr>
-								<tr>
-									<th style="font-weight: bold;">Payment Details:</th>
-								</tr>
-								<tr>
-									<th>Transaction Id:</th>
-									<th>Payment Status:</th>
-									<th>Payment Details:</th>
-									<th>Payment Type:</th>
-								</tr>
-								<tr>
-									<td id="transId" th:text="${bookingsDetails.payments.TransactionId}">
-									</td>
-									<td id="PayStatus" style="text-align: left;font-weight:bold;"
-										th:text="${bookingsDetails.payments.paymentStatus}">
-									</td>
-									<td id="PayDetails"></td>
-									<td id="PayType"></td>
-								</tr>
-								<tr>
-									<td colspan="3" style="text-align: right;font-weight:bold;">Total Amount :</td>
-									<td id="PayDate" style="text-align: left;font-weight:bold;"
-										th:text="${bookingsDetails.payments.amountReceived}">
-									</td>
-								</tr>
-								<tr>
-									<td colspan="4" style="text-align: center;"> <span>
-											<h6 style="text-align: center;font-weight: bold;">*** This is a
-												computer-generated
-												document. No signature is required ***</h6>
-										</span></td>
-								</tr>
-							</table>
-						</div>
-					</div>
-
-					<div class="button-container" style="display: flex;justify-content: flex-end;">
-						<button class="btn btn-success" onclick="printTables()"
-							style="background: #FB6340;">Print</button>
-						<button class="btn btn-success" th:onclick="return redirect([[${bookingsDetails.bookingtype}]])"
-							style="background: rgb(21, 68, 92);">Back to Home</button>
-					</div>
-
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/cdwaste/registration.html b/src/main/resources/templates/modules/cdwaste/registration.html
deleted file mode 100644
index 289c0dad..00000000
--- a/src/main/resources/templates/modules/cdwaste/registration.html
+++ /dev/null
@@ -1,307 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-	color: red;
-}
-/* Mobile screens - targeting devices with a max width of 767px */
-@media (max-width: 767px) 
-{
-	#campaignrequestform label{
-		margin-top: 10px;
-	} 
-}
-</style>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="far fa-calendar-plus bg-blue"></i>
-									<div class="d-inline">
-										<h5>Registration</h5>
-										<span>C & D Waste Collectors Registrations</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">C & D Waste Collectors Registrations</li>
-										<!-- <li class="breadcrumb-item active" aria-current="page">Create Campaign</li> -->
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<h4 class="h4 text-right text-mute" style="font-size: 12px;">
-						Auto refresh in <font id="refresh-countdown">00</font> seconds
-					</h4>
-					
-					<div class="row">
-										
-					<div class="col-md-12">
-					    <div class="card" style="margin-top: 0px;">
-					        <div class="card-header justify-content-between align-items-center">
-					            <h3><b>Registration Form</b></h3>
-					        </div>
-					        <div class="card-body">
-					            <form id="cdwasteRegistrationForm">
-					                <div class="form-group">
-					                    <div class="row">
-					                        <div class="col-sm-12 col-md-6">
-					                            <label for="name">Name<span class="required">*</span></label>
-					                            <input type="text" class="form-control" id="name" placeholder="Enter Name" required>
-					                        </div>
-					                        <div class="col-sm-12 col-md-6">
-					                            <label for="mobileNo">Mobile No<span class="required">*</span></label>
-					                            <input type="number" class="form-control" id="mobileNo" placeholder="Mobile No" required>
-					                        </div>
-					                    </div>
-					                </div>
-					
-					                <div class="form-group">
-					                    <label for="address">Address<span class="required">*</span></label>
-					                    <textarea class="form-control" id="address" rows="2" required></textarea>
-					                </div>
-					
-					                <div class="form-group">
-					                    <label for="adhaarFile">Upload Aadhaar:<span class="required">*</span></label>
-					                    <input type="file" class="form-control" id="adhaar" name="adhaar" required>
-					                </div>
-					
-					                <div class="form-group">
-					                    <label for="vehicleRcBookFile">Upload Vehicle RC Book:<span class="required">*</span></label>
-					                    <input type="file" class="form-control" id="vehicleRcBook" name="vehicleRcBook" required>
-					                </div>
-					
-					                <div class="form-group text-center">
-					                    <button type="submit" class="btn btn-primary" id="registerSubmit">Submit</button>
-					                    <button type="reset" class="btn btn-secondary ml-2" onclick="resetForm()">Reset</button>
-					                </div>
-					            </form>
-					        </div>
-					    </div>
-					</div>
-
-
-						
-						
-						
-						<div class="col-md-12">
-						    <div class="card" style="display:none;">
-						        <div class="card-block">
-						        <div class="page-header-title" >
-								    <h5 style="margin: 0;font-weight: bold;">Registration Details</h5><hr>
-								</div>
-						            <div>
-						                <table id="CDWasteDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-						                    <thead class="thead-dark">
-						                        <tr role="row">
-						                            <th class="text-center">S.No</th>                                                  
-						                            <th class="text-center">Name</th>
-						                            <th class="text-center">Mobile No</th>
-						                            <th class="text-center">Address</th>
-						                            <th class="text-center">Adhaar</th>
-						                            <th class="text-center">Vechicle RC Book</th>                                                                                                    
-						                            <th class="text-center no-sort" width="%2">Action</th> 
-						                        </tr>
-						                    </thead>
-						                    <tbody>
-						                        <tr th:each="campaign, i: ${campaigns}">
-						                            <td th:text="${i.count}">0</td>
-						                            <td th:text="${campaign.campaign_name}"></td>
-						                            <td th:text="${campaign.event_dates}"></td>
-						                            <td th:text="${campaign.description}"></td>
-						                           <td th:text="${campaign.event_dates}"></td>
-						                            <td th:text="${campaign.description}"></td>
-						                            <td class="text-center">
-													    <a href="#" th:onclick="return callEdit([[${campaign.campaign_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Edit" data-original-title="Edit">
-													        <i class="ik ik-edit f-16 mr-15 text-green"></i>
-													    </a>
-													</td>
- 
-						                        </tr>
-						                    </tbody>
-						                    <tfoot class="thead-dark">
-						                        <tr>
-						                            <th class="text-center">S.No</th>                                                  
-						                            <th class="text-center">Name</th>
-						                            <th class="text-center">Event Date</th>
-						                            <th class="text-center">Description</th>
-						                            <th class="text-center">Adhaar</th>
-						                            <th class="text-center">Vechicle RC Book</th> 
-						                            <th class="text-center no-sort" width="%2">Action</th>                            
-						                        </tr>
-						                    </tfoot>
-						                </table>
-						            </div>
-						        </div>
-						    </div>
-						</div>
-
-                      </div>
-                 
-                     </div>
-                </div>
-               
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-				</div>
-		
-		</div>
-		
-                      
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-        
-        <script type="text/javascript">
-        $(document).ready(function() {
-
-        	var table = $('#CampaignDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { targets: 'no-sort', orderable: false }
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', 'Show all']
-                ],
-                scrollY: '50vh',
-                fixedColumns: {
-                    left: 1,
-                    right: 1
-                },
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false
-            });
-        });
-        
-       
-        $(document).ready(function () {
-            $('#cdwasteRegistrationForm').on('submit', function (event) {
-                event.preventDefault(); // Prevent default form submission
-
-                var name = $('#name').val();
-                var mobileNo = $('#mobileNo').val();
-                var address = $('#address').val();
-                var adhaarFile = $('#adhaar')[0].files[0];
-                var vehicleRcBookFile = $('#vehicleRcBook')[0].files[0];
-
-                if (!name || !mobileNo || !address || !adhaarFile || !vehicleRcBookFile) {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'All fields are required!'
-                    });
-                    return;
-                }
-
-                var formData = new FormData(this); // 'this' refers to the form element
-
-                $.ajax({
-                    url: '/gcc/api/registration/register',
-                    type: 'POST',
-                    data: formData,
-                    processData: false, // Required for FormData
-                    contentType: false, // Required for FormData
-                    success: function (response) {
-                        if (response[0].status === 'success') {
-                            Swal.fire({
-                                icon: 'success',
-                                title: 'Success',
-                                text: response[0].message
-                            }).then((result) => {
-                                if (result.isConfirmed) {
-                                    $('#cdwasteRegistrationForm')[0].reset();
-                                    location.reload();
-                                }
-                            });
-                        } else {
-                            Swal.fire({
-                                icon: 'error',
-                                title: 'Error',
-                                text: response[0].message
-                            });
-                        }
-                    },
-                    error: function (xhr, status, error) {
-                        Swal.fire({
-                            icon: 'error',
-                            title: 'Error',
-                            text: 'An error occurred: ' + error
-                        });
-                    }
-                });
-            });
-        });
-
-
-
-
-
-		
-	
-
-
-	
-        </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/cdwaste/rejected.html b/src/main/resources/templates/modules/cdwaste/rejected.html
deleted file mode 100644
index 75fe7a06..00000000
--- a/src/main/resources/templates/modules/cdwaste/rejected.html
+++ /dev/null
@@ -1,409 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<style>
-
-/* Main container */
-.container {
-    display: flex;
-    flex-direction: column;
-    gap: 15px;
-    width: 100%;
-}
-
-/* Row container to align 2 fields per row */
-.labelitems {
-    display: flex;
-    justify-content: space-between; /* Evenly distributes fields */
-    gap: 15px;
-}
-
-/* Individual field wrapper */
-.field-container {
-    display: flex;
-    align-items: center;
-    flex: 1; /* Ensures equal spacing */
-}
-
-/* Label styling */
-.field-label {
-    width: 120px;
-    font-weight: bold;
-    font-size:14px;
-}
-
-/* Input box styling */
-.field-input {
-    width: 200px; /* Adjusted width */
-    padding: 5px;
-    border: 1px solid #ccc;
-    border-radius: 5px;
-    background-color: #f9f9f9;
-    font-size: 14px;
-}
-
-.modal-body {
-    max-height: 70vh; 
-    overflow-y: auto; 
-    overflow-x: hidden; 
-    padding-right: 15px; 
-}
-
-
-
-</style>
-
-
-
-
-<body>
-    <div class="wrapper">
-        <!-- Header -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-        <div class="page-wrap">
-            <!-- Left Menu -->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fas fa-th-large bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>C & D Waste Collectors </h5>
-                                        <span>Rejected</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item">C & D Waste Collectors</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Rejected</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                    <hr>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="card">
-                             <div class="card-header">
-									<h5 style="font-weight:bold;"> Rejected List</h5>
-				            </div>
-                                <div class="card-block">
-                                    <div>
-                                        <table id="worksDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                           <thead class="thead-dark">
-										        <tr role="row">
-										            <th class="text-center">S.No</th> <!-- Auto-increment index -->
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Mobile No</th>
-										            <th class="text-center">Address</th>
-										            <th class="text-center">Vehicle Number</th>
-										            <th class="text-center">Vehicle Type</th>
-										            <!-- <th class="text-center">Rejected Date</th> -->
-										            <th class="text-center">Rejected By</th>
-										            <th class="text-center">Reason</th>
-										            <th class="text-center">Register ID</th>
-										            <th class="text-center">Actions</th>
-										        </tr>
-										    </thead>
-										    <tbody>
-										        <tr th:each="rejected, i : ${rejectedDetails}">
-										            <td class="text-center" th:text="${i.count}">0</td> <!-- Index counter -->
-										            <td class="text-center" th:text="${rejected.name}">Name</td>
-										            <td class="text-center" th:text="${rejected.mobile_no}">Mobile No</td>
-										            <td class="text-center" th:text="${rejected.address}">Address</td>
-										            <td class="text-center" th:text="${rejected.vehicle_num}">Vehicle Number</td>
-							 			            <td class="text-center" th:text="${rejected.vehicletype}">Vehicle Type</td>
-										           <!-- <td class="text-center" th:text="${rejected.reject}">Rejected Date</td> -->
-										          
-										           <!-- <td class="text-center" 
-													    th:text="${rejected.reject != null} ? ${rejected.reject.split('-')[2]} + '/' + ${rejected.reject.split('-')[1]} + '/' + ${rejected.reject.split('-')[0]} : ''">
-													</td> -->
-										            <td class="text-center" th:text="${rejected.acceptedby}">Rejected By</td>
-										            <td class="text-center" th:text="${rejected.reason}">Reason</td>
-										            <td class="text-center" th:text="${rejected.register_id}">Register ID</td>
-										            <td class="text-center">
-												             <button class="btn btn-info" 
-																 th:attr="onclick='showModal(' + ${rejected['register_id']} + ')'" 
-														             th:text="'View Details'">
-														      </button>
-							                     </td>
-										        </tr>
-										    </tbody>
-
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                
-                
-                <div class="modal fade" id="detailModal" tabindex="-1" role="dialog" aria-labelledby="detailModalLabel" aria-hidden="true">
-						    <div class="modal-dialog modal-lg" role="document">
-						        <div class="modal-content">
-						            <div class="modal-header">
-						                <h5 class="modal-title" id="detailModalLabel">Register id: <span id="modal_register_id"></span></h5>
-						                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						                    <span aria-hidden="true">&times;</span>
-						                </button>
-						            </div>
-						            <div class="modal-body">
-						                <div id="cduserinfoHTML">
-						                </div>
-						                 <hr>
-						                <div class="row labelitems">
-						                    <div class="col-md-12">
-						                        <p><strong>Adhaar Photo/Document:</strong></p>
-						                        <div id="modal_adhaar_container"></div>
-						                    </div>
-						                    <div class="col-md-12">
-						                        <p><strong>User Photo:</strong></p>
-						                        <div id="modal_user_photo_container"></div>
-						                    </div>
-						                    <div class="col-md-12">
-						                        <p><strong>RC Book Document:</strong></p>
-						                        <div id="modal_vehicle_doc_container"></div>
-						                    </div>
-						                    <div class="col-md-12">
-						                        <p><strong>Lease Vehicle Document:</strong></p>
-						                        <div id="modal_leasevehicle_doc_container"></div>
-						                    </div>
-						                </div>
-						
-						                <!-- Rejection Section -->
-						                 <!--<div id="rejectionSection" style="display: none; margin-top: 20px;">
-						                    <p><strong>Reason for Rejection <span class="text-danger">*</span></strong></p>
-						                    <textarea id="rejectionReason" rows="4" class="form-control"></textarea>
-						                    <button type="button" class="btn btn-danger mt-2" onclick="confirmRejection()">Confirm</button>
-						                </div> -->
-						            </div>
-						            <div class="modal-footer">
-						                
-						                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-						            </div>
-						        </div>
-						    </div>
-						</div>
-                
-                
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-   
-
-    <!-- Include jQuery and Bootstrap JavaScript -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script type="text/javascript">
-    $(document).ready(function() {
-
-    	var table = $('#worksDatatable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [
-                { targets: 'no-sort', orderable: false }
-            ],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', 'Show all']
-            ],
-            scrollY: '50vh',
-            fixedColumns: {
-                left: 1,
-                right: 1
-            },
-            buttons: [
-                {
-                    extend: 'pageLength',
-                    className: 'btn btn-warning'
-                },
-                {
-                    title: 'Data export',
-                    extend: 'copyHtml5',
-                    text: 'Copy',
-                    className: 'btn btn-secondary',
-                    id: 'copyBtn'
-                },
-                {
-                    extend: 'excelHtml5',
-                    text: 'Excel',
-                    className: 'btn btn-secondary',
-                    id: 'excelBtn'
-                },
-                {
-                    extend: 'csvHtml5',
-                    text: 'CSV',
-                    className: 'btn btn-secondary',
-                    id: 'csvBtn'
-                },
-                {
-                    extend: 'pdfHtml5',
-                    text: 'PDF',
-                    className: 'btn btn-secondary',
-                    id: 'pdfBtn'
-                }
-            ],
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false
-        });
-       
-    });
-    	   
-    
-//function to show the view details
-    
-    function showModal(registerId) {
-        $.ajax({
-            url: '/gcc/api/registration/pendingbyid?registerId=' + registerId,
-            method: 'GET',
-            dataType: 'json',
-            success: function(data) {
-                console.log(data);
-                // Check if data is not empty
-                if (data.length > 0) {
-                    // Access the first item in the array
-                    const userData = data[0]; // Get the first object from the array
-                    const formattedRejectedDate = userData.accepteddate ? userData.accepteddate.split('T')[0] : '';
-	                
-                    let userinfo = `
-                    	<div style="display: flex; flex-direction: column; gap: 15px;">
-                	    <div class="container">
-                	        <!-- First Row -->
-                	        <div class="row">
-                	            <div class="field-container">
-                	                <label class="field-label">Name:</label>
-                	                <input type="text" id="modal_name" value="${userData.name}" readonly class="field-input">
-                	            </div>
-
-                	            <div class="field-container">
-                	                <label class="field-label">Mobile No:</label>
-                	                <input type="text" id="modal_mobile_no" value="${userData.mobile_no}" readonly class="field-input">
-                	            </div>
-                	        </div>
-
-                	        <!-- Second Row -->
-                	        <div class="row">
-                	            <div class="field-container">
-                	                <label class="field-label">Address:</label>
-                	                <input type="text" id="modal_address" value="${userData.address}" readonly class="field-input">
-                	            </div>
-
-                	            <div class="field-container">
-                	                <label class="field-label">Vehicle No:</label>
-                	                <input type="text" id="modal_vehicle_num" value="${userData.vehicle_num}" readonly class="field-input">
-                	            </div>
-                	        </div>
-
-                	        <!-- Third Row -->
-                	        <div class="row">
-                	            <div class="field-container">
-                	                <label class="field-label">Vehicle Type:</label>
-                	                <input type="text" id="modal_vehicletype" value="${userData.vehicletype}" readonly class="field-input">
-                	            </div>
-
-                	            <div class="field-container">
-                	                <label class="field-label">Ref Num:</label>
-                	                <input type="text" id="modal_ref_num" value="${userData.reference_num}" readonly class="field-input">
-                	            </div>
-                	        </div>
-                	        
-                	        <!-- Fourth Row -->
-                	        <div class="row">
-                	            <div class="field-container">
-                	                <label class="field-label">Rejected Date:</label>
-                	                <input type="date" id="modal_accepteddate" value="${formattedRejectedDate}" readonly class="field-input">
-                	            </div>
-                	        </div>
-                	        
-                	    </div>
-                	</div>`;
-
-                    $("#cduserinfoHTML").html(userinfo);
-                    $("#modal_register_id").html(userData.register_id);
-
-                    console.log(userData.adhaarurl);
-				    
-                    // Display the files (Adhaar, User Photo, Vehicle Document)
-                    if (userData.adhaarurl!=null) {
-                    	displayFile('modal_adhaar_container', userData.adhaarurl);
-                    }
-                    if (userData.user_photourl) {
-                    	displayFile('modal_user_photo_container', userData.user_photourl);
-                    }
-                    if (userData.rcbookurl) {
-                    	displayFile('modal_vehicle_doc_container', userData.rcbookurl);
-                    }
-                    if (userData.leasedocurl) {
-                    	displayFile('modal_leasevehicle_doc_container', userData.leasedocurl);
-                    }
-                    
-                    // Hide rejection section initially
-                   /*  document.getElementById('rejectionSection').style.display = 'none';
-                    document.getElementById('rejectionReason').value = ''; // Clear previous input */
-                    // Show the modal
-                    $('#detailModal').modal({
-                        backdrop: 'static',
-                        keyboard: false
-                    });
-                } else {
-                    // Handle case where no data is returned
-                    alert('No data found for this registration ID.');
-                }
-            },
-            error: function(err) {
-                console.error(err);
-                alert('Failed to fetch data');
-            }
-        });
-    }
-    
-    //display file function
-    
-		    function displayFile(containerId, filePath) {
-		    const container = document.getElementById(containerId);
-		
-		    // Ensure the container exists before proceeding
-		    if (!container) {
-		        console.error(`Element with ID '${containerId}' not found.`);
-		        return;
-		    }
-		
-		    // Ensure filePath is valid before attempting to display
-		    if (!filePath) {
-		        container.innerHTML = '<p class="text-danger">No document available</p>';
-		        return;
-		    }
-		
-		    const fileExtension = filePath.split('.').pop().toLowerCase();
-		    console.log('Full Path:', filePath);
-		
-		    if (fileExtension === 'pdf') {
-		        container.innerHTML = `<embed src="${filePath}" type="application/pdf" width="100%" height="500px" />`;
-		    } else {
-		        container.innerHTML = `<img src="${filePath}" alt="Document" class="img-fluid img-thumbnail" />`;
-		    }
-		}
-
-    </script>
-</body>
-</html>
diff --git a/src/main/resources/templates/modules/cdwastecollect/.DS_Store b/src/main/resources/templates/modules/cdwastecollect/.DS_Store
deleted file mode 100644
index 244e19b76466853280af650ea50083e5fadac19e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%Sr=55bV|*0t)8nMVPw~@DJ7y51#!2NmLY8S2lW|Kk^f`s=JjeZY~}KrF)sF
z&P>-l3NkY-BD#3JITM+Q$P|UBbViKLqg{Iuybn|xqmw7Ol@}rY4ddF6q{XT?__o(S
zmwW8wQQFJ4Td&$~g-FVDjxv8YgC}wb)*ZeFS!0x5cJba2dph9th<^sV$2^-|JUsz#
zdp^#YmI|Z-sX!`_3jACF+}X70fn(OGKq`<5d?~>5p`Z|(!0Kp62P#VefD<&E!RI5H
zoD$dsR!8)})TuzHYNQzIbhMX<YXYmI(?uis(3tr%c~P4k;};7TZ5*>s1yX^b0?d73
zGv5Cf_{)qY`4*B@Dv%2NR|Rykyjm`>ySQ7w?UQ$HLAgeuF|N{q!5=&V@Pp^bv2}WX
ap^vyGusU)Swi_Lo4*?S-t5o0@6!-w=mpT;y

diff --git a/src/main/resources/templates/modules/cdwastecollect/lessoneton.html b/src/main/resources/templates/modules/cdwastecollect/lessoneton.html
deleted file mode 100644
index 5d8fd273..00000000
--- a/src/main/resources/templates/modules/cdwastecollect/lessoneton.html
+++ /dev/null
@@ -1,430 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style> 
- .required{
-	color: red;
-}
-.card-box {
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-       	
-    }
-    
-@media (max-width: 768px) {
-    .card-box {
-        text-align: center;
-    }
-
-}
-
-	
-</style>
-<body>
-    <div class="wrapper">
-        <!-- Header -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-        <div class="page-wrap">
-            <!-- Left Menu -->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-6">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Less 1 Ton List</h5>
-                                        <span>C & N Manager System</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-6">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item">
-                                            <a href="/gcc/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">C & N Manager System</li>																		
-                                        <li class="breadcrumb-item active" aria-current="page">Less 1 Ton List</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-					
-	                <div class="row mt-4">
-	                	
-	                	<div class="col-md-12">
-                             <div class="card">
-                             	<div class="card-header">
-                             		<h3>Less 1 Ton List</h3>
-                             	</div>
-                             	
-<!--                           	<div class="row mt-3 ml-2">
-									    <div class="col-md-3">
-									    	<label for="startDate" class="form-label" style="font-size: medium;">From Date:</label>
-									        <input type="date" id="startDate" class="form-control" placeholder="Start Date" onclick="this.showPicker()">
-									    </div>
-									    <div class="col-md-3">
-									    	<label for="endDate" class="form-label" style="font-size: medium;">To Date:</label>
-									        <input type="date" id="endDate" class="form-control" placeholder="End Date" onclick="this.showPicker()">
-									    </div>
-									    <div class="col-md-3" style="margin-top: 30px;">
-									        <button id="searchBtn" class="btn btn-primary">Search</button>
-									        <button id="resetBtn" class="btn btn-secondary">Reset</button>
-									    </div>
-									</div> -->
-					   				
-					   				<div class="card-body">
-						
-                 							<table id="QaqcDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-							                    <thead class="thead-dark">
-											      
-							                        <tr role="row">           
-					                            		<th class="text-center no-sort" style="text-align: center;">S.No</th>	
-					                            		<th class="text-center no-sort" style="text-align: center;">Reference ID</th>				                            
-							                            <th class="text-center no-sort" style="text-align: center;">Name</th>
-							                            <th class="text-center no-sort" style="text-align: center;">Request Date</th>
-							                            <th class="text-center no-sort" style="text-align: center;">Quantity</th>
-							                            <th class="text-center no-sort" style="text-align: center;">Mobile No</th>							                          
-							                            
-							                        </tr>
-							                    </thead>
-							                    <tbody>
-							                        
-							                    </tbody>
-							                </table>
-
-							 </div>
-                         </div> 
-					</div>	               	
-             						 					  
-			</div> 
-        </div>
-   
-  
-      </div>
-         <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-</div>
-</div>
-
-<!-- Modal -->
-		<div class="modal fade" id="publicinfodetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-lg"  role="document">
-			        <div class="modal-content">
-			        
-			            <div class="modal-header">
-			            
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Public Information (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			                
-			            </div>
-			            
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- requester Name-->
-			                    <div class="col-md-6">
-			                        <label for="userName" class="form-label fw-bold">Name</label>
-			                        <input type="text" id="userName" class="form-control" readonly>
-			                    </div>
-			                    
-			
-			                    <!-- Phone Number -->
-			                    
-			                    <div class="col-md-6">
-			                        <label for="contactNumber" class="form-label fw-bold">Phone Number</label>
-			                        <input type="number" id="contactNumber" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- waste Selection -->
-			                    <div class="col-md-6">
-			                        <label for="wasteSelection" class="form-label fw-bold">Waste Selection</label>
-			                        <input type="text" id="wasteSelection" class="form-control" readonly>
-			                    </div>
-			
-			
-			                    <!-- vehicle Selection -->
-			                    <div class="col-md-6">
-			                        <label for="vehicleSelection" class="form-label fw-bold">Vehicle Selection </label>
-			                        <input type="text" id="vehicleSelection" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Request Date -->
-			                    <div class="col-md-6">
-			                        <label for="requestDate" class="form-label fw-bold">Request Date </label>
-			                        <input type="text" id="requestDate" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Zone -->
-			                    <div class="col-md-6">
-			                        <label for="zone" class="form-label fw-bold">Zone </label>
-			                        <input type="text" id="zone" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Wards -->
-			                    <div class="col-md-6">
-			                        <label for="ward" class="form-label fw-bold">Ward </label>
-			                        <input type="text" id="ward" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Waste Type -->
-			                    <div class="col-md-6">
-			                        <label for="wasteType" class="form-label fw-bold">Waste Type </label>
-			                        <input type="text" id="wasteType" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Location -->
-			                    <div class="col-md-6">
-			                        <label for="location" class="form-label fw-bold">Location </label>
-			                        <input type="text" id="location" class="form-control" readonly>
-			                    </div>
-			                    
-			               
-						</div>
-				</div>
-				
-				<div class="modal-footer">
-				    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-				</div>
-				
-
-			         </div>    
-			       </div>
-			    </div>
-
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	
-
-	
-	<script type="text/javascript">	
- 	 $(document).ready(function() {
- 		 
-     	var table = $('#QaqcDatatable').DataTable({
-     		
-     		
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '50vh',
-             fixedColumns: {
-                 left: 1,
-                 right: 1
-             },
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: true,
-             responsive: true,
-             searching:true,
-             select: false,
-             processing: false
-         });
-
-     	
-     
-    	
-     	 // Initialize DataTable with export buttons
-		    const tableApiUrl = "/gcc/api/dumpregistration/getless1tonlist";
-     	 
-
-    // Fetch and Populate Table Data Function
-    
-     const fetchTableData = async (startDate = "", endDate = "") => {
-        try {
-            const params = new URLSearchParams();
-            if (startDate) params.append("startDate", startDate);
-            if (endDate) params.append("endDate", endDate);
-
-            const response = await fetch(`${tableApiUrl}?${params.toString()}`);
-            const tableData = await response.json();
-
-            // Update DataTable with new data
-            table.clear(); // Clear existing data
-            tableData.forEach((row, index) => {
-                table.row.add([
-                	
-                	`<div style="text-align: center;">${index + 1}</div>`,
-                	`<button  class="btn btn-success" data-ref_id="${row.refid}"  
-                	 onclick="fetchRequestDetails('${row.refid}')"  style="text-align: center;">${row.refid}</button>`,
-
-                    `<div style="text-align: center;">${row.name}</div>`,
-                    `<div style="text-align: center;">${row.request_date}</div>`,
-                    `<div style="text-align: center;">${row.quantity}</div>`,
-                    `<div style="text-align: center;">${row.mobile_no}</div>`,
-     
-                ]);
-                
-            });
-            table.draw(); // Redraw the DataTable with the updated data
-      
-        } catch (error) {
-            console.error("Error fetching table data:", error);
-        }
-           
-    };
-
-
-    // Example: Fetch Data initially without filters
-    fetchTableData();
-    
-
- 
- // ✅ This makes fetchRequestDetails globally available for the onclick
-    window.fetchRequestDetails = function (refId) {
-        console.log("refId", refId);
-
-        $.ajax({
-            url: '/gcc/api/dumpregistration/getless1tonlistbyId',
-            type: 'GET',
-            data: { refId: refId },
-            dataType: "json",
-            success: function (response) {
-                let details = null;
-
-                if (Array.isArray(response) && response.length > 0) {
-                    details = response[0];
-                } else if (response && typeof response === 'object') {
-                    details = response;
-                }
-
-                if (details) {
-                    $('#userName').val(details.name);
-                    $('#contactNumber').val(details.mobile_no);
-                    $('#wasteSelection').val(details.quantity);
-                    $('#vehicleSelection').val(details.vehicle_name);
-                    $('#requestDate').val(details.request_date);
-                    $('#zone').val(details.zone);
-                    $('#ward').val(details.ward);
-                    $('#wasteType').val(details.waste_type);
-                    $('#location').val(details.location);
-                    $('#modalEmployeeCode').text(details.refid);
-
-                    // ✅ Show the modal
-                    $('#publicinfodetailsModal').modal('show');
-                } else {
-                    Swal.fire({
-                        icon: 'info',
-                        title: 'No Data',
-                        text: 'No details found for the selected entry.',
-                        confirmButtonText: 'OK'
-                    });
-                }
-            },
-            error: function () {
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error',
-                    text: 'Failed to fetch details. Please try again.',
-                    confirmButtonText: 'OK'
-                });
-            }
-        });
-    };
-
-
-
-/*     
- // Event listener for From Date selection
-	   $("#startDate").on("change", function() {
-	       const startDate = $(this).val();  // Get the selected start date
-	       // Set the min value for To Date to be the selected From Date
-	       $("#endDate").attr("min", startDate);
-	   });
-
-	   // Event listener for To Date selection
-	   $("#endDate").on("change", function() {
-	       const endDate = $(this).val();  // Get the selected end date
-	       // Set the max value for From Date to be the selected To Date
-	       $("#startDate").attr("max", endDate);
-	   });
-
-		    // Search Button Click
-		   document.getElementById("searchBtn").addEventListener("click", () => {
-		    const startDate = document.getElementById("startDate").value;
-		    const endDate = document.getElementById("endDate").value;
-		
-		    //console.log("xsnskjx");
-		    console.log(startDate);
-		
-		    // Check if startDate or endDate is empty
-		    if (!startDate || !endDate) {
-		        Swal.fire({
-		            icon: "warning",
-		            title: "Incomplete Search",
-		            text: "Please select the Date Before searching",
-		            confirmButtonText: "OK",
-		        });
-		    } else {
-		        // Call fetchTableData if dates are provided
-		        fetchTableData(startDate, endDate);
-		    }
-		}); */
-
-		    // Reset Button Click
-		    document.getElementById("resetBtn").addEventListener("click", () => {
-		      
- 		        window.location.reload();		        
-		    });
-
-
-            fetchTableData();
-		});
- 	 
-
-	</script>
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/cdwastecollect/officer.html b/src/main/resources/templates/modules/cdwastecollect/officer.html
deleted file mode 100644
index bf0206ad..00000000
--- a/src/main/resources/templates/modules/cdwastecollect/officer.html
+++ /dev/null
@@ -1,1122 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-
-/* .modal-body {
-    max-height: 70vh; 
-    overflow-y: auto; 
-    overflow-x: hidden; 
-    padding-right: 15px; 
-} */
-.request-box {
-	border: 1px solid #ddd;
-	background: white;
-	padding: 15px;
-	margin-bottom: 15px;
-	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
-	width: 100%;
-}
-
-.request-info {
-	width: 100%;
-}
-
-table {
-	width: 100%;
-	border-collapse: collapse;
-	table-layout: fixed; /* Ensures equal column spacing */
-}
-
-td {
-	padding: 12px;
-	border: 1px solid #ddd;
-	text-align: left;
-	white-space: nowrap;
-}
-
-/* Ensure status button aligns with table width */
-.status-container {
-	display: flex;
-	justify-content: flex-end; /* Aligns button to the right */
-	padding: 10px;
-}
-
-.status-btn {
-	padding: 10px 20px;
-	border: none;
-	border-radius: 5px;
-	font-size: 14px;
-	cursor: pointer;
-	width: 150px;
-	text-align: center;
-}
-
-.pending {
-	background-color: #004085;
-	color: white;
-}
-
-.completed {
-	background-color: green;
-	color: white;
-}
- 
-
-
-
-/* Make sure the container adjusts to screen size */
-@media ( min-width : 768px) {
-	.col-md-12 {
-		flex: 0 0 100%;
-		max-width: 100%;
-	}
-}
-
-td {
-  word-wrap: break-word;
-  white-space: normal;
-}
-</style>
-<body>
-
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Officer</h5>
-										<span>C&D Management System</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">C&D
-											Management System</li>
-										<li class="breadcrumb-item active" aria-current="page">Officer</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<h4 class="h4 text-right text-mute" style="font-size: 12px;">
-						Auto refresh in <font id="refresh-countdown">00</font> seconds
-					</h4>
-
-					<div class="row">
-
-						<div class="col-md-12">
-							<div class="card">
-
-								<div class="card-body">
-									<div class="page-header-title"
-										style="background-color: black; color: white; padding: 10px; border-radius: 5px;">
-										<h5 style="margin: 0; font-weight: bold;">Request
-											Information</h5>
-									</div>
-									<div class="container mt-5">
-										<div>
-											<h5 style="margin: 0; font-weight: bold;">Find the
-												Request Details</h5>
-											<hr>
-										</div>
-										<!-- Phone -->
-
-										<div class="row mb-3">
-											<div class="col-md-6">
-												<label class="form-label" for="searchInput">Mobile
-													No / Ref ID<span class="text-danger">*</span>
-												</label> <input type="text" id="searchInput" class="form-control"
-													placeholder="Enter Mobile No or Ref ID">
-											</div>
-
-											<div class="col-md-2 d-flex align-items-end">
-												<button class="btn btn-primary w-100" id="searchButton">Search</button>
-											</div>
-
-											<div class="col-md-2 d-flex align-items-end">
-												<button class="btn btn-secondary w-100" id="resetButton">Reset</button>
-											</div>
-										</div>
-
-									</div>
-								</div>
-							</div>
-						</div>
-
-						<div class="col-md-12" style="display: none;" id="infocard">
-							<div class="card">
-								<div class="card-block">
-									<div class="page-header-title"
-										style="background-color: black; color: white; padding: 10px; border-radius: 5px;">
-										<h5 style="margin: 0; font-weight: bold;">Public
-											Information</h5>
-										<hr>
-									</div>
-
-									<div class="container mt-5">
-										<!-- List of Array -->
-										<div class="row mb-3">
-											<div id="requestContainer"></div>
-										</div>
-
-									</div>
-								</div>
-							</div>
-
-						</div>
-
-					</div>
-
-
-				</div>
-
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-
-		</div>
-	</div>
-
-	<!-- Modal -->
-	<div class="modal fade" id="returnretrieddetailsModal" tabindex="-1"
-		role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true"
-		data-bs-backdrop="static" data-bs-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-
-				<div class="modal-header">
-
-					<h5 class="modal-title" id="detailsModalLabel">
-						Public Information (<span id="modalEmployeeCode"></span>)
-					</h5>
-					
-					<input type="hidden" id="wastetypehidden">
-
-					<button type="button" class="close" data-bs-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-
-				</div>
-
-				<div class="modal-body">
-					<div class="row">
-						<!-- requester Name-->
-						<div class="col-md-6">
-							<label for="publicName" class="form-label fw-bold">Name</label> <input
-								type="text" id="publicName" class="form-control" readonly>
-						</div>
-
-
-						<!-- Phone Number -->
-
-						<div class="col-md-6">
-							<label for="contactNumber" class="form-label fw-bold">Phone
-								Number</label> <input type="number" id="contactNumber"
-								class="form-control" readonly>
-						</div>
-
-						<!-- waste Selection -->
-						<div class="col-md-6">
-							<label for="wasteSelection" class="form-label fw-bold">Waste
-								Selection</label> <input type="text" id="wasteSelection"
-								class="form-control" readonly>
-						</div>
-
-
-						<!-- vehicle Selection -->
-						<div class="col-md-6">
-							<label for="vehicleSelection" class="form-label fw-bold">Vehicle
-								Selection </label> <input type="text" id="vehicleSelection"
-								class="form-control" readonly>
-						</div>
-
-					</div>
-
-
-					<!-- Left Side Form -->
-					<hr>
-					<div class="container">
-						<div class="row">
-							<!-- Left Side - Actual Weight -->
-							<div class="col-md-6">
-								<label for="actualWeight" class="form-label">Enter the
-									actual weight (In Kg) <span class="text-danger">*</span>
-								</label> <input type="number" class="form-control mb-2"
-									id="actualWeight" min="0" step="0.01" placeholder="Enter Here"
-									oninput="recalculateCharges()" />
-							</div>
-
-							<!-- Right Side - Payment Type -->
-							<div class="col-md-6">
-								<label class="form-label">Select the payment type <span
-									class="text-danger">*</span></label>
-								<div class="d-flex gap-2 mt-2">
-									<div
-										class="form-check flex-fill border rounded p-2 text-center">
-										<input class="form-check-input me-2" type="radio"
-											name="paymentType" id="generateLink" value="generateLink"
-											onchange="toggleMobileInput()"> <label
-											class="form-check-label" for="generateLink">Generate
-											link</label>
-									</div>
-									<div
-										class="form-check flex-fill border rounded p-2 text-center">
-										<input class="form-check-input me-2" type="radio"
-											name="paymentType" id="generateQR" value="generateQR"
-											onchange="toggleMobileInput()"> <label
-											class="form-check-label" for="generateQR">Generate QR
-											Code</label>
-									</div>
-								</div>
-
-								<!-- Mobile Number -->
-								<div class="col-md-6" id="mobileNumberContainer"
-									style="display: none;">
-									<label for="payment_mobile_no" class="form-label">Enter
-										Mobile Number <span class="text-danger">*</span>
-									</label> <input type="text" class="form-control" id="payment_mobile_no"
-										placeholder="Enter mobile number"
-										oninput="validatePhoneNumber(this)">
-								</div>
-								
-								
-							</div>
-
-						</div>
-						<!-- <div class="row"> -->
-						<!-- Payment Details Card -->
-						<div
-							class="col-md-6 mt-3 payment-details border rounded p-3 shadow-sm bg-light">
-
-							<h6>Payment Details</h6>
-							<hr />
-							<p id="processingCharges">
-								<strong>Processing Charges:</strong> Rs - <span
-									id="processingAmount"></span>
-							</p>
-							<p id="wasteCharges" style="display: none;">
-								<strong>Waste Collection Charges:</strong> Rs - <span
-									id="wasteAmount"></span>
-							</p>
-							<hr>
-							<p id="totalCharges" style="display: none;">
-								<strong>Total Charges:</strong> Rs - <span id="totalAmount"></span>
-							</p>
-
-						</div>
-
-						<!-- Buttons -->
-						<div class="col-md-12 text-center mt-4">
-							<button type="button" class="btn btn-primary me-3"
-								onclick="savePaymentDetailsFromModal()" id="submitbutton">Submit</button>
-							<button type="button" class="btn btn-outline-secondary"
-								data-bs-dismiss="modal">Cancel</button>
-						</div>
-						<!-- </div> -->
-					</div>
-
-				</div>
-
-
-			</div>
-		</div>
-	</div>
-
-	<!-- Modal box for Completed -->
-	<div class="modal fade" id="completeddetailsModal" tabindex="-1"
-		role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true"
-		data-bs-backdrop="static" data-bs-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-
-				<div class="modal-header">
-
-					<h5 class="modal-title" id="detailsModalLabel">
-						Public Information (<span id="modalEmployeeCodes"></span>)
-					</h5>
-
-					<button type="button" class="close" data-bs-dismiss="modal"
-						aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-
-				</div>
-
-				<div class="modal-body">
-					<div class="row">
-						<!-- requester Name-->
-						<div class="col-md-6">
-							<label for="publicNames" class="form-label fw-bold">Name</label>
-							<input type="text" id="publicNames" class="form-control" readonly>
-						</div>
-
-
-						<!-- Phone Number -->
-
-						<div class="col-md-6">
-							<label for="contactNumbers" class="form-label fw-bold">Phone
-								Number</label> <input type="number" id="contactNumbers"
-								class="form-control" readonly>
-						</div>
-
-						<!-- waste Selection -->
-						<div class="col-md-6">
-							<label for="wasteSelections" class="form-label fw-bold">Waste
-								Selection</label> <input type="text" id="wasteSelections"
-								class="form-control" readonly>
-						</div>
-
-
-						<!-- vehicle Selection -->
-						<div class="col-md-6">
-							<label for="vehicleSelections" class="form-label fw-bold">Vehicle
-								Selection </label> <input type="text" id="vehicleSelections"
-								class="form-control" readonly>
-						</div>
-
-						<!-- Request Date -->
-						<div class="col-md-6">
-							<label for="requestDates" class="form-label fw-bold">Request
-								Date </label> <input type="text" id="requestDates" class="form-control"
-								readonly>
-						</div>
-					</div>
-
-					<!-- Left Side Form -->
-					<hr>
-					<div class="container">
-						<div class="row">
-							<!-- Left Side - Actual Weight -->
-							<div class="col-md-6">
-								<label for="completed_actualWeight" class="form-label">Enter the
-									actual weight (In ton) <span class="text-danger">*</span>
-								</label> <input type="number" class="form-control mb-2"
-									id="completed_actualWeight" placeholder="Enter Here"
-									oninput="recalculateCharges()" / readonly>
-							</div>
-
-							<!-- Right Side - Payment Type -->
-							<div class="col-md-6">
-								<label class="form-label">Select the payment type <span
-									class="text-danger">*</span></label>
-								<div class="d-flex gap-2 mt-2">
-									<div
-										class="form-check flex-fill border rounded p-2 text-center">
-										<input class="form-check-input me-2" type="radio"
-											name="paymentTypes" id="completed_generateLinks" readonly> <label
-											class="form-check-label" for="completed_generateLinks">Generate
-											link</label>
-									</div>
-									<div
-										class="form-check flex-fill border rounded p-2 text-center">
-										<input class="form-check-input me-2" type="radio"
-											name="paymentTypes" id="completed_generateQRs" readonly> <label
-											class="form-check-label" for="completed_generateQRs">Generate
-											QR Code</label>
-									</div>
-								</div>
-							</div>
-						</div>
-						<!-- Payment Details Card -->
-						<div
-							class="col-md-6 mt-3 payment-details border rounded p-3 shadow-sm bg-light">
-							<h6>Payment Details</h6>
-							<hr />
-							<p id="processingChargess">
-								<strong>Processing Charges:</strong> Rs - <span
-									id="processingAmounts"></span>
-							</p>
-							<p id="wasteChargess" style="display: none;">
-								<strong>Waste Collection Charges:</strong> Rs - <span
-									id="wasteAmounts"></span>
-							</p>
-							<p id="totalChargess" style="display: none;">
-								<strong>Total Charges:</strong> Rs - <span id="totalAmounts"></span>
-							</p>
-
-						</div>
-
-						<!-- Buttons -->
-						<div class="col-md-12 text-center mt-4">
-						
-						<button type="button" class="btn btn-primary me-3"
-						    onclick="downloadAcknowledgementViaAjax()" id="ACKDownloadbutton">
-						    Download Acknowledgement</button>
-							<button type="button" class="btn btn-outline-secondary"
-								data-bs-dismiss="modal">Cancel</button>
-						</div>
-						
-						
-					</div>
-
-				</div>
-
-			</div>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-<!-- 	<script
-		src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script> -->
-	<script
-		src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script> 
-
-	<script type="text/javascript">
-        
-        
-        $(document).ready(function () {
-            // Initially hide the info card and request container
-            $("#requestContainer").hide();
-            $('#infocard').hide();
-            
-            function handleSearch() {
-                const inputValue = $("#searchInput").val().trim();
-
-                if (inputValue === "") {
-                    Swal.fire({
-                        icon: "warning",
-                        title: "Input Required",
-                        text: "Please enter a Mobile Number or Ref ID.",
-                        backdrop: true,
-                        allowOutsideClick: false
-                    });
-                    return;
-                }
-
-                // Determine if it's a mobile number (only digits, usually 10-digit) or refId
-                const isMobileNo = /^[6-9]\d{9}$/.test(inputValue);  // Basic mobile number check
-
-                const queryParams = {};
-                if (isMobileNo) {
-                    queryParams.mobileNo = inputValue;
-                } else {
-                    queryParams.refId = inputValue;
-                }
-
-                $.ajax({
-                    url: "/gcc/api/dumpregistration/wastecollectorlist",
-                    type: "GET",
-                    data: queryParams,
-                    dataType: "json",
-                    success: function (data) {
-                        console.log("registerdetails", data);
-                        if (Array.isArray(data) && data.length > 0) {
-                            renderRequests(data);
-                            $("#requestContainer").show();
-                            $("#infocard").show();
-                        } else {
-                            Swal.fire({
-                                icon: "warning",
-                                title: "No Data Found",
-                                text: "Mobile No or Refernce Id is  Not Availble",
-                                allowOutsideClick: false, // Disable clicking outside the modal to close it
-       		                    allowEscapeKey: false, // Disable escape key to close the modal
-       		                    allowEnterKey: false, // Disable enter key to close the modal	
-                            });
-                            $("#requestContainer").hide();
-                            $("#infocard").hide();
-                        }
-                    },
-                    error: function () {
-                        Swal.fire({
-                            icon: "error",
-                            title: "Server Error",
-                            text: "Failed to fetch data. Please try again later.",
-                            allowOutsideClick: false, // Disable clicking outside the modal to close it
-   		                    allowEscapeKey: false, // Disable escape key to close the modal
-   		                    allowEnterKey: false, // Disable enter key to close the modal	
-                        });
-                        $("#requestContainer").hide();
-                        $("#infocard").hide();
-                    }
-                });
-            }
-
-            // Button click
-            $("#searchButton").click(handleSearch);
-
-            // Enter key support
-            $("#searchInput").on("keydown", function (e) {
-                if (e.key === "Enter" || e.keyCode === 13) {
-                    handleSearch();
-                }
-            });
-
-            // Reset button
-            $("#resetButton").click(function () {
-                $("#searchInput").val("");
-                $("#requestContainer").hide();
-                $("#infocard").hide();
-            });
-
-            // Click Event for Search Button
-            $("#searchButton").click(handleSearch);
-
-            // Enter Key Event on Input Field
-            $("#phoneNumber").on("keydown", function (e) {
-                if (e.key === "Enter" || e.keyCode === 13) {
-                    handleSearch();
-                }
-            });
-
-            function renderRequests(data) {
-                const container = $("#requestContainer");
-                container.html(""); // Clear previous results
-
-                data.forEach(request => {
-                    const requestCard = `
-                        <div class="request-box mb-3 p-3 border rounded shadow-sm">
-                            <div class="request-info">
-                                
-                            <table class="table table-bordered" style="table-layout: fixed; width: 100%;">
-
-                                    <tr>
-                                        <td><strong>Reference ID :</strong> ${request.refid}</td>
-                                        <td><strong>Name :</strong> ${request.name}</td>
-                                    </tr>
-                                    <tr>
-                                        <td><strong>Zone :</strong> ${request.zone}</td>
-                                        <td><strong>Phone No :</strong> ${request.mobile_no}</td>
-                                    </tr>
-                                    <tr>
-                                   		 <td><strong>Quantity :</strong> ${request.quantity}</td>
-                                        <td><strong>Waste Type :</strong> ${request.waste_type}</td>
-                                    </tr>
-                                    <tr>
-                                   		 <td><strong>Request Date :</strong> ${request.request_date}</td>
-                                        <td><strong>Dump Location :</strong> ${request.location}</td>
-                                    </tr>
-                                    <tr>
-                                        <td><strong>Vehicle Selection :</strong> ${request.vehicle_name}</td>
-                                        <td><strong>Payment Status :</strong> ${request.payment_status}</td>
-                                    </tr>
-                                </table>
-                            </div>
-                            <div class="status-container text-end">
-                                <button class="btn btn-sm ${getStatusClass(request.payment_status)} status-btn" data-id="${request.refid}">
-                                    ${request.payment_status}
-                                </button>
-                            </div>
-                        </div>
-                    `;
-                    container.append(requestCard);
-                });
-            }
-
-            // Helper to assign status class based on payment status
-            function getStatusClass(status) {
-                switch (status.toUpperCase()) {
-                    case "COMPLETED": return "btn-success";
-                    case "PENDING": return "btn-warning";
-                    case "FAILED": return "btn-danger";
-                    default: return "btn-secondary";
-                }
-            }
-
-            // Reset Button Action
-            $("#resetButton").click(function () {
-                location.href = "/gcc/dumpregistration/officer";
-            });
-        });
-        
-        
-        
-        
-        
-        
-        $(document).ready(function () {
-
-            $(document).on('click', '.status-btn', function () {
-                const status = $(this).text().trim();
-                const refId = $(this).data("id");
-
-                if (status === "PENDING") {
-                    fetchRequestDetails(refId); // Show modal inside this
-                }
-                
-                if (status === "COMPLETED") {
-                	fetchCompletedRequestDetails(refId); // Show modal inside this
-                }
-            });
-
-            // Close buttons
-            $('.close, #back').click(function () {
-            	$('#completeddetailsModal').modal('hide');
-            });
-        });
-        
-        $('#returnretrieddetailsModal').on('show.bs.modal', function () {
-            $('#actualWeight').val(''); // Clear the value
-         // Clear text-based fields (charges display)
-            $('#processingAmount').text('');
-            $('#wasteAmount').text('');
-            $('#totalAmount').text('');
-
-            // Optionally hide the charges sections too (for fresh view)
-            $('#processingCharges').hide();
-            $('#wasteCharges').hide();
-            $('#totalCharges').hide();
-        });
-
-        
-        // charge of process and waste
-        function fetchRequestDetails(refId) {
-            console.log("refId", refId);
-
-            $.ajax({
-                url: '/gcc/api/dumpregistration/wastecollectorlist',
-                type: 'GET',
-                data: { refId: refId },
-                dataType: "json",
-                allowOutsideClick: false, // Disable clicking outside the modal to close it
-                allowEscapeKey: false, // Disable escape key to close the modal
-                allowEnterKey: false, // Disable enter key to close the modal
-                success: function (response) {
-                    if (response && response.length > 0) {
-                        const details = response[0];
-                        console.log("response:", details);
-                        
-                        console.log("details.waste_type.."+details.waste_type);
-
-                        $('#publicName').val(details.name);
-                        $('#contactNumber').val(details.mobile_no);
-                        $('#wasteSelection').val(details.quantity);
-                        $('#vehicleSelection').val(details.vehicle_name);
-                        $('#modalEmployeeCode').text(details.refid);
-                        $('#wastetypehidden').val(details.waste_type.trim());
-                        
-                        console.log("hidden waste type"+ $('#wastetypehidden').val().trim());
-
-                        // Fetch charges and calculate totals
-                        $.ajax({
-                            url: '/gcc/api/dumpregistration/getallcharges',
-                            type: 'GET',
-                            dataType: 'json',
-                            success: function (charges) {
-                                let processingRate = 0;
-                                let wasteRate = 0;
-                                let mixedWasteRate = 0;
-                                
-                                charges.forEach(charge => {
-                                    if (charge.amount_type === "Processing Charges per ton") {
-                                        processingRate = charge.amount;
-                                    } else if (charge.amount_type === "Waste Collection Charges per ton") {
-                                        wasteRate = charge.amount;
-                                    } else if (charge.amount_type === "Mixed Waste Charges per ton") {
-                                        mixedWasteRate = charge.amount;
-                                    }
-                                });
-
-                                const vehicleType = details.vehicle_id;
-                                const wasteType = details.waste_type; 
-                                const actualWeight = parseFloat($('#actualWeight').val() || 0); // Default to 0 if empty
-                                
-                                const processingTotal = (processingRate * actualWeight)/1000;
-                                const wasteTotal = (wasteRate * actualWeight)/1000;
-                                const totalAmount = (processingTotal + wasteTotal) ;
-                              
-                                
-                                
-                                if (wasteType === "Mixed Waste") {
-                                    const mixedWasteTotal = (mixedWasteRate * actualWeight) / 1000;
-
-                                    $('#processingCharges').hide(); // Hide processing
-                                    $('#wasteCharges').show(); // Show as waste
-                                    $('#wasteAmount').text(`${mixedWasteRate} x ${actualWeight} (/1000 In ton) = Rs ${mixedWasteTotal.toFixed(2)}`);
-                                    $('#totalAmount').text(`Rs ${mixedWasteTotal.toFixed(2)}`);
-                                    $('#totalCharges').show();
-                                    $('#returnretrieddetailsModal').modal('show');
-                                    return; // Exit early to skip rest of the logic
-                                }
-                                
-
-                                if (vehicleType === 4) {
-                                    $('#processingCharges').show();
-                                    $('#wasteCharges').show();
-                                    $('#processingAmount').text(`${processingRate} x ${actualWeight} (/1000 In ton) = Rs ${processingTotal.toFixed(2)}`);
-                                    $('#wasteAmount').text(`${wasteRate} x ${actualWeight} (/1000 In ton) = Rs ${wasteTotal.toFixed(2)}`);
-                                    $('#totalAmount').text(`Rs ${totalAmount.toFixed(2)}`);
-
-                                } else {
-                                    $('#processingCharges').show();
-                                    $('#wasteCharges').hide();
-                                    $('#processingAmount').text(`${processingRate} x ${actualWeight} (/1000 In ton) = Rs ${processingTotal.toFixed(2)}`);
-                                    $('#totalAmount').text(`Rs ${processingTotal.toFixed(2)}`);
-                                }
-
-                                $('#totalCharges').show(); // Make sure it's visible
-
-                                $('#returnretrieddetailsModal').modal('show');
-                            },
-                            error: function () {
-                                Swal.fire("Error", "Failed to fetch charge amounts.", "error");
-                            }
-                        });
-
-                    } else {
-                        Swal.fire({
-                            icon: 'info',
-                            title: 'No Data',
-                            text: 'No details found for the selected employee.',
-                            confirmButtonText: 'OK',
-                            allowOutsideClick: false, // Disable clicking outside the modal to close it
-   		                    allowEscapeKey: false, // Disable escape key to close the modal
-   		                    allowEnterKey: false, // Disable enter key to close the modal
-                        });
-                    }
-                },
-                error: function () {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Failed to fetch employee details. Please try again.',
-                        confirmButtonText: 'OK',
-                        allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                    allowEscapeKey: false, // Disable escape key to close the modal
-	                    allowEnterKey: false, // Disable enter key to close the modal
-                    });
-                }
-            });
-        }
-        
-        
-        function recalculateCharges() {
-            const refId = $('#modalEmployeeCode').text();
-            if (refId) {
-                fetchRequestDetails(refId); // Recalculate with new weight
-            }
-        }
-        
-        
-        function savePaymentDetailsFromModal() {
-        	 const submitBtn = document.getElementById("submitbutton");
-        	    submitBtn.disabled = true; // Disable on first click
-        	
-            const refId = $("#modalEmployeeCode").text().trim();
-            if (!refId) {
-                Swal.fire("Error", "Reference ID missing. Cannot proceed.", "error");
-                return;
-            }
-            savePaymentDetails(refId);
-        }
-
-        
-        function toggleMobileInput() {
-            const selectedType = $("input[name='paymentType']:checked").val();
-            if (selectedType === "generateLink") {
-                $("#mobileNumberContainer").show();
-            } else {
-                $("#mobileNumberContainer").hide();
-                $("#payment_mobile_no").val(""); // Optional: clear input if not needed
-            }
-        }
-
-        
-        
-        $(document).ready(function () {
-            $("input[name='paymentType']").change(function () {
-                const selectedId = $(this).attr("id");
-
-                if (selectedId === "generateLink") {
-                    $("#mobileNumberContainer").show();
-                } else {
-                    $("#mobileNumberContainer").hide();
-                    $("#payment_mobile_no").val(""); // Clear mobile number if QR selected
-                }
-            });
-        });
-
-
-        function savePaymentDetails(refId) {
-        	
-            const submitBtn = document.getElementById("submitbutton");
-            const actualWeight = parseFloat($("#actualWeight").val());
-            const paymentType = $("input[name='paymentType']:checked").val(); 
-            const wasteType = $('#wastetypehidden').val(); // Read stored value
-            
-            console.log("wasteType",wasteType);
-
-            let paymentMobileNo = "";
-
-            const processingCharge = parseFloat(
-                ($("#processingAmount").text().split("Rs")[1] || "").trim()
-            );
-            const wasteChargeText = $("#wasteAmount").text();
-            const wasteCharge = wasteChargeText ? parseFloat((wasteChargeText.split("Rs")[1] || "").trim()) : 0;
-
-            const totalCharge = parseFloat(
-                ($("#totalAmount").text().split("Rs")[1] || "").trim()
-            );
-
-            if (isNaN(actualWeight) || actualWeight <= 0) {
-                Swal.fire("Invalid Weight", "Please enter a valid positive actual weight.", "warning");
-                submitBtn.disabled = false;
-               
-                return;
-            }
-
-            if (!paymentType) {
-                Swal.fire("Missing Payment Type", "Please select a payment type.", "warning");
-                submitBtn.disabled = false;
-                return;
-            }
-
-            if (paymentType === "generateLink") {
-                paymentMobileNo = $("#payment_mobile_no").val();
-                console.log("Input Value Raw:", document.getElementById("payment_mobile_no").value);
-                const mobileRegex = /^[6-9]\d{9}$/;
-
-                if (!mobileRegex.test(paymentMobileNo)) {
-                    Swal.fire("Invalid Mobile Number", "Please enter a valid 10-digit mobile number.", "warning");
-                    submitBtn.disabled = false;
-                    return;
-                }
-            }
-
-         // Modified validation for charges
-            if (wasteType != "Mixed Waste") {
-                if (isNaN(processingCharge) || isNaN(wasteCharge) || isNaN(totalCharge)) {
-                    Swal.fire("Missing Charges", "Processing or waste charges are missing.", "warning");
-                    submitBtn.disabled = false;
-                    return;
-                }
-            }
-
-            
-            submitBtn.disabled = true;
-            const payload = {
-                refId: refId, // should be a valid actual value, not ${request.refid}
-                actualWeight: actualWeight,
-                paymentType: paymentType,
-                paymentMobileNo: paymentMobileNo,
-                processingCharge: processingCharge,
-                wasteCharge: wasteCharge,
-                totalCharge: totalCharge
-            };
-
-            console.log("saved data ", payload);
-
-            fetch("/gcc/api/dumpregistration/saveWasteRequest", {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json"
-                },
-                body: JSON.stringify(payload)
-            })
-            .then(response => {
-                if (!response.ok) throw new Error("Network error");
-                return response.text();
-            })
-            .then(result => {
-		    Swal.fire({
-		        title: "Success",
-		        text: "Details saved successfully!",
-		        icon: "success",
-		        allowOutsideClick: false,
-		        allowEscapeKey: false,
-		        confirmButtonText: "OK"
-		    }).then(() => {
-		    	
-	            
-	            if (paymentType === "generateQR") {
-	                const url = `https://gccservices.in/dumpregistration/paymentform?requestId=${refId}`;
-	                //const url = `http://localhost:8077/dumpregistration/paymentform?requestId=${refId}`;
-	                window.open(url, '_blank');
-	            }
-	            location.reload();
-		    });
-		})
-
-            .catch(error => {
-                console.error("Save failed:", error);
-                Swal.fire("Error", "Something went wrong while saving!", "error");
-                submitBtn.disabled = false;
-            });
-        }
-
-
-        
-     	function validatePhoneNumber(input) {
-   		  // Remove any non-numeric characters using regex
-   		  input.value = input.value.replace(/[^0-9]/g, '');
-
-   		  // Limit the input to 10 digits
-   		  if (input.value.length > 10) {
-   		    input.value = input.value.slice(0, 10);
-   		  }
-   		}
-        
-        $("#actualWeight").on("input", function () {
-            if (this.value < 0) this.value = "";
-        });
-        
-        
-     // Handle submit button click
-        /* $(document).ready(function () {
-            $('#submitbutton').click(function () {
-                const refId = $('#modalEmployeeCode').text().trim();
-                if (!refId) {
-                    Swal.fire("Missing Reference ID", "Employee code is missing.", "warning");
-                    return;
-                }
-                savePaymentDetails(refId);
-            });
-        });  */
-     
-        function fetchCompletedRequestDetails(refId) {
-            console.log("refId", refId);
-
-            $.ajax({
-                url: '/gcc/api/dumpregistration/wastecollectorlist',
-                type: 'GET',
-                data: { refId: refId },
-                dataType: "json",
-                success: function (response) {
-                    if (response && response.length > 0) {
-                        const details = response[0];
-                        console.log("response:", details);
-
-                        $('#publicNames').val(details.name);
-                        $('#contactNumbers').val(details.mobile_no);
-                        $('#wasteSelections').val(details.quantity);
-                        $('#vehicleSelections').val(details.vehicle_name);
-                        $('#requestDates').val(details.request_date);
-                        $('#completed_actualWeight').val(details.actual_weight);
-                        $('#modalEmployeeCodes').text(details.refid);
-
-                        // ✅ Set refId to modal here
-                        $('#completeddetailsModal').data('refId', details.refid);
-                        $.ajax({
-                            url: '/gcc/api/dumpregistration/getallcharges',
-                            type: 'GET',
-                            dataType: 'json',
-                            success: function (charges) {
-                                let processingRate = 0;
-                                let wasteRate = 0;
-
-                                charges.forEach(charge => {
-                                    if (charge.amount_type === "Processing Charges per ton") {
-                                        processingRate = charge.amount;
-                                    } else if (charge.amount_type === "Waste Collection Charges per ton") {
-                                        wasteRate = charge.amount;
-                                    }
-                                });
-
-                                const vehicleType = details.vehicle_id;
-                                const actualWeight = parseFloat(details.actual_weight || 0);
-
-                                const processingTotal = (processingRate * actualWeight)/1000;
-                                const wasteTotal = (wasteRate * actualWeight)/1000;
-                                const totalAmount = processingTotal + wasteTotal;
-
-                                // Display the values
-                                $('#processingChargess').show();
-                                $('#processingAmounts').text(`${processingRate} x ${actualWeight} (/1000 In ton) = Rs ${processingTotal.toFixed(2)}`);
-
-                                if (vehicleType === 4) {
-                                    $('#wasteChargess').show();
-                                    $('#wasteAmounts').text(`${wasteRate} x ${actualWeight} (/1000 In ton) = Rs ${wasteTotal.toFixed(2)}`);
-                                    $('#totalChargess').show();
-                                    $('#totalAmounts').text(`Rs ${totalAmount.toFixed(2)}`);
-                                } else {
-                                    $('#wasteChargess').hide();
-                                    $('#totalChargess').show();
-                                    $('#totalAmounts').text(`Rs ${processingTotal.toFixed(2)}`);
-                                }
-                            },
-                            error: function () {
-                                Swal.fire("Error", "Failed to fetch charge amounts.", "error");
-                            }
-                        });
-
-                        // Set payment type radio as readonly and checked
-                        const paymentType = details.payment_type.toUpperCase();
-                        if (paymentType === 'GENERATELINK' || paymentType === 'LINK') {
-                            $('#completed_generateLinks').prop('checked', true).prop('disabled', true);
-                            $('#completed_generateQRs').prop('checked', false).prop('disabled', true);
-                        } else if (paymentType === 'GENERATEQR' || paymentType === 'QR') {
-                            $('#completed_generateQRs').prop('checked', true).prop('disabled', true);
-                            $('#completed_generateLinks').prop('checked', false).prop('disabled', true);
-                        }
-
-                        // Disable actual weight and hide action button if payment completed
-                        if (details.payment_status === 'COMPLETED') {
-                            $('#completed_actualWeight').prop('readonly', true);
-                            $('input[name="paymentType"]').prop('disabled', true);
-                            $('.btn.btn-outline-secondary').text('Close'); // Change Cancel to Close
-                        } else {
-                            $('#actualWeight').prop('readonly', false);
-                            $('input[name="paymentType"]').prop('disabled', false);
-                            $('.btn.btn-primary').show(); // Show Submit
-                            $('.btn.btn-outline-secondary').text('Cancel');
-                        }
-
-                        $('#completeddetailsModal').modal('show');
-                    } else {
-                        Swal.fire({
-                            icon: 'info',
-                            title: 'No Data',
-                            text: 'No details found for the selected employee.',
-                            confirmButtonText: 'OK'
-                        });
-                    }
-                },
-                error: function () {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Failed to fetch employee details. Please try again.',
-                        confirmButtonText: 'OK'
-                    });
-                }
-            });
-        }
-
-
-        
-        function downloadAcknowledgementViaAjax() {
-            const modal = $('#completeddetailsModal');
-            
-            // Retrieve the stored refId from the modal's data
-            const requestId = modal.data('refId');
-
-            console.log("Modal refId:", requestId); // ✅ Debugging
-
-            const link = document.createElement('a');
-           link.href = `https://gccservices.in/dumpregistration/paymentform?requestId=${requestId}`; // remove the `;` at the end
-           // link.href = `http://localhost:8077/dumpregistration/paymentform?requestId=${requestId}`; 
-            link.target = "_blank";
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-        }
-
-        </script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/cdwastecollect/reports.html b/src/main/resources/templates/modules/cdwastecollect/reports.html
deleted file mode 100644
index 6e829bdc..00000000
--- a/src/main/resources/templates/modules/cdwastecollect/reports.html
+++ /dev/null
@@ -1,411 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Reports</h5>
-										<span>C&D Waste Collections Reports</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">C&D Waste Collections Reports</li>
-										<li class="breadcrumb-item active" aria-current="page"> Reports</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Reports Filters</span>
-								</div>
-								<div class="card-body">
-									<div class="row">
-									
-									<div class="col-sm-2 mb-2">
-										<label for="startDate" class="form-label">From Date:<span class="text-danger">*</span></label>
-					                    <input type="date" id="startDate" class="form-control">
-									</div>
-										
-									<div class="col-sm-2 mb-2">
-										<label for="endDate" class="form-label" >To Date:<span class="text-danger">*</span></label>
-					                    <input type="date" id="endDate" class="form-control">
-									</div>
-										
-									<div class="col-sm-2 mb-2 ">
-										<label for="wastequantity" class="form-label">Select weight quantity<span class="text-danger">*</span>
-										</label> <select id="wastequantity" class="form-control">
-												
-											<!-- dynamically get the quantities -->
-										</select>
-									</div>
-						
-									<div class="col-sm-2 mb-2">
-										
-										<label for="zoneDropdown" class="form-label"> Select
-											Zone <span class="text-danger">*</span>
-										</label> <select id="zoneDropdown" class="form-control">
-											<option value="">Select Zone</option>
-											<!-- Zones will be loaded dynamically -->
-										</select>
-										
-									</div>
-				
-									<div class="row mt-4">
-										<div class="col-md-12 mb-2 d-flex justify-content-center">
-											<button type="submit" id="searchBtn" 
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn" name="reset" type="button">Reset</button>
-
-										</div>
-									</div>
-									
-								</div>
-							</div>
-						</div>
-					</div>
-			
-			         <div class="col-md-12">
-							<div class="card">
-							<div class="card-header">
-								<span style="font-size: medium;font-weight: bold;">Reports List</span>
-							</div>
-							<div class="card-body">
-								<div class="table-responsive" >
-
-									<table id="ReportDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-										<thead class="thead-dark">
-											<tr role="row">
-
-												<th class="text-center no-sort">S.No</th>
-												<th class="text-center">Request ID</th>
-												<th class="text-center">Request Date</th>
-												<th class="text-center">Name</th>
-												<th class="text-center">Mobile Number</th>
-												<th class="text-center">Area</th>
-												<th class="text-center">Zone</th>
-												<th class="text-center">Weight Quantity</th>
-												<th class="text-center">Waste Type</th>
-												<th class="text-center">Dumping Location</th>
-												<th class="text-center">Actual Weight</th>																														
-												<th class="text-center">Payment Status</th>
-												<th class="text-center">Total Amount</th>
-												
-												
-											</tr>
-										</thead>
-										<tbody>
-
-										</tbody>
-									</table>
-								</div>
-							</div>
-						 </div>
-						</div>
-			
-				</div>
-
-			</div>
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-		</div>
-
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-	
-	</div>
-</div>
-
-
-	<!-- in the code use to show the download different type microsoft -->
-
-	<!-- Include jQuery and Bootstrap JavaScript -->
-
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-
-	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script type="text/javascript">
-	
-	
-	
-	 $(document).ready(function() {
-
-     	var table = $('#ReportDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '80vh',
-             scrollX: true,
-             
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: false,
-             scrollX: true, 
-             responsive: false,
-             paging:true,
-             searching: true,
-             select: false,
-             processing: false
-         });
-     	
-     // Event listener for From Date selection
-     
-     $(document).ready(function () {
-    const today = new Date();
-    const formattedToday = today.toISOString().split('T')[0];
-
-    // Get date 30 days ago
-    const pastDate = new Date();
-    pastDate.setDate(today.getDate() - 30);
-    const formattedPast = pastDate.toISOString().split('T')[0];
-
-    // Set default values and limits
-    $("#startDate").val(formattedPast);
-    $("#startDate").attr("max", formattedToday);
-    $("#endDate").val(formattedToday);
-    $("#endDate").attr("min", formattedPast);
-    $("#endDate").attr("max", formattedToday);
-
-    // Load quantities
-    $.ajax({
-        url: "/gcc/api/dumpregistration/getquantity",
-        type: "GET",
-        success: function (data) {
-            let quantityDropdown = $("#wastequantity");
-            quantityDropdown.empty().append("<option value=''>Select Quantity</option>");
-            $.each(data, function (index, item) {
-                quantityDropdown.append(`<option value="${item.quantity}">${item.quantity}</option>`);
-            });
-        },
-        error: function (xhr, status, error) {
-            console.error("Error fetching quantities:", error);
-        }
-    });
-
-    // Function to fetch and load data
-    function loadReportData() {
-        let startDate = $('#startDate').val();
-        let endDate = $('#endDate').val();
-        let zone = $('#zoneDropdown').val();
-        let wasteQuantity = $('#wastequantity').val();
-
-        const params = new URLSearchParams({
-            fromDate: startDate,
-            toDate: endDate
-        });
-
-        if (zone) {
-            params.append("zone", zone);
-        }
-
-        if (wasteQuantity) {
-            params.append("wastequantity", wasteQuantity);
-        }
-
-        $('#pageLoader').show();
-
-        $.ajax({
-            type: "GET",
-            url: `/gcc/api/dumpregistration/getAllDetails?${params.toString()}`,
-            contentType: "application/json",
-            success: function (response) {
-                $('#pageLoader').hide();
-
-                if (Array.isArray(response) && response.length > 0) {
-                    $('#ReportDatatable').DataTable({
-                    	destroy: true,
-                        searching: true,
-                        paging: true,
-                        info: true,
-                        autoWidth: true, // IMPORTANT: let you control column width
-                        scrollX: true,     // Enables horizontal scroll
-                        responsive: true, // Disable built-in responsive which hides columns
-                        data: response,
-                        columns: [
-                            { data: null, render: (data, type, row, meta) => meta.row + 1, className: 'text-center' },
-                            { data: 'refid', defaultContent: '-', className: 'text-center' },
-                            { data: 'request_date', defaultContent: '-', className: 'text-center' },
-                            { data: 'name', defaultContent: '-', className: 'text-center' },
-                            { data: 'mobile_no', defaultContent: '-', className: 'text-center' },
-                            { data: 'area', defaultContent: '-', className: 'text-center' },
-                            { data: 'zone', defaultContent: '-', className: 'text-center' },
-                            { data: 'quantity', defaultContent: '-', className: 'text-center' },
-                            { data: 'waste_type', defaultContent: '-', className: 'text-center' },
-                            { data: 'location', defaultContent: '-', className: 'text-center' },
-                            { data: 'actual_weight', defaultContent: '-', className: 'text-center' },
-                            { data: 'payment_status', defaultContent: '-', className: 'text-center' },
-                            { data: 'total_charge', defaultContent: '-', className: 'text-center' }
-                            
-                        ],
-                        dom: 'Bfrtip',
-                        buttons: [
-                            { extend: 'pageLength', className: 'btn btn-warning' },
-                            { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-                            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-                            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-                            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-                        ],
-                        columnDefs: [{ targets: 'no-sort', orderable: false }],
-                        lengthMenu: [
-                            [50, 100, 200, 500, -1],
-                            ['50 rows', '100 rows', '200 rows', 'Show all']
-                        ],
-                        scrollY: '80vh',
-                        scrollX: true,
-                        responsive: true
-                    });
-                } else {
-                    Swal.fire({
-                        icon: 'warning',
-                        title: 'No Data',
-                        text: 'No data available for the selected criteria.'
-                    });
-                }
-            },
-            error: function () {
-                $('#pageLoader').hide();
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error',
-                    text: 'Something went wrong while fetching the data.'
-                });
-            }
-        });
-    }
-
-    // Bind search button to loadReportData
-    $('#searchBtn').on('click', function (e) {
-        e.preventDefault();
-
-        let startDate = $('#startDate').val();
-        let endDate = $('#endDate').val();
-
-        if (!startDate || !endDate) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Error',
-                text: 'Please Select Both From Date and To Date',
-                showConfirmButton: true,
-                timer: 3000
-            });
-            return;
-        }
-
-        loadReportData();
-    });
-
-    // Load data for the last 30 days on page load
-    loadReportData();
-});
-	
-});
-	 
-	 $('#resetBtn').click(function () {
-		    location.reload();
-		});
-
-
-	   
-	 // Load all zones
-	    $(document).ready(function () {
-	        $.ajax({
-	            url: '/gcc/api/dumpregistration/getzones',
-	            type: 'GET',
-	            success: function (zones) {
-	            	
-	  	                $.each(zones, function (index, zone) {
-	                    $('#zoneDropdown').append('<option value="' + zone.id + '">' + zone.zone_name + '</option>');
-	                });
-	            },
-	            error: function () {
-	                alert('Failed to load zones.');
-	            }
-	        });
-	    });
-	 
-	 
-	 
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/castemaster.html b/src/main/resources/templates/modules/childrensurvey/castemaster.html
deleted file mode 100644
index 707272a6..00000000
--- a/src/main/resources/templates/modules/childrensurvey/castemaster.html
+++ /dev/null
@@ -1,563 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Caste Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Caste
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Caste Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Caste</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label> Caste Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		let editId = 0;
-
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Caste");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/castemasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                         <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-	   <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Caste");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/savecaste",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/caste-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/childlist.html b/src/main/resources/templates/modules/childrensurvey/childlist.html
deleted file mode 100644
index 9617f94e..00000000
--- a/src/main/resources/templates/modules/childrensurvey/childlist.html
+++ /dev/null
@@ -1,1189 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<!-- LEFT SIDE -->
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-thumbs-up bg-blue me-2"></i>
-									<h5 class="mb-0">Children Survey Dashboard</h5>
-								</div>
-							</div>
-
-							<!-- RIGHT SIDE (DATE FILTER) -->
-							<!--<div class="col-lg-6 text-end">
-								<label class="form-label fw-semibold me-2">From Date:</label>
-								<input type="date" id="fromDate" class="form-control d-inline-block"
-									style="width:150px;">
-								<label class="form-label fw-semibold me-2">To Date:</label>
-								<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-							</div>-->
-
-						</div>
-
-						<!-- BREADCRUMB (SEPARATE ROW) -->
-						<div class="row mt-2">
-							<div class="col-lg-12">
-								<nav class="breadcrumb-container">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active"> Survey Child List</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row mb-3 align-items-end">
-
-						<div class="col-md-2">
-							<select id="gender" class="form-control">
-								<option value="">Gender</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="age" class="form-control">
-								<option value="">Age</option>
-								<option value="4-8">4-8</option>
-								<option value="9-13">9-13</option>
-								<option value="14-18">14-18</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="area" class="form-control">
-								<option value="">Area Wise</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="education" class="form-control">
-								<option value="">Education</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<label class="fw-semibold">From Date</label>
-							<input type="date" id="fromDate" class="form-control">
-						</div>
-
-						<div class="col-md-2">
-							<label class="fw-semibold">To Date</label>
-							<input type="date" id="toDate" class="form-control">
-						</div>
-
-					</div>
-
-					<div class="row mb-3 justify-content-center">
-
-						<div class="col-md-2 text-center">
-							<button class="btn btn-primary w-100" onclick="fetchSurveyData()">
-								Search
-							</button>
-						</div>
-
-						<div class="col-md-2 text-center">
-							<button class="btn btn-secondary w-100" onclick="resetFilters()">
-								Reset
-							</button>
-						</div>
-
-					</div>
-					<!--<div class="row mb-3">
-
-
-
-						<div class="col-md-2">
-							<select id="gender" class="form-control">
-								<option value="">Gender</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="age" class="form-control">
-								<option value="">Age</option>
-								<option value="4-8">4-8</option>
-								<option value="9-13">9-13</option>
-								<option value="14-18">14-18</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="area" class="form-control">
-								<option value="">Area Wise</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="education" class="form-control">
-								<option value="">Education</option>
-							</select>
-						</div>
-						<div class="col-lg-6 text-end">
-							<label class="form-label fw-semibold me-2">From Date:</label>
-							<input type="date" id="fromDate" class="form-control d-inline-block" style="width:150px;">
-							<label class="form-label fw-semibold me-2">To Date:</label>
-							<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-						</div>
-					</div>
-					<div class="row mb-3 justify-content-center">
-
-						<div class="col-md-2 text-center">
-							<button class="btn btn-primary w-100 " onclick="fetchSurveyData()">Search</button>
-
-						</div>
-						<div class="col-md-2 text-center">
-							<button class="btn btn-secondary w-100 " onclick="resetFilters()">Reset</button>
-						</div>
-					</div>-->
-
-				</div>
-				<!-- Salary Report Table -->
-				<div class="card-block mt-3">
-					<table id="surveyTable" class="table table-striped table-bordered">
-						<div class="mb-3">
-
-							<button class="btn btn-success" onclick="downloadBulkSurveyExcel()">
-
-								<i class="fa fa-file-excel"></i>
-								Bulk Download Excel
-
-							</button>
-
-						</div>
-						<thead class="thead-dark">
-							<tr>
-								<th>Date</th>
-								<th>Survey ID</th>
-								<th>Name</th>
-								<th>Gender</th>
-								<th>Age</th>
-								<th>Mobile</th>
-								<th>Area</th>
-								<th>Education</th>
-								<th>Action</th>
-
-							</tr>
-						</thead>
-						<tbody>
-
-						</tbody>
-						<tfoot class="thead-dark">
-
-						</tfoot>
-					</table>
-				</div>
-
-			</div>
-
-			<div class="modal fade" id="surveyModal" tabindex="-1">
-				<div class="modal-dialog modal-lg modal-dialog-scrollable" style="max-width:70%; width:70%;">
-					<div class="modal-content">
-
-						<div class="modal-header">
-							<h5 class="modal-title">Child Survey Details</h5>
-							<button type="button" class="close" data-bs-dismiss="modal">
-								&times;
-							</button>
-						</div>
-
-						<div class="modal-body">
-							<div id="surveyDetails"></div>
-						</div>
-
-						<div class="modal-footer">
-							<button class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-						</div>
-
-					</div>
-
-
-
-				</div>
-
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-
-	</div>
-
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		async function downloadBulkSurveyExcel() {
-
-			try {
-
-				Swal.fire({
-					title: 'Preparing Excel...',
-					text: 'Please wait',
-					allowOutsideClick: false,
-					didOpen: () => {
-						Swal.showLoading();
-					}
-				});
-
-				// GET TABLE DATA
-				let table = $('#surveyTable').DataTable();
-
-				let rows = table.rows().data().toArray();
-
-				if (rows.length === 0) {
-
-					Swal.fire({
-						icon: 'warning',
-						title: 'No Data Found'
-					});
-
-					return;
-				}
-
-				let excelData = [];
-
-				let slno = 1;
-
-				/*for (const rowNode of rows) {
-	
-					// GET SURVEY ID FROM TABLE
-					let surveyId = $(rowNode[1]).text() || rowNode[1];
-	
-					surveyId = surveyId.toString().trim();
-	
-					// CALL DETAILS API
-					let surveyData = await $.ajax({
-						url: "/gcc/api/children-survey/details",
-						type: "GET",
-						data: {
-							surveyId: surveyId
-						}
-					});
-	
-					// MERGE ALL SECTIONS
-					let allQuestions = {
-	
-						...surveyData.personalInformation,
-						...surveyData.locationDetails,
-						...surveyData.educationDetails,
-						...surveyData.healthDetails,
-						...surveyData.documentDetails,
-						...surveyData.vulnerabilityDetails
-					};
-	
-					// CREATE ROW OBJECT
-					let rowData = {
-						"S.No": slno,
-						"Survey ID": surveyId
-					};
-	
-					// ADD ALL QUESTIONS AS COLUMNS
-					Object.keys(allQuestions).forEach(function (question) {
-	
-						rowData[question] = allQuestions[question];
-	
-					});
-	
-					excelData.push(rowData);
-	
-					slno++;
-				}*/
-				for (const rowNode of rows) {
-
-					let surveyId = $(rowNode[1]).text() || rowNode[1];
-
-					surveyId = surveyId.toString().trim();
-
-					// SKIP EMPTY ROWS
-					if (!surveyId || surveyId === "") {
-						continue;
-					}
-
-					let surveyData = await $.ajax({
-						url: "/gcc/api/children-survey/details",
-						type: "GET",
-						data: {
-							surveyId: surveyId
-						}
-					});
-
-
-					let allQuestions = {
-
-
-						...surveyData.locationDetails,
-						...surveyData.personalInformation,
-						...surveyData.educationDetails,
-						...surveyData.healthDetails,
-						...surveyData.documentDetails,
-						...surveyData.vulnerabilityDetails
-					};
-
-					let rowData = {
-						"S.No": slno,
-						"Survey ID": surveyId
-					};
-
-					Object.keys(allQuestions).forEach(function (question) {
-
-						rowData[question] = allQuestions[question];
-
-					});
-
-					excelData.push(rowData);
-
-					slno++;
-				}
-
-				// CREATE WORKSHEET
-				//const worksheet = XLSX.utils.json_to_sheet(excelData);
-				// FIXED COLUMN ORDER
-				const headers = [
-
-					"S.No",
-					"Survey ID",
-
-					// LOCATION
-					"Select the Area",
-					"Type of House Ownership",
-					"How Long You Have Been Staying Here?",
-					"Block No",
-					"House No",
-
-					// PERSONAL
-					"Name of the Child",
-					"Gender",
-					"Do you know DOB?",
-					"Date of Birth",
-					"Age",
-					"Place of Birth",
-					"Hospital of Birth",
-					"Religion",
-					"Caste",
-					"Sub Caste",
-					"Child Living With",
-					"Father Name",
-					"Mother Name",
-					"Where about of Father?",
-					"Where about of Mother?",
-					"Guardian Name",
-					"Relationship",
-					"Occupation",
-					"Family Monthly Income",
-					"Contact Number",
-
-					// EDUCATION
-					"Are they Currently Studying",
-					"Education Status",
-					"School Name",
-					"School Location",
-					"Which standard they stopped",
-					"Which year did they stopped",
-
-					"Reason for Dropout",
-					"Is The Child Interested In Continuing Education?",
-					"What are you Interested In?",
-					"Are you Staying in any Educational Hostel",
-					"Name of the Hostel?",
-					"Location of the Hostel?",
-
-					// HEALTH
-					"Does the child have any history of health issues?",
-					"Health Details",
-
-					// DOCUMENT
-
-					"Aadhar card",
-					"Aadhar No",
-					"Any corrections to be made in Aadhar card document?",
-					"If Not Why Aadhar card?",
-					"Community Certificate",
-					"Any corrections to be made in community certificate document?",
-					"If Not Why community certificate?",
-					"Birth Certificate",
-					"Any corrections to be made in birth certificate document?",
-					"If Not Why birth certificate?",
-
-					// VULNERABILITY
-					"Vulnerability Assessment",
-					"Any Other Support Needed?",
-					"Comments & Remarks",
-
-				];
-
-				// CREATE NEW ORDERED DATA
-				let orderedExcelData = [];
-
-				excelData.forEach(function (row) {
-
-					let orderedRow = {};
-
-					headers.forEach(function (header) {
-
-						orderedRow[header] = row[header] || '';
-
-					});
-
-					orderedExcelData.push(orderedRow);
-
-				});
-
-				// CREATE SHEET
-				const worksheet = XLSX.utils.json_to_sheet(
-					orderedExcelData,
-					{
-						header: headers
-					}
-				);
-				// DYNAMIC HEADERS
-
-
-				// AUTO COLUMN WIDTH
-				//const columns = [];
-
-				/*Object.keys(excelData[0]).forEach(function () {
-	
-					columns.push({ wch: 30 });
-	
-				});
-	
-				worksheet['!cols'] = columns;*/
-				const columns = [];
-
-				Object.keys(excelData[0]).forEach(function (key) {
-
-					if (key === "S.No") {
-
-						columns.push({ wch: 8 });
-
-					} else {
-
-						columns.push({ wch: 25 });
-
-					}
-
-				});
-
-				worksheet['!cols'] = columns;
-
-
-				// CREATE WORKBOOK
-				const workbook = XLSX.utils.book_new();
-
-				XLSX.utils.book_append_sheet(
-					workbook,
-					worksheet,
-					"Children Survey"
-				);
-
-				// DOWNLOAD
-				XLSX.writeFile(
-					workbook,
-					"Children_Survey_Report.xlsx"
-				);
-
-				Swal.close();
-
-			} catch (e) {
-
-				console.log(e);
-
-				Swal.fire({
-					icon: 'error',
-					title: 'Excel Download Failed'
-				});
-			}
-		}
-		$(document).ready(function () {
-
-			// 🔹 Load dropdowns when page loads
-			loadDropdowns();
-			fetchSurveyData(true);
-
-			// 🔹 (Optional) Load table initially
-			// fetchSurveyData();
-			// Restrict To Date based on From Date
-			$("#fromDate").on("change", function () {
-
-				let fromDate = $(this).val();
-
-				// Set minimum selectable date for To Date
-				$("#toDate").attr("min", fromDate);
-
-				// If current To Date is less than From Date, clear it
-				if ($("#toDate").val() < fromDate) {
-					$("#toDate").val('');
-				}
-			});
-
-		});
-		function resetFilters() {
-			$("#searchName").val('');
-			$("#gender").val('');
-			$("#age").val('');
-			$("#area").val('');
-			$("#education").val('');
-			$("#fromDate").val('');
-			$("#toDate").val('');
-
-			// Re-load table with all data
-			fetchSurveyData(true);
-		}
-		function viewSurvey(surveyId) {
-
-
-			$.ajax({
-				url: "/gcc/api/children-survey/details",
-				type: "GET",
-				data: { surveyId: surveyId },
-				success: function (data) {
-
-					let html = "";
-					function buildSection(title, sectionData) {
-
-						let sectionHtml = `
-    
-	<div class="survey-section mb-5">
-
-		<h5 class="section-heading">
-			${title}
-		</h5>
-
-		<div class="row">
-	`;
-
-						let keys = Object.keys(sectionData);
-
-						keys.forEach(function (key) {
-
-							sectionHtml += `
-
-			<div class="col-md-6 mb-3">
-
-				<div class="detail-card">
-
-					<div class="detail-label">
-						${key}
-					</div>
-
-					<div class="detail-value">
-						${sectionData[key] || '-'}
-					</div>
-
-				</div>
-
-			</div>
-		`;
-
-						});
-
-						sectionHtml += `
-        </div>
-    </div>
-    `;
-
-						return sectionHtml;
-					}
-
-					/*function buildSection(title, sectionData) {
-			
-						let sectionHtml = `
-			<div class="mb-4">
-			
-				<h5 class="fw-bold border-bottom pb-2 mb-3">
-					${title}
-				</h5>
-			`;
-			
-						Object.keys(sectionData).forEach(function (key) {
-			
-							sectionHtml += `
-				<div class="row py-2 border-bottom">
-			
-					<div class="col-md-5 fw-bold">
-						${key}
-					</div>
-			
-					<div class="col-md-7">
-						: ${sectionData[key] || ''}
-					</div>
-			
-				</div>
-			`;
-						});
-			
-						sectionHtml += `</div>`;
-			
-						return sectionHtml;
-					}*/
-
-
-
-					html += buildSection(
-						"Location Details",
-						data.locationDetails
-					);
-					html += buildSection(
-						"Personal Information",
-						data.personalInformation
-					);
-
-					html += buildSection(
-						"Education Details",
-						data.educationDetails
-					);
-
-					html += buildSection(
-						"Health Details",
-						data.healthDetails
-					);
-
-					html += buildSection(
-						"Document Details",
-						data.documentDetails
-					);
-
-					html += buildSection(
-						"Vulnerability Details",
-						data.vulnerabilityDetails
-					);
-
-					$("#surveyDetails").html(html);
-
-					let modal = new bootstrap.Modal(
-						document.getElementById('surveyModal')
-					);
-
-					modal.show();
-				}
-
-				/*success: function (data) {
-	
-					let html = "";
-	
-					Object.keys(data).forEach(function (key) {
-	
-						html += `
-					<div class="row mb-2">
-						<div class="col-md-5">
-							<strong>${key}</strong>
-						</div>
-						<div class="col-md-7">
-							: ${data[key]}
-						</div>
-					</div>
-				`;
-					});
-	
-					$("#surveyDetails").html(html);
-	
-					// Show modal
-					let modal = new bootstrap.Modal(document.getElementById('surveyModal'));
-					modal.show();
-				}*/
-			});
-		}
-		function fetchSurveyData(isInitialLoad = false) {
-
-
-			var gender = $("#gender").val();
-			var age = $("#age").val();
-			var area = $("#area").val();
-			var education = $("#education").val();
-			var fromDate = $("#fromDate").val();
-			var toDate = $("#toDate").val();
-
-			// SHOW SWAL ONLY WHEN SEARCH BUTTON CLICKED
-			if (!isInitialLoad &&
-
-				gender == '' &&
-				age == '' &&
-				area == '' &&
-				education == '' &&
-				fromDate == '' &&
-				toDate == '') {
-
-				Swal.fire({
-					icon: 'warning',
-					title: 'Warning',
-					text: 'Please select at least one filter.',
-					confirmButtonColor: '#3085d6'
-				});
-
-				return;
-			}
-			if (fromDate != '') {
-				if (toDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-			if (toDate != '') {
-				if (fromDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-
-
-
-			$.ajax({
-				url: "/gcc/api/children-survey/list",
-				type: "GET",
-				data: {
-					name: $("#searchName").val(),
-					gender: $("#gender").val(),
-					age: $("#age").val(),
-					area: $("#area").val(),
-					education: $("#education").val(),
-					fromDate: $("#fromDate").val(),
-					toDate: $("#toDate").val()
-				},
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row) {
-						//<td>${row.survey_date || ''}</td>
-
-						tbody += `
-                    <tr>
-						<!--td>${formatDate(row.survey_date)}</td-->
-						<td data-order="${row.survey_date}">
-							${formatDate(row.survey_date)}
-						</td>
-                        
-                        <td>${row.survey_id || ''}</td>
-                        <td>${row.child_name || ''}</td>
-                        <td>${row.gender || ''}</td>
-                        <td>${row.age || ''}</td>
-                        <td>${row.mobile_number || ''}</td>
-                        <td>${row.area || ''}</td>
-                        <td>${row.education || ''}</td>
-                         <td>
-        <button class="btn btn-sm btn-info" onclick="viewSurvey('${row.survey_id}')">
-            <i class="fa fa-eye"></i>
-        </button>
-    </td>
-                    </tr>
-                `;
-					});
-
-					// 🔥 Destroy old DataTable if exists
-					if ($.fn.DataTable.isDataTable('#surveyTable')) {
-						$('#surveyTable').DataTable().clear().destroy();
-					}
-
-					// Set new data
-					$("#surveyTable tbody").html(tbody);
-
-					// 🔥 Reinitialize DataTable WITH BUTTONS
-					$('#surveyTable').DataTable({
-						dom: 'Bfrtip',
-						buttons: [
-							{
-								extend: 'pageLength',
-								className: 'btn btn-warning'
-							},
-							{
-								extend: 'excelHtml5',
-								text: 'Excel',
-								className: 'btn btn-success'
-							},
-							{
-								extend: 'pdfHtml5',
-								text: 'PDF',
-								className: 'btn btn-secondary',
-								orientation: 'landscape',
-								pageSize: 'A4'
-							}
-						],
-						responsive: true,
-						destroy: true
-
-
-					});
-				}
-			});
-		}
-		function formatDate(dateString) {
-
-			if (!dateString) return '';
-
-			const date = new Date(dateString);
-
-			const day = String(date.getDate()).padStart(2, '0');
-
-			const month = String(date.getMonth() + 1).padStart(2, '0');
-
-			const year = date.getFullYear();
-
-			return `${day}-${month}-${year}`;
-		}
-		function loadDropdowns() {
-
-			// Gender
-			$.ajax({
-				url: "/gcc/api/children-survey/gender",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Gender</option>';
-
-					data.forEach(function (g) {
-						options += `<option value="${g.id}">${g.english_name}</option>`;
-					});
-
-					$("#gender").html(options);
-				}
-			});
-
-			// Area
-			$.ajax({
-				url: "/gcc/api/children-survey/location",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Area</option>';
-
-					data.forEach(function (a) {
-						options += `<option value="${a.id}">${a.english_name}</option>`;
-					});
-
-					$("#area").html(options);
-				}
-			});
-
-			// Education
-			$.ajax({
-				url: "/gcc/api/children-survey/education",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Education</option>';
-
-					data.forEach(function (e) {
-						options += `<option value="${e.id}">${e.english_name}</option>`;
-					});
-
-					$("#education").html(options);
-				}
-			});
-
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/documentcorrectionmaster.html b/src/main/resources/templates/modules/childrensurvey/documentcorrectionmaster.html
deleted file mode 100644
index 0ec27084..00000000
--- a/src/main/resources/templates/modules/childrensurvey/documentcorrectionmaster.html
+++ /dev/null
@@ -1,574 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Document Correction Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Document Correction
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Sl No</th>
-									<th>Document Correction Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Document Correction</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Document Correction Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-		let editId = 0;
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Document Correction");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/documentcreationmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                          <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Document Correction");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/documentcreationsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: editId,
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/documentcreationstatus",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/documentreasonmaster.html b/src/main/resources/templates/modules/childrensurvey/documentreasonmaster.html
deleted file mode 100644
index 52b38482..00000000
--- a/src/main/resources/templates/modules/childrensurvey/documentreasonmaster.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Document Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Document Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Sl No</th>
-									<th>Document Reason Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Document Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Religion Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-		let editId = 0;
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Document Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/documentreasonmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${row.id}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                         <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Document Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/documentreasonmaster",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: editId,
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/documentreasonmasterstatus",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/dropoutreasonmaster.html b/src/main/resources/templates/modules/childrensurvey/dropoutreasonmaster.html
deleted file mode 100644
index 18fc24af..00000000
--- a/src/main/resources/templates/modules/childrensurvey/dropoutreasonmaster.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Dropout Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Dropout Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Sl No</th>
-									<th>Dropout Reason Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Dropout Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Dropout Reason Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-		let editId = 0;
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Dropout Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/dropoutreasonmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${row.id}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Dropout Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/dropoutreasonsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: editId,
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/dropoutreasonstatus",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/educationmaster.html b/src/main/resources/templates/modules/childrensurvey/educationmaster.html
deleted file mode 100644
index 5006369b..00000000
--- a/src/main/resources/templates/modules/childrensurvey/educationmaster.html
+++ /dev/null
@@ -1,564 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Education Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Education
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Education Name</th>
-									<th>Status</th>
-									<th>Action</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Education</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Education Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		function openAddModal() {
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Education");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-
-
-
-			modal.show();
-		}
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/educationmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-                       <td>
-    <button class="btn btn-primary btn-sm"
-        onclick="editEducation(${row.id},'${row.english_name}')">
-        Edit
-    </button>
-</td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Education");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/save",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/gendermaster.html b/src/main/resources/templates/modules/childrensurvey/gendermaster.html
deleted file mode 100644
index 6ac25f06..00000000
--- a/src/main/resources/templates/modules/childrensurvey/gendermaster.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Gender Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Gender
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Gender Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Gender</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Gender Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Gender");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/gendermasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Gender");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/gendersave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/gender-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/incomemaster.html b/src/main/resources/templates/modules/childrensurvey/incomemaster.html
deleted file mode 100644
index b36fa8d0..00000000
--- a/src/main/resources/templates/modules/childrensurvey/incomemaster.html
+++ /dev/null
@@ -1,575 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Income Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Income
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Sl No</th>
-									<th>Income Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Income</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Income Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		let editId = 0;
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Income");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function openAddModal1() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/incomemasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                         <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Income");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/incomesave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/incomemasterstatus",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/interestfieldmaster.html b/src/main/resources/templates/modules/childrensurvey/interestfieldmaster.html
deleted file mode 100644
index b2e11b16..00000000
--- a/src/main/resources/templates/modules/childrensurvey/interestfieldmaster.html
+++ /dev/null
@@ -1,572 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Interest Field Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Interest Field
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Sl No</th>
-									<th>Interest Field Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Interest Field</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Interest Field Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-		let editId = 0;
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Interest Field");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/interestfieldmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                       <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Interest Field");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/interestfieldsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-					english_name: $("#educationName").val()
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/interestfieldmaster-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/livingmaster.html b/src/main/resources/templates/modules/childrensurvey/livingmaster.html
deleted file mode 100644
index 0fbca886..00000000
--- a/src/main/resources/templates/modules/childrensurvey/livingmaster.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Living Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Living Type
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Sl.No</th>
-									<th>Living Type Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Living</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Living Type Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-		let editId = 0;
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Living");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/livingmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-	    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Living");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/livingsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/living-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/locationmaster.html b/src/main/resources/templates/modules/childrensurvey/locationmaster.html
deleted file mode 100644
index 8a907141..00000000
--- a/src/main/resources/templates/modules/childrensurvey/locationmaster.html
+++ /dev/null
@@ -1,577 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Location Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Location
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Location Name</th>
-									<th>Status</th>
-
-									<th>Delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Location</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Location Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Location");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/locationmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = row.isactive == 1
-							? `<span class="badge">Active</span>`
-							: `<span class="badge">Disabled</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-						   <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-
-                       <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Location");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/locationsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/location-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/nonchildlist.html b/src/main/resources/templates/modules/childrensurvey/nonchildlist.html
deleted file mode 100644
index 46bada32..00000000
--- a/src/main/resources/templates/modules/childrensurvey/nonchildlist.html
+++ /dev/null
@@ -1,958 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<!-- LEFT SIDE -->
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-thumbs-up bg-blue me-2"></i>
-									<h5 class="mb-0">Children Survey Dashboard</h5>
-								</div>
-							</div>
-
-							<!-- RIGHT SIDE (DATE FILTER) -->
-							<!--<div class="col-lg-6 text-end">
-								<label class="form-label fw-semibold me-2">From Date:</label>
-								<input type="date" id="fromDate" class="form-control d-inline-block"
-									style="width:150px;">
-								<label class="form-label fw-semibold me-2">To Date:</label>
-								<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-							</div>-->
-
-						</div>
-
-						<!-- BREADCRUMB (SEPARATE ROW) -->
-						<div class="row mt-2">
-							<div class="col-lg-12">
-								<nav class="breadcrumb-container">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active">Non Survey Child List</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row mb-3 align-items-end">
-
-
-
-
-
-						<div class="col-md-2">
-							<select id="area" class="form-control">
-								<option value="">Area Wise</option>
-							</select>
-						</div>
-
-
-
-						<div class="col-md-2">
-							<label class="fw-semibold">From Date</label>
-							<input type="date" id="fromDate" class="form-control">
-						</div>
-
-						<div class="col-md-2">
-							<label class="fw-semibold">To Date</label>
-							<input type="date" id="toDate" class="form-control">
-						</div>
-
-
-
-
-
-						<div class="col-md-2 text-center">
-							<button class="btn btn-primary w-100" onclick="fetchSurveyData()">
-								Search
-							</button>
-						</div>
-
-						<div class="col-md-2 text-center">
-							<button class="btn btn-secondary w-100" onclick="resetFilters()">
-								Reset
-							</button>
-						</div>
-
-					</div>
-					<!--<div class="row mb-3">
-
-
-
-						<div class="col-md-2">
-							<select id="gender" class="form-control">
-								<option value="">Gender</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="age" class="form-control">
-								<option value="">Age</option>
-								<option value="4-8">4-8</option>
-								<option value="9-13">9-13</option>
-								<option value="14-18">14-18</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="area" class="form-control">
-								<option value="">Area Wise</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="education" class="form-control">
-								<option value="">Education</option>
-							</select>
-						</div>
-						<div class="col-lg-6 text-end">
-							<label class="form-label fw-semibold me-2">From Date:</label>
-							<input type="date" id="fromDate" class="form-control d-inline-block" style="width:150px;">
-							<label class="form-label fw-semibold me-2">To Date:</label>
-							<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-						</div>
-					</div>
-					<div class="row mb-3 justify-content-center">
-
-						<div class="col-md-2 text-center">
-							<button class="btn btn-primary w-100 " onclick="fetchSurveyData()">Search</button>
-
-						</div>
-						<div class="col-md-2 text-center">
-							<button class="btn btn-secondary w-100 " onclick="resetFilters()">Reset</button>
-						</div>
-					</div>-->
-
-				</div>
-				<!-- Salary Report Table -->
-				<div class="card-block mt-3">
-					<table id="surveyTable" class="table table-striped table-bordered">
-						<div class="mb-3">
-
-							<!--<button class="btn btn-success" onclick="downloadBulkSurveyExcel()">
-
-								<i class="fa fa-file-excel"></i>
-								Bulk Download Excel
-
-							</button>-->
-
-						</div>
-						<thead class="thead-dark">
-							<tr>
-								<th>Date</th>
-								<th>Survey ID</th>
-								<th>Reason</th>
-
-
-
-								<th>Area</th>
-								<th>House No</th>
-								<th>Block No</th>
-
-
-							</tr>
-						</thead>
-						<tbody>
-
-						</tbody>
-						<tfoot class="thead-dark">
-
-						</tfoot>
-					</table>
-				</div>
-
-			</div>
-
-			<div class="modal fade" id="surveyModal" tabindex="-1">
-				<div class="modal-dialog modal-lg modal-dialog-scrollable" style="max-width:70%; width:70%;">
-					<div class="modal-content">
-
-						<div class="modal-header">
-							<h5 class="modal-title">Child Survey Details</h5>
-							<button type="button" class="close" data-bs-dismiss="modal">
-								&times;
-							</button>
-						</div>
-
-						<div class="modal-body">
-							<div id="surveyDetails"></div>
-						</div>
-
-						<div class="modal-footer">
-							<button class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-						</div>
-
-					</div>
-
-
-
-				</div>
-
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-
-	</div>
-
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		async function downloadBulkSurveyExcel() {
-
-			let area = $("#area").val();
-			let fromDate = $("#fromDate").val();
-			let toDate = $("#toDate").val();
-
-			try {
-
-				let response = await $.ajax({
-
-					url: "/gcc/api/children-survey/nonsurveyed/list",
-					type: "GET",
-					data: {
-
-						area: area,
-						fromDate: fromDate,
-						toDate: toDate
-					}
-				});
-
-				let excelData = [];
-
-				response.forEach(function (row, index) {
-
-					excelData.push({
-
-						"S.No": index + 1,
-						"Date": row.survey_date || '',
-						"Survey ID": row.survey_id || '',
-						"Reason": row.reason || '',
-						"Area": row.area || '',
-						"House No": row.house_no || '',
-						"Block No": row.block_no || ''
-
-					});
-
-				});
-
-				if (excelData.length === 0) {
-
-					alert("No data found");
-					return;
-				}
-
-				let worksheet = XLSX.utils.json_to_sheet(excelData);
-
-				let workbook = XLSX.utils.book_new();
-
-				XLSX.utils.book_append_sheet(
-					workbook,
-					worksheet,
-					"Non Survey Child List"
-				);
-
-				XLSX.writeFile(
-					workbook,
-					"Non_Survey_Child_List.xlsx"
-				);
-
-			} catch (e) {
-
-				console.log(e);
-				alert("Error downloading excel");
-			}
-		}
-		$(document).ready(function () {
-
-			// 🔹 Load dropdowns when page loads
-			loadDropdowns();
-			fetchSurveyData(true);
-
-			// 🔹 (Optional) Load table initially
-			// fetchSurveyData();
-			// Restrict To Date based on From Date
-			$("#fromDate").on("change", function () {
-
-				let fromDate = $(this).val();
-
-				// Set minimum selectable date for To Date
-				$("#toDate").attr("min", fromDate);
-
-				// If current To Date is less than From Date, clear it
-				if ($("#toDate").val() < fromDate) {
-					$("#toDate").val('');
-				}
-			});
-
-		});
-		function resetFilters() {
-			$("#searchName").val('');
-			$("#gender").val('');
-			$("#age").val('');
-			$("#area").val('');
-			$("#education").val('');
-			$("#fromDate").val('');
-			$("#toDate").val('');
-
-			// Re-load table with all data
-			fetchSurveyData(true);
-		}
-		function viewSurvey(surveyId) {
-
-
-			$.ajax({
-				url: "/gcc/api/children-survey/details",
-				type: "GET",
-				data: { surveyId: surveyId },
-				success: function (data) {
-
-					let html = "";
-					function buildSection(title, sectionData) {
-
-						let sectionHtml = `
-    
-	<div class="survey-section mb-5">
-
-		<h5 class="section-heading">
-			${title}
-		</h5>
-
-		<div class="row">
-	`;
-
-						let keys = Object.keys(sectionData);
-
-						keys.forEach(function (key) {
-
-							sectionHtml += `
-
-			<div class="col-md-6 mb-3">
-
-				<div class="detail-card">
-
-					<div class="detail-label">
-						${key}
-					</div>
-
-					<div class="detail-value">
-						${sectionData[key] || '-'}
-					</div>
-
-				</div>
-
-			</div>
-		`;
-
-						});
-
-						sectionHtml += `
-        </div>
-    </div>
-    `;
-
-						return sectionHtml;
-					}
-
-					/*function buildSection(title, sectionData) {
-			
-						let sectionHtml = `
-			<div class="mb-4">
-			
-				<h5 class="fw-bold border-bottom pb-2 mb-3">
-					${title}
-				</h5>
-			`;
-			
-						Object.keys(sectionData).forEach(function (key) {
-			
-							sectionHtml += `
-				<div class="row py-2 border-bottom">
-			
-					<div class="col-md-5 fw-bold">
-						${key}
-					</div>
-			
-					<div class="col-md-7">
-						: ${sectionData[key] || ''}
-					</div>
-			
-				</div>
-			`;
-						});
-			
-						sectionHtml += `</div>`;
-			
-						return sectionHtml;
-					}*/
-
-
-
-					html += buildSection(
-						"Location Details",
-						data.locationDetails
-					);
-					html += buildSection(
-						"Personal Information",
-						data.personalInformation
-					);
-
-					html += buildSection(
-						"Education Details",
-						data.educationDetails
-					);
-
-					html += buildSection(
-						"Health Details",
-						data.healthDetails
-					);
-
-					html += buildSection(
-						"Document Details",
-						data.documentDetails
-					);
-
-					html += buildSection(
-						"Vulnerability Details",
-						data.vulnerabilityDetails
-					);
-
-					$("#surveyDetails").html(html);
-
-					let modal = new bootstrap.Modal(
-						document.getElementById('surveyModal')
-					);
-
-					modal.show();
-				}
-
-				/*success: function (data) {
-	
-					let html = "";
-	
-					Object.keys(data).forEach(function (key) {
-	
-						html += `
-					<div class="row mb-2">
-						<div class="col-md-5">
-							<strong>${key}</strong>
-						</div>
-						<div class="col-md-7">
-							: ${data[key]}
-						</div>
-					</div>
-				`;
-					});
-	
-					$("#surveyDetails").html(html);
-	
-					// Show modal
-					let modal = new bootstrap.Modal(document.getElementById('surveyModal'));
-					modal.show();
-				}*/
-			});
-		}
-		function fetchSurveyData(isInitialLoad = false) {
-
-
-			var gender = $("#gender").val();
-			var age = $("#age").val();
-			var area = $("#area").val();
-			var education = $("#education").val();
-			var fromDate = $("#fromDate").val();
-			var toDate = $("#toDate").val();
-
-			// SHOW SWAL ONLY WHEN SEARCH BUTTON CLICKED
-			if (!isInitialLoad &&
-
-				gender == '' &&
-				age == '' &&
-				area == '' &&
-				education == '' &&
-				fromDate == '' &&
-				toDate == '') {
-
-				Swal.fire({
-					icon: 'warning',
-					title: 'Warning',
-					text: 'Please select at least one filter.',
-					confirmButtonColor: '#3085d6'
-				});
-
-				return;
-			}
-			if (fromDate != '') {
-				if (toDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-			if (toDate != '') {
-				if (fromDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-
-
-
-			$.ajax({
-				url: "/gcc/api/children-survey/nonsurveyed/list",
-				type: "GET",
-				data: {
-
-
-					area: $("#area").val(),
-
-					fromDate: $("#fromDate").val(),
-					toDate: $("#toDate").val()
-				},
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row) {
-						//<td>${row.survey_date || ''}</td>
-
-						tbody += `
-<tr>
-
-    <!--td>${formatDate(row.survey_date)}</td-->
-						<td data-order="${row.survey_date}">
-							${formatDate(row.survey_date)}
-						</td>
-
-    <td>${row.survey_id || ''}</td>
-
-    <td>${row.reason || ''}</td>
-
-    <td>${row.area || ''}</td>
-
-    <td>${row.house_no || ''}</td>
-
-    <td>${row.block_no || ''}</td>
-
-    
-
-</tr>
-`;
-					});
-
-					// 🔥 Destroy old DataTable if exists
-					if ($.fn.DataTable.isDataTable('#surveyTable')) {
-						$('#surveyTable').DataTable().clear().destroy();
-					}
-
-					// Set new data
-					$("#surveyTable tbody").html(tbody);
-
-					// 🔥 Reinitialize DataTable WITH BUTTONS
-					$('#surveyTable').DataTable({
-						dom: 'Bfrtip',
-						buttons: [
-							{
-								extend: 'pageLength',
-								className: 'btn btn-warning'
-							},
-							{
-								extend: 'excelHtml5',
-								text: 'Excel',
-								className: 'btn btn-success'
-							},
-							{
-								extend: 'pdfHtml5',
-								text: 'PDF',
-								className: 'btn btn-secondary',
-								orientation: 'landscape',
-								pageSize: 'A4'
-							}
-						],
-						responsive: true,
-						destroy: true
-
-
-					});
-				}
-			});
-		}
-		function formatDate(dateString) {
-
-			if (!dateString) return '';
-
-			const date = new Date(dateString);
-
-			const day = String(date.getDate()).padStart(2, '0');
-
-			const month = String(date.getMonth() + 1).padStart(2, '0');
-
-			const year = date.getFullYear();
-
-			return `${day}-${month}-${year}`;
-		}
-		function loadDropdowns() {
-
-			// Gender
-			$.ajax({
-				url: "/gcc/api/children-survey/gender",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Gender</option>';
-
-					data.forEach(function (g) {
-						options += `<option value="${g.id}">${g.english_name}</option>`;
-					});
-
-					$("#gender").html(options);
-				}
-			});
-
-			// Area
-			$.ajax({
-				url: "/gcc/api/children-survey/location",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Area</option>';
-
-					data.forEach(function (a) {
-						options += `<option value="${a.id}">${a.english_name}</option>`;
-					});
-
-					$("#area").html(options);
-				}
-			});
-
-			// Education
-			$.ajax({
-				url: "/gcc/api/children-survey/education",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Education</option>';
-
-					data.forEach(function (e) {
-						options += `<option value="${e.id}">${e.english_name}</option>`;
-					});
-
-					$("#education").html(options);
-				}
-			});
-
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/ownermaster.html b/src/main/resources/templates/modules/childrensurvey/ownermaster.html
deleted file mode 100644
index 5b362897..00000000
--- a/src/main/resources/templates/modules/childrensurvey/ownermaster.html
+++ /dev/null
@@ -1,575 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Owner Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Owner
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Sl.No</th>
-									<th>Owner Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Owner</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Owner Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-		let editId = 0;
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Owner");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/ownermasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${row.id}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                         <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Owner");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/ownermastersave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/ownermasterstatus",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/religionmaster.html b/src/main/resources/templates/modules/childrensurvey/religionmaster.html
deleted file mode 100644
index ec4bf67c..00000000
--- a/src/main/resources/templates/modules/childrensurvey/religionmaster.html
+++ /dev/null
@@ -1,575 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Religion Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Religion
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Sl.No</th>
-									<th>Religion Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Religion</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Religion Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-		let editId = 0;
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Religion");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/religionmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                          <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Religion");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/religionsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/religion-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/surveylist.html b/src/main/resources/templates/modules/childrensurvey/surveylist.html
deleted file mode 100644
index e00fa226..00000000
--- a/src/main/resources/templates/modules/childrensurvey/surveylist.html
+++ /dev/null
@@ -1,1030 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	#surveyorModal .modal-dialog {
-		max-width: 96%;
-		width: 96%;
-	}
-
-	#surveyorModal .modal-content {
-		width: 100%;
-	}
-
-	#surveyTable {
-		width: 100% !important;
-	}
-
-	#surveyTable_wrapper {
-		width: 100%;
-	}
-
-	#surveyTable_wrapper .row {
-		width: 100%;
-		margin: 0;
-	}
-
-	#surveyTable_wrapper .col-sm-12 {
-		padding-left: 0;
-		padding-right: 0;
-	}
-
-	#surveyModal .modal-body {
-		max-height: 75vh;
-		overflow-y: auto;
-		padding: 20px 30px;
-	}
-
-	#surveyDetails .row {
-		border-bottom: 1px solid #f1f1f1;
-		padding: 8px 0;
-		margin: 0;
-	}
-
-	#surveyDetails .col-md-5 {
-		font-weight: 600;
-		color: #222;
-	}
-
-	#surveyDetails .col-md-7 {
-		color: #555;
-	}
-
-	#surveyModal .modal-content {
-		border-radius: 10px;
-	}
-
-	.table-responsive {
-		width: 100%;
-	}
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<!-- LEFT SIDE -->
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-thumbs-up bg-blue me-2"></i>
-									<h5 class="mb-0">Children Survey Dashboard</h5>
-								</div>
-							</div>
-
-							<!-- RIGHT SIDE (DATE FILTER) -->
-							<!--<div class="col-lg-6 text-end">
-								<label class="form-label fw-semibold me-2">From Date:</label>
-								<input type="date" id="fromDate" class="form-control d-inline-block"
-									style="width:150px;">
-
-								<label class="form-label fw-semibold me-2">To Date:</label>
-								<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-							</div>-->
-
-						</div>
-
-						<!-- BREADCRUMB (SEPARATE ROW) -->
-						<div class="row mt-2">
-							<div class="col-lg-12">
-								<nav class="breadcrumb-container">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active"> Surveyors List</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row mb-3">
-
-
-
-
-
-						<div class="col-md-2">
-							<select id="area" class="form-control">
-								<option value="">Area Wise</option>
-							</select>
-						</div>
-						<div class="col-md-6">
-							<label class="form-label fw-semibold me-2">From Date:</label>
-							<input type="date" id="fromDate" class="form-control d-inline-block" style="width:150px;">
-
-							<label class="form-label fw-semibold me-2">To Date:</label>
-							<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-						</div>
-
-
-
-						<div class="col-md-2">
-							<button class="btn btn-primary w-100" onclick="loadSurveyors()">Search</button>
-						</div>
-						<div class="col-md-2">
-							<button class="btn btn-secondary w-100" onclick="resetFilters()">Reset</button>
-						</div>
-
-					</div>
-					<!-- Salary Report Table -->
-					<!--<div class="card-block mt-3">
-						<table id="surveyTable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>Date</th>
-									<th>Survey ID</th>
-									<th>Name</th>
-									<th>Gender</th>
-									<th>Age</th>
-									<th>Mobile</th>
-									<th>Area</th>
-									<th>Education</th>
-									<th>Action</th>
-
-								</tr>
-							</thead>
-							<tbody>
-
-							</tbody>
-							<tfoot class="thead-dark">
-
-							</tfoot>
-						</table>
-					</div>-->
-					<div class="table-responsive">
-
-						<table id="surveyorTable" class="table table-bordered table-striped dt-responsive nowrap w-100">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Date</th>
-									<!--<th>Surveyor ID</th>-->
-									<th>Surveyor Name</th>
-									<th>Mobile Number</th>
-									<th>Area</th>
-									<th>Total Survey Done</th>
-									<th>Action</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-
-
-				</div>
-			</div>
-
-			<div class="modal fade" id="surveyorModal" tabindex="-1">
-
-				<div class="modal-dialog modal-fullscreen-xl-down">
-
-					<div class="modal-content">
-
-						<div class="modal-header">
-
-							<h5 class="modal-title">
-								Child Survey Details
-							</h5>
-
-							<button type="button" class="close" data-bs-dismiss="modal">
-
-								&times;
-
-							</button>
-
-						</div>
-
-						<div class="modal-body">
-
-							<div class="table-responsive">
-
-								<table id="surveyTable" class="table table-bordered table-striped">
-
-									<thead class="thead-dark">
-
-										<tr>
-
-											<th>Date</th>
-											<th>Survey ID</th>
-											<th>Name</th>
-											<th>Gender</th>
-											<th>Age</th>
-											<th>Mobile</th>
-											<th>Area</th>
-											<th>Education</th>
-											<th>Action</th>
-
-										</tr>
-
-									</thead>
-
-									<tbody></tbody>
-
-								</table>
-
-							</div>
-
-						</div>
-
-						<div class="modal-footer">
-
-							<button class="btn btn-secondary" data-bs-dismiss="modal">
-
-								Close
-
-							</button>
-
-						</div>
-
-					</div>
-
-				</div>
-				<div class="modal fade" id="surveyModal" tabindex="-1">
-
-					<div class="modal-dialog modal-dialog-scrollable" style="max-width:70%; width:70%;">
-
-						<div class="modal-content">
-
-							<div class="modal-header">
-
-								<h5 class="modal-title">
-									Child Survey Details
-								</h5>
-
-								<button type="button" class="close" data-bs-dismiss="modal">
-
-									&times;
-
-								</button>
-
-							</div>
-
-							<div class="modal-body">
-
-								<div id="surveyDetails"></div>
-
-							</div>
-
-							<div class="modal-footer">
-
-								<button class="btn btn-secondary" data-bs-dismiss="modal">
-
-									Close
-
-								</button>
-
-							</div>
-
-						</div>
-
-					</div>
-
-				</div>
-
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-			$("#fromDate").val('');
-			$("#toDate").val('');
-
-			// 🔹 Load dropdowns when page loads
-			loadDropdowns();
-			//fetchSurveyData();
-			loadSurveyors(true);
-
-
-			// 🔹 (Optional) Load table initially
-			// fetchSurveyData();
-			// Restrict To Date based on From Date
-			$("#fromDate").on("change", function () {
-
-				let fromDate = $(this).val();
-
-				// Set minimum selectable date for To Date
-				$("#toDate").attr("min", fromDate);
-
-				// If current To Date is less than From Date, clear it
-				if ($("#toDate").val() < fromDate) {
-					$("#toDate").val('');
-				}
-			});
-
-		});
-		function resetFilters() {
-
-			// reset all dropdowns
-			$("#zone").val('');
-			$("#area").val('');
-
-			// reset date
-			$("#fromDate").val('');
-			$("#toDate").val('');
-
-			// reload table
-			loadSurveyors(true);
-		}
-		//using flag
-		function viewChildSurvey(surveyId) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/details",
-
-				type: "GET",
-
-				data: {
-					surveyId: surveyId
-				},
-
-				success: function (data) {
-
-					let html = "";
-
-					function buildSection(title, sectionData) {
-
-						let sectionHtml = `
-
-                    <div class="survey-section mb-5">
-
-                        <h5 class="section-heading">
-                            ${title}
-                        </h5>
-
-                        <div class="row">
-                `;
-
-						Object.keys(sectionData).forEach(function (key) {
-
-							sectionHtml += `
-
-                        <div class="col-md-6 mb-3">
-
-                            <div class="detail-card">
-
-                                <div class="detail-label">
-                                    ${key}
-                                </div>
-
-                                <div class="detail-value">
-                                    ${sectionData[key] || '-'}
-                                </div>
-
-                            </div>
-
-                        </div>
-                    `;
-						});
-
-						sectionHtml += `
-                        </div>
-
-                    </div>
-                `;
-
-						return sectionHtml;
-					}
-					html += buildSection(
-						"Location Details",
-						data.locationDetails
-					);
-
-					html += buildSection(
-						"Personal Information",
-						data.personalInformation
-					);
-
-
-
-					html += buildSection(
-						"Education Details",
-						data.educationDetails
-					);
-
-					html += buildSection(
-						"Health Details",
-						data.healthDetails
-					);
-
-					html += buildSection(
-						"Document Details",
-						data.documentDetails
-					);
-
-					html += buildSection(
-						"Vulnerability Details",
-						data.vulnerabilityDetails
-					);
-
-					$("#surveyDetails").html(html);
-
-					let modal = new bootstrap.Modal(
-						document.getElementById('surveyModal')
-					);
-
-					modal.show();
-				},
-
-				error: function (xhr) {
-
-					console.log(xhr);
-
-					alert("Unable to fetch survey details");
-				}
-			});
-		}
-		function viewSurvey1(loginId, locationId, surveyDate) {
-
-			if ($.fn.DataTable.isDataTable('#surveyTable')) {
-
-				$('#surveyTable').DataTable().destroy();
-			}
-
-			$("#surveyTable tbody").empty();
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/survey-breakup",
-
-				type: "GET",
-				data: {
-					loginId: loginId,
-					locationId: locationId,
-					surveyDate: surveyDate
-				},
-
-
-
-
-
-				success: function (data) {
-
-					let tbody = "";
-
-					$.each(data, function (i, row) {
-
-						tbody += `
-					<tr>
-<td>${formatDate(row.survey_date)}</td>
-						<td>${row.survey_id || ''}</td>
-
-						<td>${row.child_name || ''}</td>
-
-						<td>${row.gender || ''}</td>
-
-						<td>${row.age || ''}</td>
-
-						<td>${row.mobile_number || ''}</td>
-
-						<td>${row.area || ''}</td>
-
-						<td>${row.education || ''}</td>
-
-						<td>
-
-							<button class="btn btn-info btn-sm"
-									onclick="viewChildSurvey('${row.survey_id}')">
-
-								<i class="fa fa-eye"></i>
-
-							</button>
-
-						</td>
-
-					</tr>
-				`;
-					});
-
-					$("#surveyTable tbody").html(tbody);
-
-					$('#surveyTable').DataTable({
-
-						dom: 'Bfrtip',
-
-						buttons: [
-							{
-								extend: 'pageLength',
-								className: 'btn btn-warning'
-							},
-							{
-								extend: 'excelHtml5',
-								text: 'Excel',
-								className: 'btn btn-success'
-							},
-							{
-								extend: 'pdfHtml5',
-								text: 'PDF',
-								className: 'btn btn-secondary',
-								orientation: 'landscape',
-								pageSize: 'A4'
-							}
-						],
-
-						responsive: true,
-						pageLength: 10
-					});
-
-					$("#surveyorModal").modal("show");
-				}
-			});
-		}
-		//static qid not flag
-		/*function viewChildSurvey(surveyId) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/details",
-
-				type: "GET",
-
-				data: {
-					surveyId: surveyId
-				},
-
-				success: function (data) {
-
-					let html = "";
-
-					Object.keys(data).forEach(function (key) {
-
-						html += `
-					<div class="row mb-2">
-
-						<div class="col-md-5">
-							<strong>${key}</strong>
-						</div>
-
-						<div class="col-md-7">
-							: ${data[key] || ''}
-						</div>
-
-					</div>
-				`;
-					});
-
-					$("#surveyDetails").html(html);
-
-					// 🔥 OPEN MODAL
-					let modal = new bootstrap.Modal(
-						document.getElementById('surveyModal')
-					);
-
-					modal.show();
-				},
-
-				error: function (xhr) {
-
-					console.log(xhr);
-
-					alert("Unable to fetch survey details");
-				}
-			});
-		}*/
-
-
-		function loadSurveyors(isInitialLoad = false) {
-			var area = $("#area").val();
-			var fromDate = $("#fromDate").val();
-			var toDate = $("#toDate").val();
-
-			// SHOW SWAL ONLY WHEN SEARCH BUTTON CLICKED
-			if (!isInitialLoad &&
-				area == '' &&
-				fromDate == '' &&
-				toDate == '') {
-
-				Swal.fire({
-					icon: 'warning',
-					title: 'Warning',
-					text: 'Please select at least one filter.',
-					confirmButtonColor: '#3085d6'
-				});
-
-				return;
-			}
-
-			if (fromDate != '') {
-				if (toDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-			if (toDate != '') {
-				if (fromDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-
-			if ($.fn.DataTable.isDataTable('#surveyorTable')) {
-				$('#surveyorTable').DataTable().destroy();
-			}
-
-			$("#surveyorTable tbody").empty();
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/getSurveyorsList",
-
-				type: "GET",
-
-				data: {
-
-					area: $("#area").val(),
-
-					fromDate: $("#fromDate").val(),
-
-					toDate: $("#toDate").val()
-
-				},
-
-
-				success: function (response) {
-
-					let rows = "";
-
-					$.each(response, function (i, item) {
-						//   <td>${item.surveyor_id || ''}</td>
-						// <td>${item.survey_date || ''}</td>
-						rows += `
-                    <tr>
-                       <!--<td>${formatDate(item.survey_date)}</td>-->
-					   <td data-order="${item.survey_date}">
-							${formatDate(item.survey_date)}
-						</td>
-                     
-                        <td>${item.user_name || ''}</td>
-                        <td>${item.mobile_no || ''}</td>
-                        <td>${item.area || ''}</td>
-                        <td>${item.total_survey_done || 0}</td>
-                       <td>
-
-                            <button class="btn btn-info btn-sm"
-                                    onclick="viewSurvey1('${item.loginId}', '${item.location_id}', '${item.survey_date}')">
-
-                                <i class="fa fa-eye"></i>
-
-                            </button>
-
-                        </td>
-
-                    </tr>
-                `;
-					});
-
-					$("#surveyorTable tbody").html(rows);
-
-					$('#surveyorTable').DataTable({
-
-						dom: 'Bfrtip',
-
-						buttons: [
-							{
-								extend: 'pageLength',
-								className: 'btn btn-warning'
-							},
-							{
-								extend: 'excelHtml5',
-								text: 'Excel',
-								className: 'btn btn-success'
-							},
-							{
-								extend: 'pdfHtml5',
-								text: 'PDF',
-								className: 'btn btn-secondary',
-								orientation: 'landscape',
-								pageSize: 'A4'
-							}
-						],
-
-						responsive: true,
-						pageLength: 10
-
-					});
-
-				}
-			});
-		}
-		function formatDate(dateString) {
-
-			if (!dateString) return '';
-
-			const date = new Date(dateString);
-
-			const day = String(date.getDate()).padStart(2, '0');
-
-			const month = String(date.getMonth() + 1).padStart(2, '0');
-
-			const year = date.getFullYear();
-
-			return `${day}-${month}-${year}`;
-		}
-		function viewSurvey(surveyId) {
-
-
-			$.ajax({
-				url: "/gcc/api/children-survey/details",
-				type: "GET",
-				data: { surveyId: surveyId },
-
-				success: function (data) {
-
-					let html = "";
-
-					Object.keys(data).forEach(function (key) {
-
-						html += `
-                    <div class="row mb-2">
-                        <div class="col-md-5">
-                            <strong>${key}</strong>
-                        </div>
-                        <div class="col-md-7">
-                            : ${data[key]}
-                        </div>
-                    </div>
-                `;
-					});
-
-					$("#surveyDetails").html(html);
-
-					// Show modal
-					let modal = new bootstrap.Modal(document.getElementById('surveyModal'));
-					modal.show();
-				}
-			});
-		}
-		function fetchSurveyData() {
-
-			$.ajax({
-				url: "/gcc/api/children-survey/list",
-				type: "GET",
-				data: {
-					name: $("#searchName").val(),
-					gender: $("#gender").val(),
-					age: $("#age").val(),
-					area: $("#area").val(),
-					education: $("#education").val(),
-					fromDate: $("#fromDate").val(),
-					toDate: $("#toDate").val()
-				},
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row) {
-
-						tbody += `
-                    <tr>
-                        <td>${row.survey_date || ''}</td>
-                        <td>${row.survey_id || ''}</td>
-                        <td>${row.child_name || ''}</td>
-                        <td>${row.gender || ''}</td>
-                        <td>${row.age || ''}</td>
-                        <td>${row.mobile_number || ''}</td>
-                        <td>${row.area || ''}</td>
-                        <td>${row.education || ''}</td>
-                         <td>
-        <button class="btn btn-sm btn-info" onclick="viewSurvey('${row.survey_id}')">
-            <i class="fa fa-eye"></i>
-        </button>
-    </td>
-                    </tr>
-                `;
-					});
-
-					// 🔥 Destroy old DataTable if exists
-					if ($.fn.DataTable.isDataTable('#surveyTable')) {
-						$('#surveyTable').DataTable().clear().destroy();
-					}
-
-					// Set new data
-					$("#surveyTable tbody").html(tbody);
-
-					// 🔥 Reinitialize DataTable WITH BUTTONS
-					$('#surveyTable').DataTable({
-						dom: 'Bfrtip',
-						buttons: [
-							{
-								extend: 'pageLength',
-								className: 'btn btn-warning'
-							},
-							{
-								extend: 'excelHtml5',
-								text: 'Excel',
-								className: 'btn btn-success'
-							},
-							{
-								extend: 'pdfHtml5',
-								text: 'PDF',
-								className: 'btn btn-secondary',
-								orientation: 'landscape',
-								pageSize: 'A4'
-							}
-						],
-						responsive: true,
-						destroy: true
-					});
-				}
-			});
-		}
-		function loadDropdowns() {
-
-			// Gender
-			$.ajax({
-				url: "/gcc/api/children-survey/gender",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Gender</option>';
-
-					data.forEach(function (g) {
-						options += `<option value="${g.id}">${g.english_name}</option>`;
-					});
-
-					$("#gender").html(options);
-				}
-			});
-
-			// Area
-			$.ajax({
-				url: "/gcc/api/children-survey/location",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Area</option>';
-
-					data.forEach(function (a) {
-						options += `<option value="${a.id}">${a.english_name}</option>`;
-					});
-
-					$("#area").html(options);
-				}
-			});
-
-			// Education
-			$.ajax({
-				url: "/gcc/api/children-survey/education",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Education</option>';
-
-					data.forEach(function (e) {
-						options += `<option value="${e.id}">${e.english_name}</option>`;
-					});
-
-					$("#education").html(options);
-				}
-			});
-
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/surveyorsreports.html b/src/main/resources/templates/modules/childrensurvey/surveyorsreports.html
deleted file mode 100644
index 3bdda61c..00000000
--- a/src/main/resources/templates/modules/childrensurvey/surveyorsreports.html
+++ /dev/null
@@ -1,873 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<link rel="stylesheet" th:href="@{/assets/css/bootstrap.min.css}">
-
-	<link rel="stylesheet" th:href="@{/assets/css/style.css}">
-
-	<script th:src="@{/assets/js/jquery.min.js}"></script>
-
-	<script th:src="@{/assets/js/bootstrap.bundle.min.js}"></script>
-
-	<style>
-		.report-card {
-			border-radius: 12px;
-			padding: 20px;
-			background: #fff;
-			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08);
-			height: 100%;
-		}
-
-		.report-title {
-			font-size: 12px;
-			color: #777;
-			text-transform: uppercase;
-		}
-
-		.report-count {
-			font-size: 32px;
-			font-weight: 700;
-			color: #222;
-		}
-
-		.section-box {
-			border-radius: 12px;
-			background: #fff;
-			padding: 20px;
-			margin-top: 20px;
-			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08);
-		}
-
-		.section-title {
-			font-size: 18px;
-			font-weight: 600;
-			margin-bottom: 15px;
-		}
-
-		.progress {
-			height: 10px;
-			border-radius: 20px;
-		}
-
-		.report-row {
-			margin-bottom: 15px;
-		}
-
-		.container-fluid {
-			padding: 25px;
-		}
-
-		.report-card {
-			min-height: 130px;
-		}
-
-		.report-count {
-			margin-top: 10px;
-		}
-
-		.section-box {
-			min-height: 100%;
-		}
-
-		.progress-bar {
-			border-radius: 20px;
-		}
-
-		body {
-			background: #f5f7fb;
-		}
-
-		.dashboard-card {
-			border-radius: 12px;
-			background: #fff;
-			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08);
-			min-height: 160px;
-			/*height: 160px;*/
-		}
-
-		/*.dashboard-card .card-body {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-		}*/
-		.dashboard-card .card-body {
-			padding: 20px;
-		}
-
-		.dashboard-card .card-title {
-			font-size: 18px;
-			font-weight: 500;
-			min-height: 48px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			text-align: center;
-			line-height: 1.3;
-		}
-
-		.dashboard-count {
-			font-size: 48px;
-			font-weight: 700;
-			margin-top: 10px;
-		}
-
-		/* AREA CARD SCROLL */
-
-		/* AREA WISE FIXED SCROLL CARD */
-
-		/* AREA WISE CARD FIXED HEIGHT */
-
-		/*.area-scroll-card {
-			height: 500px !important;
-			overflow: hidden !important;
-		}
-
-	
-
-		.area-scroll-card .card-body {
-			height: 100% !important;
-			overflow-y: auto !important;
-			overflow-x: hidden !important;
-			padding-right: 10px;
-		}
-
-		
-
-		.area-scroll-card .card-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		.area-scroll-card .card-body::-webkit-scrollbar-thumb {
-			background: #bdbdbd;
-			border-radius: 10px;
-		}
-
-		.area-scroll-card {
-			height: 500px;
-		}
-
-		#areaWiseDiv {
-			max-height: 380px;
-			overflow-y: auto;
-			overflow-x: hidden;
-			padding-right: 8px;
-		}
-
-		
-
-		#areaWiseDiv::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#areaWiseDiv::-webkit-scrollbar-thumb {
-			background: #bdbdbd;
-			border-radius: 10px;
-		}
-
-		*/
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-center mb-4">
-
-							<div class="col-lg-6">
-
-								<div class="page-header-title">
-
-									<i class="ik ik-thumbs-up bg-blue"></i>
-
-									<div class="d-inline">
-
-										<h3 class="mb-0">
-											Survey Analytics & Reports
-										</h3>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-lg-6 text-right">
-
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-
-									<ol class="breadcrumb justify-content-end">
-
-										<li class="breadcrumb-item">
-
-											<a href="/index">
-
-												<i class="ik ik-home"></i>
-
-											</a>
-
-										</li>
-
-										<li class="breadcrumb-item active">
-
-											Survey Reports
-
-										</li>
-
-									</ol>
-
-								</nav>
-
-							</div>
-
-						</div>
-						<!-- TOP COUNTS -->
-
-						<!--	<div class="row">
-
-							<div class="col-lg-2 col-md-4 col-sm-6 mb-4 d-flex">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h6 class="card-title">
-											Total Surveyed Children
-										</h6>
-
-										<h1 id="totalChildren" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-2 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h6 class="card-title">
-											Areas Covered
-										</h6>
-
-										<h1 id="areasCovered" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-2 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h6 class="card-title">
-											Gender - Male
-										</h6>
-
-										<h1 id="maleCount" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-2 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h6 class="card-title">
-											Gender - Female
-										</h6>
-
-										<h1 id="femaleCount" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-2 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h6 class="card-title">
-											Currently Studying
-										</h6>
-
-										<h1 id="currentlyStudying" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-						</div>-->
-						<div class="row">
-
-							<div class="col mb-4 d-flex">
-								<div class="card dashboard-card text-center w-100">
-									<div class="card-body">
-										<h6 class="card-title">
-											Total Surveyed Children
-										</h6>
-
-										<h1 id="totalChildren" class="dashboard-count">
-											0
-										</h1>
-									</div>
-								</div>
-							</div>
-
-							<div class="col mb-4 d-flex">
-								<div class="card dashboard-card text-center w-100">
-									<div class="card-body">
-										<h6 class="card-title">
-											Areas Covered
-										</h6>
-
-										<h1 id="areasCovered" class="dashboard-count">
-											0
-										</h1>
-									</div>
-								</div>
-							</div>
-
-							<div class="col mb-4 d-flex">
-								<div class="card dashboard-card text-center w-100">
-									<div class="card-body">
-										<h6 class="card-title">
-											Gender - Male
-										</h6>
-
-										<h1 id="maleCount" class="dashboard-count">
-											0
-										</h1>
-									</div>
-								</div>
-							</div>
-
-							<div class="col mb-4 d-flex">
-								<div class="card dashboard-card text-center w-100">
-									<div class="card-body">
-										<h6 class="card-title">
-											Gender - Female
-										</h6>
-
-										<h1 id="femaleCount" class="dashboard-count">
-											0
-										</h1>
-									</div>
-								</div>
-							</div>
-
-							<div class="col mb-4 d-flex">
-								<div class="card dashboard-card text-center w-100">
-									<div class="card-body">
-										<h6 class="card-title">
-											Gender - Others
-										</h6>
-
-										<h1 id="othersCount" class="dashboard-count">
-											0
-										</h1>
-									</div>
-								</div>
-							</div>
-
-							<div class="col mb-4 d-flex">
-								<div class="card dashboard-card text-center w-100">
-									<div class="card-body">
-										<h6 class="card-title">
-											Currently Studying
-										</h6>
-
-										<h1 id="currentlyStudying" class="dashboard-count">
-											0
-										</h1>
-									</div>
-								</div>
-							</div>
-
-						</div>
-
-
-						<!-- AGE DISTRIBUTION -->
-
-						<div class="row">
-
-							<div class="col-md-4 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h5>4 - 8 Years</h5>
-
-										<h1 id="age4to8" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-4 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h5>9 - 13 Years</h5>
-
-										<h1 id="age9to13" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-4 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h5>14 - 18 Years</h5>
-
-										<h1 id="age14to18" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-						</div>
-
-						<!--<div class="row mt-3">
-
-							
-
-							<div class="col-md-6">
-
-
-
-								<div class="card" style="height:500px;">
-
-									<div class="card-body">
-
-										<h5 class="section-title">
-											Area-wise Distribution
-										</h5>
-
-										<div id="areaWiseDiv" style="
-                    max-height:400px;
-                    overflow-y:auto;
-                    overflow-x:hidden;
-                    padding-right:8px;
-                 ">
-										</div>
-
-
-
-									</div>
-
-								</div>
-
-							</div>
-
-							
-
-							<div class="col-md-6">
-
-								<div class="card dashboard-card">
-
-									<h5 class="section-title">
-										Vulnerability Assessment
-									</h5>
-									<div class="card-body">
-										<div id="vulnerabilityDiv"></div>
-									</div>
-
-								</div>
-
-							</div>
-
-						</div>-->
-						<div class="row mt-3 align-items-stretch">
-
-							<!-- AREA WISE -->
-							<div class="col-md-6 mb-4">
-
-								<div class="card h-100" style="height:500px;">
-
-									<div class="card-body">
-
-										<h5 class="section-title">
-											Area-wise Distribution
-										</h5>
-
-										<div id="areaWiseDiv" style="
-                        height:400px;
-                        overflow-y:auto;
-                        overflow-x:hidden;
-                        padding-right:8px;
-                     ">
-										</div>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<!-- VULNERABILITY -->
-							<div class="col-md-6 mb-4">
-
-								<div class="card h-100" style="height:500px;">
-
-									<div class="card-body">
-
-										<h5 class="section-title">
-											Vulnerability Assessment
-										</h5>
-
-										<div id="vulnerabilityDiv"></div>
-
-									</div>
-
-								</div>
-
-							</div>
-
-						</div>
-
-
-
-						<!-- EDUCATION -->
-
-						<div class="row mt-4 align-items-stretch">
-
-							<!-- EDUCATION STATUS -->
-							<div class="col-lg-4 mb-4">
-
-								<div class="card dashboard-card h-100">
-
-									<div class="card-body">
-
-										<h5 class="section-title">
-											Education Status
-										</h5>
-
-										<div id="educationDiv"></div>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<!-- HEALTH OVERVIEW -->
-							<div class="col-lg-4 mb-4">
-
-								<div class="card dashboard-card h-100">
-
-									<div class="card-body">
-
-										<h5 class="section-title">
-											Health Overview
-										</h5>
-
-										<div id="healthDiv"></div>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<!-- CERTIFICATE -->
-							<div class="col-lg-4 mb-4">
-
-								<div class="card dashboard-card h-100">
-
-									<div class="card-body">
-
-										<h5 class="section-title">
-											Certificate
-										</h5>
-
-										<div class="d-flex justify-content-between mb-2">
-											<span>Aadhar Card</span>
-											<span>
-												Yes :
-												<span id="aadharYes">0</span>
-												&nbsp;&nbsp;
-												No :
-												<span id="aadharNo">0</span>
-											</span>
-										</div>
-
-										<div class="d-flex justify-content-between mb-2">
-											<span>Community</span>
-											<span>
-												Yes :
-												<span id="communityYes">0</span>
-												&nbsp;&nbsp;
-												No :
-												<span id="communityNo">0</span>
-											</span>
-										</div>
-
-										<div class="d-flex justify-content-between">
-											<span>Birth Certificate</span>
-											<span>
-												Yes :
-												<span id="birthYes">0</span>
-												&nbsp;&nbsp;
-												No :
-												<span id="birthNo">0</span>
-											</span>
-										</div>
-
-									</div>
-
-								</div>
-
-							</div>
-
-						</div>
-
-					</div>
-
-
-
-				</div>
-
-
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		$(document).ready(function () {
-
-			loadDashboard();
-
-		});
-
-		function loadDashboard() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/dashboard",
-
-				type: "GET",
-
-				success: function (data) {
-
-					$("#totalChildren").text(data.totalChildren);
-
-					$("#areasCovered").text(data.areasCovered);
-
-					$("#maleCount").text(data.maleCount);
-
-					$("#femaleCount").text(data.femaleCount);
-					$("#othersCount").text(data.othersCount);
-
-					//$("#currentlyStudying").text(data.currentlyStudying);
-					$("#currentlyStudying").text(
-						data.currentlyStudying + "%"
-					);
-
-					$("#age4to8").text(data.age4to8);
-
-					$("#age9to13").text(data.age9to13);
-
-					$("#age14to18").text(data.age14to18);
-					$("#aadharYes").text(data.certificateDetails.aadhar_yes || 0);
-					$("#aadharNo").text(data.certificateDetails.aadhar_no || 0);
-
-					$("#communityYes").text(data.certificateDetails.community_yes || 0);
-					$("#communityNo").text(data.certificateDetails.community_no || 0);
-
-					$("#birthYes").text(data.certificateDetails.birth_yes || 0);
-					$("#birthNo").text(data.certificateDetails.birth_no || 0);
-
-
-					// AREA WISE
-
-					let areaHtml = "";
-
-					$.each(data.areaWise, function (i, row) {
-
-						areaHtml += `
-                    <div class="report-row">
-
-                        <div class="d-flex justify-content-between">
-
-                            <span>${row.area}</span>
-
-                            <span>${row.total_children} children</span>
-
-                        </div>
-
-                        <div class="progress mt-2">
-
-                            <div class="progress-bar bg-success"
-                                 style="width:${row.total_children}%">
-
-                            </div>
-
-                        </div>
-
-                    </div>
-                `;
-					});
-
-					$("#areaWiseDiv").html(areaHtml);
-
-					// VULNERABILITY
-
-					let vulnerabilityHtml = "";
-
-					$.each(data.vulnerability, function (i, row) {
-
-						vulnerabilityHtml += `
-                    <div class="d-flex justify-content-between mb-2">
-
-                        <span>${row.vulnerability}</span>
-
-                        <span>${row.total}</span>
-
-                    </div>
-                `;
-					});
-
-					$("#vulnerabilityDiv").html(vulnerabilityHtml);
-
-					// EDUCATION
-
-					// EDUCATION STATUS
-
-					let educationHtml = `
-
-    <div class="d-flex justify-content-between mb-2">
-
-        <span>Currently Studying</span>
-
-        <span>${data.educationStatus.currently_studying || 0}</span>
-
-    </div>
-
-    <div class="d-flex justify-content-between mb-2">
-
-        <span>Not Studying</span>
-
-        <span>${data.educationStatus.not_studying || 0}</span>
-
-    </div>
-
-    <div class="d-flex justify-content-between mb-2">
-
-        <span>Continue Education Intent</span>
-
-        <span>${data.educationStatus.continue_education_intent || 0}</span>
-
-    </div>
-
-`;
-
-					$("#educationDiv").html(educationHtml);
-
-					// HEALTH
-
-					let healthHtml = "";
-
-					$.each(data.healthOverview, function (i, row) {
-
-						healthHtml += `
-                    <div class="d-flex justify-content-between mb-2">
-
-                        <span>${row.status}</span>
-
-                        <span>${row.total}</span>
-
-                    </div>
-                `;
-					});
-
-					$("#healthDiv").html(healthHtml);
-
-				}
-			});
-
-		}
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/vulnerabilitymaster.html b/src/main/resources/templates/modules/childrensurvey/vulnerabilitymaster.html
deleted file mode 100644
index 2a99088b..00000000
--- a/src/main/resources/templates/modules/childrensurvey/vulnerabilitymaster.html
+++ /dev/null
@@ -1,575 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Vulnerability Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Vulnerability
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Vulnerability Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Vulnerability</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Vulnerability Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-		let editId = 0;
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Vulnerability");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/vulnerabilitymasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${row.id}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Vulnerability");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/vulnerabilitysave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/vulnerabilitymasterstatus",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/childrensurvey/whereaboutmaster.html b/src/main/resources/templates/modules/childrensurvey/whereaboutmaster.html
deleted file mode 100644
index 2fc10409..00000000
--- a/src/main/resources/templates/modules/childrensurvey/whereaboutmaster.html
+++ /dev/null
@@ -1,574 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Where About Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Where About
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Where About Name</th>
-									<th>Status</th>
-									<th>delete</th>
-									<th>Edit</th>
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Religion</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Where About Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-		let editId = 0;
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Where About");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/whereaboutmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Disable
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${row.id}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                         <td>
-        <button class="btn btn-danger btn-sm"
-            onclick="toggleStatus(${row.id},0)">
-            Delete
-        </button>
-    </td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Where About");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/whereaboutsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/children-survey/whereaboutstatus",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/circular/inbox.html b/src/main/resources/templates/modules/circular/inbox.html
deleted file mode 100644
index 9f64cfee..00000000
--- a/src/main/resources/templates/modules/circular/inbox.html
+++ /dev/null
@@ -1,300 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Circular List</h5>
-                                            <span>Circular / Minutes</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Circular & Minutes</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Circular List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="circularDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort" width="2%">S.No</th>
-														<th class="text-center" width="10%">Category</th>
-						 								<th class="text-center" width="10%">Type</th>
-						 								<th class="text-center" width="10%">Department</th>
-						 								<th class="text-center" width="10%">Date</th>
-														<th class="text-center" width="40%">Subject</th>
-						                                <th class="text-center no-sort no-exportable no-print" width="5%"><i class="ik ik-more-horizontal"></i></th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- 
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Category</th>
-						 								<th class="text-center">Type</th>
-						 								<th class="text-center">Department</th>
-						 								<th class="text-center">Date</th>
-														<th class="text-center">Subject</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-													</tr>
-                                                </tfoot>
-                                                 --> 
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/circular/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/circular/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-       		var uploadDirectory = /*[[${uploadDirectory}]]*/'';
-       		
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Circular List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_circular_data(){
-	        	var apiUrl = '/gcc/api/circular/getCircularList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_circular_list(){
-	        	get_circular_data().then(function(circularList) {
-	    		    // Handle the complaint list
-	    		    generate_table(circularList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching circular list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching circular list:', error);
-			        }
-	    		});
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#circularDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false },
-						  { targets: 5, orderSequence: ['desc'] }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        /*scrollY: '50vh',*/
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	//var rowNum = data.length;
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-
-	            	var circular_category=row["category"];
-	            	circular_category=circular_category.charAt(0).toUpperCase() + circular_category.slice(1);
-					
-					var file_text = `No File`;
-					var filetype = '';
-					if(row['file_exits']=='true'){
-						file_text = row['file_name'];
-						filetype = row['file_type'];
-					}
-					
-					var action =`<center><a href="#" onclick="return viewFile('${file_text}','${filetype}');" class="text-blue" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Circular Details" data-original-title="View Circular Details"><i class="ik ik-eye f-16 text-blue"></i></a></center>`;
-			                    
-	                table.row.add([
-	                	rowNum++,
-	                	circular_category,
-	                    row['circular_type_name'],
-	                    row['department_name'],
-	                    convertdate_2(row['date']),
-	                    row['subject'],
-	                    action
-	                ]).draw(false);
-	            });
-	            
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-				get_circular_list();
-			});
-			
-			function viewFile(filename,filetype){
-	        	$("#viewFileBox").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				var filepath= '/gcc/files/circular/'+filename;
-				var fileHTML = '';
-				
-	        	if(filetype=='application/pdf'){
-	        		fileHTML = `<iframe src="${filepath}" type="application/pdf" width="100%" height="600px"></iframe>`;
-					
-				}
-				else{
-					fileHTML =nodata;
-				}
-				
-	        	console.error(fileHTML);
-	        	
-	        	$('#viewFileBoxBody').html(fileHTML); // Inject content into modal body
-				
-				return false;
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/circular/new_circular.html b/src/main/resources/templates/modules/circular/new_circular.html
deleted file mode 100644
index 6f040116..00000000
--- a/src/main/resources/templates/modules/circular/new_circular.html
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Add New Circular</h5>
-                                            <span>Circular / Minutes</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Circular & Minutes</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Add New</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-                        	<div class="col-md-2"></div>
-							<div class="col-md-8">
-                                <div class="card">
-									<form class="request-form" id="request-form" onsubmit="return saveRequest();" enctype="multipart/form-data">
-	                                    <div class="card-header"><h3>New Circular Form</h3></div>
-	                               		<div class="card-body">
-											<div class="form-group">
-												<label >Document Category :</label> 
-												<div class="form-radio" id="doc_cat_txt">
-													<div class="radio radiofill radio-inline radio-success">
-								                        <label class="cursure_poiter">
-								                            <input type="radio" name="doc_cat" value="common" required> <i class="helper"></i>Common
-								                        </label>
-								                    </div>
-		                                       
-													<div class="radio radiofill radio-inline radio-primary">
-								                        <label class="cursure_poiter">
-								                            <input type="radio" name="doc_cat" value="flood" required> <i class="helper"></i>Flood
-								                        </label>
-								                    </div>
-		                                        </div>
-											</div>
-	                                        <div class="form-group">
-												<label>Type :</label> 
-												<div class="form-radio" id="circularType"></div>
-											</div>
-											<div class="row">	 
-							                     <div class="col-lg-6">
-													<div class="form-group">
-														<label for="department">From Department :</label> 
-														<select class="form-control" name="department" id="department" required>
-															<option value="" selected disabled>Choose Department</option>
-														</select>
-													</div>
-												</div>
-											 
-							                     <div class="col-lg-6">
-													<div class="form-group">
-														<label for="Date">Date :</label>
-														<input type="date" class="form-control" id="Date" name="Date" oninput="formatDate(this)" required>
-													</div>
-												</div>
-											</div>
-											<div class="form-group">
-												<label for="subject">Subject :</label>
-												<textarea class="form-control" name="subject" id="subject" rows="5" placeholder="Subject" data-autosize-input='{ "space": 40 }'></textarea>
-											</div>
-	                                        <div class="row">
-							                     <div class="col-lg-12">
-								                     <div class="form-group">
-								                       <label for="scan_page1">Select File :</label>
-													   <input name="scan_page1" id="scan_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*">
-													 </div>
-												 </div>
-											</div>
-										</div>	 
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/circular/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var circularTypeList = "";
-			 /* Get Complaint Type Data */
-	        function get_circular_type_data(){
-	
-	        	get_circular_type_list().then(function(circularTypes) {
-	    		    // Handle the Complaint list
-	    		    circularTypeList = circularTypes;
-	    		    circularTypeHTML = "";
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(circularTypeList, function(index, circularType) {
-	    	            // Create an option element
-	    	            circularTypeHTML +=`<div class="radio radiofill ${circularType.color_class} radio-inline">
-						                            <label class="cursure_poiter">
-						                            <input type="radio" name="circularType" value="${circularType.tid}" required>
-						                            <i class="helper"></i>${circularType.name}
-						                        </label>
-						                    </div>`;
-	    	        });
-	    		 // Append the option to the select element
-    	            $('#circularType').append(circularTypeHTML);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching circular type list:', error);
-	    		});
-			}
-			 
-	        /* Get Department Data */
-	        function get_department_data(){
-	
-	    		get_department_list().then(function(departmentList) {
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(departmentList, function(index, department) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: department.did, // case-sensitive as per object
-	    	                text: department.name
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#department').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			// Save New petition 
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementComplaintType = $('#department');
-				var department = inputElementComplaintType.val();
-				
-				if (department) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#request-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        saveFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Circular data saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					// Reload the current page
-		        					//location.reload();
-		        					// Navigate to a Ack page
-		        					window.location = "/gcc/circular/list";
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save circular data. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save circular:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					//inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveFormData(formData){
-				var apiUrl = '/gcc/api/circular/saveCircular';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#resetFormBtn").prop("disabled", false);
-				$("#requestSubmitBtn").prop("disabled", false);
-				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-			}
-			
-			function form_btn_disable(){
-				$("#resetFormBtn").prop("disabled", true);
-				$("#requestSubmitBtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			$(document).ready(function() {
-				get_circular_type_data();
-				get_department_data();
-				$('#petitionerMobile').mask('0000000000');
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/circular/report.html b/src/main/resources/templates/modules/circular/report.html
deleted file mode 100644
index abeda821..00000000
--- a/src/main/resources/templates/modules/circular/report.html
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Complaint List</h5>
-                                            <span>Councillor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Councillor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Complaint List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="circularDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort" width="2%">S.No</th>
-														<th class="text-center">Department</th>
-														<th class="text-center">Count</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/circular/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/circular/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Circular Report'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Circular Report'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Circular Report'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Circular Report',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_circular_data(){
-	        	var apiUrl = '/gcc/api/circular/getReport';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_circular_list(){
-	        	get_circular_data().then(function(circularList) {
-
-        			// Iterate over the data array
-        			var rowNum = 1;
-		            $.each(circularList, function(index, row) {
-		                var department_name = row["name"];
-		                department_name = department_name.charAt(0).toUpperCase() + department_name.slice(1);
-
-		                // Create an array to store the dynamic values for this row
-		                var dynamicValues = [];
-
-		                // Iterate over the keys in the row object
-		                for (var key in row) {
-		                    // Check if the key starts with "dynamic_"
-		                    if (key.startsWith('dynamic_')) {
-		                        // Extract the field name without the "dynamic_" prefix
-		                        var fieldName = key.substring('dynamic_'.length);
-		                        // If it's the first row, add the dynamic column to the DataTable header
-		                        if (rowNum === 1) {
-		                            $('#circularDatatable thead tr').append(`<th class="text-center dynamic-column">${fieldName}</th>`);
-		                        }
-		                    }
-		                }
-		                rowNum++;
-		            });
-		                
-	    		    // Handle the complaint list
-	    		    generate_table(circularList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching circular list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching circular list:', error);
-			        }
-	    		});
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data) {
-	            var table = $('#circularDatatable').DataTable({
-	                dom: 'Bftip',
-	                columnDefs: [
-	                    { targets: 'no-sort', "orderable": false },
-	                    { targets: 'no-exportable', "exportable": false }
-	                ],
-	                lengthMenu: [
-	                    [25, 50, 100, 200, 500, -1],
-	                    ['25 rows', '50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-	                ],
-	                /*scrollY: '50vh',*/
-	                fixedColumns: {
-	                    left: 0,
-	                    right: 0
-	                },
-	                buttons: [buttons],
-	                responsive: true,
-	                searching: false,
-	                select: false,
-	                processing: false,
-	            });
-
-	            // Clear Table data
-	            table.clear().draw();
-
-	            // Initialize row number
-	            var rowNum = 1;
-
-	            // Iterate over the data array
-	            $.each(data, function(index, row) {
-	                var department_name = row["name"];
-	                department_name = department_name.charAt(0).toUpperCase() + department_name.slice(1);
-
-	                // Create an array to store the dynamic values for this row
-	                var dynamicValues = [];
-
-	                // Iterate over the keys in the row object
-	                for (var key in row) {
-	                    // Check if the key starts with "dynamic_"
-	                    if (key.startsWith('dynamic_')) {
-	                        // Add the dynamic value to the array
-	                        dynamicValues.push(row[key]);
-	                    }
-	                }
-
-					// Create the row array
-				    var rowData = [
-				        rowNum++,
-				        department_name,
-				        row["total"]
-				    ];
-
-				    // Add each dynamic value to the row array
-				    rowData = rowData.concat(dynamicValues);
-
-				    // Add the row to the DataTable
-				    table.row.add(rowData).draw(false);
-	            });
-
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-	        }
-
-			
-			$(document).ready(function() {
-				call_loading();
-				get_circular_list();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/com_petition/complaint_list.html b/src/main/resources/templates/modules/com_petition/complaint_list.html
deleted file mode 100644
index c2f26f79..00000000
--- a/src/main/resources/templates/modules/com_petition/complaint_list.html
+++ /dev/null
@@ -1,843 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Complaint List</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Complaint List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <!-- <div class="card">
-                                    
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="complaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Address&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-													</tr>
-                                                </tfoot> -->
-                                                 
-                                            </table>
-                                        </div>
-                                   <!--  </div>
-                                </div>-->
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/com_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/com_petition/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_complaint_data(){
-	        	
-	        	var apiUrl = '/gcc/api/com_petition/getComplaintList?loginId='+createdBy;
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-	        
-	        /* Get Complaints List */
-	        function get_complaint_list(){
-	        	get_complaint_data().then(function(complaintList) {
-	    		    // Handle the complaint list
-	    		    generate_table(complaintList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching complaint list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching complaint list:', error);
-			        }
-	    		});
-			}
-	        
-	        function viewPetitionSummary(petitionNo){
-	        	$("#viewpetition").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				var url = '/gcc/com_petition/view-petition-modal?petitionNo='+petitionNo;
-				$.ajax({
-				    url: url,
-				    type: 'GET',
-				    dataType: 'html',
-				    success: function(data) {
-				      $('#viewPetitionBoxBody').html(data); // Inject content into modal body
-				    },
-				    error: function(xhr, status, error) {
-				      console.error("Error loading URL:", error);
-				      // Handle error, display a message, etc.
-				    }
-				  });
-				
-				return false;
-			}
-	        
-	        function updateStatus(mapId){
-	        	$("#ComplaintStatusBox").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				callComplaintDetails(mapId);
-				return false;
-			}
-	        
-	        function callComplaintDetails(mapId){
-	        	loading_text_msg = getLoadingMessage(); // get Loading random text
-	        	var loading=searchinfo("<b>"+loading_text_msg+"</b>");
-	    		var complaintContentHTML=`
-	    							<div class="row">
-	    							    <div class="col-lg-6">
-	    						        <div class="block block-rounded">
-	    						           
-	    						                <div id="leftContainer">${loading}</div>
-	    						            
-	    						        </div>
-	    						    </div>
-	    						    
-	    						    <div class="col-lg-6 printack2">
-	    						        <div class="block block-rounded">
-	    						            
-	    						                <div id="rightContainer">${loading}</div>
-	    						           
-	    						        </div>
-	    						    </div>
-	    						    <!--<div class="col-lg-12 text-center block-options pt-10">
-	    						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-	    						    </div>-->
-	    						</div>`;
-	    		
-	    		$('#ComplaintStatusBoxBody').html(complaintContentHTML); // Box content (Body)
-	    		
-	    		getComplaintData(mapId);
-			}
-	        
-	        function getComplaintData(mapId){
-	        	get_complaint_details_byId(mapId).then(function(complaintDetails) {
-	        		
-	        		var complaintStatus = complaintDetails[0].status;
-					
-	        		var statusBadge = complaintStatus.charAt(0).toUpperCase() + complaintStatus.slice(1);
-	        		var refRibben = `<div class="card-header-right" style="top:auto;">
-	        							Ref ID: ${mapId}
-				              	      </div>`;
-           	        var statusRibben = ""; 
-	        		if(complaintStatus=='pending'){
-	        			statusRibben = `<div class="ribbon">
-		              	      <div class="wrap">
-		              	        <span class="ribbon6 bg-danger"><div styel="color:#fff;">${statusBadge}</div></span>
-		              	      </div>
-		              	    </div>`;
-		              	statusRibben = "";    
-	        			statusBadge = `<span class="badge badge-danger" style="font-size:10px;padding:0.25em 0.4em;">${statusBadge}</span>`;
-	        			
-					}
-	        		else if(complaintStatus=='close'){   
-	        			statusBadge = `<span class="badge badge-success" style="font-size:10px;padding:0.25em 0.4em;">${statusBadge}</span>`;
-					}
-	        		var complaintRightBody = "";
-	        		
-	        		var fileType_c = complaintDetails[0].file_type;
-					fileType_c = fileType_c.split("/").pop();
-					var filetypeico_c = "file-lines";
-					if(fileType_c=='pdf'){
-						filetypeico_c = "file-pdf";
-					}
-					else{
-						filetypeico_c = "file-image";
-					}
-					
-					
-					var complaintLeftBody = `<div class="card mb-0">
-								             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                	<h3>Complaint Details</h3>
-								                	${statusRibben}
-								                </div>
-								                <div class="card-body">
-									                <table class="table table-borderless table-vcenter mb-0" style="font-size:12px;">
-												      <tbody>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${convertdate(complaintDetails[0].cdate)}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petition_no}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petitioner_name}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petitioner_mobile}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th colspan="2" style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:<br><p class="fw-semibold mb-0" style="font-weight:normal;">${complaintDetails[0].complaint_nature}</p></th>
-												        </tr>
-												        <tr>
-												        	<td colspan="2" style="padding: 0.45rem 0.45rem;">
-												        	<div class="like-comm mt-20 mb-0"> 
-				                                        	<b>ஆவணப் பதிவேற்றம் / Document Upload:</b><br>
-				                                        	
-					                                        	<table class="table table-bordered table-vcenter mb-0">
-													                <thead>
-													                  <tr>
-													                    <th>S.no</th>
-													                    <th>File Name</th>
-													                    <th>Size</th>
-													                    <th>Type</th>
-													                    <th><i class="ik ik-more-horizontal"></i></th>
-													                  </tr>
-													                </thead>
-												                	<tbody>
-												                 		<tr>
-															            	<td class="fw-semibold">1</td>
-															            	<td class="fw-semibold">${complaintDetails[0].file_name}</td>
-															            	<td class="fw-semibold">${formatFileSize(complaintDetails[0].file_size)}</td>
-															            	<td class="fw-semibold">${fileType_c}</td>
-															            	<td class="fw-semibold">
-															            		<a href="javascript:void(0)" class="link mr-10" onclick="downloadFile('petition','${complaintDetails[0].file_name}','${complaintDetails[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Download File"><i class="fa fa-fw fa-download" style="font-size: 18px;"></i></a>
-															            		<a href="javascript:void(0)" class="link mr-10" onclick="viewFile('petition','${complaintDetails[0].file_name}','${complaintDetails[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View File"><i class="far fa-3x fa-${filetypeico_c}" style="font-size: 18px;"></i></a>
-															            	</td>
-													                  	</tr>
-												                	</tbody>
-												              	</table>
-				                                   			</div>
-													        	<table class="table table-bordered table-vcenter mb-0">
-													                <thead>
-													                  <tr>
-													                    <th>Complaint <i class="fa fa-arrow-right"></i> Status</th>
-													                    <th class="text-right" id="complaint_forward_link"><a href="javascript:void(0);" onclick="return forward_compliant(${complaintDetails[0].mapid}, '${complaintDetails[0].complaint_type}');" class="link" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Click here to forward this complaint to another department officer."><i class="far fa-share-square"></i> Click to forward </a></th>
-													                  </tr>
-													                </thead>
-												                	<tbody>
-												                 		<tr>
-															            	<td colspan="2" class="fw-semibold">
-															            	${complaintDetails[0].complaint_type} <i class="fa fa-arrow-right"></i> ${statusBadge} <i class="fa fa-arrow-right"></i> ${complaintDetails[0].off_nm}
-														                    </td>
-													                  	</tr>
-												                	</tbody>
-												              	</table>
-												        	</td>
-												        </tr>
-												      </tbody>
-												    </table>
-								                </div>
-								            </div>`;
-					
-					$('#leftContainer').html(complaintLeftBody);
-					
-					if(complaintStatus!='close'){
-						complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-												<div class="card mb-0">
-							                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-							                    		<h3>Complaint Update Details</h3>
-							                    	    ${refRibben}
-							                		</div>
-							                		<div class="card-body">
-								                		<div class="form-group">
-					                                    	<label for="complaintActionText">நடவடிக்கை / Action:</label>
-									   						<textarea class="form-control" id="complaintActionText" name="complaintActionText" rows="6" maxlength="250" placeholder="புகாரின் தன்மை..." required></textarea>
-									   					</div>
-									   					<div class="form-group">
-									                       <label for="action_san_page1">ஆவணப் பதிவேற்றம் / Document Upload:</label>
-														   <input name="action_san_page1" id="action_san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*" required>
-														 </div>
-														 <div class="form-group mb-0 text-center">
-														 	<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveandclose(${mapId},${complaintDetails[0].petition_id},'${complaintDetails[0].petition_no}');" id="updatebtn"><i class="ik ik-save"></i> Save and Close </button>
-														 </div>
-							                		</div>
-							            		</div>
-						            		</form>`;
-						$('#rightContainer').html(complaintRightBody);
-					}
-					else{
-						// first remove forward link
-						$("#complaint_forward_link").html("");
-						
-						get_complaint_action_byId(mapId).then(function(complaintAction) {
-							var fileType = complaintAction[0].file_type;
-							fileType = fileType.split("/").pop();
-							var filetypeico = "file-lines";
-							if(fileType=='pdf'){
-								filetypeico = "file-pdf";
-							}
-							else{
-								filetypeico = "file-image";
-							}
-							
-							complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-													<div class="card mb-0">
-								                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                    		<h3>Complaint Update Details</h3>
-								                    	    ${refRibben}
-								                		</div>
-								                		<div class="card-body">
-									                		<div>
-									                			<b>நடவடிக்கை தேதி / Action Date:</b> ${convertdate(complaintAction[0].cdate)}
-					                                            <hr>
-					                                            <b>நடவடிக்கை / Action:</b><br>
-					                                            <p class="mt-10">${complaintAction[0].comments}</p>
-					                                        </div>
-					                                        	<hr>
-					                                        <div class="like-comm mt-20 mb-0"> 
-					                                        	<b>ஆவணப் பதிவேற்றம் / Document Upload:</b><br>
-					                                        	
-						                                        	<table class="table table-bordered table-vcenter mb-0">
-														                <thead>
-														                  <tr>
-														                    <th>S.no</th>
-														                    <th>File Name</th>
-														                    <th>Size</th>
-														                    <th>Type</th>
-														                    <th><i class="ik ik-more-horizontal"></i></th>
-														                  </tr>
-														                </thead>
-													                	<tbody>
-													                 		<tr>
-																            	<td class="fw-semibold">1</td>
-																            	<td class="fw-semibold">${complaintAction[0].file_name}</td>
-																            	<td class="fw-semibold">${formatFileSize(complaintAction[0].file_size)}</td>
-																            	<td class="fw-semibold">${fileType}</td>
-																            	<td class="fw-semibold">
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="downloadFile('action','${complaintAction[0].file_name}','${complaintAction[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Download File"><i class="fa fa-fw fa-download" style="font-size: 18px;"></i></a>
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="viewFile('action','${complaintAction[0].file_name}','${complaintAction[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View File"><i class="far fa-3x fa-${filetypeico}" style="font-size: 18px;"></i></a>
-																            	</td>
-														                  	</tr>
-													                	</tbody>
-													              	</table>
-					                                   		</div>
-								                		</div>
-								            		</div>
-							            		</form>`;
-							$('#rightContainer').html(complaintRightBody);
-							// Enable tooltips for all elements with data-toggle="tooltip"
-				            $('[data-toggle="tooltip"]').tooltip();
-						}).catch(function(error) {
-			    		    // Handle errors
-			    		    console.error('Error fetching action details ('+mapId+'):', error);
-			    		});	 
-						
-					}
-					// Enable tooltips for all elements with data-toggle="tooltip"
-		            $('[data-toggle="tooltip"]').tooltip();
-	        	}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching Complaint details ('+mapId+'):', error);
-	    		});	            
-	        	
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#complaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        //scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: false,
-				        searching: true,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	            	var complaint_status=row["status"];
-					complaint_status=complaint_status.charAt(0).toUpperCase() + complaint_status.slice(1);
-					
-					actionHTML = `<div class="dropdown d-inline-block show">
-			                        <!--<a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="ik ik-more-horizontal"></i></a>
-			                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-			                        Action for: `+row['petition_no']+` 
-			                        	<a class="dropdown-item" href="" onclick="return viewAck('`+row['petition_no']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Acknowledgement"><i class="ik ik-eye"></i> Acknowledgement</a>
-			                        	<a class="dropdown-item" href="/gcc/com_petition/petition-ack/`+row['petition_no']+`" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Print Acknowledgement"><i class="ik ik-printer"></i> Acknowledgement</a>
-			                        </div>-->
-			                    </div>`
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/com_petition/update-petition?petitionNo='+row['petitionNoEncode']+'" onclick="return viewPetitionSummary(\''+row['petitionNoEncode']+'\');">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    row['petitioner_address'],
-	                    row['petitioner_pincode'],
-	                    row['complaint_type'],
-	                    convertdate(row['cdate']),
-	                    '<a href="#" onclick="return updateStatus('+row['mapid']+');" style="text-transform: capitalize;"">'+complaint_status+'</a>',
-	                    row['off_nm'],
-	                    actionHTML
-	                ]).draw(false);
-	            });
-	            
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-	            onSearchComplete();
-			}
-			
-	      //Save Forward Details
-			function saveForward(mapid){
-				
-				var offidto = $("#dept2").val();
-				
-				if(offidto=='' || offidto==0){
-					var formError= "Select Department Required!";
-					$('#forwardFormError').html(formError);
-					return false;
-				}
-				
-				var comments = $("#forwardcomp").val();
-				var textLength = comments.length;
-				var formError= "";
-				if(textLength<=10){
-					formError= "Forward Comments Required!";
-					$('#forwardFormError').html(formError);
-					return false;
-				}
-				else{
-					$('#forwardFormError').html(formError);
-				}
-				
-				$.ajax({
-				    type: "POST",
-				    url: '/gcc/api/com_petition/insertForwardLog',
-				    data: {
-				        'mapid': mapid,
-						'comments':comments,
-						'offidto':offidto
-				    },
-				}).done(function(response) {
-				      Swal.fire(
-				        'Complaint Forward Status!',
-				        'Complaint Forwarded Successfully!',
-				        'success'
-				      ).then(() => {
-							    location.reload();
-							 });
-					console.log(response);
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					/*
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-				    console.error("URL: /api/setEventId");
-				    console.error("Query parameters:", {
-				        'upass': upass
-				    });
-					*/
-				});
-				return false;
-			}
-	     	
-	      // Save New Action  
-			function saveandclose(mapId,petitionId,petitionNo){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var comments = $('#complaintActionText');
-				var textLength = comments.val().length;
-				comments.removeClass('is-invalid');
-				
-				var fileInput = $("#action_san_page1");
-				fileInput.removeClass('is-invalid');
-				var selectedFile = fileInput.val();
-				
-				if (textLength>=10 && selectedFile) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#action-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        formData.append('mapId',mapId);
-			        formData.append('petitionId',petitionId);
-			        formData.append('petitionNo',petitionNo);
-			        formData.append('complaintStatus','close');
-			        
-			        saveActionFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Complaint action saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					$("#ComplaintStatusBox").modal('hide');
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save complaint action. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					if(textLength<10){
-						comments.addClass('is-invalid');
-					}
-					
-					if (!selectedFile) {
-						fileInput.addClass('is-invalid');
-					}
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveActionFormData(formData){
-				var apiUrl = '/gcc/api/com_petition/saveComplanitStatus';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#updatebtn").prop("disabled", false);
-				$("#updatebtn").html('<i class="ik ik-save"></i> Save and Close ');
-			}
-			
-			function form_btn_disable(){
-				$("#updatebtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#updatebtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			// For Complient Map Select HTML 
-			function calloffice(val,id){
-				if(val==1){ // Intenal
-					var officeSelectHTML = `<div class="mb-4">
-	                							<label for="office${id}">Select Office</label>
-	                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-									                <option value="0">Select Office</option>
-									                <option value="1">HQ</option>
-									                <option value="2">Zonal Office</option>
-							                	</select>
-						                	</div>`;
-					$("#officedata"+id).html(officeSelectHTML);
-				}
-				else if(val==2){ // External
-					$("#officers"+id).html('');
-					var ExSelectHTML = getselect(id,"ExSelect");
-					var departmentSelectHTML = `<div class="mb-4">
-													<label for="dept3">Select Department</label>
-													${ExSelectHTML}
-											 	</div>`;
-					$("#officedata"+id).html(departmentSelectHTML);
-				}
-				else{
-					$("#officedata"+id).html('');
-					$("#officers"+id).html('');
-				}
-				$("#officers"+id).html('');
-			}
-			
-			function callofficers(val,id){
-				
-				if(val==1){
-					// HQ
-					var HQSelectHTML = getselect(id,"HQSelect");
-				 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-				}
-				else if(val==2){
-					// Zone Office
-					var ZoneSelectHTML = getselect(id,"ZoneSelect");
-					$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-				}
-				else{
-					$("#officers"+id).html('');
-				}
-				
-			}
-			
-			function getselect(comid,type){
-		  	  var HQSelect = '';
-		  	  var ZoneSelect = '';
-		  	  var ExSelect = '';
-		  
-		  	  for (var i = 0; i < officerMasterList.length; i++) {
-		  		  if(officerMasterList[i].zone_id=="HQ"){
-		  			  HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else if(officerMasterList[i].zone_id=="99"){
-		  			  ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else{
-		  			  ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  	  }
-		  	  
-		  	// Forward Save Button
-			  var forward_Btn = `<div class="col-12 pt-3 mb-0 pb-0" id="submitdiv">
-									<label class="form-label" for="forwardcomp">Forward Comments</label>
-									<textarea class="js-maxlength form-control" id="forwardcomp" name="forwardcomp" rows="6" maxlength="250" placeholder="கருத்துகள்..." data-always-show="true" data-placement="right" th:utext="" required></textarea>
-			  						<div class="text-center pt-3">
-									<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveForward(${comid});" id="updatebtn"><i class="si si-rocket me-1"></i> Save and Forward</button>
-			  						<div id="forwardFormError" class="text-danger"></div>
-			  						</div>
-								</div>`;
-								
-		  	  if(type=="HQSelect"){
-		  	  	 return `<select name="mapOfficers" id="dept2" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ZoneSelect"){
-		  	  	 return `<select name="mapOfficers" id="dept2" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ExSelect"){
-		  	  	 return `<select name="mapOfficers" id="dept2" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  return '';
-			}
-			$(document).ready(function() {
-				call_loading();
-				get_officer_master_data();
-				get_complaint_list();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/com_petition/new_petition.html b/src/main/resources/templates/modules/com_petition/new_petition.html
deleted file mode 100644
index 2d29f52b..00000000
--- a/src/main/resources/templates/modules/com_petition/new_petition.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Add New Petition</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Add Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-                        	<div class="col-md-2"></div>
-							<div class="col-md-8">
-                                <div class="card">
-									<form class="request-form" id="request-form" onsubmit="return saveRequest();" enctype="multipart/form-data">
-	                                    <div class="card-header"><h3>New Petition Form</h3></div>
-	                               		<div class="card-body">
-											<div class="form-group">
-	                                            <label for="petitionerName">Petition Type / மனுவின் வகை</label>
-	                                            <div class="form-radio" id="petition_type">
-		                                          
-		                                        </div>
-	                                        </div>
-											<div class="form-group">
-	                                            <label for="petitionerName">Petitioner's Name / மனுதாரரின் பெயர்</label>
-	                                            <input type="text" class="form-control" name="petitionerName" id="petitionerName" autocomplete="off" placeholder="மனுதாரரின் பெயர்"  maxlength="250" required>
-	                                        </div>
-	                                        <div class="form-group">
-	                                            <label for="petitionerMobile">Mobile NO / கைபேசி எண்</label>
-			                       				<input type="text" class="js-maxlength form-control" id="petitionerMobile" name="petitionerMobile" autocomplete="off" placeholder="கைபேசி எண்" maxlength="10" data-always-show="true" data-placement="top" required>
-	                                        </div>
-											<div class="form-group">
-                                          		<label for="complaintType">Type of complaint / புகார் வகை (பலவற்றை தேர்ந்தெடு..) </label>
-												<select class="select2" id="complaintType" name="complaintType" style="width: 100%;" data-placeholder="பலவற்றை தேர்ந்தெடு.." multiple required>
-													<option th:each="complaintType : ${complaintTypesList}" th:value="${complaintType.complaintTypeId}" th:text="${complaintType.complaintType}"></option>
-												</select>
-											</div>
-	                                        <div class="row">
-												 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page1">Petition Page 1 / மனு பக்கம் 1</label>
-													   <input name="san_page1" id="san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*">
-													 </div>
-												 </div>
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page2">Petition Page 2 / மனு பக்கம் 2</label>
-													   <input name="san_page2" id="san_page2" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-												 
-											</div>	 
-											<div class="row">	 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page3">Petition Page 3 / மனு பக்கம் 3</label>
-													   <input name="san_page3" id="san_page3" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-												 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page4">Petition Page 4 / மனு பக்கம் 4</label>
-													   <input name="san_page4" id="san_page4" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-											</div>
-										 	
-	                                  	</div>
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-							<div class="col-md-2"></div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/com_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var complaintTypeList = "";
-			/* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(complaintTypeList, function(index, complaintType) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: complaintType.complaint_typeid, // case-sensitive as per object
-	    	                text: complaintType.complaint_type
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#complaintType').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			
-	        /* Get Petition Type Data */
-	        function get_petition_type_data(){
-	        	var petitionTypeHTML="";
-	    		get_petition_type_list().then(function(petitionTypes) {
-	    		    // Handle the Complaint list
-	    		    petitionTypeList = petitionTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(petitionTypeList, function(index, petitionType) {
-	    	            // Create an option element
-	    	            
-	    	            petitionTypeHTML +=`<div class="radio radiofill ${petitionType.color_class} radio-inline">
-						                            <label class="cursure_poiter">
-						                            <input type="radio" name="petitionType" value="${petitionType.petition_type_id}">
-						                            <i class="helper"></i>${petitionType.name}
-						                        </label>
-						                    </div>`;
-	    	        });
-	    		 // Append the option to the select element
-    	         $('#petition_type').html(petitionTypeHTML);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching petition type list:', error);
-	    		});
-			}
-			 
-			// Save New petition 
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null && mobileFormatRegex.test(mobileNo) && mobileNo.length == 10) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#request-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        saveFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Petition data saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					// Reload the current page
-		        					//location.reload();
-		        					// Navigate to a Ack page
-		        					window.location = "/gcc/com_petition/petition-list";//petition-ack/"+response;
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save petition data. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveFormData(formData){
-				var apiUrl = '/gcc/api/com_petition/savePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#resetFormBtn").prop("disabled", false);
-				$("#requestSubmitBtn").prop("disabled", false);
-				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-			}
-			
-			function form_btn_disable(){
-				$("#resetFormBtn").prop("disabled", true);
-				$("#requestSubmitBtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			$(document).ready(function() {
-				get_complaint_type_data();
-				get_petition_type_data();
-				$('#petitionerMobile').mask('0000000000');
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/com_petition/pending_list.html b/src/main/resources/templates/modules/com_petition/pending_list.html
deleted file mode 100644
index e53d4785..00000000
--- a/src/main/resources/templates/modules/com_petition/pending_list.html
+++ /dev/null
@@ -1,351 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    /* Add space between buttons inside the container */
-    .col-md-3.d-flex button {
-        margin-right: 10px; /* Adjust the value as needed */
-    }
-    /* Remove extra margin from the last button */
-    .col-md-3.d-flex button:last-child {
-        margin-right: 0;
-    }
-</style>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Pending List</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Pending List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <!-- <div class="card">
-                                    
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-										
-
-
-										
-							<!-- 			<div class="row mb-3">
-										    <div class="col-md-3">
-										        <label for="fromDate">From Date:</label>
-										        <input type="date" id="fromDate" class="form-control">
-										    </div>
-										    <div class="col-md-3">
-										        <label for="toDate">To Date:</label>
-										        <input type="date" id="toDate" class="form-control">
-										    </div>
-											<div class="col-md-3 d-flex align-items-end">
-											    <button id="filterBtn" class="btn btn-primary">Search</button>
-											    <button id="resetBtn" class="btn btn-secondary">Reset</button>
-											</div>
-                                        </div>										
-										
-										<div class="form-group">
-                                            <label for="eventid">Select Petition Type / மனுவின் வகை</label>
-                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required onchange="get_complaint_list(this.value);">
-												<option value=""></option>
-											</select>
-                                        </div> -->
-                                        
-                                        <div class="row mb-3">
-    <div class="col-md-3">
-        <label for="fromDate">From Date:</label>
-        <input type="date" id="fromDate" class="form-control">
-    </div>
-    <div class="col-md-3">
-        <label for="toDate">To Date:</label>
-        <input type="date" id="toDate" class="form-control">
-    </div>
-<div class="col-md-3">
-    <label for="petitionType">Select Petition Type / மனுவின் வகை</label>
-    <select class="form-control" id="petitionType" name="petitionType">
-        <option value="">-- All Types --</option>
-    </select>
-</div>
-
-    <div class="col-md-3 d-flex align-items-end">
-        <button id="filterBtn" class="btn btn-primary me-2">Search</button>
-        <button id="resetBtn" class="btn btn-secondary">Reset</button>
-    </div>
-</div>
-                                         
-                                        <div>
-											<table id="ReportDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-														<!-- <th class="text-center">Counsilor Ward</th>
-						 								<th class="text-center">Counsilor Zone</th> -->
-						 								<th class="text-center">Counsilor Name</th>
-						 								<th class="text-center">Petition Type </th>
-						 								<th class="text-center">Content</th>
-						 								<!-- <th class="text-center">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Address&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th> -->
-														<!-- <th class="text-center">Postal Code</th> -->
-						                                <!-- <th class="text-center">Type of Complaint</th> -->
-						                                <!-- <th class="text-center">Date</th> -->
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center">Status</th>
-						                                
-						                                <!-- <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th> -->
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                          
-                          
-                                                 
-                                            </table>
-                                        </div>
-                                 
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/zerohours_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-			
-			//Report List
-			
-// Function to load petition types into dropdown
-function loadPetitionTypes() {
-    $.ajax({
-        url: '/gcc/api/com_petition/getPetitionTypes',
-        type: 'GET',
-        dataType: 'json',
-        success: function (response) {
-            let $dropdown = $("#petitionType");
-            $dropdown.empty(); 
-            $dropdown.append('<option value="">-- All Types --</option>');
-
-            // If response is an array
-            if (Array.isArray(response)) {
-                $.each(response, function (index, item) {
-                    $dropdown.append('<option value="' + item.petition_type_id + '">' + item.name + '</option>');
-                });
-            } else {
-                // If response is a single object
-                $dropdown.append('<option value="' + response.petition_type_id + '">' + response.name + '</option>');
-            }
-        },
-        error: function (xhr, status, error) {
-            console.error("Error loading petition types:", error);
-        }
-    });
-}
-
-			
-function loadReportData(fromDate, toDate, petitionTypeId = "", isReset = false) {
-    let apiUrl = '/gcc/api/com_petition/getReportList';
-    let params = [];
-
-    if (!isReset) {
-        if (fromDate && toDate) {
-            params.push("fromDate=" + fromDate);
-            params.push("toDate=" + toDate);
-        }
-        if (petitionTypeId) {
-            params.push("petitionType=" + petitionTypeId);
-        }
-    }
-
-    if (params.length > 0) {
-        apiUrl += "?" + params.join("&");
-    }
-
-    $.ajax({
-        url: apiUrl,
-        type: 'GET',
-        dataType: 'json',
-        success: function (response) {
-            if ($.fn.DataTable.isDataTable('#ReportDatatable')) {
-                $('#ReportDatatable').DataTable().clear().destroy();
-            }
-
-            $('#ReportDatatable').DataTable({
-                data: response,
-                dom: 'Bfrtip',
-                buttons: buttons,
-                columns: [
-                    {
-                        data: null,
-                        className: "text-center",
-                        render: function (data, type, row, meta) {
-                            return meta.row + 1;
-                        }
-                    },
-                    { data: 'petition_no', className: "text-center" },
-                    { data: 'petitioner_name', className: "text-center" },
-                    { data: 'petition_type', className: "text-center" },
-                    { data: 'complaint_nature', className: "text-center" },
-                    { data: 'officer_name', className: "text-center" },
-                    { data: 'status', className: "text-center" }
-                ]
-            });
-        },
-        error: function (xhr, status, error) {
-            console.error("Error fetching report list:", error);
-        }
-    });
-}
-
-
-$(document).ready(function () {
-    // Load petition types dynamically
-    loadPetitionTypes();
-
-    // Default load today's data
-    let today = new Date().toISOString().split('T')[0];
-    $("#fromDate").val(today);
-    $("#toDate").val(today);
-    loadReportData(today, today);
-
-    // On Filter Button Click
-    $("#filterBtn").click(function () {
-        let fromDate = $("#fromDate").val();
-        let toDate = $("#toDate").val();
-        let petitionTypeId = $("#petitionType").val();
-
-        if (fromDate && toDate) {
-            loadReportData(fromDate, toDate, petitionTypeId);
-        } else {
-            alert("Please select both From Date and To Date");
-        }
-    });
-
-    // Reset button click
-    $("#resetBtn").click(function () {
-        location.reload();
-    });
-});
-
-
-    
-
-    
-			
- 
-		    
-		    //////////
-			
-
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/com_petition/petition_ack.html b/src/main/resources/templates/modules/com_petition/petition_ack.html
deleted file mode 100644
index 5d11f608..00000000
--- a/src/main/resources/templates/modules/com_petition/petition_ack.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5 th:utext="'Petition Acknowledgement ('+${petitionNo}+')'">Petition Acknowledgement</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition Acknowledgement</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr class="print_no">
-                        <!-- 
-                        <div class="row">
-                        	<div class="col-lg-6">
-								<div class="block block-rounded ack ack-container">
-									<div id="ack1table" style="border: 1px solid black;">
-										<div id="ack1"></div>
-									</div>
-								</div>
-							</div>
-						 
-							<div class="col-lg-6">
-								<div class="block block-rounded ack ack-container">
-									<div id="ack2table" style="border: 1px solid black;">
-										<div id="ack2"></div>
-									</div>
-								</div>
-							</div>
-		   	 	            <div class="col-lg-12 text-center block-options pt-10">
-		   	 					<button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-		   	 	            </div>
-                        </div>
-                         -->
-                        <div class="row">
-						    <div class="col-lg-6">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack1table" class="ack-content">
-						                <div id="ack1">This is ack1</div>
-						            </div>
-						        </div>
-						    </div>
-						    
-						    <div class="col-lg-6 printack2">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack2table" class="ack-content">
-						                <div id="ack2">This is ack2</div>
-						            </div>
-						        </div>
-						    </div>
-						    <div class="col-lg-12 text-center block-options pt-10">
-						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-						    </div>
-						</div>
-						                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/com_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var complaintTypeList = "";
-			
-			 /* Get Complaint Type Data */
-			function get_complaint_type_data(){
-			
-				get_complaint_type_list().then(function(complaintTypes) {
-				    // Handle the Complaint list
-				    complaintTypeList = complaintTypes;
-					
-				    // After Complaint Type list created we call petition details
-				    get_petition_data();
-				    
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching complaint type list:', error);
-				});
-			}
-			
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint_txt;
-					
-					var complaintArray = complaint.split(',');
-					
-					for(j = 0; j < complaintArray.length; j++){
-						if(j>0){
-							complaintHTML+="<br>";
-						}
-						complaintHTML+= (j+1)+') '+complaintArray[j];
-					}
-					var ack =`
-					<table class="table table-borderless table-vcenter p-0 m-0">
-					  <tbody>
-					    <tr>
-					      <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-					      <td class="fw-semibold text-center">
-								<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-								மக்களை தேடி மேயர் திட்டம்<br>
-								ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-						  </td>
-						  <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-					    </tr>
-					</tbody>
-					</table>
-					<hr style="margin:0px">
-					  <div class="block-content p-0 m-0">
-					    <table class="table table-borderless table-vcenter" style="font-size:12px;">
-					      <tbody>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${convertdate(petitionDetails[0].cdate)}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petition_no}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petitioner_name}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petitioner_mobile}
-					          </td>
-					        </tr>
-					        <tr style="font-size:12px;">
-					          <th style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${complaintHTML}
-							</td>
-					        </tr>
-					        <tr>
-					          <td scope="row" colspan="2" style="font-size:10px">இம்மனுவின் ஒப்புகைச் சீட்டு எண் மனு தாரரின் கைபேசி எண்ணிற்கு குறுஞ்செய்தி மூலம் அனுப்பி வைக்கப்படும் . இம்மனுவின் நிலை குறித்து https://chennaicorporation.gov.in/MTM/ என்ற இணையதளத்தில் மனுவின் எண்ணை குறிப்பிட்டு அறிந்துகொள்ளலாம்</th>
-					        </tr>
-					        <tr style="text-align: right;">
-					          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-					        </tr>
-					      </tbody>
-					    </table>
-					  `;
-				    
-					$("#ack1").html(ack);
-					$("#ack2").html(ack);
-					  
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition details ('+petitionNo+'):', error);
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/com_petition/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                resolve(jsonResponse);
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			$(document).ready(function() {
-				get_complaint_type_data();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/com_petition/petition_list.html b/src/main/resources/templates/modules/com_petition/petition_list.html
deleted file mode 100644
index 8ba28971..00000000
--- a/src/main/resources/templates/modules/com_petition/petition_list.html
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Petition List</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                               <!--  <div class="card">
-                                    
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="petitionDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered" style="font-size:10px;">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Petition Type</th>
-						                                <th class="text-center">Remarks</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- 
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center">Nature Of Complaint</th>
-						                                <th class="text-center">Remarks</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-													</tr>
-                                                </tfoot> -->
-                                            </table>
-                                        </div>
-                                    <!--</div>
-                                </div>-->
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/com_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/com_petition/script :: script}"></script>
-        <script th:inline="javascript">
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_petitions_data(){
-	        	var apiUrl = '/gcc/api/com_petition/getPetitionList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_petitions_list(){
-	        	get_petitions_data().then(function(petitionList) {
-	    		    // Handle the department list
-	    		    generate_table(petitionList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching petition list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching petition list:', error);
-			        }
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#petitionDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        //scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: false,
-				        searching: true,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-
-	            	//View Acknowledgement: View the acknowledgement for petition MP10000001.
-					//Print Acknowledgement: Print the acknowledgement for petition MP10000001.
-					//View Petition Details: View the details of petition MP10000001.
-					//View Uploaded Files: View the files uploaded for petition MP10000001.
-
-					actionHTML = `<div class="dropdown d-inline-block show">
-			                        <a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="ik ik-more-horizontal"></i></a>
-			                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-			                        
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the acknowledgement for petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Acknowledgement</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Print the acknowledgement for petition `+row['petition_no']+`."><i class="ik ik-printer"></i> Print Acknowledgement</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the details of petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Petition Details</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the files uploaded for petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Uploaded Files</a>
-			                        </div>
-			                    </div>`
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/com_petition/update-petition?petitionNo='+row['petitionNoEncode']+'" class="link">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    row['petitioner_address'],
-	                    row['petitioner_pincode'],
-	                    row['petitioner_complaint_txt'],
-	                    convertdate(row['cdate']),
-	                    row['status'],
-	                    row['petition_type_name'],
-	                    row['remarks'],
-	                    actionHTML
-	                ]).draw(false);
-	            });
-	            
-	           // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-	            get_petitions_list();
-	            
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/com_petition/petition_not_mapped_list.html b/src/main/resources/templates/modules/com_petition/petition_not_mapped_list.html
deleted file mode 100644
index 63850440..00000000
--- a/src/main/resources/templates/modules/com_petition/petition_not_mapped_list.html
+++ /dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Unmapped Petition List</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Unmapped Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <!-- <div class="card">
-                                	<div class="card-header">
-                                        <h3>These are the petitions that are currently not assigned to any department officer:</h3>
-                                    </div>
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-                                        <div>
-                                        <p style="font-size:12px">These are the petitions that are currently not assigned to any department officer:</p>
-											<table id="petitionDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Petition Type</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-													</tr>
-                                                </tfoot>-->
-                                            </table>
-                                        </div>
-                                   <!-- </div>
-                                </div> --> 
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/com_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/com_petition/script :: script}"></script>
-        <script th:inline="javascript">
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_petitions_data(){
-	        	var apiUrl = '/gcc/api/com_petition/getUnmapPetitionList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_petitions_list(){
-	        	get_petitions_data().then(function(petitionList) {
-	    		    // Handle the department list
-	    		    generate_table(petitionList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching petition list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching petition list:', error);
-			        }
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#petitionDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-				        	{ targets: 'no-sort', "orderable": false },
-							{ targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				       // scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: false,
-				        searching: true,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/com_petition/update-petition?petitionNo='+row['petitionNoEncode']+'">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    row['petitioner_address'],
-	                    row['petitioner_pincode'],
-	                    row['petitioner_complaint_txt'],
-	                    convertdate(row['cdate']),
-	                    row['status'],
-	                    row['petition_type_name'],
-	                    '<a href="" onclick="return viewAck(\''+row['petition_no']+'\');"data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Ack"><i class="far fa-handshake"></i></a>',
-	                ]).draw(false);
-	            });
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-	            get_petitions_list();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/com_petition/petition_update.html b/src/main/resources/templates/modules/com_petition/petition_update.html
deleted file mode 100644
index 255875ab..00000000
--- a/src/main/resources/templates/modules/com_petition/petition_update.html
+++ /dev/null
@@ -1,764 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Edit / Update Petition</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Edit/Update Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card" id="petitionUpdateForm">
-									<form class="update-request-form" id="update-request-form" onsubmit="return updateRequest();">
-										<div class="card-header">
-		                                    <h3>Edit / Update Petition Form</h3>
-		                                    <div class="card-header-right">
-	                                            <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-	                                        </div>
-	                                    </div>
-	                               		<div class="card-body">
-	                               			<div class="row">
-	                               				<div class="col-12">
-	                               					<div class="form-group">
-			                                            <label for="petitionerName">Petition Type / மனுவின் வகை</label>
-			                                            <div class="form-radio" id="petition_type">
-				                                          
-				                                        </div>
-			                                        </div>
-	                               				</div>
-												<div class="col-6">
-													<div class="form-group">
-			                                            <label for="petitionerName">Petitioner's Name / மனுதாரரின் பெயர்</label>
-			                                            <input type="text" class="form-control" name="petitionerName" id="petitionerName" autocomplete="off" placeholder="மனுதாரரின் பெயர்"  maxlength="250" required>
-			                                        </div>
-			                                        <div class="form-group">
-			                                            <label for="petitionerMobile">Mobile NO / கைபேசி எண்</label>
-					                       				<input type="text" class="form-control" id="petitionerMobile" name="petitionerMobile" autocomplete="off" placeholder="கைபேசி எண்" maxlength="10" required>
-			                                        </div>
-			                                        <div class="form-group">
-			                                        	<label for="complaintNature">புகாரின் தன்மை / Nature Of Complaint</label>
-								   						<textarea class="form-control" id="complaintNature" name="complaintNature" rows="6" placeholder="புகாரின் தன்மை..."></textarea>
-								   					</div>
-								   					<div class="form-group">
-			                                        	<label for="remarks">குறிப்பு / Remarks:</label>
-								   						<textarea class="form-control" id="remarks" name="remarks" rows="6" placeholder="குறிப்பு..."></textarea>
-								   					</div>
-												</div>
-												<div class="col-6">
-													<div class="form-group">
-														<label for="petitionerAddress">Address of petitioner / மனுதாரரின் முகவரி</label>
-									   					<textarea class="form-control" id="petitionerAddress" name="petitionerAddress" rows="6" maxlength="250" placeholder="மனுதாரரின் முகவரி..."></textarea>
-													</div>
-													<div class="form-group">
-														<label for="petitionerPincode">Postal code / தபால் குறியீடு</label>
-	   			                       					<input type="text" class="form-control" id="petitionerPincode" name="petitionerPincode" placeholder="தபால் குறியீடு" maxlength="6" required>
-													</div>
-													<div class="form-group">
-		                                          		<label for="complaintType">Type of complaint / புகார் வகை (பலவற்றை தேர்ந்தெடு..) </label>
-														<select class="select2" id="complaintType" name="complaintType" style="width: 100%;" data-placeholder="பலவற்றை தேர்ந்தெடு.." multiple required onchange="javascript:load_mapper();">
-															<option></option>
-														</select>
-													</div>
-												</div>
-												<div class="col-12">
-													<div class="block-content" id="userinfo2">
-														<div id="comp_mapping_to_officers" class="row"></div>
-													</div>
-											 	</div>
-											</div>
-	                                  	</div>
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/com_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Iterate through the Master Complanint Type and add options to the select element
-	    		    $.each(complaintTypeList, function(index, complaintType) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: complaintType.complaint_typeid, // case-sensitive as per object
-	    	                text: complaintType.complaint_type
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#complaintType').append(option);
-	    	        });
-	    		    // Call Petition function to fetch the data
-	    		    get_petition_data();
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-	        /* Get Petition Type Data */
-	        function get_petition_type_data(){
-	        	var petitionTypeHTML="";
-	    		get_petition_type_list().then(function(petitionTypes) {
-	    		    // Handle the Complaint list
-	    		    petitionTypeList = petitionTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(petitionTypeList, function(index, petitionType) {
-	    	            // Create an option element
-	    	            
-	    	            petitionTypeHTML +=`<div class="radio radiofill ${petitionType.color_class} radio-inline">
-						                            <label class="cursure_poiter">
-						                            <input type="radio" name="petitionType" id="petition_type_${petitionType.petition_type_id}" value="${petitionType.petition_type_id}" disable>
-						                            <i class="helper"></i>${petitionType.name}
-						                        </label>
-						                    </div>`;
-	    	        });
-	    		 // Append the option to the select element
-    	         $('#petition_type').html(petitionTypeHTML);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching petition type list:', error);
-	    		});
-			}
-	        
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-			 
-	     	// Function to get complaint_type and complaint_typeid by complaint_typeid
-	        function getComplaintTypeById(complaintTypeId) {
-	            for (var i = 0; i < complaintTypeList.length; i++) {
-	                if (complaintTypeList[i].complaint_typeid == complaintTypeId) {
-	                    return {
-	                        complaint_type: complaintTypeList[i].complaint_type,
-	                        complaint_typeid: complaintTypeList[i].complaint_typeid
-	                    };
-	                }
-	            }
-	            return null; // Return null if no matching complaint_typeid is found
-	        }
-	     
-			// Save New petition 
-			function updateRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null && mobileFormatRegex.test(mobileNo) && mobileNo.length == 10) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#update-request-form')[0]);
-			        formData.append('petitionNo',petitionNo);
-			        formData.append('createdBy',createdBy);
-			        formData.append('petitionId',petitionId);
-			        updateFormData(formData).then(function(response) {
-		    		    // Handle the response
-		    		    if(response==true){
-							// Delete Old data in Petition Mapping table
-		    		    	savePetitionMapData(formData).then(function(response) {
-		    		    		if(response==true){
-		    		    			Swal.fire({
-				        				title: 'Petition updated successfully!',
-				        				customClass: {
-				        			        title: 'swal-title-custom' // Add a custom class for the title
-				        			    },
-				        				//text: "Error",
-				        				icon: 'success',
-				        				showCancelButton: false,
-				        				confirmButtonColor: '#3085d6',
-				        				cancelButtonColor: '#d33',
-				        				confirmButtonText: 'Ok',
-				        				}).then(function(result) {
-				        				if (result.isConfirmed) {
-				        					form_btn_enable();
-				        				}
-				        			});
-		    		    		}
-		    		    		else{
-		    		    			Swal.fire({
-				        				title: 'Petition details have been updated, but mapping the complaint to the officer has failed.',
-				        				customClass: {
-				        			        title: 'swal-title-custom' // Add a custom class for the title
-				        			    },
-				        				//text: "Error",
-				        				icon: 'warning',
-				        				showCancelButton: false,
-				        				confirmButtonColor: '#3085d6',
-				        				cancelButtonColor: '#d33',
-				        				confirmButtonText: 'Ok',
-				        				}).then(function(result) {
-				        				if (result.isConfirmed) {
-				        					form_btn_enable();
-				        				}
-				        			});
-								}
-		    		    	}).catch(function(error) {
-		    	    		    // Handle errors
-		    	    		    console.error('Error fetching offcier master data:', error);
-		    	    		    form_btn_enable();
-		    	    		});
-		    		    	
-						}
-		    		    else{
-		    		    	Swal.fire({
-		        				title: 'Failed to update petition details!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-	    		    	
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function updateFormData(formData){
-				var apiUrl = '/gcc/api/com_petition/updatePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function savePetitionMapData(formData){
-				var apiUrl = '/gcc/api/com_petition/mapComplientToOfficer';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint;
-					petitionId = petitionDetails[0].petition_id;
-					var complaintArray = complaint.split(",");
-					$("#complaintType").val(complaintArray);
-					
-					$('#complaintType').trigger('change');
-					
-					closedComplaintsList = complaintArray;
-					var petition_type = "#petition_type_"+petitionDetails[0].petition_type;
-					// Suppose you want to select the radio button with the value 'option2'
-					$(petition_type).prop('checked', true);
-
-					$("#petitionerName").val(petitionDetails[0].petitioner_name);
-					$("#petitionerMobile").val(petitionDetails[0].petitioner_mobile);
-					$("#petitionerAddress").val(petitionDetails[0].petitioner_address);
-					$("#petitionerPincode").val(petitionDetails[0].petitioner_pincode);
-					
-					$("#complaintNature").val(petitionDetails[0].complaint_nature);
-					
-					$("#remarks").val(petitionDetails[0].remarks);
-					
-					//load_mapper(); // Call for Complaint Mapping Form
-					
-					// IDs of the values you want to prevent from being deselected
-					var valuesToPreventDeselection = closedComplaintsList;//['value1', 'value2', 'value3'];
-
-					$('#complaintType').on('select2:unselect', function (e) {
-					    var deselectedValue = e.params.data.id;
-					    
-					    // Check if the deselected value should be prevented from being deselected
-					    if (valuesToPreventDeselection.includes(deselectedValue)) {
-					        // Prevent the deselection
-					        e.preventDefault();
-					    	// Re-select the deselected value to prevent it from being deselected
-					        $(this).val(valuesToPreventDeselection).trigger('change.select2');
-					        // Optionally, you can display a message or perform any other action
-					        console.log('Deselection of value ' + deselectedValue + ' prevented');
-					        alert('Deselection of value ' + deselectedValue + ' prevented');
-					    }
-					});
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition Data ('+petitionNo+'):', error.message);
-				    call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/com_petition/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			function load_mapper(){
-			  	var complaintArray = $("#complaintType").val();
-			  	//var complaintArray = complaint.split(',');
-				var compPetitionNo = petitionNo;
-				var compPetitionId = petitionId;
-				
-				var compmapHTML='';
-				for(j = 0; j < complaintArray.length; j++){
-					var complaintTypeDetails = getComplaintTypeById(complaintArray[j]); // Pass the complaint_typeid
-					var title=(j+1)+') '+ complaintTypeDetails.complaint_type; // Map form title
-					var compID="comp"+j;
-					var complaintTypeId = complaintTypeDetails.complaint_typeid;
-					
-					getMappingByComplaintsID(complaintTypeId);
-					
-					compmapHTML+=`<div class="col-lg-6" id="comp${complaintArray[j]}">
-										
-										<div class="widget">
-					                        <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                            <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-					                        </div>
-					                        <div class="widget-body">
-					                        	<div class="form-group">
-						                        	<label for="dept${complaintArray[j]}">Select Department Type</label>
-													<select name="dept[]" id="dept${complaintArray[j]}" class="form-control" onchange="javascript:calloffice(this.value,${complaintArray[j]})">
-														<option value="0">Select Department</option>
-														<option value="1">GCC Department</option>
-														<option value="2">External Department</option>
-												    </select>
-												</div>
-												<div id="officedata${complaintArray[j]}"></div>
-												<div id="officers${complaintArray[j]}"></div>
-					                        </div>
-					                    </div>
-									
-								  </div>`;
-						
-				}
-				$('#comp_mapping_to_officers').html(compmapHTML);
-				
-			  }
-			
-		</script>
-		
-		<script>
-		// For Complient Map Select HTML 
-		function calloffice(val,id){
-			if(val==1){ // Intenal
-				var officeSelectHTML = `<div class="mb-4">
-                							<label for="office${id}">Select Office</label>
-                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-								                <option value="0">Select Office</option>
-								                <option value="1">HQ</option>
-								                <option value="2">Zonal Office</option>
-						                	</select>
-					                	</div>`;
-				$("#officedata"+id).html(officeSelectHTML);
-			}
-			else if(val==2){ // External
-				$("#officers"+id).html('');
-				var ExSelectHTML = getselect(id,"ExSelect");
-				var departmentSelectHTML = `<div class="mb-4">
-												<label for="dept3">Select Department</label>
-												${ExSelectHTML}
-										 	</div>`;
-				$("#officedata"+id).html(departmentSelectHTML);
-			}
-			else{
-				$("#officedata"+id).html('');
-				$("#officers"+id).html('');
-			}
-			$("#officers"+id).html('');
-		}
-		
-		function callofficers(val,id){
-			
-			if(val==1){
-				// HQ
-				var HQSelectHTML = getselect(id,"HQSelect");
-			 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-			}
-			else if(val==2){
-				// Zone Office
-				var ZoneSelectHTML = getselect(id,"ZoneSelect");
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-			}
-			else{
-				$("#officers"+id).html('');
-			}
-			
-		}
-		
-		function getselect(comid,type){
-	  	  var HQSelect = '';
-	  	  var ZoneSelect = '';
-	  	  var ExSelect = '';
-	  
-	  	  for (var i = 0; i < officerMasterList.length; i++) {
-	  		  if(officerMasterList[i].zone_id=="HQ"){
-	  			  HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  		  else if(officerMasterList[i].zone_id=="99"){
-	  			  ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  		  else{
-	  			  ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  	  }
-	  	  
-	  	  if(type=="HQSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>`;
-	  	  }
-	  	  if(type=="ZoneSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>`;
-	  	  }
-	  	  if(type=="ExSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>`;
-	  	  }
-	  	  return '';
-		}
-		
-		function form_btn_enable(){
-			$("#resetFormBtn").prop("disabled", false);
-			$("#requestSubmitBtn").prop("disabled", false);
-			$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-		}
-		
-		function form_btn_disable(){
-			$("#resetFormBtn").prop("disabled", true);
-			$("#requestSubmitBtn").prop("disabled", true);
-			// Show the loading icon on the button
-			$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-		}
-		
-		function getMappingByComplaintsID(complaintTypeId){
-				
-				$.ajax({
-				    type: "GET",
-				    url: '/gcc/api/com_petition/getComplaintMappingDetails',
-				    data: {
-				        'petitionId': petitionId,
-						'petitionNo': petitionNo,
-						'complaintTypeId': complaintTypeId
-				    },
-					dataType: 'json',
-				}).done(function(response) {
-					
-					//console.log(response);
-					
-					if(response.length>0){
-						var comid = response[0]["complaint_typeid"];
-						var offid = response[0]["off_id"];
-						var mapid = response[0]["mapid"];
-						loadSelectforUpdate(comid,offid,comid);
-					}
-					
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-						
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-					    
-				});
-		}
-		
-		function loadSelectforUpdate(comid,offid,id){
-			var type ="NULL";
-	  	  	var HQSelect = '';
-	  	  	var ZoneSelect = '';
-	  	  	var ExSelect = '';
-	  
-			for (var i = 0; i < officerMasterList.length; i++) {
-		  		//console.log(officerMasterList[i]);
-				if(officerMasterList[i].zone_id=="HQ"){
-			  
-				  	if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "HQSelect";
-				  		HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-				  	}
-				  	else{
-				  		HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-				  	}
-					  
-				}
-				else if(officerMasterList[i].zone_id=="99"){
-					if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "ExSelect";
-						ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-		  			}
-		  			else{
-		  				ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  			}
-				}
-				else{
-					if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "ZoneSelect";
-						//console.log(type + " === "+ officerMasterList[i].offId +" == "+ offid);
-						ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-				  	}
-				  	else{
-				  		ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-				  	}  
-				}
-			}  
-			
-			//console.log("comid : "+comid +",\noffid : "+offid+",\nid : "+id+",\ntype : "+type);
-			
-			if(type=="HQSelect"){
-				//console.log("I am from HQSelect: \n #officers"+id);
-				$("#officedata"+id).html('<div class="mb-4">' +
-				           '<label for="office$'+id+'">Select Office</label>' +
-				           '<select name="office[]" id="office$'+id+'" class="form-control" onchange="javascript:callofficers(this.value,'+id+')">' +
-				           '<option value="0">Select Office</option>' +
-				           '<option value="1" Selected>HQ</option>' +
-				           '<option value="2">Zonal Office</option>' +
-				           '</select>' +
-				           '</div>');
-			  	 HQSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>`;
-		 		$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${HQSelectHTML}</div>`);
-		 
-			}
-			if(type=="ZoneSelect"){
-				//console.log("I am from ZoneSelect: \n #officers"+id);
-				$("#officedata"+id).html('<div class="mb-4">' +
-				           '<label for="office$'+id+'">Select Office</label>' +
-				           '<select name="office[]" id="office$'+id+'" class="form-control" onchange="javascript:callofficers(this.value,'+id+')">' +
-				           '<option value="0">Select Office</option>' +
-				           '<option value="1">HQ</option>' +
-				           '<option value="2" Selected>Zonal Office</option>' +
-				           '</select>' +
-				           '</div>');
-				  
-				ZoneSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>`;
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${ZoneSelectHTML}</div>`);
-			}
-			if(type=="ExSelect"){
-				//console.log("I am from ExSelect: \n #officers"+id);
-				ExSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>`;
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${ExSelectHTML}</div>`);
-			}
-		 
-		}
-		
-		function call_petition_search_from(errorTXT){
-			var errorHTML = "";
-			if(errorTXT!=""){
-				errorHTML = `<div class="form-group text-center text-danger">${errorTXT}</div>`;
-			}
-			var searchFormHTML = `<form class="search-form" id="search-form" onsubmit="return searchRequest();">
-										<div class="card-header">
-						                <h3>Edit / Update Petition Form</h3>
-						                <div class="card-header-right">
-						                    <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-						                </div>
-						            </div>
-						       		<div class="card-body">
-						       			<div class="row">
-											<div class="col-12 text-center">
-												${errorHTML}
-												<div class="form-group">
-						                            <label for="petitionNoSearch">Petition No / மனு எண் </label>
-						                            <input type="text" class="form-control text-center" name="petitionNoSearch" id="petitionNoSearch" autocomplete="off" placeholder="COM00000000" maxlength="11" required>
-						                        </div>
-						                        
-											</div>
-											<div class="col-12">
-												<div class="block-content" id="userinfo2">
-													<div id="comp_mapping_to_officers" class="row"></div>
-												</div>
-										 	</div>
-										</div>
-						          	</div>
-						          	<div class="card-footer text-center">
-										<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            	<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						        	</div>
-						    	</form>`;
-			
-			$("#petitionUpdateForm").html(searchFormHTML);
-			$('#petitionNoSearch').mask('COM00000000');
-		}
-		
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/com_petition/update-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			
-			if(petitionNo!=null && petitionNo!="error"){
-				get_complaint_type_data();
-				get_petition_type_data();
-				get_officer_master_data();
-			}
-			else{
-				if(petitionNo=="error"){
-					call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				}
-				else{
-					call_petition_search_from("");
-				}
-			}
-			
-		});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/com_petition/petition_view.html b/src/main/resources/templates/modules/com_petition/petition_view.html
deleted file mode 100644
index 41c32ce5..00000000
--- a/src/main/resources/templates/modules/com_petition/petition_view.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>View Petition</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">View Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Petition Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="window.print()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">நாள் / Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="cdate_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petition_no_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_name_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_mobile_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Address of petitioner / மனுதாரரின் முகவரி:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_address_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">புகாரின் தன்மை / Nature of complaint:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="complaint_nature_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											      	<tr>
-											          <th style="padding: 0.45rem 0.45rem;">Petition Status: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_status_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total number of complaints in this petition: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Completed:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_completed_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Pending:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_pending_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-												
-												
-												<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th id="petition_summary_title">Pending Summary</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-									                	<tr style="background-color:#fbffe0;">
-												          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_summary_html"></td>
-												        </tr>
-								                	</tbody>
-								              	</table>
-								              	
-											</div>
-										</div>
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/com_petition/script :: script}"></script>
-        <script th:replace="~{fragments/modules/com_petition/petition_view_script :: script}"></script>
-       	
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/com_petition/petition_view_modal_page.html b/src/main/resources/templates/modules/com_petition/petition_view_modal_page.html
deleted file mode 100644
index 9d52c3d9..00000000
--- a/src/main/resources/templates/modules/com_petition/petition_view_modal_page.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Petition Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="window.print()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">நாள் / Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="cdate_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petition_no_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_name_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_mobile_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">மனுதாரரின் முகவரி / Address of petitioner:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_address_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">புகாரின் தன்மை / Nature of complaint:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="complaint_nature_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">குறிப்பு / Remarks:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="remarks_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="remarks_with_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											      	<tr>
-											          <th style="padding: 0.45rem 0.45rem;">Petition Status: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_status_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total number of complaints in this petition: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Completed:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_completed_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Pending:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_pending_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-												
-												
-												<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th id="petition_summary_title">Pending Summary</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-									                	<tr style="background-color:#fbffe0;">
-												          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_summary_html"></td>
-												        </tr>
-								                	</tbody>
-								              	</table>
-								              	
-											</div>
-										</div>
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/com_petition/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/com_petition/petition_view_script :: script}"></script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html b/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html
deleted file mode 100644
index 73eb0afe..00000000
--- a/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html
+++ /dev/null
@@ -1,673 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .width1 {
-        width: 120px;
-    }
-
-    .width2 {
-        width: 150px;
-    }
-
-    .modal-label {
-        font-weight: 600;
-        color: #333;
-    }
-
-    .modal-value {
-        color: #444;
-    }
-
-    .modal-section-title {
-        font-size: 1.2rem;
-        font-weight: bold;
-        margin-top: 20px;
-        margin-bottom: 10px;
-        border-bottom: 2px solid #dee2e6;
-        padding-bottom: 5px;
-    }
-
-
-    .modal-title-big {
-        font-size: 20px;
-        font-weight: 700;
-    }
-
-    .modal-subtext {
-        color: #b4c5d3;
-        font-size: 13px;
-    }
-
-    .card-section {
-        background: white;
-        border-radius: 10px;
-        padding: 20px;
-        margin-bottom: 25px;
-        border: 1px solid #eee;
-    }
-
-    .section-title {
-        font-weight: 700;
-        color: #333;
-        margin-bottom: 15px;
-        font-size: 16px;
-    }
-
-    .label-text {
-        font-size: 13px;
-        color: #6c757d;
-    }
-
-    .value-text {
-        font-size: 15px;
-        font-weight: 600;
-        color: #333;
-    }
-
-    .info-block {
-        display: flex;
-        flex-direction: column;
-    }
-
-
-    .badge-status {
-        background: #2dce89;
-        color: #212121;
-        padding: 6px 10px;
-        border-radius: 5px;
-        font-size: 13px;
-
-    }
-
-    .btn-big {
-        padding: 12px 25px;
-        border-radius: 8px;
-        width: 200px;
-    }
-
-    .rdo-box {
-        border: 1px solid #eee;
-        border-radius: 10px;
-        padding: 20px;
-    }
-</style>
-
-<body>
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-6">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Approved & Rejected List</h5>
-                                        <span>Flag Pole Approved & Rejected List</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-6">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item">
-                                            <a href="/rdo/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">Flag Pole Approved & Rejected
-                                            List</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Approved & Rejected List
-                                        </li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="row mt-4">
-
-                        <div class="col-md-12">
-                            <div class="card">
-                                <div class="card-header d-flex justify-content-between align-items-center fw-bold">
-                                    <h3 class="mb-0">Temporary Flag Poles - Approved & Rejected List : <span
-                                            th:text="${officer_name}"></span></h3>
-                                    <input type="hidden" id="userName" th:value="${officer_name}">
-                                    <input type="hidden" id="loginuserid" th:value="${LoginUserId}">
-
-                                </div>
-
-                                <div class="row mt-3 ml-2">
-                                    <div class="col-md-3">
-                                        <label for="startDate" class="form-label" style="font-size: medium;">From
-                                            Date:</label>
-                                        <input type="date" id="startDate" class="form-control" placeholder="Start Date">
-                                    </div>
-                                    <div class="col-md-3">
-                                        <label for="endDate" class="form-label" style="font-size: medium;">To
-                                            Date:</label>
-                                        <input type="date" id="endDate" class="form-control" placeholder="End Date">
-                                    </div>
-                                    <div class="col-md-3">
-                                        <label class="form-label">Status:</label>
-                                        <select id="statusFilter" class="form-control">
-                                            <option value="">All</option>
-                                            <option value="APPROVED">Approved</option>
-                                            <option value="REJECTED">Rejected</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-3" style="margin-top: 30px;">
-                                        <button id="searchBtn" class="btn btn-primary">Search</button>
-                                        <button id="resetBtn" class="btn btn-secondary">Reset</button>
-                                    </div>
-                                </div>
-
-                                <div class="card-body">
-                                    <div>
-                                        <div class="row mt-2">
-
-
-                                            <div class="col-xl-3 col-md-3 col-sm-12">
-                                                <div class="card card-box p-4">
-                                                    <h6 class="text-facebook mb-20 mt-2 text-center fw-bold"><b>Total
-                                                            Request</b>
-                                                    </h6>
-                                                    <h4 class="text-twitter fw-700 text-center" id="totalrequest">10
-                                                    </h4>
-                                                </div>
-                                            </div>
-                                            <div class="col-xl-3 col-md-3 col-sm-12" style="display: none;">
-                                                <div class="card card-box p-4">
-                                                    <h6 class="text-facebook mb-20 mt-2 text-center"><b>Pending Decision
-                                                        </b></h6>
-                                                    <h4 class="text-twitter fw-700 text-center" id="pendingdecision">9
-                                                    </h4>
-                                                </div>
-                                            </div>
-                                            <div class="col-xl-3 col-md-3 col-sm-12">
-                                                <div class="card card-box p-4">
-                                                    <h6 class="text-facebook mb-20 mt-2 text-center"><b>Approved</b>
-                                                    </h6>
-                                                    <h4 class="text-twitter fw-700 text-center" id="approved">1</h4>
-                                                </div>
-                                            </div>
-                                            <div class="col-xl-3 col-md-3 col-sm-12">
-                                                <div class="card card-box p-4">
-                                                    <h6 class="text-facebook mb-20 mt-2 text-center"><b>Rejected</b>
-                                                    </h6>
-                                                    <h4 class="text-twitter fw-700 text-center" id="rejected">0</h4>
-                                                </div>
-                                            </div>
-                                        </div>
-
-                                        <div>
-                                            <table id="QaqcDatatable"
-                                                class="table table-striped table-bordered table-hover dataTable"
-                                                role="grid">
-                                                <thead class="thead-dark">
-                                                    <tr role="row">
-                                                        <th class="text-center">S.No</th>
-                                                        <th class="text-center no-sort">Applicant Name</th>
-                                                        <th class="text-center">RequestId</th>
-                                                        <th class="text-center">Zone/Ward</th>
-                                                        <th class="text-center">Event Type</th>
-                                                        <th class="text-center">Event Date</th>
-                                                        <th class="text-center">Total Cost</th>
-                                                        <th class="text-center">Status</th>
-                                                        <th class="text-center">Action</th>
-
-                                                    </tr>
-
-                                                </thead>
-                                                <tbody>
-
-                                                </tbody>
-                                            </table>
-                                        </div>
-
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </div>
-            <div id="pageLoader"
-                style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-                <div style="position: relative; top: 50%; transform: translateY(-50%);">
-                    <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                        <span class="sr-only">Loading...</span>
-                    </div>
-                    <!-- Add the 'Please wait' text below the spinner -->
-                    <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-                </div>
-            </div>
-
-            <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-
-    <!-- Details Modal -->
-    <div class="modal fade" id="detailsModal" tabindex="-1" aria-hidden="true">
-        <div class="modal-dialog modal-xl modal-dialog-scrollable">
-            <div class="modal-content">
-
-                <div class="modal-header" style="background:#2f3e54; color:white;">
-                    <div>
-                        <h4 class="modal-title-big" id="modalTitle"></h4>
-                        <div id="modalSubTitle" class="modal-subtext"></div>
-                    </div>
-
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span></button>
-                </div>
-
-                <div class="modal-body">
-
-                    <div id="modalContent"></div>
-
-                    <div class="text-center mt-4">
-                        <button type="button" class="btn btn-primary btn-big" data-dismiss="modal"
-                            style="background:#2f3e54;">Close</button>
-                    </div>
-
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script type="text/javascript">
-
-
-
-        let table;
-
-        $(document).ready(function () {
-            loadTable();
-
-            $("#searchBtn").on("click", loadTable);
-
-            $("#resetBtn").on("click", function () {
-                $("#startDate").val("");
-                $("#endDate").val("");
-                $("#statusFilter").val("");
-                loadTable();
-            });
-        });
-
-        function loadTable() {
-
-            //let officer_name = $("#userName").val();
-            let gccUserId = $("#loginuserid").val();
-            let startDate = $("#startDate").val();
-            let endDate = $("#endDate").val();
-            let status = $("#statusFilter").val();
-
-            console.log("gccuserid", gccUserId);
-
-            if ($.fn.DataTable.isDataTable('#QaqcDatatable')) {
-                $('#QaqcDatatable').DataTable().clear().destroy();
-            }
-
-            table = $('#QaqcDatatable').DataTable({
-                processing: true,
-                responsive: true,
-                scrollY: '50vh',
-                dom: 'Bfrtip',
-
-                ajax: {
-                    url: "/gcc/api/flagpoleregistration/getApprovedAndRejectedDetails",
-                    type: "GET",
-                    data: {
-                        //userLogin: officer_name,
-                        gccUserId: gccUserId,
-                        startDate: startDate,
-                        endDate: endDate,
-                        status: status
-                    },
-                    dataSrc: function (json) {
-
-                        const data = json.data || [];
-
-                        // 🔹 Dashboard counts
-                        let pending = 0, approved = 0, rejected = 0;
-
-                        data.forEach(r => {
-                            let status = r.history && r.history.length > 0
-                                ? r.history[r.history.length - 1].status
-                                : null;
-
-
-                            if (!status) pending++;
-                            else if (status === 'APPROVED') approved++;
-                            else if (status === 'REJECTED') rejected++;
-                        });
-
-                        // data.forEach(r => {
-                        //     if (!r.rdo_status) pending++;
-                        //     else if (r.rdo_status === 'APPROVED') approved++;
-                        //     else if (r.rdo_status === 'REJECTED') rejected++;
-                        // });
-
-                        $("#totalrequest").text(data.length);
-                        $("#pendingdecision").text(pending);
-                        $("#approved").text(approved);
-                        $("#rejected").text(rejected);
-
-                        return data; // ✅ already unique per refid
-                    }
-                },
-
-                columns: [
-                    {
-                        data: null,
-                        className: "text-center",
-                        render: (d, t, r, m) => m.row + 1
-                    },
-                    {
-                        data: "applicant_name",
-                        className: "text-center"
-                    },
-                    {
-                        data: "refid",
-                        className: "text-center"
-                    },
-                    {
-                        data: null,
-                        className: "text-center",
-                        render: row => {
-                            if (!row.streets || row.streets.length === 0) return "-";
-                            return `${row.streets[0].zone} / ${row.streets[0].ward}`;
-                        }
-                    },
-                    {
-                        data: "event_name",
-                        className: "text-center"
-                    },
-                    {
-                        data: "event_date",
-                        className: "text-center",
-                        render: d => new Date(d).toLocaleDateString("en-GB")
-                    },
-                    {
-                        data: "total_cost",
-                        className: "text-center",
-                        render: d => d.toLocaleString("en-GB")
-                    },
-                    // {
-                    //     data: "rdo_status",
-                    //     className: "text-center",
-                    //     render: d => {
-                    //         if (!d)
-                    //             return `<span class="badge bg-warning text-dark">Pending</span>`;
-                    //         if (d === 'APPROVED')
-                    //             return `<span class="badge bg-success">Approved</span>`;
-                    //         return `<span class="badge bg-danger">Rejected</span>`;
-                    //     }
-                    // },
-                    {
-                        data: null,
-                        className: "text-center",
-                        render: row => {
-
-                            let status = row.history && row.history.length > 0
-                                ? row.history[row.history.length - 1].status
-                                : null;
-
-
-                            if (!status)
-                                return `<span class="badge bg-warning text-dark">Pending</span>`;
-                            if (status === 'APPROVED')
-                                return `<span class="badge bg-success">Approved</span>`;
-                            return `<span class="badge bg-danger">Rejected</span>`;
-                        }
-                    },
-
-                    // {
-                    //     data: "remarks",
-                    //     className: "text-center"
-                    // },
-                    // {
-                    //     data: null,
-                    //     className: "text-center",
-                    //     render: function (row) {
-
-                    //         if (!row.history || row.history.length === 0)
-                    //             return "-";
-
-                    //         // history already filtered by backend for login dept
-                    //         return row.history[0].remarks || "-";
-                    //     }
-                    // },
-
-                    {
-                        data: null,
-                        className: "text-center",
-                        render: row =>
-                            `<button class="btn btn-primary btn-sm viewBtn"
-                        data-refid="${row.refid}">
-                        View
-                    </button>`
-                    }
-                ]
-            });
-        }
-
-
-
-        // Destroy previous instance if exists
-        if ($.fn.DataTable.isDataTable('#QaqcDatatable')) {
-            $('#QaqcDatatable').DataTable().clear().destroy();
-        }
-
-
-
-
-        $('#QaqcDatatable').on("click", ".viewBtn", function () {
-
-            // 🔹 Get row data directly from DataTable
-            const rowData = table.row($(this).closest('tr')).data();
-
-            if (!rowData) {
-                alert("No details found");
-                return;
-            }
-
-            populateModal(rowData);
-            $("#detailsModal").modal("show");
-        });
-
-        // -----------------------------
-        // VIEW BUTTON → OPEN MODAL
-        // -----------------------------
-        function populateModal(record) {
-
-            // HEADER
-            $("#modalTitle").html(`Application Details - ${record.applicant_name}`);
-            $("#modalSubTitle").html(
-                `Ref ID: ${record.refid} - ${record.streets.length} Streets`
-            );
-
-            $("#detailsModal").data("refid", record.refid);
-
-            // 🔹 Streets
-            let streetHtml = "";
-
-            record.streets.forEach((s, index) => {
-                streetHtml += `
-        <div class="card-section">
-            <div class="section-title">Street ${index + 1}</div>
-
-            <div class="row mb-2">
-                <div class="col-md-4">
-                    <div class="label-text">Street Name</div>
-                    <div class="value-text">${s.street_name}</div>
-                </div>
-                <div class="col-md-4">
-                    <div class="label-text">Zone</div>
-                    <div class="value-text">${s.zone}</div>
-                </div>
-                <div class="col-md-4">
-                    <div class="label-text">Ward</div>
-                    <div class="value-text">${s.ward}</div>
-                </div>
-                <div class="col-md-4">
-                    <div class="label-text">No. of Poles</div>
-                    <div class="value-text">${s.no_of_poles}</div>
-                </div>
- 
-    
-                <div class="col-md-4">
-                    <div class="label-text">Height</div>
-                    <div class="value-text">${s.height}</div>
-                </div>
-
-                <div class="col-md-4">
-                    <div class="label-text">Flag Material</div>
-                    <div class="value-text">${s.flag_material}</div>
-                </div>
-             
-                <div class="col-md-4">
-                    <div class="label-text">Pole Material</div>
-                    <div class="value-text">${s.pole_material}</div>
-                </div>
-                
-            </div>
-
-                
-            
-        </div>`;
-            });
-
-
-            let historyHtml = "";
-
-            if (record.history && record.history.length > 0) {
-
-                historyHtml += `
-    <div class="card-section">
-        <div class="section-title">Application History</div>
-    `;
-
-                record.history.forEach((h, index) => {
-                    historyHtml += `
-        <div class="row mb-2 border-bottom pb-2">
-            <div class="col-md-3">
-                <div class="label-text">Action Date</div>
-                <div class="value-text">${h.action_date}</div>
-            </div>
-
-            <div class="col-md-3">
-                <div class="label-text">Department</div>
-                <div class="value-text">${h.department_name}</div>
-            </div>
-
-
-            <div class="col-md-3">
-                <div class="label-text">Status</div>
-                <div class="value-text">${h.status}</div>
-            </div>
-
-        
-
-            ${h.remarks ? `
-            <div class="col-md-3">
-                <div class="label-text">Remarks</div>
-                <div class="value-text">${h.remarks}</div>
-            </div>` : ""}
-        </div>
-        `;
-                });
-
-                historyHtml += `</div>`;
-            }
-
-            let html = `
-    <!-- APPLICANT INFO -->
-    <div class="card-section">
-        <div class="section-title">Applicant Information</div>
-
-        <div class="row mb-2">
-            <div class="col-md-6">
-                <div class="label-text">Applicant Name</div>
-                <div class="value-text">${record.applicant_name}</div>
-            </div>
-            <div class="col-md-6">
-                <div class="label-text">Mobile Number</div>
-                <div class="value-text">${record.mobile_number}</div>
-            </div>
-        </div>
-
-        <div class="row mb-2">
-            <div class="col-md-6">
-                <div class="label-text">Event Type</div>
-                <div class="value-text">${record.event_name}</div>
-            </div>
-            <div class="col-md-6">
-                <div class="label-text">Event Date</div>
-                <div class="value-text">
-                    ${new Date(record.event_date).toLocaleDateString("en-GB")}
-                </div>
-            </div>
-            <div class="col-md-6">
-                <div class="label-text">Address</div>
-                <div class="value-text">
-                    ${record.applicant_address}
-                </div>
-            </div>
-            <div class="col-md-6">
-                <div class="label-text">Total Cost</div>
-                <div class="value-text">
-                    ${record.total_cost.toLocaleString("en-GB")}
-                </div>
-            </div>
-             <div class="col-md-6">
-                    <div class="label-text">No. of Days</div>
-                    <div class="value-text">${record.no_of_days}</div>
-            </div>
-             <div class="col-md-6">
-                    <div class="label-text">Event Description</div>
-                    <div class="value-text">${record.event_desc}</div>
-            </div>
-        </div>
-        <div class="row mb-2">
-            <div class="col-md-6">
-                <div class="label-text">Applied Date</div>
-                <div class="value-text">${record.cdate}</div>
-            </div>
-        </div>
-    </div>
-
-    ${streetHtml}
-    ${historyHtml}
-    `;
-
-            $("#modalContent").html(html);
-        }
-
-
-
-
-
-
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/flagpole/requestlist.html b/src/main/resources/templates/modules/flagpole/requestlist.html
deleted file mode 100644
index 684932c1..00000000
--- a/src/main/resources/templates/modules/flagpole/requestlist.html
+++ /dev/null
@@ -1,909 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .width1 {
-        width: 120px;
-    }
-
-    .width2 {
-        width: 150px;
-    }
-
-    .modal-label {
-        font-weight: 600;
-        color: #333;
-    }
-
-    .modal-value {
-        color: #444;
-    }
-
-    .modal-section-title {
-        font-size: 1.2rem;
-        font-weight: bold;
-        margin-top: 20px;
-        margin-bottom: 10px;
-        border-bottom: 2px solid #dee2e6;
-        padding-bottom: 5px;
-    }
-
-
-    .modal-title-big {
-        font-size: 20px;
-        font-weight: 700;
-    }
-
-    .modal-subtext {
-        color: #b4c5d3;
-        font-size: 13px;
-    }
-
-    .card-section {
-        background: white;
-        border-radius: 10px;
-        padding: 20px;
-        margin-bottom: 25px;
-        border: 1px solid #eee;
-    }
-
-    .section-title {
-        font-weight: 700;
-        color: #333;
-        margin-bottom: 15px;
-        font-size: 16px;
-    }
-
-    .label-text {
-        font-size: 13px;
-        color: #6c757d;
-    }
-
-    .value-text {
-        font-size: 15px;
-        font-weight: 600;
-        color: #333;
-    }
-
-    .info-block {
-        display: flex;
-        flex-direction: column;
-    }
-
-
-    .badge-status {
-        background: #ffd9b3;
-        color: #a65c00;
-        padding: 6px 10px;
-        border-radius: 5px;
-        font-size: 13px;
-
-    }
-
-    .btn-big {
-        padding: 12px 25px;
-        border-radius: 8px;
-        width: 200px;
-    }
-
-    .rdo-box {
-        border: 1px solid #eee;
-        border-radius: 10px;
-        padding: 20px;
-    }
-</style>
-
-<body>
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-6">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Request List</h5>
-                                        <span>Flag Pole Request List</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-6">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item">
-                                            <a href="/gcc/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">Flag Pole Request List</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Request List</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="row mt-4">
-
-                        <div class="col-md-12">
-                            <div class="card">
-                                <div class="card-header d-flex justify-content-between align-items-center fw-bold">
-                                    <h3 class="mb-0">Temporary Flag Poles - Request List : <span
-                                            th:text="${officer_name}"></span></h3>
-                                    <input type="hidden" id="userName" th:value="${officer_name}">
-                                    <input type="hidden" id="loginuserid" th:value="${LoginUserId}">
-                                </div>
-
-                                <div class="row mt-3 ml-2">
-                                    <div class="col-md-3">
-                                        <label for="startDate" class="form-label" style="font-size: medium;">From
-                                            Date:</label>
-                                        <input type="date" id="startDate" class="form-control" placeholder="Start Date">
-                                    </div>
-                                    <div class="col-md-3">
-                                        <label for="endDate" class="form-label" style="font-size: medium;">To
-                                            Date:</label>
-                                        <input type="date" id="endDate" class="form-control" placeholder="End Date">
-                                    </div>
-                                    <div class="col-md-3" style="margin-top: 30px;">
-                                        <button id="searchBtn" class="btn btn-primary">Search</button>
-                                        <button id="resetBtn" class="btn btn-secondary">Reset</button>
-                                    </div>
-                                </div>
-
-                                <div class="card-body">
-                                    <div>
-                                        <div class="row mt-2">
-
-
-                                            <div class="col-xl-3 col-md-3 col-sm-12">
-                                                <div class="card card-box p-4">
-                                                    <h6 class="text-facebook mb-20 mt-2 text-center fw-bold"><b>Total
-                                                            Request</b>
-                                                    </h6>
-                                                    <h4 class="text-twitter fw-700 text-center" id="totalrequest">
-                                                    </h4>
-                                                </div>
-                                            </div>
-                                            <div class="col-xl-3 col-md-3 col-sm-12">
-                                                <div class="card card-box p-4">
-                                                    <h6 class="text-facebook mb-20 mt-2 text-center"><b>Pending Decision
-                                                        </b></h6>
-                                                    <h4 class="text-twitter fw-700 text-center" id="pendingdecision">
-                                                    </h4>
-                                                </div>
-                                            </div>
-                                            <div class="col-xl-3 col-md-3 col-sm-12" style="display: none;">
-                                                <div class="card card-box p-4">
-                                                    <h6 class="text-facebook mb-20 mt-2 text-center"><b>Approved</b>
-                                                    </h6>
-                                                    <h4 class="text-twitter fw-700 text-center" id="approved"></h4>
-                                                </div>
-                                            </div>
-                                            <div class="col-xl-3 col-md-3 col-sm-12" style="display: none;">
-                                                <div class="card card-box p-4">
-                                                    <h6 class="text-facebook mb-20 mt-2 text-center"><b>Rejected</b>
-                                                    </h6>
-                                                    <h4 class="text-twitter fw-700 text-center" id="rejected"></h4>
-                                                </div>
-                                            </div>
-                                        </div>
-
-                                        <div>
-                                            <table id="QaqcDatatable"
-                                                class="table table-striped table-bordered table-hover dataTable"
-                                                role="grid">
-                                                <thead class="thead-dark">
-                                                    <tr role="row">
-                                                        <th class="text-center">S.No</th>
-                                                        <th class="text-center no-sort">Applicant Name</th>
-                                                        <th class="text-center">RequestId</th>
-                                                        <th class="text-center">Zone/Ward</th>
-                                                        <th class="text-center">Event Type</th>
-                                                        <th class="text-center">Event Date</th>
-                                                        <th class="text-center">Total Cost</th>
-                                                        <th class="text-center">Status</th>
-                                                        <th class="text-center">Action</th>
-
-                                                    </tr>
-
-                                                </thead>
-                                                <tbody>
-
-                                                </tbody>
-                                            </table>
-                                        </div>
-
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </div>
-            <div id="pageLoader"
-                style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-                <div style="position: relative; top: 50%; transform: translateY(-50%);">
-                    <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                        <span class="sr-only">Loading...</span>
-                    </div>
-                    <!-- Add the 'Please wait' text below the spinner -->
-                    <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-                </div>
-            </div>
-
-            <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-    <!-- Details Modal -->
-    <div class="modal fade" id="detailsModal" tabindex="-1" aria-hidden="true">
-        <div class="modal-dialog modal-xl modal-dialog-scrollable">
-            <div class="modal-content">
-
-                <div class="modal-header" style="background:#2f3e54; color:white;">
-                    <div>
-                        <h4 class="modal-title-big" id="modalTitle"></h4>
-                        <div id="modalSubTitle" class="modal-subtext"></div>
-                    </div>
-
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span></button>
-                </div>
-
-                <div class="modal-body">
-
-                    <div id="modalContent"></div>
-
-                    <div class="text-center mt-4">
-                        <button type="button" class="btn btn-primary btn-big" data-dismiss="modal"
-                            style="background:#2f3e54;">Close</button>
-                    </div>
-
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-
-    <div class="modal fade" id="imagePreviewModal" tabindex="-1">
-        <div class="modal-dialog modal-dialog-centered modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">Document Preview</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-                <div class="modal-body text-center">
-                    <img id="previewImage" class="img-fluid">
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script type="text/javascript">
-
-
-        let table;
-
-        $(document).ready(function () {
-            loadTable();
-
-            $("#searchBtn").on("click", loadTable);
-
-            $("#resetBtn").on("click", function () {
-                $("#startDate").val("");
-                $("#endDate").val("");
-                loadTable();
-            });
-        });
-
-        $(document).on("click", ".zoom-img", function () {
-
-            const src = $(this).data("src");
-
-            $("#previewImage").attr("src", src);
-
-            $("#imagePreviewModal").modal("show");
-        });
-
-
-        // function loadTable() {
-
-        //     let officer_name = $("#userName").val();
-        //     let startDate = $("#startDate").val();
-        //     let endDate = $("#endDate").val();
-
-        //     if ($.fn.DataTable.isDataTable('#QaqcDatatable')) {
-        //         $('#QaqcDatatable').DataTable().clear().destroy();
-        //     }
-
-        //     table = $('#QaqcDatatable').DataTable({
-        //         processing: true,
-        //         responsive: true,
-        //         scrollY: '50vh',
-        //         dom: 'Bfrtip',   // 🔥 ENABLE BUTTONS
-
-        //         ajax: {
-        //             url: "/gcc/api/flagpoleregistration/getAllDetails",
-        //             type: "GET",
-        //             data: {
-        //                 userLogin: officer_name,
-        //                 startDate: startDate,
-        //                 endDate: endDate
-        //             },
-        //             dataSrc: function (json) {
-
-        //                 const data = json.data || [];
-
-        //                 // 🔹 Dashboard counts
-        //                 let pending = 0, approved = 0, rejected = 0;
-
-        //                 data.forEach(r => {
-        //                     if (!r.rdo_status) pending++;
-        //                     else if (r.rdo_status === 'APPROVED') approved++;
-        //                     else if (r.rdo_status === 'REJECTED') rejected++;
-        //                 });
-
-        //                 $("#totalrequest").text(data.length);
-        //                 $("#pendingdecision").text(pending);
-        //                 $("#approved").text(approved);
-        //                 $("#rejected").text(rejected);
-
-        //                 return data; // ✅ already unique per refid
-        //             }
-        //         },
-
-        //         columns: [
-        //             {
-        //                 data: null,
-        //                 className: "text-center",
-        //                 render: (d, t, r, m) => m.row + 1
-        //             },
-        //             {
-        //                 data: "applicant_name",
-        //                 className: "text-center"
-        //             },
-        //             {
-        //                 data: "refid",
-        //                 className: "text-center"
-        //             },
-        //             {
-        //                 data: null,
-        //                 className: "text-center",
-        //                 render: row => {
-        //                     if (!row.streets || row.streets.length === 0) return "-";
-        //                     return `${row.streets[0].zone} / ${row.streets[0].ward}`;
-        //                 }
-        //             },
-        //             {
-        //                 data: "event_name",
-        //                 className: "text-center"
-        //             },
-        //             {
-        //                 data: "event_date",
-        //                 className: "text-center",
-        //                 render: d => new Date(d).toLocaleDateString("en-GB")
-        //             },
-        //             {
-        //                 data: "total_cost",
-        //                 className: "text-center",
-        //                 render: d => d.toLocaleString("en-GB")
-        //             },
-        //             {
-        //                 data: "rdo_status",
-        //                 className: "text-center",
-        //                 render: d => {
-        //                     if (!d)
-        //                         return `<span class="badge bg-warning text-dark">Pending</span>`;
-        //                     if (d === 'APPROVED')
-        //                         return `<span class="badge bg-success">Approved</span>`;
-        //                     return `<span class="badge bg-danger">Rejected</span>`;
-        //                 }
-        //             },
-        //             {
-        //                 data: null,
-        //                 className: "text-center",
-        //                 render: row =>
-        //                     `<button class="btn btn-primary btn-sm viewBtn"
-        //                 data-refid="${row.refid}">
-        //                 View
-        //             </button>`
-        //             }
-        //         ]
-        //     });
-        // }
-
-
-
-        function loadTable() {
-
-            let gccUserId = $("#loginuserid").val();
-            let startDate = $("#startDate").val();
-            let endDate = $("#endDate").val();
-
-            console.log("gccuserid:" + gccUserId);
-
-            if ($.fn.DataTable.isDataTable('#QaqcDatatable')) {
-                $('#QaqcDatatable').DataTable().clear().destroy();
-            }
-
-            table = $('#QaqcDatatable').DataTable({
-                processing: true,
-                responsive: true,
-                scrollY: '50vh',
-                dom: 'Bfrtip',
-
-                ajax: {
-                    url: "/gcc/api/flagpoleregistration/getAllDetails",
-                    type: "GET",
-                    data: {
-                        gccUserId: gccUserId,
-                        startDate: startDate,
-                        endDate: endDate
-                    },
-                    dataSrc: function (json) {
-
-                        const data = json.data || [];
-
-                        let pending = 0, approved = 0, rejected = 0;
-
-                        // data.forEach(r => {
-                        //     if (!r.rdo_status) pending++;
-                        //     else if (r.rdo_status === 'APPROVED') approved++;
-                        //     else if (r.rdo_status === 'REJECTED') rejected++;
-                        // });
-
-                        data.forEach(r => {
-
-                            const status = r.final_status;
-
-                            if (!status) pending++;
-                            else if (status === 'APPROVED') approved++;
-                            else if (status === 'REJECTED') rejected++;
-                        });
-
-
-
-                        $("#totalrequest").text(data.length);
-                        $("#pendingdecision").text(pending);
-                        $("#approved").text(approved);
-                        $("#rejected").text(rejected);
-
-                        return data;
-                    }
-                },
-
-                columns: [
-                    { data: null, render: (d, t, r, m) => m.row + 1, className: "text-center" },
-                    { data: "applicant_name", className: "text-center" },
-                    { data: "refid", className: "text-center" },
-                    {
-                        data: null,
-                        className: "text-center",
-                        render: r =>
-                            r.streets?.length
-                                ? `${r.streets[0].zone} / ${r.streets[0].ward}`
-                                : "-"
-                    },
-                    { data: "event_name", className: "text-center" },
-                    {
-                        data: "event_date",
-                        className: "text-center",
-                        render: d => new Date(d).toLocaleDateString("en-GB")
-                    },
-                    {
-                        data: "total_cost",
-                        className: "text-center",
-                        render: d => d.toLocaleString("en-GB")
-                    },
-                    // {
-                    //     data: "rdo_status",
-                    //     className: "text-center",
-                    //     render: d =>
-                    //         !d
-                    //             ? `<span class="badge bg-warning text-dark">Pending</span>`
-                    //             : d === 'APPROVED'
-                    //                 ? `<span class="badge bg-success">Approved</span>`
-                    //                 : `<span class="badge bg-danger">Rejected</span>`
-                    // },
-                    {
-                        data: null,
-                        className: "text-center",
-                        render: r => {
-
-                            const status = r.final_status;
-
-                            if (!status)
-                                return `<span class="badge bg-warning text-dark">Pending</span>`;
-                            else if (status === 'APPROVED')
-                                return `<span class="badge bg-success">Approved</span>`;
-                            else
-                                return `<span class="badge bg-danger">Rejected</span>`;
-                        }
-                    },
-
-                    {
-                        data: null,
-                        className: "text-center",
-                        render: r =>
-                            `<button class="btn btn-primary btn-sm viewBtn"
-                        data-refid="${r.refid}">
-                        View
-                     </button>`
-                    }
-                ]
-            });
-        }
-
-
-
-        // 🔹 View button action
-
-        // Destroy previous instance if exists
-        if ($.fn.DataTable.isDataTable('#QaqcDatatable')) {
-            $('#QaqcDatatable').DataTable().clear().destroy();
-        }
-
-
-
-
-        $('#QaqcDatatable').on("click", ".viewBtn", function () {
-
-            // 🔹 Get full row data from DataTable
-            const record = table.row($(this).closest('tr')).data();
-
-            if (!record) {
-                alert("No details found");
-                return;
-            }
-
-            populateModal(record);
-            $("#detailsModal").modal("show");
-        });
-
-
-
-
-
-        function populateModal(record) {
-
-            // HEADER
-            $("#modalTitle").html(`Application Details - ${record.applicant_name}`);
-            $("#modalSubTitle").html(
-                `Ref ID: ${record.refid} - ${record.streets.length} Streets`
-            );
-
-            $("#detailsModal").data("refid", record.refid);
-
-            // 🔹 Streets
-            let streetHtml = "";
-
-            record.streets.forEach((s, i) => {
-                streetHtml += `
-                <div class="card-section">
-                    <div class="section-title">Street ${i + 1}</div>
-
-                <div class="row mb-2">
-                    <div class="col-md-4">
-                        <div class="label-text">Street Name</div>
-                        <div class="value-text">${s.street_name}</div>
-                    </div>
-                    <div class="col-md-4">
-                        <div class="label-text">Zone</div>
-                        <div class="value-text">${s.zone}</div>
-                    </div>
-                    <div class="col-md-4">
-                        <div class="label-text">Ward</div>
-                        <div class="value-text">${s.ward}</div>
-                    </div>
-                    <div class="col-md-4">
-                        <div class="label-text">No. of Poles</div>
-                        <div class="value-text">${s.no_of_poles}</div>
-                    </div>
-
-
-                    <div class="col-md-4">
-                        <div class="label-text">Height</div>
-                        <div class="value-text">${s.height}</div>
-                    </div>
-
-                    <div class="col-md-4">
-                        <div class="label-text">Flag Material</div>
-                        <div class="value-text">${s.flag_material}</div>
-                    </div>
-
-                    <div class="col-md-4">
-                        <div class="label-text">Pole Material</div>
-                        <div class="value-text">${s.pole_material}</div>
-                    </div>
-
-                </div>
-
-
-            </div>`;
-            });
-
-            let historyHtml = "";
-
-            if (record.history && record.history.length > 0) {
-
-                historyHtml += `
-        <div class="card-section">
-            <div class="section-title">Application History</div>
-        `;
-
-                record.history.forEach((h, index) => {
-                    historyHtml += `
-            <div class="row mb-2 border-bottom pb-2">
-                <div class="col-md-3">
-                    <div class="label-text">Action Date</div>
-                    <div class="value-text">${h.action_date}</div>
-                </div>
-
-                <div class="col-md-3">
-                    <div class="label-text">Department</div>
-                    <div class="value-text">${h.department_name}</div>
-                </div>
-
-
-
-                <div class="col-md-3">
-                    <div class="label-text">Status</div>
-                    <div class="value-text">${h.status}</div>
-                </div>
-
-
-                ${h.remarks ? `
-                <div class="col-md-3">
-                    <div class="label-text">Remarks</div>
-                    <div class="value-text">${h.remarks}</div>
-                </div>` : ""}
-            </div>
-            `;
-                });
-
-                historyHtml += `</div>`;
-            }
-
-            let decisionHtml = "";
-
-            // 🔹 Show decision buttons ONLY if pending
-            if (!record.final_status) {
-                decisionHtml = `
-            <div class="rdo-box">
-                <div class="section-title">Department Decision</div>
-
-                <textarea id="rdoRemarks" class="form-control mb-3"
-                    rows="4" placeholder="Enter remarks..."></textarea>
-
-                <div class="d-flex justify-content-between">
-                    <button class="btn btn-success btn-big"
-                        onclick="submitOfficerDecision('APPROVED')">Approve</button>
-
-                    <button class="btn btn-danger btn-big"
-                        onclick="submitOfficerDecision('REJECTED')">Reject</button>
-                </div>
-            </div>`;
-            }
-
-
-
-            let html = `
-        <div class="card-section">
-            <div class="section-title">Applicant Information</div>
-
-            <div class="row mb-2">
-                <div class="col-md-6">
-                    <div class="label-text">Applicant Name</div>
-                    <div class="value-text">${record.applicant_name}</div>
-                </div>
-                <div class="col-md-6">
-                    <div class="label-text">Mobile Number</div>
-                    <div class="value-text">${record.mobile_number}</div>
-                </div>
-            </div>
-
-            <div class="row mb-2">
-                <div class="col-md-6">
-                    <div class="label-text">Event Type</div>
-                    <div class="value-text">${record.event_name}</div>
-                </div>
-                <div class="col-md-6">
-                    <div class="label-text">Event Date</div>
-                    <div class="value-text">
-                        ${new Date(record.event_date).toLocaleDateString("en-GB")}
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="label-text">Address</div>
-                    <div class="value-text">
-                        ${record.applicant_address}
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="label-text">Total Cost</div>
-                    <div class="value-text">
-                        ${record.total_cost.toLocaleString("en-GB")}
-                    </div>
-                </div>
-                 <div class="col-md-6">
-                        <div class="label-text">No. of Days</div>
-                        <div class="value-text">${record.no_of_days}</div>
-                </div>
-                  <div class="col-md-6">
-                        <div class="label-text">Event Description</div>
-                        <div class="value-text">${record.event_desc}</div>
-                </div>
-
-            </div>
-
-            <div class="row mb-2">
-                <div class="col-md-6">
-                    <div class="label-text">Applied Date</div>
-                    <div class="value-text">${record.cdate}</div>
-                </div>
-            </div>
-        </div>
-
-
-
-        ${streetHtml}
-         ${historyHtml}
-        ${decisionHtml}
-
-        `;
-
-
-
-            $("#modalContent").html(html);
-        }
-
-
-
-
-        // function submitRdoDecision(status) {
-
-        //     let remarks = ($("#rdoRemarks").val() || "").trim();
-        //     let refid = $("#detailsModal").data("refid");
-        //     let gccUserId = $("#loginuserid").val(); // 🔥 ONLY THIS
-
-        //     //let approvedBy = $("#userName").val(); // 🔥 FROM HIDDEN INPUT
-
-        //     if (!remarks) {
-        //         Swal.fire({
-        //             icon: 'warning',
-        //             title: 'Remarks Required',
-        //             text: 'Please enter remarks before submitting'
-        //         });
-        //         return;
-        //     }
-
-        //     Swal.fire({
-        //         title: `Are you sure?`,
-        //         text: `You want to ${status.toLowerCase()} this request`,
-        //         icon: status === 'APPROVED' ? 'success' : 'error',
-        //         showCancelButton: true,
-        //         confirmButtonColor: status === 'APPROVED' ? '#28a745' : '#dc3545',
-        //         cancelButtonColor: '#6c757d',
-        //         confirmButtonText: `Yes, ${status}`
-        //     }).then((result) => {
-
-        //         if (!result.isConfirmed) return;
-
-        //         $.ajax({
-        //             url: "/gcc/api/flagpoleregistration/rdo/updateDecision",
-        //             type: "POST",
-        //             data: {
-        //                 refid: refid,
-        //                 status: status,
-        //                 remarks: remarks,
-        //                 gccUserId: gccUserId
-        //                 //approvedBy: approvedBy   // 🔥 PASS TO BACKEND
-        //             },
-        //             success: function (res) {
-
-        //                 Swal.fire({
-        //                     icon: 'success',
-        //                     title: status === 'APPROVED' ? 'Approved!' : 'Rejected!',
-        //                     text: res.message || `Request has been ${status.toLowerCase()}`,
-        //                     timer: 2000,
-        //                     showConfirmButton: false
-        //                 });
-
-        //                 $("#detailsModal").modal("hide");
-        //                 $("#QaqcDatatable").DataTable().ajax.reload(null, false);
-        //             },
-        //             error: function () {
-        //                 Swal.fire({
-        //                     icon: 'error',
-        //                     title: 'Error',
-        //                     text: 'Failed to update decision'
-        //                 });
-        //             }
-        //         });
-        //     });
-        // }
-
-        function submitOfficerDecision(status) {
-
-            let remarks = ($("#rdoRemarks").val() || "").trim();
-            let refid = $("#detailsModal").data("refid");
-
-            let gccUserId = $("#loginuserid").val();   // login user id
-            let username = $("#userName").val();      // display username
-
-            if (!remarks) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Remarks Required',
-                    text: 'Please enter remarks before submitting'
-                });
-                return;
-            }
-
-            Swal.fire({
-                title: `Are you sure?`,
-                text: `You want to ${status.toLowerCase()} this request`,
-                icon: status === 'APPROVED' ? 'success' : 'error',
-                showCancelButton: true,
-                confirmButtonColor: status === 'APPROVED' ? '#28a745' : '#dc3545',
-                cancelButtonColor: '#6c757d',
-                confirmButtonText: `Yes, ${status}`
-            }).then((result) => {
-
-                if (!result.isConfirmed) return;
-
-                $.ajax({
-                    url: "/gcc/api/flagpoleregistration/officer/updateDecision",
-                    type: "POST",
-                    data: {
-                        refid: refid,
-                        status: status,
-                        remarks: remarks,
-                        gccUserId: gccUserId,
-                        username: username          // ✅ NEW
-                    },
-                    success: function (res) {
-
-                        Swal.fire({
-                            icon: 'success',
-                            title: status === 'APPROVED' ? 'Approved!' : 'Rejected!',
-                            text: res.message || `Request has been ${status.toLowerCase()}`,
-                            timer: 2000,
-                            showConfirmButton: false
-                        });
-
-                        $("#detailsModal").modal("hide");
-                        $("#QaqcDatatable").DataTable().ajax.reload(null, false);
-                    },
-                    error: function () {
-                        Swal.fire({
-                            icon: 'error',
-                            title: 'Error',
-                            text: 'Failed to update decision'
-                        });
-                    }
-                });
-            });
-        }
-
-
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/garbagecollection/.DS_Store b/src/main/resources/templates/modules/garbagecollection/.DS_Store
deleted file mode 100644
index f559138137caed79263f87d42b9d01defe9da137..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%Syvg5Is{XRNVv=aU<jhEcgep)P-w*K-&ftVpAVQm)YyT_<gSQ%$-YUlV&SL
zW?<&r*PJBhhD<I187*h$KmuSuSM2REY%rZyZ&@#n>=Gq#ykm%ayy6i>Yqbw-qXN2j
z`*^?{Gvrv=zpJ90PKt8Ed3`x9=)<32Yyro3=K3cr8DF^LXPBbozAw1*Ir};J>UW{R
z_0`}y+`y&mw}GdFMNS(mNsDDpj<>G6kPqg6t~}9ED}TX!)kW30>*V=v+y}dEu7E4x
z3T(Lotl4UV14EClfGgk%)C%bLA*Cy35i7&+>0k&)0AioR!PwT{Ma@YgW)Ukx&d|hC
ziIytyh#{8F@ieZ>B36c$4vB{kiC30*LXmKF@~2@rBs28r3b+F63hY=n(fWVceg0oh
z@}4W;3j8Ytq(8nMkN8NjwzeKlYi&xup{wb-%CJshBa~vU)lz&y561CS8^kPPWylel
O{|E#bJh%dXs=zM{Qel<=

diff --git a/src/main/resources/templates/modules/garbagecollection/index.html b/src/main/resources/templates/modules/garbagecollection/index.html
deleted file mode 100644
index eb40f902..00000000
--- a/src/main/resources/templates/modules/garbagecollection/index.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-bar-chart-2 bg-success"></i>
-                                        <div class="d-inline">
-                                            <h5>Garbage Collection</h5>
-                                            <span>Designed to facilitate the process of requesting waste disposal services</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Garbage Collection</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							
-							<!-- analytic card start - First Tile Start -->
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-facebook mb-20"><i class="ik ik-layers"></i></h2>
-                                        <h3 class="text-facebook fw-700">6,750</h3>
-                                        <p>Total Request</p>
-                                        <p class="mb-0 mt-15">View Request List<i class="fas fa-arrow-right ml-5 f-10 text-facebook"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-green mb-20"><i class="far fa-smile-beam"></i></h2>
-                                        <h3 class="text-green fw-700">8,752</h3>
-                                        <p>Request Completed </p>
-                                        <p class="mb-0 mt-15">View Completed Request<i class="fas fa-arrow-right ml-5 f-10 text-green"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-red mb-20"><i class="far fa-frown"></i></h2>
-                                        <h3 class="text-red fw-700">952</h3>
-                                        <p>Request Pending</p>
-                                        <p class="mb-0 mt-15">View Pending Request<i class="fas fa-arrow-right ml-5 f-10 text-red"></i></p>
-                                    </div>
-                                </div>
-								</a>
-                            </div>
-                            
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-warning mb-20"><i class="fas fa-exclamation-circle"></i></h2>
-                                        <h3 class="text-warning fw-700">9,752</h3>
-                                        <p>Out Of Scope</p>
-                                        <p class="mb-0 mt-15">View Out Of Scope List<i class="fas fa-arrow-right ml-5 f-10 text-twitter"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <!-- First Tile End -->
-			                
-			                <div class="col-md-12">
-				                <div class="card sale-card">
-		                            <div class="card-header">
-		                                <h3>Deals Analytics</h3>
-		                            </div>
-		                            <div class="card-block">
-		                                <div id="deal-analytic-chart" class="chart-shadow" style="height:300px"></div>
-		                            </div>
-		                        </div>    
-	                        </div>    
-	                          
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>Page Title</h3>
-                                    </div>
-                                    <div class="card-block">
-                                        
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script src="/assets/node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="/assets/node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="/assets/node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <script>
-			
-			var chartData = [];
-		    var currentDate = new Date();
-		    var currentMonth = currentDate.getMonth() + 1;
-		    var currentYear = currentDate.getFullYear();
-		    var daysInMonth = new Date(currentYear, currentMonth, 0).getDate();
-		
-		    // Generate random data for each date in the current month
-		    for (var i = 1; i <= daysInMonth; i++) {
-		        var randomValue1 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		        var randomValue2 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		
-		        var dateString = currentYear + '-' + (currentMonth < 10 ? '0' : '') + currentMonth + '-' + (i < 10 ? '0' : '') + i;
-		        var dataPoint = {
-		            "date": dateString,
-		            "market1": randomValue1,
-		            "market2": randomValue2
-		        };
-		        chartData.push(dataPoint);
-		    }
-			// deal-analytic-chart
-    var chart = AmCharts.makeChart("deal-analytic-chart", {
-        "type": "serial",
-        "theme": "light",
-        "dataDateFormat": "YYYY-MM-DD",
-        "precision": 2,
-        "valueAxes": [{
-            "id": "v1",
-            "position": "left",
-            "autoGridCount": false,
-            "labelFunction": function(value) {
-                return "$" + Math.round(value) + "M";
-            }
-        }, {
-            "id": "v2",
-            "gridAlpha": 0,
-            "autoGridCount": false
-        }],
-        "graphs": [{
-            "id": "g1",
-            "valueAxis": "v2",
-            /*"bullet": "round",
-            "bulletBorderAlpha": 1,
-            "bulletColor": "#FFFFFF",
-            "bulletSize": 8,
-            "hideBulletsCount": 50,
-            "lineThickness": 3,
-            "lineColor": "#2ed8b6",*/
-            "lineColor": "#2ed8b6",
-            "fillColors": "#2ed8b6",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Positive Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market1",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }, {
-            "id": "g2",
-            "valueAxis": "v2",
-            //"bullet": "round",
-            //"bulletBorderAlpha": 1,
-            //"bulletColor": "#FFFFFF",
-            //"bulletSize": 8,
-            //"hideBulletsCount": 50,
-            //"lineThickness": 3,
-            //"lineColor": "#e95753",
-            "lineColor": "#F22613",
-            "fillColors": "#F22613",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Negative Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market2",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }],
-        "chartCursor": {
-            "pan": true,
-            "valueLineEnabled": true,
-            "valueLineBalloonEnabled": true,
-            "cursorAlpha": 0,
-            "valueLineAlpha": 0.2
-        },
-        "categoryField": "date",
-        "categoryAxis": {
-            "parseDates": true,
-            "dashLength": 1,
-            "minorGridEnabled": true
-        },
-        "legend": {
-            "useGraphSettings": true,
-            "position": "top"
-        },
-        "balloon": {
-            "borderThickness": 1,
-            "shadowAlpha": 0
-        },
-        "dataProvider": chartData,
-    });
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/garbagecollection/request-completed.html b/src/main/resources/templates/modules/garbagecollection/request-completed.html
deleted file mode 100644
index 9a1c37cf..00000000
--- a/src/main/resources/templates/modules/garbagecollection/request-completed.html
+++ /dev/null
@@ -1,702 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-shipping-fast bg-success"></i>
-                                        <div class="d-inline">
-                                            <h5>Completed Request List</h5>
-                                            <span>Garbage Collection</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Garbage Collection</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Completed Request List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="garbageDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center" width="20%">Name</th>
-														<th class="text-center" width="10%">Mobile No</th>
-														<th class="text-center" width="10%">Email ID</th>
-														<th class="text-center" width="10%">Address</th>
-														<th class="text-center" width="20%">Request Type</th>
-														<th class="text-center" width="20%">Garbage Type</th>
-														<th class="text-center" width="20%">Zone</th>
-														<th class="text-center" width="10%">Division</th>
-														<!--<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="10%">Location</th>
-														<th class="text-center" width="10%">Street</th>-->
-						                                <th class="text-center no-sort" style="width:50px;">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="requestlist, i : ${requestlist}" class="requestlist">
-						                                <td th:utext="${i.count}">0</td>
-														<td th:utext="${requestlist.name}"></td>
-														<td th:utext="${requestlist.mobile}"></td>
-						                                <td th:utext="${requestlist.email}"></td>
-						                                <td th:utext="${requestlist.address}"></td>
-						                                <td th:utext="${requestlist.requestType}"></td>
-						                                <td th:utext="${requestlist.garbageCategory}"></td>
-														<td th:utext="${requestlist.zone}"></td>
-														<td th:utext="${requestlist.division}"></td>
-						                                <!--<td th:utext="${requestlist.area}"></td>
-						                                <td th:utext="${requestlist.locality}"></td>
-						                                <td th:utext="${requestlist.street}"></td>-->
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callView([[${requestlist.requestId}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Garbage Request Details" data-original-title="View Garbage Request Details"><i class="ik ik-eye f-16 text-blue"></i></a>&nbsp;&nbsp;
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-						                                <th class="text-center" width="20%">Name</th>
-														<th class="text-center" width="10%">Mobile No</th>
-														<th class="text-center" width="10%">Email ID</th>
-														<th class="text-center" width="10%">Address</th>
-														<th class="text-center" width="20%">Request Type</th>
-														<th class="text-center" width="20%">Garbage Type</th>
-														<th class="text-center" width="20%">Zone</th>
-														<th class="text-center" width="10%">Division</th>
-														<!--<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="10%">Location</th>
-														<th class="text-center" width="10%">Street</th>-->
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="garbageRequestDetailsView" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Garbage Request Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-							      
-                            <div class="col-xl-6 col-md-6" id="garbageRequestDetails">
-								&nbsp;
-                            </div>
-                            
-                            <div class="col-xl-6 col-md-6 bg-light" style="border-left: 1px solid #dee2e6;" id="requestActionDetails">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="garbageRequestStatusForm" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Garbage Request Status Update Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-                            <div class="col-xl-12 col-md-12 bg-light" id="requestActionUpdateHTML">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="statusHistory" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Status Timeline</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body pb-0 pt-0">
-						<div class="row">
-                            <div class="card mb-0" style="">
-                                    <div class="card-body timeline p-0" id="timelineHTML">
-                                        
-                                    </div>
-                                </div>            
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                // Additional button
-	                /*
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }*/
-		            'colvis'
-	            ];
-				
-			    $('#garbageDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callUpdateForm(requestid,statusid){
-					$('#garbageRequestStatusForm').modal({
-					    backdrop: 'static',
-					    keyboard: false
-					})
-					
-					var requestid = requestid;
-				
-					var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-					$.ajax({
-					    url: apiUrl,
-					    type: 'GET',
-					    dataType: 'json',
-					    success: function(jsonResponse) {
-							// Handle the API response data here
-							console.log('Data from API:', jsonResponse);
-							// Parse the JSON response into a JavaScript object
-							// Check if jsonResponse is not empty or null
-					        if (jsonResponse && jsonResponse.length > 0) {
-					            var data = jsonResponse[0];
-					            // Now you can use 'data' as needed
-					            
-								var data = jsonResponse[0];
-								
-								var status = data.status;
-								
-					        } else {
-					            console.log('No data available.');
-					            var status = 'Open';
-					        }
-					        
-					        var requestActionDetails = `<form action="#" id="request_action_save" method="post" enctype="multipart/form-data" onsubmit="return savestatus();">
-															<input type="hidden" name="request_id" id="request_id" value="${requestid}"/>
-															<div class="row">
-																<div class="col-xl-12 col-md-12"> <strong>Action Status</strong>
-																	<p class="text-muted">
-											                            <select class="form-control select2" name="status" id="status" required>
-								                                            <option value="">---Select---</option>
-								                                            <option value="Open">Open</option>
-								                                            <option value="Inprogress">Inprogress</option>
-								                                            <option value="Pending">Pending</option>
-								                                            <option value="Close">Close</option>
-								                                            <option value="Out Of Scope">Out Of Scope</option>
-								                                        </select>
-								                                     </p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>Action Comments</strong>
-										                            <p class="text-muted">
-																		<textarea class="form-control" name="comments" id="comments" rows="5" required=""></textarea>
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>Before Image</strong>
-										                            <p class="text-muted">
-																		<input type="file" accept="image/*" class="form-control" name="garbageFile2" id="garbageFile2">
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>After Image</strong>
-										                            <p class="text-muted">
-																		<input type="file" accept="image/*" class="form-control" name="garbageFile" id="garbageFile">
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12 text-right">
-																	<button type="submit" class="btn btn-primary btn-sm">Save</button>
-																</div>
-										                        
-										                    </div>
-										                    </form>`;
-							$("#requestActionUpdateHTML").html(requestActionDetails);
-							// Set the selected option"
-							$("#status").val(status);
-						},
-					    error: function(xhr, status, error) {
-					      // Handle errors here
-					      console.error('Error fetching data:', status, error);
-					    }
-					});	
-					$('#garbageRequestStatusForm').modal('show');
-					return false;
-				}
-				
-			function callView(requestid){
-				$('#garbageRequestDetailsView').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#garbageRequestDetailsView').modal('show');
-				getGarbageDetails(requestid);
-				$('#garbageRequestStatusForm').modal('hide');
-				return false;
-			}
-			
-			function getGarbageDetails(requestid){
-				var requestid = requestid;
-				var apiUrl = '/api/garbagecollection/getGarbageDetails?requestid='+requestid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse[0];
-						var statusid = data.statusid;
-						
-						// HTML content
-						var garbageDetails = `<div class="row">
-												<div class="col-xl-12 col-md-12"> <strong>Name</strong>
-						                            <p class="text-muted form-control showInputValue">${data.name}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Mobile No</strong>
-						                            <p class="text-muted form-control showInputValue">${data.mobile}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Email ID</strong>
-						                            <p class="text-muted form-control showInputValue">${data.email}</p>
-						                        </div>
-						                        <div class="col-xl-12 col-md-12"> <strong>Address</strong>
-						                            <p class="text-muted form-control showInputValue">${data.address}</p>
-						                        </div>
-						                        <div class="col-xl-12 col-md-12"> <strong>Nearest Landmark</strong>
-						                            <p class="text-muted form-control showInputValue">${data.name}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Request Type</strong>
-						                            <p class="text-muted form-control showInputValue">${data.request_type}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Garbage Type</strong>
-						                            <p class="text-muted form-control showInputValue">${data.garbage_category}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Zone</strong>
-						                            <p class="text-muted form-control showInputValue">${data.zone}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Division</strong>
-						                            <p class="text-muted form-control showInputValue">${data.division}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Area</strong>
-						                            <p class="text-muted form-control showInputValue">${data.area}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Location</strong>
-						                            <p class="text-muted form-control showInputValue">${data.locality}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Street</strong>
-						                            <p class="text-muted form-control showInputValue">${data.street}</p>
-						                        </div>
-						                    </div>`;
-						$("#garbageRequestDetails").html(garbageDetails);
-						
-						showActionform(requestid,statusid);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-			
-			function showActionform(requestid,statusid){
-			
-				if(statusid>0)
-				{
-					getStatus(requestid,statusid);
-				}
-				else{
-					getActionFormData(requestid,statusid);
-				}
-			}
-			
-			function getActionFormData(requestid,statusid){
-				var requestid = requestid;
-				
-				var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							
-							var status = data.status;
-							
-				        } else {
-				            console.log('No data available.');
-				            var status = 'Open';
-				        }
-				        
-				        var requestActionDetails = `<form action="#" id="request_action_save" method="post" enctype="multipart/form-data" onsubmit="return savestatus();">
-														<input type="hidden" name="request_id" id="request_id" value="${requestid}"/>
-														<div class="row">
-															<div class="col-xl-12 col-md-12"> <strong>Action Status</strong>
-																<p class="text-muted">
-										                            <select class="form-control select2" name="status" id="status" required>
-							                                            <option value="">---Select---</option>
-							                                            <option value="Open">Open</option>
-							                                            <option value="Inprogress">Inprogress</option>
-							                                            <option value="Pending">Pending</option>
-							                                            <option value="Close">Close</option>
-							                                            <option value="Out Of Scope">Out Of Scope</option>
-							                                        </select>
-							                                     </p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>Action Comments</strong>
-									                            <p class="text-muted">
-																	<textarea class="form-control" name="comments" id="comments" rows="5" required=""></textarea>
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>Before Image</strong>
-									                            <p class="text-muted">
-																	<input type="file" accept="image/*" class="form-control" name="garbageFile2" id="garbageFile2">
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>After Image</strong>
-									                            <p class="text-muted">
-																	<input type="file" accept="image/*" class="form-control" name="garbageFile" id="garbageFile">
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12 text-right">
-																<button type="submit" class="btn btn-primary btn-sm">Save</button>
-															</div>
-									                    </div>
-									                    </form>`;
-						$("#requestActionDetails").html(requestActionDetails);
-						// Set the selected option"
-						$("#status").val(status);
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});	
-			}
-			
-			function getStatus(requestid,statusid){
-				
-				var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							
-							var status = data.status;
-							
-				        } else {
-							var status = 'Open';
-				            console.log('No data available.');
-				        }
-				        var requestActionDetails = `<div class="row">
-														<div class="col-xl-12 col-md-12 text-center">
-															<a href="#" class="btn btn-info" onclick="return callUpdateForm(${requestid},${statusid});"}>Edit / Update Current Status</a>
-				        									<a href="#" class="btn btn-warning" onclick="return callStatusHistory(${requestid},${statusid});"}>View Full Status History</a>
-														</div>
-														<div class="col-xl-12 col-md-12"> <strong>Status</strong>
-								                            <p class="text-muted form-control showInputValue">${data.status}</p>
-								                        </div>
-								                        <div class="col-xl-12 col-md-12"> <strong>Officer Comments</strong>
-								                            <p class="text-muted form-control showInputValue">${data.comments}</p>
-								                        </div>
-								                        <div class="col-xl-12 col-md-12"> <strong>Status Date</strong>
-								                            <p class="text-muted form-control showInputValue">${data.cDate}</p>
-								                        </div>
-							                        </div>	
-				        							
-				        							`;
-						$("#requestActionDetails").html(requestActionDetails);
-						// Set the selected option"
-						$("#status").val(status);
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});	
-			}
-			
-			function savestatus(){
-				
-				var apiUrl = '/api/garbagecollection/saveStatus';
-				
-				// Create a FormData object to hold your form data
-				var formData = new FormData();
-				//formData.append('file', fileInput.files[0]); // Replace 'file' with your actual file input name
-				var requestid = $('#request_id').val();
-				// Add other form fields as needed
-				formData.append('status', $('#status').val());
-				formData.append('comments', $('#comments').val());
-				formData.append('request_id', requestid);
-				// ... other fields
-
-				$.ajax({
-				    url: apiUrl,
-				    type: 'POST',
-				    data: formData,
-				    contentType: false, // Set content type to false for multipart form data
-				    processData: false, // Disable processing of data for multipart form data
-				    
-				    success: function(response) {
-						alert(response);
-						// Handle the API response data here
-						console.log('Data from API:', response);
-						// Parse the JSON response into a JavaScript object
-						callView(requestid);
-						
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-				return false;
-			}
-			
-			
-			function callStatusHistory(requestid, statusid){
-				$('#statusHistory').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#statusHistory').modal('show');
-				
-				var apiUrl = '/api/garbagecollection/getStatus?requestid='+requestid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							// For Request Created Date//
-							var cdate = datetotext(data.request.cDate);
-							var cdate_parts = cdate.split("-"); // format -> 14-Monday-AUGUST-2023-16:10:22
-							var day = cdate_parts[0];
-							var dayName = cdate_parts[1];
-							var monthName = cdate_parts[2];
-							var year = cdate_parts[3];
-							var time = cdate_parts[4];
-							/////////////////
-							var status = data.status;
-							var statusListHTML="";
-							for(var i=0; i<jsonResponse.length; i++){
-								var statusdata = jsonResponse[i];
-								var cdate_parts = statusdata.cDate.split(" ");
-								var status = `<div class="col-6 pl-0">Status: <label class="text-success mb-1"><b>${statusdata.status}</b></div><div class="col-6 pr-0 text-right"></label> Date: <label class="text-warning mb-1"><b>${cdate_parts[0]}</b></label></div>`;
-								statusListHTML += `<li>
-					                                    <div class="bullet bg-green"></div>
-					                                    <div class="time">${cdate_parts[1]}</div>
-					                                    <div class="desc">
-					                                        <div class="row p-0 m-0">${status}</div>
-					                                        Comments:
-					                                        <p class="form-control showInputValue">${statusdata.comments}</p>
-					                                    </div>
-					                                </li>`;
-							}
-							
-				        } else {
-							var status = 'Open';
-				            console.log('No data available.');
-				        }
-				        
-				        var statusHTML=`<div class="header bg-theme" style="background-image: url('/assets/images/placeimg_400_200_nature.jpg')">
-                                            <div class="text-center">Request Created</div>
-                                            <div class="color-overlay d-flex align-items-center">
-                                                <div class="col-4 text-center day-number">${day}</div>
-                                                <div class="col-4 text-center date-right">
-                                                    <div class="day-name">${dayName}</div>
-                                                    <div class="month">${monthName} ${year}</div>
-                                                </div>
-                                                <div class="col-4 text-center date-right pr-1">
-                                                    <div class="day-name">${time}</div>
-                                                </div>
-                                            </div>                                
-                                        </div>
-                                        <ul>
-                                            ${statusListHTML}
-                                        </ul>`;
-                  		$("#timelineHTML").html(statusHTML);
-                  		
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-                  
-				return false;
-			}
-			
-			function datetotext(dateval){
-				var date = new Date(dateval);
-				var day = date.getDate(); // Get the day of the month (e.g., 8)
-				var dayName = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getDay()]; // Get the day name (e.g., Monday)
-				var monthName = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][date.getMonth()]; // Get the month name (e.g., February)
-				var year = date.getFullYear(); // Get the year (e.g., 2018)
-				var time = date.toLocaleTimeString(); // Get the time (e.g., 12:00:00 AM)
-				
-				var formattedDate = day + '-' + dayName + '-' + monthName.toUpperCase() + '-' + year + '-' + time;
-				return formattedDate;
-			}
-		</script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/garbagecollection/request-create.html b/src/main/resources/templates/modules/garbagecollection/request-create.html
deleted file mode 100644
index ccd706af..00000000
--- a/src/main/resources/templates/modules/garbagecollection/request-create.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-		<link rel="stylesheet" type="text/css" href="/assets/node_modules/jquery.datetimepicker/jquery.datetimepicker.min.css"/ >
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Create Request</h5>
-                                            <span>1913 Tax Collection Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">1913 Tax Collection</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-md-6">
-                                <div class="card">
-									<form class="forms-sample">
-	                                    <div class="card-header"><h3>Request Form</h3></div>
-	                               		<div class="card-body">
-											<div class="form-group">
-	                                            <label for="exampleInputPassword1">Name</label>
-	                                            <input type="text" class="form-control" name="name" id="name" placeholder="Name" required>
-	                                        </div>
-											<div class="row">
-                                                <div class="col-md-6">
-													<label for="exampleInputEmail1">Property tax number</label>
-													<div class="form-group input-group input-group-button">
-                                                        <input type="text" class="form-control" id="ptax" placeholder="00-000-00000-000" required>
-                                                        <div class="input-group-append">
-                                                            <button class="btn btn-primary" type="button" id="ptaxsearchbtn" onclick="displayPtaxInfo();return false;"><i class="ik ik-search"></i></button>
-                                                        </div>
-                                                    </div>
-			                                    </div>
-                                                <div class="col-md-6">
-			                                        <div class="form-group">
-			                                            <label for="exampleInputUsername1">Mobile Number</label>
-			                                            <input type="text" class="form-control" id="mobileno" placeholder="Enter your 10-digit mobile number" required>
-			                                        </div>
-			                                    </div>
-                                            </div>
-	                                        
-	                                        <div class="row">
-                                                <div class="col-md-6">
-                                                    <div class="form-group">
-                                                        <label for="exampleInputEmail3">Availability Date & Time</label>
-                                                        <input type="text" class="form-control" id="datetimepicker">
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-6">
-                                                    <div class="form-group">
-		                                                <label for="exampleSelectGender">User Type</label>
-		                                                <select class="form-control" id="exampleSelectGender">
-		                                                    <option>Senior citizen</option>
-		                                                    <option>Disability</option>
-		                                                </select>
-		                                            </div>
-                                                </div>
-                                            </div>
-	                                  	</div>
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-light mr-2">Cancel</button>
-                                        	<button type="submit" class="btn btn-primary">Submit</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-							<div class="col-md-6">
-								<div class="card">
-                                    <div class="card-header"><h3>Property tax Information</h3></div>
-                               		<div class="card-body" id="ptaxPersonalInfo">
-									
-									</div>
-								</div>
-							</div>
-							
-							<div class="card">
-                                <div class="card-block">
-									<div class="d-flex">
-                                        <h4 class="card-title">Today tax collection request list</h4>
-                                    </div>
-                                </div>
-                            </div>
-                           
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script src="/assets/node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-        <script src="/assets/node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="/assets/node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="/assets/node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <script src="/assets/node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-       	<script>
-			$(document).ready(function() {
-			  // Input masking for the desired format
-			  $('#ptax').mask('00-000-00000-000');
-			  $('#mobileno').mask('0000000000');
-			  
-			  // For datetime picker
-			  jQuery('#datetimepicker').datetimepicker({
-				  minTime:'10:00',
-				  maxTime:'18:01',
-				  minDate: 0, // Today
-				  //minDate:'-1970/01/2',
-				  //maxDate:'+1970/01/2',
-				  //timepicker:false, // Disable time picker
-				  mask:true,
-				  disabledWeekDays:[0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-				  weekends:['2023/08/10','2023/08/11','2023/08/12'], // Disable date on holidays
-				  
-				  // Disable all weekends
-				  onGenerate:function( ct ){
-				    jQuery(this).find('.xdsoft_date.xdsoft_weekend')
-				      .addClass('xdsoft_disabled');
-				  }
-			  });
-			  
-			});
-			
-			function displayPtaxInfo(ptax){
-				var inputElement = $('#ptax');
-				
-				inputElement.removeClass('is-invalid');
-				
-				// Disable the button to prevent multiple clicks
-				$("#ptaxsearchbtn").prop("disabled", true);
-				
-				// Show the loading icon on the button
-				$("#ptaxsearchbtn").html('<i class="fas fa-spinner fa-spin"></i>');
-				  
-				var ptax = inputElement.val();
-				var formatRegex = /^\d{2}-\d{3}-\d{5}-\d{3}$/; //'04-042-03251-000';
-				
-				// Check if the tax value is not null and follows the format
-				if (ptax !== null && formatRegex.test(ptax)) {
-				  console.log('ptax value is valid:', ptax);
-				  // Check if the tax value has the correct length as per the format (15 characters)
-				  if (ptax.length === 16) {
-				    console.log('ptax value length is correct.');
-				    getPtaxInfo(ptax);
-				  } else {
-				    console.log('ptax value length is incorrect.');
-				    
-				    inputElement.addClass('is-invalid');
-				    
-				    $("#ptaxsearchbtn").prop("disabled", false);
-    				$("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				  }
-				} else {
-				  console.log('ptax value is not valid or null.');
-				  
-				  inputElement.addClass('is-invalid'); //Error
-				  
-				  $("#ptaxsearchbtn").prop("disabled", false); 
-    			  $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				}
-			}
-			
-			function getPtaxInfo(ptax){
-				//var ptax = '04-042-03251-000';
-				var apiUrl = '/taxcollection/api/getPropertTaxPersonalDetails?ptax='+ptax;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						
-						// Access the values
-						var owner = data.PROPTAX[0].Owner;
-						var address = data.PROPTAX[0].Address;
-						//var famCardNo = data.PROPTAX[0].Fam_Card_No;
-						var mobNo = data.PROPTAX[0].Mob_No;
-						var email = data.PROPTAX[0].Email_ID;
-						
-						// HTML content
-						var ptaxPersonalinfoHtml = '<table class="table table-borderless">' +
-						           '  <tbody>' +
-								   '    <tr>' +
-						           '      <td>Property tax number</td>' +
-						           '      <td class="font-medium">'+ptax+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Owner Name</td>' +
-						           '      <td class="font-medium">'+owner+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Address</td>' +
-						           '      <td class="font-medium">'+address+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Mobile No</td>' +
-						           '      <td class="font-medium">'+mobNo+'</td>' +
-						           '    </tr>' +
-						           '  </tbody>' +
-						           '</table>';
-						$("#ptaxPersonalInfo").html(ptaxPersonalinfoHtml);
-						// Enable the button
-						$("#ptaxsearchbtn").prop("disabled", false);
-    					$("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				      // Enable the button
-				      $("#ptaxsearchbtn").prop("disabled", false);
-				      $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				    }
-				});
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/garbagecollection/request-new.html b/src/main/resources/templates/modules/garbagecollection/request-new.html
deleted file mode 100644
index a3d7ac54..00000000
--- a/src/main/resources/templates/modules/garbagecollection/request-new.html
+++ /dev/null
@@ -1,711 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-recycle bg-success"></i>
-                                        <div class="d-inline">
-                                            <h5>New Request List</h5>
-                                            <span>Garbage Collection</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Garbage Collection</li>
-                                            <li class="breadcrumb-item active" aria-current="page">New Request List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="garbageDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center">Name</th>
-														<th class="text-center">Mobile No</th>
-														<th class="text-center">Email ID</th>
-														<th class="text-center">Address</th>
-														<th class="text-center">Request Type</th>
-														<th class="text-center">Garbage Type</th>
-														<th class="text-center">Zone</th>
-														<th class="text-center">Division</th>
-														<th class="text-center">Status</th>
-														<!--<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="10%">Location</th>
-														<th class="text-center" width="10%">Street</th>-->
-						                                <th class="text-center no-sort" style="width:50px;">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="requestlist, i : ${requestlist}" class="requestlist">
-						                                <td th:utext="${i.count}" width="1%">0</td>
-														<td th:utext="${requestlist.name}"></td>
-														<td th:utext="${requestlist.mobile}"></td>
-						                                <td th:utext="${requestlist.email}"></td>
-						                                <td th:utext="${requestlist.address}"></td>
-						                                <td th:utext="${requestlist.requestType}"></td>
-						                                <td th:utext="${requestlist.garbageCategory}"></td>
-														<td th:utext="${requestlist.zone}"></td>
-														<td th:utext="${requestlist.division}"></td>
-														<td th:utext="${requestlist.status}"></td>
-						                                <!--<td th:utext="${requestlist.area}"></td>
-						                                <td th:utext="${requestlist.locality}"></td>
-						                                <td th:utext="${requestlist.street}"></td>-->
-						                                <td class="text-center" style="width:50px;">
-						                                    <a th:href="@{#}" th:onclick="return callView([[${requestlist.requestId}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Garbage Request Details" data-original-title="View Garbage Request Details"><i class="ik ik-eye f-16 text-blue"></i></a>&nbsp;&nbsp;
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center">Name</th>
-														<th class="text-center">Mobile No</th>
-														<th class="text-center">Email ID</th>
-														<th class="text-center">Address</th>
-														<th class="text-center">Request Type</th>
-														<th class="text-center">Garbage Type</th>
-														<th class="text-center">Zone</th>
-														<th class="text-center">Division</th>
-														<th class="text-center">Status</th>
-														<!--<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="10%">Location</th>
-														<th class="text-center" width="10%">Street</th>-->
-						                                <th class="text-center no-sort" style="width:50px;">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="garbageRequestDetailsView" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Garbage Request Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-							      
-                            <div class="col-xl-6 col-md-6" id="garbageRequestDetails">
-								&nbsp;
-                            </div>
-                            
-                            <div class="col-xl-6 col-md-6 bg-light" style="border-left: 1px solid #dee2e6;" id="requestActionDetails">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="garbageRequestStatusForm" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Garbage Request Status Update Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-                            <div class="col-xl-12 col-md-12 bg-light" id="requestActionUpdateHTML">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="statusHistory" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Status Timeline</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body pb-0 pt-0">
-						<div class="row">
-                            <div class="card mb-0" style="">
-                                    <div class="card-body timeline p-0" id="timelineHTML">
-                                        
-                                    </div>
-                                </div>            
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'colvis',
-	                    text: 'Column visibility',
-	                    className: 'btn btn-warning',
-	                    id: 'colvisBtn'
-	                },
-	                // Additional button
-	                /*
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }*/
-		            //'colvis'
-	            ];
-				
-			    $('#garbageDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-    				scrollX: true,
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callUpdateForm(requestid,statusid){
-					$('#garbageRequestStatusForm').modal({
-					    backdrop: 'static',
-					    keyboard: false
-					})
-					
-					var requestid = requestid;
-				
-					var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-					$.ajax({
-					    url: apiUrl,
-					    type: 'GET',
-					    dataType: 'json',
-					    success: function(jsonResponse) {
-							// Handle the API response data here
-							console.log('Data from API:', jsonResponse);
-							// Parse the JSON response into a JavaScript object
-							// Check if jsonResponse is not empty or null
-					        if (jsonResponse && jsonResponse.length > 0) {
-					            var data = jsonResponse[0];
-					            // Now you can use 'data' as needed
-					            
-								var data = jsonResponse[0];
-								
-								var status = data.status;
-								
-					        } else {
-					            console.log('No data available.');
-					            var status = 'Open';
-					        }
-					        
-					        var requestActionDetails = `<form action="#" id="request_action_save" method="post" enctype="multipart/form-data" onsubmit="return savestatus();">
-															<input type="hidden" name="request_id" id="request_id" value="${requestid}"/>
-															<div class="row">
-																<div class="col-xl-12 col-md-12"> <strong>Action Status</strong>
-																	<p class="text-muted">
-											                            <select class="form-control select2" name="status" id="status" required>
-								                                            <option value="">---Select---</option>
-								                                            <option value="Open">Open</option>
-								                                            <option value="Inprogress">Inprogress</option>
-								                                            <option value="Pending">Pending</option>
-								                                            <option value="Close">Close</option>
-								                                            <option value="Out Of Scope">Out Of Scope</option>
-								                                        </select>
-								                                     </p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>Action Comments</strong>
-										                            <p class="text-muted">
-																		<textarea class="form-control" name="comments" id="comments" rows="5" required=""></textarea>
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>Before Image</strong>
-										                            <p class="text-muted">
-																		<input type="file" accept="image/*" class="form-control" name="garbageFile2" id="garbageFile2">
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>After Image</strong>
-										                            <p class="text-muted">
-																		<input type="file" accept="image/*" class="form-control" name="garbageFile" id="garbageFile">
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12 text-right">
-																	<button type="submit" class="btn btn-primary btn-sm">Save</button>
-																</div>
-										                        
-										                    </div>
-										                    </form>`;
-							$("#requestActionUpdateHTML").html(requestActionDetails);
-							// Set the selected option"
-							$("#status").val(status);
-						},
-					    error: function(xhr, status, error) {
-					      // Handle errors here
-					      console.error('Error fetching data:', status, error);
-					    }
-					});	
-					$('#garbageRequestStatusForm').modal('show');
-					return false;
-				}
-				
-			function callView(requestid){
-				$('#garbageRequestDetailsView').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#garbageRequestDetailsView').modal('show');
-				getGarbageDetails(requestid);
-				$('#garbageRequestStatusForm').modal('hide');
-				return false;
-			}
-			
-			function getGarbageDetails(requestid){
-				var requestid = requestid;
-				var apiUrl = '/api/garbagecollection/getGarbageDetails?requestid='+requestid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse[0];
-						var statusid = data.statusid;
-						
-						// HTML content
-						var garbageDetails = `<div class="row">
-												<div class="col-xl-12 col-md-12"> <strong>Name</strong>
-						                            <p class="text-muted form-control showInputValue">${data.name}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Mobile No</strong>
-						                            <p class="text-muted form-control showInputValue">${data.mobile}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Email ID</strong>
-						                            <p class="text-muted form-control showInputValue">${data.email}</p>
-						                        </div>
-						                        <div class="col-xl-12 col-md-12"> <strong>Address</strong>
-						                            <p class="text-muted form-control showInputValue">${data.address}</p>
-						                        </div>
-						                        <div class="col-xl-12 col-md-12"> <strong>Nearest Landmark</strong>
-						                            <p class="text-muted form-control showInputValue">${data.name}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Request Type</strong>
-						                            <p class="text-muted form-control showInputValue">${data.request_type}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Garbage Type</strong>
-						                            <p class="text-muted form-control showInputValue">${data.garbage_category}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Zone</strong>
-						                            <p class="text-muted form-control showInputValue">${data.zone}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Division</strong>
-						                            <p class="text-muted form-control showInputValue">${data.division}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Area</strong>
-						                            <p class="text-muted form-control showInputValue">${data.area}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Location</strong>
-						                            <p class="text-muted form-control showInputValue">${data.locality}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Street</strong>
-						                            <p class="text-muted form-control showInputValue">${data.street}</p>
-						                        </div>
-						                    </div>`;
-						$("#garbageRequestDetails").html(garbageDetails);
-						
-						showActionform(requestid,statusid);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-			
-			function showActionform(requestid,statusid){
-			
-				if(statusid>0)
-				{
-					getStatus(requestid,statusid);
-				}
-				else{
-					getActionFormData(requestid,statusid);
-				}
-			}
-			
-			function getActionFormData(requestid,statusid){
-				var requestid = requestid;
-				
-				var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							
-							var status = data.status;
-							
-				        } else {
-				            console.log('No data available.');
-				            var status = 'Open';
-				        }
-				        
-				        var requestActionDetails = `<form action="#" id="request_action_save" method="post" enctype="multipart/form-data" onsubmit="return savestatus();">
-														<input type="hidden" name="request_id" id="request_id" value="${requestid}"/>
-														<div class="row">
-															<div class="col-xl-12 col-md-12"> <strong>Action Status</strong>
-																<p class="text-muted">
-										                            <select class="form-control select2" name="status" id="status" required>
-							                                            <option value="">---Select---</option>
-							                                            <option value="Open">Open</option>
-							                                            <option value="Inprogress">Inprogress</option>
-							                                            <option value="Pending">Pending</option>
-							                                            <option value="Close">Close</option>
-							                                            <option value="Out Of Scope">Out Of Scope</option>
-							                                        </select>
-							                                     </p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>Action Comments</strong>
-									                            <p class="text-muted">
-																	<textarea class="form-control" name="comments" id="comments" rows="5" required=""></textarea>
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>Before Image</strong>
-									                            <p class="text-muted">
-																	<input type="file" accept="image/*" class="form-control" name="garbageFile2" id="garbageFile2">
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>After Image</strong>
-									                            <p class="text-muted">
-																	<input type="file" accept="image/*" class="form-control" name="garbageFile" id="garbageFile">
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12 text-right">
-																<button type="submit" class="btn btn-primary btn-sm">Save</button>
-															</div>
-									                    </div>
-									                    </form>`;
-						$("#requestActionDetails").html(requestActionDetails);
-						// Set the selected option"
-						$("#status").val(status);
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});	
-			}
-			
-			function getStatus(requestid,statusid){
-				
-				var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							
-							var status = data.status;
-							
-				        } else {
-							var status = 'Open';
-				            console.log('No data available.');
-				        }
-				        var requestActionDetails = `<div class="row">
-														<div class="col-xl-12 col-md-12 text-center">
-															<a href="#" class="btn btn-info" onclick="return callUpdateForm(${requestid},${statusid});"}>Edit / Update Current Status</a>
-				        									<a href="#" class="btn btn-warning" onclick="return callStatusHistory(${requestid},${statusid});"}>View Full Status History</a>
-														</div>
-														<div class="col-xl-12 col-md-12"> <strong>Status</strong>
-								                            <p class="text-muted form-control showInputValue">${data.status}</p>
-								                        </div>
-								                        <div class="col-xl-12 col-md-12"> <strong>Officer Comments</strong>
-								                            <p class="text-muted form-control showInputValue">${data.comments}</p>
-								                        </div>
-								                        <div class="col-xl-12 col-md-12"> <strong>Status Date</strong>
-								                            <p class="text-muted form-control showInputValue">${data.cDate}</p>
-								                        </div>
-							                        </div>	
-				        							
-				        							`;
-						$("#requestActionDetails").html(requestActionDetails);
-						// Set the selected option"
-						$("#status").val(status);
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});	
-			}
-			
-			function savestatus(){
-				
-				var apiUrl = '/api/garbagecollection/saveStatus';
-				
-				// Create a FormData object to hold your form data
-				var formData = new FormData();
-				//formData.append('file', fileInput.files[0]); // Replace 'file' with your actual file input name
-				var requestid = $('#request_id').val();
-				// Add other form fields as needed
-				formData.append('status', $('#status').val());
-				formData.append('comments', $('#comments').val());
-				formData.append('request_id', requestid);
-				// ... other fields
-
-				$.ajax({
-				    url: apiUrl,
-				    type: 'POST',
-				    data: formData,
-				    contentType: false, // Set content type to false for multipart form data
-				    processData: false, // Disable processing of data for multipart form data
-				    
-				    success: function(response) {
-						alert(response);
-						// Handle the API response data here
-						console.log('Data from API:', response);
-						// Parse the JSON response into a JavaScript object
-						callView(requestid);
-						
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-				return false;
-			}
-			
-			
-			function callStatusHistory(requestid, statusid){
-				$('#statusHistory').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#statusHistory').modal('show');
-				
-				var apiUrl = '/api/garbagecollection/getStatus?requestid='+requestid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							// For Request Created Date//
-							var cdate = datetotext(data.request.cDate);
-							var cdate_parts = cdate.split("-"); // format -> 14-Monday-AUGUST-2023-16:10:22
-							var day = cdate_parts[0];
-							var dayName = cdate_parts[1];
-							var monthName = cdate_parts[2];
-							var year = cdate_parts[3];
-							var time = cdate_parts[4];
-							/////////////////
-							var status = data.status;
-							var statusListHTML="";
-							for(var i=0; i<jsonResponse.length; i++){
-								var statusdata = jsonResponse[i];
-								var cdate_parts = statusdata.cDate.split(" ");
-								var status = `<div class="col-6 pl-0">Status: <label class="text-success mb-1"><b>${statusdata.status}</b></div><div class="col-6 pr-0 text-right"></label> Date: <label class="text-warning mb-1"><b>${cdate_parts[0]}</b></label></div>`;
-								statusListHTML += `<li>
-					                                    <div class="bullet bg-green"></div>
-					                                    <div class="time">${cdate_parts[1]}</div>
-					                                    <div class="desc">
-					                                        <div class="row p-0 m-0">${status}</div>
-					                                        Comments:
-					                                        <p class="form-control showInputValue">${statusdata.comments}</p>
-					                                    </div>
-					                                </li>`;
-							}
-							
-				        } else {
-							var status = 'Open';
-				            console.log('No data available.');
-				        }
-				        
-				        var statusHTML=`<div class="header bg-theme" style="background-image: url('/assets/images/placeimg_400_200_nature.jpg')">
-                                            <div class="text-center">Request Created</div>
-                                            <div class="color-overlay d-flex align-items-center">
-                                                <div class="col-4 text-center day-number">${day}</div>
-                                                <div class="col-4 text-center date-right">
-                                                    <div class="day-name">${dayName}</div>
-                                                    <div class="month">${monthName} ${year}</div>
-                                                </div>
-                                                <div class="col-4 text-center date-right pr-1">
-                                                    <div class="day-name">${time}</div>
-                                                </div>
-                                            </div>                                
-                                        </div>
-                                        <ul>
-                                            ${statusListHTML}
-                                        </ul>`;
-                  		$("#timelineHTML").html(statusHTML);
-                  		
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-                  
-				return false;
-			}
-			
-			function datetotext(dateval){
-				var date = new Date(dateval);
-				var day = date.getDate(); // Get the day of the month (e.g., 8)
-				var dayName = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getDay()]; // Get the day name (e.g., Monday)
-				var monthName = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][date.getMonth()]; // Get the month name (e.g., February)
-				var year = date.getFullYear(); // Get the year (e.g., 2018)
-				var time = date.toLocaleTimeString(); // Get the time (e.g., 12:00:00 AM)
-				
-				var formattedDate = day + '-' + dayName + '-' + monthName.toUpperCase() + '-' + year + '-' + time;
-				return formattedDate;
-			}
-		</script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/garbagecollection/request-outofscope.html b/src/main/resources/templates/modules/garbagecollection/request-outofscope.html
deleted file mode 100644
index e5c4c845..00000000
--- a/src/main/resources/templates/modules/garbagecollection/request-outofscope.html
+++ /dev/null
@@ -1,701 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-shipping-fast bg-success"></i>
-                                        <div class="d-inline">
-                                            <h5>Out Of Scope Request List</h5>
-                                            <span>Garbage Collection</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Garbage Collection</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Pending Request List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="garbageDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center" width="20%">Name</th>
-														<th class="text-center" width="10%">Mobile No</th>
-														<th class="text-center" width="10%">Email ID</th>
-														<th class="text-center" width="10%">Address</th>
-														<th class="text-center" width="20%">Request Type</th>
-														<th class="text-center" width="20%">Garbage Type</th>
-														<th class="text-center" width="20%">Zone</th>
-														<th class="text-center" width="10%">Division</th>
-														<!--<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="10%">Location</th>
-														<th class="text-center" width="10%">Street</th>-->
-						                                <th class="text-center no-sort" style="width:50px;">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="requestlist, i : ${requestlist}" class="requestlist">
-						                                <td th:utext="${i.count}">0</td>
-														<td th:utext="${requestlist.name}"></td>
-														<td th:utext="${requestlist.mobile}"></td>
-						                                <td th:utext="${requestlist.email}"></td>
-						                                <td th:utext="${requestlist.address}"></td>
-						                                <td th:utext="${requestlist.requestType}"></td>
-						                                <td th:utext="${requestlist.garbageCategory}"></td>
-														<td th:utext="${requestlist.zone}"></td>
-														<td th:utext="${requestlist.division}"></td>
-						                                <!--<td th:utext="${requestlist.area}"></td>
-						                                <td th:utext="${requestlist.locality}"></td>
-						                                <td th:utext="${requestlist.street}"></td>-->
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callView([[${requestlist.requestId}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Garbage Request Details" data-original-title="View Garbage Request Details"><i class="ik ik-eye f-16 text-blue"></i></a>&nbsp;&nbsp;
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-						                                <th class="text-center" width="20%">Name</th>
-														<th class="text-center" width="10%">Mobile No</th>
-														<th class="text-center" width="10%">Email ID</th>
-														<th class="text-center" width="10%">Address</th>
-														<th class="text-center" width="20%">Request Type</th>
-														<th class="text-center" width="20%">Garbage Type</th>
-														<th class="text-center" width="20%">Zone</th>
-														<th class="text-center" width="10%">Division</th>
-														<!--<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="10%">Location</th>
-														<th class="text-center" width="10%">Street</th>-->
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="garbageRequestDetailsView" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Garbage Request Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-							      
-                            <div class="col-xl-6 col-md-6" id="garbageRequestDetails">
-								&nbsp;
-                            </div>
-                            
-                            <div class="col-xl-6 col-md-6 bg-light" style="border-left: 1px solid #dee2e6;" id="requestActionDetails">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="garbageRequestStatusForm" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Garbage Request Status Update Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-                            <div class="col-xl-12 col-md-12 bg-light" id="requestActionUpdateHTML">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="statusHistory" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Status Timeline</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body pb-0 pt-0">
-						<div class="row">
-                            <div class="card mb-0" style="">
-                                    <div class="card-body timeline p-0" id="timelineHTML">
-                                        
-                                    </div>
-                                </div>            
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                // Additional button
-	                /*
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }*/
-		            'colvis'
-	            ];
-				
-			    $('#garbageDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callUpdateForm(requestid,statusid){
-					$('#garbageRequestStatusForm').modal({
-					    backdrop: 'static',
-					    keyboard: false
-					})
-					
-					var requestid = requestid;
-				
-					var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-					$.ajax({
-					    url: apiUrl,
-					    type: 'GET',
-					    dataType: 'json',
-					    success: function(jsonResponse) {
-							// Handle the API response data here
-							console.log('Data from API:', jsonResponse);
-							// Parse the JSON response into a JavaScript object
-							// Check if jsonResponse is not empty or null
-					        if (jsonResponse && jsonResponse.length > 0) {
-					            var data = jsonResponse[0];
-					            // Now you can use 'data' as needed
-					            
-								var data = jsonResponse[0];
-								
-								var status = data.status;
-								
-					        } else {
-					            console.log('No data available.');
-					            var status = 'Open';
-					        }
-					        
-					        var requestActionDetails = `<form action="#" id="request_action_save" method="post" enctype="multipart/form-data" onsubmit="return savestatus();">
-															<input type="hidden" name="request_id" id="request_id" value="${requestid}"/>
-															<div class="row">
-																<div class="col-xl-12 col-md-12"> <strong>Action Status</strong>
-																	<p class="text-muted">
-											                            <select class="form-control select2" name="status" id="status" required>
-								                                            <option value="">---Select---</option>
-								                                            <option value="Open">Open</option>
-								                                            <option value="Inprogress">Inprogress</option>
-								                                            <option value="Pending">Pending</option>
-								                                            <option value="Close">Close</option>
-								                                            <option value="Out Of Scope">Out Of Scope</option>
-								                                        </select>
-								                                     </p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>Action Comments</strong>
-										                            <p class="text-muted">
-																		<textarea class="form-control" name="comments" id="comments" rows="5" required=""></textarea>
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>Before Image</strong>
-										                            <p class="text-muted">
-																		<input type="file" accept="image/*" class="form-control" name="garbageFile2" id="garbageFile2">
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>After Image</strong>
-										                            <p class="text-muted">
-																		<input type="file" accept="image/*" class="form-control" name="garbageFile" id="garbageFile">
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12 text-right">
-																	<button type="submit" class="btn btn-primary btn-sm">Save</button>
-																</div>
-										                        
-										                    </div>
-										                    </form>`;
-							$("#requestActionUpdateHTML").html(requestActionDetails);
-							// Set the selected option"
-							$("#status").val(status);
-						},
-					    error: function(xhr, status, error) {
-					      // Handle errors here
-					      console.error('Error fetching data:', status, error);
-					    }
-					});	
-					$('#garbageRequestStatusForm').modal('show');
-					return false;
-				}
-				
-			function callView(requestid){
-				$('#garbageRequestDetailsView').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#garbageRequestDetailsView').modal('show');
-				getGarbageDetails(requestid);
-				$('#garbageRequestStatusForm').modal('hide');
-				return false;
-			}
-			
-			function getGarbageDetails(requestid){
-				var requestid = requestid;
-				var apiUrl = '/api/garbagecollection/getGarbageDetails?requestid='+requestid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse[0];
-						var statusid = data.statusid;
-						
-						// HTML content
-						var garbageDetails = `<div class="row">
-												<div class="col-xl-12 col-md-12"> <strong>Name</strong>
-						                            <p class="text-muted form-control showInputValue">${data.name}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Mobile No</strong>
-						                            <p class="text-muted form-control showInputValue">${data.mobile}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Email ID</strong>
-						                            <p class="text-muted form-control showInputValue">${data.email}</p>
-						                        </div>
-						                        <div class="col-xl-12 col-md-12"> <strong>Address</strong>
-						                            <p class="text-muted form-control showInputValue">${data.address}</p>
-						                        </div>
-						                        <div class="col-xl-12 col-md-12"> <strong>Nearest Landmark</strong>
-						                            <p class="text-muted form-control showInputValue">${data.name}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Request Type</strong>
-						                            <p class="text-muted form-control showInputValue">${data.request_type}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Garbage Type</strong>
-						                            <p class="text-muted form-control showInputValue">${data.garbage_category}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Zone</strong>
-						                            <p class="text-muted form-control showInputValue">${data.zone}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Division</strong>
-						                            <p class="text-muted form-control showInputValue">${data.division}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Area</strong>
-						                            <p class="text-muted form-control showInputValue">${data.area}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Location</strong>
-						                            <p class="text-muted form-control showInputValue">${data.locality}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Street</strong>
-						                            <p class="text-muted form-control showInputValue">${data.street}</p>
-						                        </div>
-						                    </div>`;
-						$("#garbageRequestDetails").html(garbageDetails);
-						
-						showActionform(requestid,statusid);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-			
-			function showActionform(requestid,statusid){
-			
-				if(statusid>0)
-				{
-					getStatus(requestid,statusid);
-				}
-				else{
-					getActionFormData(requestid,statusid);
-				}
-			}
-			
-			function getActionFormData(requestid,statusid){
-				var requestid = requestid;
-				
-				var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							
-							var status = data.status;
-							
-				        } else {
-				            console.log('No data available.');
-				            var status = 'Open';
-				        }
-				        
-				        var requestActionDetails = `<form action="#" id="request_action_save" method="post" enctype="multipart/form-data" onsubmit="return savestatus();">
-														<input type="hidden" name="request_id" id="request_id" value="${requestid}"/>
-														<div class="row">
-															<div class="col-xl-12 col-md-12"> <strong>Action Status</strong>
-																<p class="text-muted">
-										                            <select class="form-control select2" name="status" id="status" required>
-							                                            <option value="">---Select---</option>
-							                                            <option value="Open">Open</option>
-							                                            <option value="Inprogress">Inprogress</option>
-							                                            <option value="Pending">Pending</option>
-							                                            <option value="Close">Close</option>
-							                                            <option value="Out Of Scope">Out Of Scope</option>
-							                                        </select>
-							                                     </p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>Action Comments</strong>
-									                            <p class="text-muted">
-																	<textarea class="form-control" name="comments" id="comments" rows="5" required=""></textarea>
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>Before Image</strong>
-									                            <p class="text-muted">
-																	<input type="file" accept="image/*" class="form-control" name="garbageFile2" id="garbageFile2">
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>After Image</strong>
-									                            <p class="text-muted">
-																	<input type="file" accept="image/*" class="form-control" name="garbageFile" id="garbageFile">
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12 text-right">
-																<button type="submit" class="btn btn-primary btn-sm">Save</button>
-															</div>
-									                    </div>
-									                    </form>`;
-						$("#requestActionDetails").html(requestActionDetails);
-						// Set the selected option"
-						$("#status").val(status);
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});	
-			}
-			
-			function getStatus(requestid,statusid){
-				
-				var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							
-							var status = data.status;
-							
-				        } else {
-							var status = 'Open';
-				            console.log('No data available.');
-				        }
-				        var requestActionDetails = `<div class="row">
-														<div class="col-xl-12 col-md-12 text-center">
-															<a href="#" class="btn btn-info" onclick="return callUpdateForm(${requestid},${statusid});"}>Edit / Update Current Status</a>
-				        									<a href="#" class="btn btn-warning" onclick="return callStatusHistory(${requestid},${statusid});"}>View Full Status History</a>
-														</div>
-														<div class="col-xl-12 col-md-12"> <strong>Status</strong>
-								                            <p class="text-muted form-control showInputValue">${data.status}</p>
-								                        </div>
-								                        <div class="col-xl-12 col-md-12"> <strong>Officer Comments</strong>
-								                            <p class="text-muted form-control showInputValue">${data.comments}</p>
-								                        </div>
-								                        <div class="col-xl-12 col-md-12"> <strong>Status Date</strong>
-								                            <p class="text-muted form-control showInputValue">${data.cDate}</p>
-								                        </div>
-							                        </div>	
-				        							
-				        							`;
-						$("#requestActionDetails").html(requestActionDetails);
-						// Set the selected option"
-						$("#status").val(status);
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});	
-			}
-			
-			function savestatus(){
-				
-				var apiUrl = '/api/garbagecollection/saveStatus';
-				
-				// Create a FormData object to hold your form data
-				var formData = new FormData();
-				//formData.append('file', fileInput.files[0]); // Replace 'file' with your actual file input name
-				var requestid = $('#request_id').val();
-				// Add other form fields as needed
-				formData.append('status', $('#status').val());
-				formData.append('comments', $('#comments').val());
-				formData.append('request_id', requestid);
-				// ... other fields
-
-				$.ajax({
-				    url: apiUrl,
-				    type: 'POST',
-				    data: formData,
-				    contentType: false, // Set content type to false for multipart form data
-				    processData: false, // Disable processing of data for multipart form data
-				    
-				    success: function(response) {
-						alert(response);
-						// Handle the API response data here
-						console.log('Data from API:', response);
-						// Parse the JSON response into a JavaScript object
-						callView(requestid);
-						
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-				return false;
-			}
-			
-			
-			function callStatusHistory(requestid, statusid){
-				$('#statusHistory').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#statusHistory').modal('show');
-				
-				var apiUrl = '/api/garbagecollection/getStatus?requestid='+requestid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							// For Request Created Date//
-							var cdate = datetotext(data.request.cDate);
-							var cdate_parts = cdate.split("-"); // format -> 14-Monday-AUGUST-2023-16:10:22
-							var day = cdate_parts[0];
-							var dayName = cdate_parts[1];
-							var monthName = cdate_parts[2];
-							var year = cdate_parts[3];
-							var time = cdate_parts[4];
-							/////////////////
-							var status = data.status;
-							var statusListHTML="";
-							for(var i=0; i<jsonResponse.length; i++){
-								var statusdata = jsonResponse[i];
-								var cdate_parts = statusdata.cDate.split(" ");
-								var status = `<div class="col-6 pl-0">Status: <label class="text-success mb-1"><b>${statusdata.status}</b></div><div class="col-6 pr-0 text-right"></label> Date: <label class="text-warning mb-1"><b>${cdate_parts[0]}</b></label></div>`;
-								statusListHTML += `<li>
-					                                    <div class="bullet bg-green"></div>
-					                                    <div class="time">${cdate_parts[1]}</div>
-					                                    <div class="desc">
-					                                        <div class="row p-0 m-0">${status}</div>
-					                                        Comments:
-					                                        <p class="form-control showInputValue">${statusdata.comments}</p>
-					                                    </div>
-					                                </li>`;
-							}
-							
-				        } else {
-							var status = 'Open';
-				            console.log('No data available.');
-				        }
-				        
-				        var statusHTML=`<div class="header bg-theme" style="background-image: url('/assets/images/placeimg_400_200_nature.jpg')">
-                                            <div class="text-center">Request Created</div>
-                                            <div class="color-overlay d-flex align-items-center">
-                                                <div class="col-4 text-center day-number">${day}</div>
-                                                <div class="col-4 text-center date-right">
-                                                    <div class="day-name">${dayName}</div>
-                                                    <div class="month">${monthName} ${year}</div>
-                                                </div>
-                                                <div class="col-4 text-center date-right pr-1">
-                                                    <div class="day-name">${time}</div>
-                                                </div>
-                                            </div>                                
-                                        </div>
-                                        <ul>
-                                            ${statusListHTML}
-                                        </ul>`;
-                  		$("#timelineHTML").html(statusHTML);
-                  		
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-                  
-				return false;
-			}
-			
-			function datetotext(dateval){
-				var date = new Date(dateval);
-				var day = date.getDate(); // Get the day of the month (e.g., 8)
-				var dayName = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getDay()]; // Get the day name (e.g., Monday)
-				var monthName = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][date.getMonth()]; // Get the month name (e.g., February)
-				var year = date.getFullYear(); // Get the year (e.g., 2018)
-				var time = date.toLocaleTimeString(); // Get the time (e.g., 12:00:00 AM)
-				
-				var formattedDate = day + '-' + dayName + '-' + monthName.toUpperCase() + '-' + year + '-' + time;
-				return formattedDate;
-			}
-		</script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/garbagecollection/request-pending.html b/src/main/resources/templates/modules/garbagecollection/request-pending.html
deleted file mode 100644
index 13b039e7..00000000
--- a/src/main/resources/templates/modules/garbagecollection/request-pending.html
+++ /dev/null
@@ -1,701 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-shipping-fast bg-success"></i>
-                                        <div class="d-inline">
-                                            <h5>Pending Request List</h5>
-                                            <span>Garbage Collection</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Garbage Collection</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Pending Request List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="garbageDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center" width="20%">Name</th>
-														<th class="text-center" width="10%">Mobile No</th>
-														<th class="text-center" width="10%">Email ID</th>
-														<th class="text-center" width="10%">Address</th>
-														<th class="text-center" width="20%">Request Type</th>
-														<th class="text-center" width="20%">Garbage Type</th>
-														<th class="text-center" width="20%">Zone</th>
-														<th class="text-center" width="10%">Division</th>
-														<!--<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="10%">Location</th>
-														<th class="text-center" width="10%">Street</th>-->
-						                                <th class="text-center no-sort" style="width:50px;">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="requestlist, i : ${requestlist}" class="requestlist">
-						                                <td th:utext="${i.count}">0</td>
-														<td th:utext="${requestlist.name}"></td>
-														<td th:utext="${requestlist.mobile}"></td>
-						                                <td th:utext="${requestlist.email}"></td>
-						                                <td th:utext="${requestlist.address}"></td>
-						                                <td th:utext="${requestlist.requestType}"></td>
-						                                <td th:utext="${requestlist.garbageCategory}"></td>
-														<td th:utext="${requestlist.zone}"></td>
-														<td th:utext="${requestlist.division}"></td>
-						                                <!--<td th:utext="${requestlist.area}"></td>
-						                                <td th:utext="${requestlist.locality}"></td>
-						                                <td th:utext="${requestlist.street}"></td>-->
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callView([[${requestlist.requestId}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Garbage Request Details" data-original-title="View Garbage Request Details"><i class="ik ik-eye f-16 text-blue"></i></a>&nbsp;&nbsp;
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-						                                <th class="text-center" width="20%">Name</th>
-														<th class="text-center" width="10%">Mobile No</th>
-														<th class="text-center" width="10%">Email ID</th>
-														<th class="text-center" width="10%">Address</th>
-														<th class="text-center" width="20%">Request Type</th>
-														<th class="text-center" width="20%">Garbage Type</th>
-														<th class="text-center" width="20%">Zone</th>
-														<th class="text-center" width="10%">Division</th>
-														<!--<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="10%">Location</th>
-														<th class="text-center" width="10%">Street</th>-->
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="garbageRequestDetailsView" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Garbage Request Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-							      
-                            <div class="col-xl-6 col-md-6" id="garbageRequestDetails">
-								&nbsp;
-                            </div>
-                            
-                            <div class="col-xl-6 col-md-6 bg-light" style="border-left: 1px solid #dee2e6;" id="requestActionDetails">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="garbageRequestStatusForm" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Garbage Request Status Update Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-                            <div class="col-xl-12 col-md-12 bg-light" id="requestActionUpdateHTML">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="statusHistory" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header thead-dark">
-                        <h5 class="modal-title" id="modal-title">Status Timeline</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body pb-0 pt-0">
-						<div class="row">
-                            <div class="card mb-0" style="">
-                                    <div class="card-body timeline p-0" id="timelineHTML">
-                                        
-                                    </div>
-                                </div>            
-						</div>
-                    </div>
-                    <!--<div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>-->
-                </div>
-            </div>
-        </div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    exportOptions: {
-		                    columns: ':visible'
-		                }
-	                },
-	                // Additional button
-	                /*
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }*/
-		            'colvis'
-	            ];
-				
-			    $('#garbageDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callUpdateForm(requestid,statusid){
-					$('#garbageRequestStatusForm').modal({
-					    backdrop: 'static',
-					    keyboard: false
-					})
-					
-					var requestid = requestid;
-				
-					var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-					$.ajax({
-					    url: apiUrl,
-					    type: 'GET',
-					    dataType: 'json',
-					    success: function(jsonResponse) {
-							// Handle the API response data here
-							console.log('Data from API:', jsonResponse);
-							// Parse the JSON response into a JavaScript object
-							// Check if jsonResponse is not empty or null
-					        if (jsonResponse && jsonResponse.length > 0) {
-					            var data = jsonResponse[0];
-					            // Now you can use 'data' as needed
-					            
-								var data = jsonResponse[0];
-								
-								var status = data.status;
-								
-					        } else {
-					            console.log('No data available.');
-					            var status = 'Open';
-					        }
-					        
-					        var requestActionDetails = `<form action="#" id="request_action_save" method="post" enctype="multipart/form-data" onsubmit="return savestatus();">
-															<input type="hidden" name="request_id" id="request_id" value="${requestid}"/>
-															<div class="row">
-																<div class="col-xl-12 col-md-12"> <strong>Action Status</strong>
-																	<p class="text-muted">
-											                            <select class="form-control select2" name="status" id="status" required>
-								                                            <option value="">---Select---</option>
-								                                            <option value="Open">Open</option>
-								                                            <option value="Inprogress">Inprogress</option>
-								                                            <option value="Pending">Pending</option>
-								                                            <option value="Close">Close</option>
-								                                            <option value="Out Of Scope">Out Of Scope</option>
-								                                        </select>
-								                                     </p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>Action Comments</strong>
-										                            <p class="text-muted">
-																		<textarea class="form-control" name="comments" id="comments" rows="5" required=""></textarea>
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>Before Image</strong>
-										                            <p class="text-muted">
-																		<input type="file" accept="image/*" class="form-control" name="garbageFile2" id="garbageFile2">
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12"> <strong>After Image</strong>
-										                            <p class="text-muted">
-																		<input type="file" accept="image/*" class="form-control" name="garbageFile" id="garbageFile">
-																	</p>
-										                        </div>
-										                        <div class="col-xl-12 col-md-12 text-right">
-																	<button type="submit" class="btn btn-primary btn-sm">Save</button>
-																</div>
-										                        
-										                    </div>
-										                    </form>`;
-							$("#requestActionUpdateHTML").html(requestActionDetails);
-							// Set the selected option"
-							$("#status").val(status);
-						},
-					    error: function(xhr, status, error) {
-					      // Handle errors here
-					      console.error('Error fetching data:', status, error);
-					    }
-					});	
-					$('#garbageRequestStatusForm').modal('show');
-					return false;
-				}
-				
-			function callView(requestid){
-				$('#garbageRequestDetailsView').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#garbageRequestDetailsView').modal('show');
-				getGarbageDetails(requestid);
-				$('#garbageRequestStatusForm').modal('hide');
-				return false;
-			}
-			
-			function getGarbageDetails(requestid){
-				var requestid = requestid;
-				var apiUrl = '/api/garbagecollection/getGarbageDetails?requestid='+requestid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse[0];
-						var statusid = data.statusid;
-						
-						// HTML content
-						var garbageDetails = `<div class="row">
-												<div class="col-xl-12 col-md-12"> <strong>Name</strong>
-						                            <p class="text-muted form-control showInputValue">${data.name}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Mobile No</strong>
-						                            <p class="text-muted form-control showInputValue">${data.mobile}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Email ID</strong>
-						                            <p class="text-muted form-control showInputValue">${data.email}</p>
-						                        </div>
-						                        <div class="col-xl-12 col-md-12"> <strong>Address</strong>
-						                            <p class="text-muted form-control showInputValue">${data.address}</p>
-						                        </div>
-						                        <div class="col-xl-12 col-md-12"> <strong>Nearest Landmark</strong>
-						                            <p class="text-muted form-control showInputValue">${data.name}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Request Type</strong>
-						                            <p class="text-muted form-control showInputValue">${data.request_type}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Garbage Type</strong>
-						                            <p class="text-muted form-control showInputValue">${data.garbage_category}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Zone</strong>
-						                            <p class="text-muted form-control showInputValue">${data.zone}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Division</strong>
-						                            <p class="text-muted form-control showInputValue">${data.division}</p>
-						                        </div>
-						                        <div class="col-xl-4 col-md-12"> <strong>Area</strong>
-						                            <p class="text-muted form-control showInputValue">${data.area}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Location</strong>
-						                            <p class="text-muted form-control showInputValue">${data.locality}</p>
-						                        </div>
-						                        <div class="col-xl-6 col-md-12"> <strong>Street</strong>
-						                            <p class="text-muted form-control showInputValue">${data.street}</p>
-						                        </div>
-						                    </div>`;
-						$("#garbageRequestDetails").html(garbageDetails);
-						
-						showActionform(requestid,statusid);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-			
-			function showActionform(requestid,statusid){
-			
-				if(statusid>0)
-				{
-					getStatus(requestid,statusid);
-				}
-				else{
-					getActionFormData(requestid,statusid);
-				}
-			}
-			
-			function getActionFormData(requestid,statusid){
-				var requestid = requestid;
-				
-				var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							
-							var status = data.status;
-							
-				        } else {
-				            console.log('No data available.');
-				            var status = 'Open';
-				        }
-				        
-				        var requestActionDetails = `<form action="#" id="request_action_save" method="post" enctype="multipart/form-data" onsubmit="return savestatus();">
-														<input type="hidden" name="request_id" id="request_id" value="${requestid}"/>
-														<div class="row">
-															<div class="col-xl-12 col-md-12"> <strong>Action Status</strong>
-																<p class="text-muted">
-										                            <select class="form-control select2" name="status" id="status" required>
-							                                            <option value="">---Select---</option>
-							                                            <option value="Open">Open</option>
-							                                            <option value="Inprogress">Inprogress</option>
-							                                            <option value="Pending">Pending</option>
-							                                            <option value="Close">Close</option>
-							                                            <option value="Out Of Scope">Out Of Scope</option>
-							                                        </select>
-							                                     </p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>Action Comments</strong>
-									                            <p class="text-muted">
-																	<textarea class="form-control" name="comments" id="comments" rows="5" required=""></textarea>
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>Before Image</strong>
-									                            <p class="text-muted">
-																	<input type="file" accept="image/*" class="form-control" name="garbageFile2" id="garbageFile2">
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12"> <strong>After Image</strong>
-									                            <p class="text-muted">
-																	<input type="file" accept="image/*" class="form-control" name="garbageFile" id="garbageFile">
-																</p>
-									                        </div>
-									                        <div class="col-xl-12 col-md-12 text-right">
-																<button type="submit" class="btn btn-primary btn-sm">Save</button>
-															</div>
-									                    </div>
-									                    </form>`;
-						$("#requestActionDetails").html(requestActionDetails);
-						// Set the selected option"
-						$("#status").val(status);
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});	
-			}
-			
-			function getStatus(requestid,statusid){
-				
-				var apiUrl = '/api/garbagecollection/getStatusById?statusid='+statusid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							
-							var status = data.status;
-							
-				        } else {
-							var status = 'Open';
-				            console.log('No data available.');
-				        }
-				        var requestActionDetails = `<div class="row">
-														<div class="col-xl-12 col-md-12 text-center">
-															<a href="#" class="btn btn-info" onclick="return callUpdateForm(${requestid},${statusid});"}>Edit / Update Current Status</a>
-				        									<a href="#" class="btn btn-warning" onclick="return callStatusHistory(${requestid},${statusid});"}>View Full Status History</a>
-														</div>
-														<div class="col-xl-12 col-md-12"> <strong>Status</strong>
-								                            <p class="text-muted form-control showInputValue">${data.status}</p>
-								                        </div>
-								                        <div class="col-xl-12 col-md-12"> <strong>Officer Comments</strong>
-								                            <p class="text-muted form-control showInputValue">${data.comments}</p>
-								                        </div>
-								                        <div class="col-xl-12 col-md-12"> <strong>Status Date</strong>
-								                            <p class="text-muted form-control showInputValue">${data.cDate}</p>
-								                        </div>
-							                        </div>	
-				        							
-				        							`;
-						$("#requestActionDetails").html(requestActionDetails);
-						// Set the selected option"
-						$("#status").val(status);
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});	
-			}
-			
-			function savestatus(){
-				
-				var apiUrl = '/api/garbagecollection/saveStatus';
-				
-				// Create a FormData object to hold your form data
-				var formData = new FormData();
-				//formData.append('file', fileInput.files[0]); // Replace 'file' with your actual file input name
-				var requestid = $('#request_id').val();
-				// Add other form fields as needed
-				formData.append('status', $('#status').val());
-				formData.append('comments', $('#comments').val());
-				formData.append('request_id', requestid);
-				// ... other fields
-
-				$.ajax({
-				    url: apiUrl,
-				    type: 'POST',
-				    data: formData,
-				    contentType: false, // Set content type to false for multipart form data
-				    processData: false, // Disable processing of data for multipart form data
-				    
-				    success: function(response) {
-						alert(response);
-						// Handle the API response data here
-						console.log('Data from API:', response);
-						// Parse the JSON response into a JavaScript object
-						callView(requestid);
-						
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-				return false;
-			}
-			
-			
-			function callStatusHistory(requestid, statusid){
-				$('#statusHistory').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#statusHistory').modal('show');
-				
-				var apiUrl = '/api/garbagecollection/getStatus?requestid='+requestid;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						// Check if jsonResponse is not empty or null
-				        if (jsonResponse && jsonResponse.length > 0) {
-				            var data = jsonResponse[0];
-				            // Now you can use 'data' as needed
-				            
-							var data = jsonResponse[0];
-							// For Request Created Date//
-							var cdate = datetotext(data.request.cDate);
-							var cdate_parts = cdate.split("-"); // format -> 14-Monday-AUGUST-2023-16:10:22
-							var day = cdate_parts[0];
-							var dayName = cdate_parts[1];
-							var monthName = cdate_parts[2];
-							var year = cdate_parts[3];
-							var time = cdate_parts[4];
-							/////////////////
-							var status = data.status;
-							var statusListHTML="";
-							for(var i=0; i<jsonResponse.length; i++){
-								var statusdata = jsonResponse[i];
-								var cdate_parts = statusdata.cDate.split(" ");
-								var status = `<div class="col-6 pl-0">Status: <label class="text-success mb-1"><b>${statusdata.status}</b></div><div class="col-6 pr-0 text-right"></label> Date: <label class="text-warning mb-1"><b>${cdate_parts[0]}</b></label></div>`;
-								statusListHTML += `<li>
-					                                    <div class="bullet bg-green"></div>
-					                                    <div class="time">${cdate_parts[1]}</div>
-					                                    <div class="desc">
-					                                        <div class="row p-0 m-0">${status}</div>
-					                                        Comments:
-					                                        <p class="form-control showInputValue">${statusdata.comments}</p>
-					                                    </div>
-					                                </li>`;
-							}
-							
-				        } else {
-							var status = 'Open';
-				            console.log('No data available.');
-				        }
-				        
-				        var statusHTML=`<div class="header bg-theme" style="background-image: url('/assets/images/placeimg_400_200_nature.jpg')">
-                                            <div class="text-center">Request Created</div>
-                                            <div class="color-overlay d-flex align-items-center">
-                                                <div class="col-4 text-center day-number">${day}</div>
-                                                <div class="col-4 text-center date-right">
-                                                    <div class="day-name">${dayName}</div>
-                                                    <div class="month">${monthName} ${year}</div>
-                                                </div>
-                                                <div class="col-4 text-center date-right pr-1">
-                                                    <div class="day-name">${time}</div>
-                                                </div>
-                                            </div>                                
-                                        </div>
-                                        <ul>
-                                            ${statusListHTML}
-                                        </ul>`;
-                  		$("#timelineHTML").html(statusHTML);
-                  		
-					},
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-                  
-				return false;
-			}
-			
-			function datetotext(dateval){
-				var date = new Date(dateval);
-				var day = date.getDate(); // Get the day of the month (e.g., 8)
-				var dayName = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getDay()]; // Get the day name (e.g., Monday)
-				var monthName = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][date.getMonth()]; // Get the month name (e.g., February)
-				var year = date.getFullYear(); // Get the year (e.g., 2018)
-				var time = date.toLocaleTimeString(); // Get the time (e.g., 12:00:00 AM)
-				
-				var formattedDate = day + '-' + dayName + '-' + monthName.toUpperCase() + '-' + year + '-' + time;
-				return formattedDate;
-			}
-		</script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/greencommittee/createmeeting.html b/src/main/resources/templates/modules/greencommittee/createmeeting.html
deleted file mode 100644
index 686b1965..00000000
--- a/src/main/resources/templates/modules/greencommittee/createmeeting.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-
-</style>
-    <body>
-		
-
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="far fa-calendar-plus bg-blue"></i>
-									<div class="d-inline">
-										<h5>Create Meeting</h5>
-										<span>Green Committee</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Green Committee</li>
-										<li class="breadcrumb-item active" aria-current="page">Create Meeting</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<br>
-					
-					<div class="row">
-					
-						<div class="col-md-12">
-							<div class="card" style="margin-top: 0px;">
-								<div class="card-header justify-content-between align-items-center">
-									<h3><b>Add Green Committee Meeting<span th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span></b></h3>
-								</div>
-								<div class="card-body">
-								
-									 <form id="addeventform">
-					                    <div class="form-group">
-					                    	<div class="row" style="row-gap:10px;">
-					                    		<div class="col-sm-12 col-md-6">
-							                        <label class="form-label" for="name">Meeting Name<span
-													class="text-danger">*</span></label> <input type="text"
-													class="form-control" value="green committee meeting"
-													id="eventname"  required readonly="readonly">
-					                    		</div>
-					                    	
-					                            <div class="col-sm-12 col-md-6">
-							                        <label class="form-label" for="eventdate">Select Date<span
-													class="text-danger">*</span></label> <input type="DATE"
-													class="form-control" id="eventdate" onclick="this.showPicker()" required>
-					                    		</div>
-					                    
-					                    
-								           <!-- Attachment -->
-											<div class="col-sm-12">
-												<label for="fileInput" class="form-label" >Attachment:<span class="text-danger">*</span></label>
-					                     	    <input type="file" class="form-control" id="fileInput" required>			
-					                     	    <small id="fileError" class="text-danger" style="display: none;">Only JPEG, JPG, or PDF files are allowed.</small>
-					                     	    
-											</div>
-
-
-					                    	</div>
-					                    </div>
-
-
-					                    <div class="form-group text-center">
-					                        <button type="submit" class="btn btn-primary " id="createdBtn">Create Meeting</button>
-					                        <button type="reset" class="btn btn-secondary ml-2" onclick="resetForm()">Reset</button>
-					                    </div>
-					                </form>
-
-								
-								</div>
-
-							</div>
-						</div>
-
-                      </div>
-                        
-                        
-                     </div>
-                </div>
-                
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-               
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-				</div>
-				
-		</div>
-	
-	          
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-       
-        
-        <script type="text/javascript">
-
-        function resetForm() {
-            document.getElementById('addeventform').reset(); // Built-in reset functionality
-        }
-        
-        //disabled the past dates
-        document.addEventListener("DOMContentLoaded", function () {
-            var today = new Date().toISOString().split('T')[0];
-            document.getElementById("eventdate").setAttribute("min", today);
-        });
-        
-        
-        
-    	document.getElementById('fileInput').addEventListener('change', function (event) {
-    	    var fileInput = event.target;
-    	    var filePath = fileInput.value;
-    	    var allowedExtensions = /(\.jpeg|\.jpg|\.pdf)$/i;
-    	
-    	    if (!allowedExtensions.exec(filePath)) {
-    	        document.getElementById('fileError').style.display = 'block'; // Show error message
-    	        fileInput.value = ''; // Clear the input
-    	    } else {
-    	        document.getElementById('fileError').style.display = 'none'; // Hide error message
-    	    }
-    	});
-
-    	//Maximum file size (10 MB)
-    	const MAX_FILE_SIZE = 10 * 1024 * 1024; // 10MB in bytes
-
-    	// Apply to all file inputs inside the form
-    	$("#addeventform input[type='file']").on("change", function () {
-    	    const fileInput = this;
-
-    	    if (fileInput.files.length > 0) {
-    	        let file = fileInput.files[0];
-
-    	        if (file.size > MAX_FILE_SIZE) {
-
-    	            Swal.fire({
-    	                icon: "error",
-    	                title: "File too large!",
-    	                text: "Maximum allowed file size is 10 MB.",
-    	            });
-
-    	            // Clear file input
-    	            $(fileInput).val('');
-    	        }
-    	    }
-    	});
-    	
-    	
-    	$(document).ready(function () {
-            $('#addeventform').on('submit', function (e) {
-                e.preventDefault();
-                
-                $('#createdBtn').prop('disabled', true).text('Creating...');
-    	        
-    	        $('#pageLoader').show();
-
-                var eventName = $('#eventname').val().trim();
-                var eventDate = $('#eventdate').val();
-                var file = $('#fileInput')[0].files[0];
-                let userId = document.getElementById('userIdSpan').textContent;
-
-                if (!eventName || !eventDate || !file) {
-                	$('#pageLoader').hide();
-                	 $('#createdBtn').prop('disabled', false).text('Create Meeting');
-                    Swal.fire('warning', 'All fields are required.', 'info');                  
-                    return;
-                }
-
-                var formData = new FormData();
-                
-                formData.append("eventName", eventName);
-                formData.append("eventDate", eventDate);
-                formData.append("file", file);
-                formData.append("cby", userId);
-                console.log("formData",formData);
-
-                $.ajax({
-                    url: '/gcc/api/greencommittee/createmeeting/savemeeting',
-                    type: 'POST',
-                    data: formData,
-                    processData: false,
-                    contentType: false,
-                    success: function (response) {
-                    	$('#pageLoader').hide();
-                        if (response.status) {
-                        	Swal.fire({
-    	                        icon: 'success',
-    	                        title: 'Success',
-    	                        text: response.description ,
-    	                        allowOutsideClick: false, 
-    		                    allowEscapeKey: false,
-    		                    allowEnterKey: false, 
-    		                    showConfirmButton: true
-    	                    }).then((result) => {
-    		                    if (result.isConfirmed) {		                    	
-    		                    	location.reload();		                    			                    	
-    		                    }
-    		                });                       
-                        } else {
-                        	$('#pageLoader').hide();
-                        	 Swal.fire({
-    		                        icon: 'error',
-    		                        title: 'Save Failed',
-    		                        text: response.description || 'Something went wrong!'
-    		                    });
-                        }
-                        $('#createdBtn').prop('disabled', false).text('Create Meeting');
-                    },
-                    error: function () {
-                    	$('#pageLoader').hide();
-                    	Swal.fire({
-    	                    icon: 'error',
-    	                    title: 'Submission Error',
-    	                    text: 'Something went wrong while submitting the form.'
-    	                });
-                    	$('#createdBtn').prop('disabled', false).text('Create Meeting');
-                    }
-                });
-            });
-        });
-		
-        </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/greencommittee/dashboard.html b/src/main/resources/templates/modules/greencommittee/dashboard.html
deleted file mode 100644
index 6a984389..00000000
--- a/src/main/resources/templates/modules/greencommittee/dashboard.html
+++ /dev/null
@@ -1,859 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	/* Thumbnail styling */
-	.complaint-thumb {
-		width: 110px;
-		height: 110px;
-		object-fit: cover;
-		margin: 5px;
-		cursor: pointer;
-		transition: transform 0.2s ease-in-out, box-shadow 0.2s;
-	}
-
-	.complaint-thumb:hover {
-		transform: scale(1.05);
-		box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
-	}
-
-	/* Image grid alignment */
-	.image-grid {
-		gap: 8px;
-	}
-
-	#pendingModal .modal-body {
-		min-height: 60vh;
-		max-height: 70vh;
-		overflow-y: auto;
-	}
-</style>
-
-<body>
-
-
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="far fa-calendar-plus bg-blue"></i>
-									<div class="d-inline">
-										<h5>Dashboard</h5>
-										<span>Green Committee</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item" aria-current="page">Green Committee</li>
-										<li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<br>
-
-					<div class="row mt-1">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-body">
-									<div class="row">
-										<div class="col-sm-4">
-											<label for="startDate" style="font-size: medium;">From Date:</label>
-											<input type="date" id="startDate" class="form-control"
-												onclick="this.showPicker()">
-										</div>
-										<div class="col-sm-4">
-											<label for="endDate" style="font-size: medium;">To Date:</label>
-											<input type="date" id="endDate" class="form-control"
-												onclick="this.showPicker()">
-										</div>
-
-									</div>
-									<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button onclick="loadZoneReport()"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn" name="reset"
-												type="reset">Reset</button>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-
-
-					<div class="row mt-1">
-
-						<div class="col-12">
-							<div class="card">
-								<div class="card-body">
-									<div class="page-header-title">
-										<h5 style="margin: 0;font-weight: bold;">Zone-wise Abstract Data</h5>
-										<hr>
-									</div>
-									<table id="ZoneDatatable"
-										class="table table-striped table-bordered table-hover dataTable" role="grid">
-										<thead class="thead-dark">
-											<tr role="row">
-												<th rowspan="2" class="text-center">Zones</th>
-												<th rowspan="2" class="text-center">Total Request</th>
-												<th colspan="3" class="text-center">Inspection</th>
-												<th rowspan="2" class="text-center">Committee Pending</th>
-												<th rowspan="2" class="text-center">Withdraw</th>
-												<th rowspan="2" class="text-center">Completed</th>
-											</tr>
-											<tr>
-												<th class="text-center">NGO Pending</th>
-												<th class="text-center">GCC Pending</th>
-												<th class="text-center">TNFD Pending</th>
-											</tr>
-										</thead>
-										<tbody>
-
-										</tbody>
-										<tfoot>
-											<tr class="font-weight-bold bg-light">
-												<th class="text-center">TOTAL</th>
-												<th class="text-center"></th>
-												<th class="text-center"></th>
-												<th class="text-center"></th>
-												<th class="text-center"></th>
-												<th class="text-center"></th>
-												<th class="text-center"></th>
-												<th class="text-center"></th>
-											</tr>
-										</tfoot>
-									</table>
-								</div>
-							</div>
-						</div>
-					</div>
-
-
-				</div>
-			</div>
-
-
-
-			<div class="modal fade" id="zoneDetailsModal" tabindex="-1" aria-labelledby="zoneDetailsLabel"
-				aria-hidden="true" data-bs-keyboard="false" data-bs-backdrop="static">
-				<div class="modal-dialog modal-xl">
-					<div class="modal-content">
-						<div class="modal-header">
-							<h5 class="modal-title" id="zoneModalTitle">Zone Details</h5>
-							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-								<span aria-hidden="true">&times;</span>
-							</button>
-						</div>
-						<div class="modal-body">
-
-							<table id="WardDatatable" class="table table-striped table-bordered display nowrap w-100">
-								<thead class="thead-dark">
-									<tr role="row">
-										<th rowspan="2" class="text-center">Zones</th>
-										<th rowspan="2" class="text-center">Total Request</th>
-										<th colspan="3" class="text-center">Inspection</th>
-										<th rowspan="2" class="text-center">Committee Pending</th>
-										<th rowspan="2" class="text-center">Withdraw</th>
-										<th rowspan="2" class="text-center">Completed</th>
-									</tr>
-									<tr>
-										<th class="text-center">NGO Pending</th>
-										<th class="text-center">GCC Pending</th>
-										<th class="text-center">TNFD Pending</th>
-									</tr>
-								</thead>
-								<tbody>
-
-
-								</tbody>
-								<tfoot>
-									<tr class="font-weight-bold bg-light">
-										<th class="text-center">TOTAL</th>
-										<th class="text-center"></th>
-										<th class="text-center"></th>
-										<th class="text-center"></th>
-										<th class="text-center"></th>
-										<th class="text-center"></th>
-										<th class="text-center"></th>
-										<th class="text-center"></th>
-									</tr>
-								</tfoot>
-							</table>
-
-						</div>
-					</div>
-				</div>
-			</div>
-
-
-			<div class="modal fade" id="pendingModal" tabindex="-1" aria-labelledby="DetailsLabel" aria-hidden="true"
-				data-bs-keyboard="false" data-bs-backdrop="static">
-				<div class="modal-dialog modal-xl">
-					<div class="modal-content">
-						<div class="modal-header">
-							<h5 id="pendingModalTitle"></h5>
-							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-								<span aria-hidden="true">&times;</span>
-							</button>
-						</div>
-						<div class="modal-body" id="pendingModalBody"></div>
-					</div>
-				</div>
-			</div>
-
-			<div class="modal fade" id="imagePreviewModal" tabindex="-1">
-				<div class="modal-dialog modal-dialog-centered modal-lg">
-					<div class="modal-content">
-						<div class="modal-body text-center p-2">
-							<img id="previewImage" src="" class="img-fluid rounded">
-						</div>
-					</div>
-				</div>
-			</div>
-
-
-			<div id="pageLoader"
-				style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				<div style="position: relative; top: 50%; transform: translateY(-50%);">
-					<div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-						<span class="sr-only">Loading...</span>
-					</div>
-					<!-- Add the 'Please wait' text below the spinner -->
-					<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-
-	</div>
-
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-
-
-	<script type="text/javascript">
-		let CURRENT_ZONE = null;
-
-		function openImagePreview(src) {
-			$('#previewImage').attr('src', src);
-			$('#imagePreviewModal').modal('show');
-		}
-
-		$(document).ready(function () {
-
-			var table = $('#ZoneDatatable').DataTable({
-				dom: 'Bfrtip',
-				columnDefs: [
-					{ targets: 'no-sort', orderable: false }
-				],
-				lengthMenu: [
-					[50, 100, 200, 500, -1],
-					['50 rows', '100 rows', '200 rows', 'Show all']
-				],
-				scrollY: '80vh',
-				scrollX: true,
-				buttons: [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'Excel',
-						className: 'btn btn-secondary',
-						id: 'excelBtn'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn'
-					}
-				],
-				fixedHeader: false,
-				autoWidth: false,
-				responsive: false,
-				searching: false,
-				select: false,
-				processing: false
-			});
-
-			// Set today's date as max
-			const today = new Date().toISOString().split('T')[0];
-			$('#startDate, #endDate').attr('max', today);
-
-			// When start date changes → set min for end date
-			$('#startDate').on('change', function () {
-				const startDate = $(this).val();
-
-				$('#endDate').attr('min', startDate);
-
-				// If endDate already selected but invalid → clear it
-				if ($('#endDate').val() && $('#endDate').val() < startDate) {
-					$('#endDate').val('');
-				}
-			});
-
-			// When end date changes → validate against start date
-			$('#endDate').on('change', function () {
-				const startDate = $('#startDate').val();
-				const endDate = $(this).val();
-
-				if (startDate && endDate < startDate) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Invalid Date Range',
-						text: 'End date cannot be before start date'
-					});
-					$(this).val('');
-				}
-			});
-
-			loadZoneReport();
-
-			$('#zoneDetailsModal').on('shown.bs.modal', function () {
-				if ($.fn.DataTable.isDataTable('#WardDatatable')) {
-					let questionDatatable = $('#WardDatatable').DataTable();
-					questionDatatable.columns.adjust().draw();
-				}
-			});
-
-		});
-
-		function openZoneModal(zoneCode) {
-			CURRENT_ZONE = zoneCode;
-
-			//console.log("Opening modal for zone:", zoneCode);
-			const startDate = $('#startDate').val(); // yyyy-mm-dd or ""
-			const endDate = $('#endDate').val();
-
-			$('#pageLoader').show();
-
-			// Set data in modal (example)
-			$('#zoneModalTitle').text('Zone ' + zoneCode + ' Details');
-
-
-			$.ajax({
-				url: '/gcc/api/greencommittee/report/getWardDetailsByZone',
-				method: 'GET',
-				data: {
-					zone: zoneCode,
-					startDate: startDate,
-					endDate: endDate
-				},
-				success: function (response) {
-
-					var res = Array.isArray(response) ? response[0] : response;
-					//console.log("Response:", res);
-
-					$('#pageLoader').hide();
-
-					if (res.status === "Success") {
-
-						if (Array.isArray(res.data) && res.data.length > 0) {
-							// console.log("Details Array:", response);
-
-
-							let table = $('#WardDatatable').DataTable({
-								destroy: true,
-								autoWidth: true,
-								info: true,
-								data: res.data, // using response directly
-								columns: [
-									{ data: 'ward_name', className: 'text-center' },
-									{ data: 'total_requests', className: 'text-center' },
-
-									{
-										data: 'ngo_pending',
-										className: 'text-center',
-										render: (d, t, r) => renderPendingCell(d, r, 'NGO', 'WARD')
-									},
-									{
-										data: 'gcc_pending',
-										className: 'text-center',
-										render: (d, t, r) => renderPendingCell(d, r, 'GCC', 'WARD')
-									},
-									{
-										data: 'tnfd_pending',
-										className: 'text-center',
-										render: (d, t, r) => renderPendingCell(d, r, 'TNFD', 'WARD')
-									},
-									{
-										data: 'committee_pending',
-										className: 'text-center'
-									},
-									{
-										data: 'withdrawn',
-										className: 'text-center',
-										render: (d, t, r) => renderPendingCell(d, r, 'WITHDRAW', 'WARD')
-									},
-									{ data: 'completed', className: 'text-center' }
-								],
-								footerCallback: footerSumCallback,
-								dom: 'Bfrtip',
-								lengthMenu: [
-									[50, 100, 200, 500, -1],
-									['50 rows', '100 rows', '200 rows', 'Show all']
-								],
-								buttons: [
-									{
-										extend: 'pageLength',
-										className: 'btn btn-warning'
-									},
-									{
-										title: 'Data export',
-										extend: 'copyHtml5',
-										text: 'Copy',
-										className: 'btn btn-secondary',
-										id: 'copyBtn'
-									},
-									{
-										extend: 'excelHtml5',
-										text: 'Excel',
-										className: 'btn btn-secondary',
-										id: 'excelBtn'
-									},
-									{
-										extend: 'csvHtml5',
-										text: 'CSV',
-										className: 'btn btn-secondary',
-										id: 'csvBtn'
-									},
-									{
-										extend: 'pdfHtml5',
-										text: 'PDF',
-										className: 'btn btn-secondary',
-										id: 'pdfBtn'
-									}
-								],
-								scrollY: '400px',
-								scrollX: true,
-								responsive: false,
-								searching: false,
-								ordering: false
-
-
-							});
-
-
-
-							$('#zoneDetailsModal').modal('show');
-						}
-						else if (Array.isArray(res.data) && res.data.length === 0) {
-							$('#pageLoader').hide();
-							//alert("No data available.");
-
-							Swal.fire({
-								icon: 'info',
-								title: 'No Data',
-								text: 'No data available.',
-								showConfirmButton: true,
-								timer: 3000
-							});
-						}
-						else {
-							$('#pageLoader').hide();
-							//alert("Error: " + response.message);
-							Swal.fire({
-								icon: 'error',
-								title: 'Error',
-								text: res.message,
-								showConfirmButton: true,
-								timer: 3000
-							});
-						}
-					}
-					else {
-						$('#pageLoader').hide();
-						//alert("Error: " + response.message);
-						Swal.fire({
-							icon: 'error',
-							title: 'Error',
-							text: res.message,
-							showConfirmButton: true,
-							timer: 3000
-						});
-
-
-
-					}
-
-				},
-				error: function (xhr, status, error) {
-					$('#pageLoader').hide();
-					//alert("Request failed: " + error);
-
-					Swal.fire({
-						icon: 'error',
-						title: 'Error',
-						text: error,
-						showConfirmButton: true,
-						timer: 3000
-					});
-
-				}
-			});
-
-		}
-
-		document.getElementById('resetBtn').addEventListener('click', function () {
-			event.preventDefault();
-
-			location.reload();
-
-		});
-		function loadZoneReport() {
-
-			const startDate = $('#startDate').val();
-			const endDate = $('#endDate').val();
-
-			$('#pageLoader').show();
-			$.ajax({
-				url: '/gcc/api/greencommittee/report/getabscount',
-				method: 'GET',
-				data: {
-					startDate: startDate,
-					endDate: endDate
-				},
-				success: function (response) {
-
-					// Safely extract data whether it's an array or an object
-					var res = Array.isArray(response) ? response[0] : response;
-					//console.log("Response:", res);
-
-					$('#pageLoader').hide();
-
-					if (res.status === "Success") {
-
-						if (Array.isArray(res.data) && res.data.length > 0) {
-							//console.log("Details Array:", response);
-
-							let table = $('#ZoneDatatable').DataTable({
-								destroy: true,
-								info: true,
-								paging: true,
-								data: res.data, // using response directly
-								columns: [
-									{
-										data: 'zone_name',
-										className: 'text-center',
-										render: d => `<a href="javascript:void(0)" onclick="openZoneModal('${d}')" class="text-primary">${d}</a>`
-									},
-									{ data: 'total_requests', className: 'text-center' },
-
-									{
-										data: 'ngo_pending',
-										className: 'text-center',
-										render: (d, t, r) => renderPendingCell(d, r, 'NGO', 'ZONE')
-									},
-									{
-										data: 'gcc_pending',
-										className: 'text-center',
-										render: (d, t, r) => renderPendingCell(d, r, 'GCC', 'ZONE')
-									},
-									{
-										data: 'tnfd_pending',
-										className: 'text-center',
-										render: (d, t, r) => renderPendingCell(d, r, 'TNFD', 'ZONE')
-									},
-									{
-										data: 'committee_pending',
-										className: 'text-center'
-									},
-									{
-										data: 'withdrawn',
-										className: 'text-center',
-										render: (d, t, r) => renderPendingCell(d, r, 'WITHDRAW', 'ZONE')
-									},
-									{ data: 'completed', className: 'text-center' }
-								],
-								dom: 'Bfrtip',
-								lengthMenu: [
-									[50, 100, 200, 500, -1],
-									['50 rows', '100 rows', '200 rows', 'Show all']
-								],
-								buttons: [
-									{
-										extend: 'pageLength',
-										className: 'btn btn-warning'
-									},
-									{
-										title: 'Data export',
-										extend: 'copyHtml5',
-										text: 'Copy',
-										className: 'btn btn-secondary',
-										id: 'copyBtn'
-									},
-									{
-										extend: 'excelHtml5',
-										text: 'Excel',
-										className: 'btn btn-secondary',
-										id: 'excelBtn'
-									},
-									{
-										extend: 'csvHtml5',
-										text: 'CSV',
-										className: 'btn btn-secondary',
-										id: 'csvBtn'
-									},
-									{
-										extend: 'pdfHtml5',
-										text: 'PDF',
-										className: 'btn btn-secondary',
-										id: 'pdfBtn'
-									}
-								],
-								footerCallback: footerSumCallback,
-								scrollY: 'auto',
-								scrollX: true,
-								fixedHeader: false,
-								autoWidth: false,
-								responsive: false,
-								searching: false,
-								select: false,
-								processing: false
-							});
-
-						}
-
-						else if (Array.isArray(res.data) && res.data.length === 0) {
-							$('#pageLoader').hide();
-							//alert("No data available.");
-
-							Swal.fire({
-								icon: 'info',
-								title: 'No Data',
-								text: 'No data available.',
-								showConfirmButton: true,
-								timer: 3000
-							});
-
-						}
-
-						else {
-							$('#pageLoader').hide();
-							//alert("Error: " + response.message);
-							Swal.fire({
-								icon: 'error',
-								title: 'Error',
-								text: 'Error',
-								showConfirmButton: true,
-								timer: 3000
-							});
-
-						}
-
-					}
-
-					else {
-						$('#pageLoader').hide();
-						//alert("Error: " + response.message);
-						Swal.fire({
-							icon: 'error',
-							title: 'Error',
-							text: res.message,
-							showConfirmButton: true,
-							timer: 3000
-						});
-
-
-
-					}
-				},
-				error: function (xhr, status, error) {
-					$('#pageLoader').hide();
-					// alert("Request failed: " + error);
-					Swal.fire({
-						icon: 'error',
-						title: 'Error',
-						text: error,
-						showConfirmButton: true,
-						timer: 3000
-					});
-
-
-
-				}
-			});
-
-		}
-		function footerSumCallback(row, data) {
-			let api = this.api();
-
-			const sum = idx =>
-				api.column(idx).data()
-					.reduce((a, b) => Number(a) + Number(b || 0), 0);
-
-			for (let i = 1; i <= 7; i++) {
-				$(api.column(i).footer()).html(sum(i));
-			}
-		}
-
-
-		function openPendingModal(zone, ward, type, startDate, endDate, level) {
-
-			//console.log("data="+zone+","+ward+","+startDate+","+endDate);
-
-			$('#pendingModal').modal('show');
-			$('#pendingModalTitle').text(
-				`${type} Pending - Zone ${zone}${ward ? ', Ward ' + ward : ''}`
-			);
-
-			$('#pageLoader').show();
-
-			$.ajax({
-				url: '/gcc/api/greencommittee/report/getPendingDetails',
-				method: 'GET',
-				data: {
-					zone: zone,
-					ward: ward || null,
-					type: type,
-					startDate: startDate || null,
-					endDate: endDate || null
-				},
-				success: function (res) {
-					$('#pageLoader').hide();
-
-					if (res.status === 'Success' && res.data.length > 0) {
-						renderComplaintCards(res.data);
-					} else {
-						$('#pendingModalBody').html(
-							`<p class="text-center text-muted">No complaints found</p>`
-						);
-					}
-				},
-				error: function () {
-					$('#pageLoader').hide();
-					Swal.fire('Error', 'Failed to load details', 'error');
-				}
-			});
-		}
-
-
-		function renderComplaintCards(data) {
-
-			let html = '';
-
-			data.forEach(item => {
-
-				// ✅ Name fallback logic
-				const displayName =
-					item.p_name && item.p_name.trim() !== ''
-						? item.p_name
-						: [item.dept_name, item.designation].filter(Boolean).join(' - ') || '-';
-
-				html += `
-    	        <div class="card mb-3 shadow-sm">
-    	            <div class="card-header text-white font-weight-bold" style="background-color:#404e67">
-    	                ${item.ref_id} — ${item.r_Cdate}
-    	            </div>
-
-    	            <div class="card-body">
-    	                <div class="row align-items-start">
-    	                    
-    	                    <!-- LEFT -->
-    	                    <div class="col-md-8">
-    	                        <p><strong>Name:</strong> ${displayName}</p>
-    	                        <p><strong>Mobile:</strong> ${item.ph_no}</p>
-    	                        <p>
-    	                        <strong>Zone:</strong> ${item.zone}
-    	                        <span class="mx-3">|</span>
-    	                        <strong>Ward:</strong> ${item.ward}
-    	                        <span class="mx-3">|</span>
-    	                        <strong>Total Trees:</strong> ${item.total_trees}
-    	                    	</p>
-    	                        <p><strong>Address:</strong> ${item.address}</p>
-    	                        <p><strong>Remarks:</strong> ${item.remarks}</p>
-    	                        <p><strong>Complaints:</strong> ${item.comp_details}</p>
-    	                    </div>
-
-    	                    <!-- RIGHT (Images) -->
-    	                    <div class="col-md-4">
-    	                        <div class="d-flex flex-wrap image-grid">
-    	                            ${item.image_paths.map(img => `
-    	                                <img
-    	                                    src="${img.img_path}"
-    	                                    class="img-thumbnail complaint-thumb"
-    	                                    onclick="openImagePreview('${img.img_path}')"
-    	                                >
-    	                            `).join('')}
-    	                        </div>
-    	                    </div>
-
-    	                </div>
-    	            </div>
-    	        </div>`;
-			});
-
-			$('#pendingModalBody').html(html);
-		}
-
-
-		function renderPendingCell(value, row, type, level) {
-			if (!value || value === 0) {
-				return `<span class="text-muted">${value}</span>`;
-			}
-
-			const zone = row.zone_name || CURRENT_ZONE;
-			const ward = row.ward_name || '';
-			const startDate = $('#startDate').val() || '';
-			const endDate = $('#endDate').val() || '';
-
-			return `
-    	        <a href="javascript:void(0)"
-    	           class="text-primary font-weight-bold"
-    	           onclick="openPendingModal(
-    	               '${zone}',
-    	               '${ward}',
-    	               '${type}',
-    	               '${startDate}',
-    	               '${endDate}',
-    	               '${level}'
-    	           )">
-    	           ${value}
-    	        </a>`;
-		}
-	</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/greencommittee/monitoring.html b/src/main/resources/templates/modules/greencommittee/monitoring.html
deleted file mode 100644
index 4972af2a..00000000
--- a/src/main/resources/templates/modules/greencommittee/monitoring.html
+++ /dev/null
@@ -1,658 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.thumb-img {
-    width: 90px;
-    height: 70px;
-    object-fit: cover;
-    cursor: pointer;
-    border: 2px solid #ddd;
-    margin-right: 5px;
-}
-.thumb-img:hover {
-    border-color: #007bff;
-}
-#viewModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-    
-/* #imageViewModal .modal-body {
-        max-height: 60vh; 
-        overflow-y: auto;  
-    } */
-    
-    .full-image-modal {
-    width: 50%;
-    height: 70vh;          /* fixed height */
-    object-fit: cover;     /* fills modal without distortion */
-    object-position: center;
-    background-color: #000;  /* if image is smaller */
-}
-</style>
-    <body>
-		
-
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="far fa-calendar-plus bg-blue"></i>
-									<div class="d-inline">
-										<h5>Task Force Monitoring</h5>
-										<span>Green Committee</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Green Committee</li>
-										<li class="breadcrumb-item active" aria-current="page">Task Force Monitoring</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<br>
-					
-				<div class="row">
-					
-					<div class="col-md-12" >
-						    <div class="card">
-						        <div class="card-block">
-						        <div class="row">
-								    <div class="form-group col-sm-8">
-								        <label for="dropdownevent">Select Meeting
-								        <span class="text-danger">*</span></label>
-								        <select id="dropdownevent" class="form-control">							          
-								        </select>
-								    </div>	
-								    
-								    <div class="form-group col-sm-4">
-								        <label for="zonedropdown">Select Zone
-								        </label>
-								        <select id="zonedropdown" class="form-control">	
-								        	<option value="">Select Zone </option>						          
-								        </select>
-								    </div>
-						        </div>
-						        <div class="page-header-title" >
-									<h5 style="margin: 0;font-weight: bold;">Green Committee Task Force Monitoring</h5><span th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span><hr>
-							   </div> 
-						        
-						            <div>
-						                <table id="RequestListDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-						                    <thead class="thead-dark">
-						                        <tr role="row">
-						                            <th class="text-center">S.No</th>				                                                                            
-						                            <th class="text-center">Application No</th>
-						                            <th class="text-center">Zone</th>
-						                            <th class="text-center">Ward</th>
-						                            <th class="text-center">Type</th>                           
-						                            <th class="text-center">Name</th>
-						                            <th class="text-center">Mobile</th>
-						                            <th class="text-center">Address</th>
-						                            <th class="text-center">Remarks</th>
-						                            <th class="text-center">No of trees</th> 
-						                            <th class="text-center">Details of Complaints</th>                                                                                              
-						                            <th class="text-center no-sort">Action</th> 
-						                        </tr>
-						                    </thead>
-						                    
-						                    <tbody>
-		
-											</tbody>
-						                    
-						                    
-
-						                    
-						                </table>
-						            </div>
-						        </div>
-						    </div>
-						</div>
-					
-				</div>
-                        
-                        
-                     </div>
-                </div>
-                
-                
-                <!--View Modal -->
-				<div class="modal fade" id="viewModal" tabindex="-1">
-				  <div class="modal-dialog modal-xl">
-				    <div class="modal-content">
-				      <div class="modal-header">
-				        <h5 class="modal-title" id="viewModalLabel">Request Details</h5>
-				        <button type="button" class="close" data-dismiss="modal">
-				          <span>&times;</span>
-				        </button>
-				      </div>
-				      <div class="modal-body" id="modalBodyContent"></div>
-				      <div class="modal-footer">
-				        <button class="btn btn-secondary" data-dismiss="modal">Close</button>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-				
-				<!--Image Modal -->
-				<div class="modal fade" id="imageViewModal" tabindex="-1">
-				  <div class="modal-dialog modal-lg">
-				    <div class="modal-content">
-				      <div class="modal-body text-center p-0">
-				        <img id="fullImagePreview" src="" class="full-image-modal"  />
-				      </div>
-				      <div class="modal-footer">
-				        <button class="btn btn-secondary" data-dismiss="modal">Close</button>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-                
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-               
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-				</div>
-				
-		</div>
-	
-	          
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-       
-        
-        <script type="text/javascript">
-
-        let userId = document.getElementById('userIdSpan').textContent;
-        
-        function openFullImage(src) {
-            $("#fullImagePreview").attr("src", src);
-            $("#imageViewModal").modal("show");
-        }
-
-        $(document).ready(function() {
-        	var table = $('#RequestListDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-        			{ width: "150px", targets: 7 },  
-        			{width: "350px", targets: 8}
-        			],
-                lengthMenu: [
-                	[200, 400, -1],
-                    ['200 rows', '400 rows', 'Show all']
-                ],
-                scrollY: '50vh',               
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: false,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false
-            
-
-            });
-        	
-        	fetchEventDropdown();
-        	fetchZones();
-        	
-			
-        	$('#dropdownevent').on('change', function () {     
-            	
-            	$('#zonedropdown').val("");
-               
-                fetchgreenCommitteeList();
-                       
-            });
-        	
-        	$('#zonedropdown').on('change', function () {                    
-				let miss_meet=$('#dropdownevent').val();
-				
-				if(!miss_meet){
-					Swal.fire("Warning", "Please select an meeting!", "warning");
-					return;
-				}
-				fetchgreenCommitteeList();
-             
-            });
-        		
-        	
-        });
-        
-        
-function fetchgreenCommitteeList(){
-        	                       
-			let selectedevent = $('#dropdownevent').val();
-        	
-        	// Read zone dropdown value
-            let selectedZone = $('#zonedropdown').val();
-        	
-            $('#pageLoader').show();
-            
-            $.ajax({
-                url: '/gcc/api/greencommittee/monitoring/getgreencommitteelist',
-                data: { meetingid: selectedevent,zones:selectedZone },
-                method: 'GET',
-                contentType: 'application/json',
-                success: function (data) {
-        	
-                	$('#pageLoader').hide();
-                    let tableContainer = $('#RequestListDatatable');
-
-                    // Destroy any existing DataTable instance
-                    if ($.fn.DataTable.isDataTable(tableContainer)) {
-                        tableContainer.DataTable().destroy();
-                    }
-                    
-                 // Initialize DataTable
-                    tableContainer.DataTable({
-                        destroy: true,
-                        searching: true,
-                        autoWidth: true,
-                        paging: true,
-                        info: true,
-                        data: data,
-                        columns: [
-                            {
-                                data: null,
-                                render: (data, type, row, meta) => meta.row + 1,
-                                className: 'text-center'
-                            },
-                            { data: 'ref_id', defaultContent: '-', className: 'text-center' },
-                            { data: 'zone', defaultContent: '-', className: 'text-center' },
-                            { data: 'ward', defaultContent: '-', className: 'text-center' },
-                            { data: 'cby', defaultContent: '-', className: 'text-center' },
-                            {
-                                data: null,
-                                render: function (data, type, row) {
-
-                                    // public user
-                                    if (row.cby === "public") {
-                                        return row.p_name ?? "-";
-                                    }
-
-                                    // department user
-                                    if (row.cby === "department") {
-                                        let deptName = row.dept_name ? row.dept_name : "-";
-                                        let desg = row.designation ? row.designation : "";
-                                        return `${deptName} / ${desg}`;
-                                    }
-
-                                    return "-";
-                                },
-                                className: 'text-center'
-                            },
-
-                            { data: 'ph_no', defaultContent: '-', className: 'text-center' },
-                            { data: 'address', defaultContent: '-', className: 'text-center' },
-                            { data: 'remarks', defaultContent: '-', className: 'text-center' },
-                            { data: 'total_trees', defaultContent: '-', className: 'text-center' },
-                            {
-                                data: 'comp_details',
-                                render: function (compList) {
-
-                                    if (!compList || compList.length === 0) return "-";
-
-                                    // Convert array → "name - total, name - total"
-                                    return compList
-                                        .map(item => `${item.nature} - ${item.total_trees}`)
-                                        .join(", ");
-                                },
-                                className: 'text-center'
-                            },
-                            {
-                                data: 'ref_id',
-                                render: function (data, type, row) {
-                                    return `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
-                                },
-                                className: 'text-center'
-                            }
-                        ],
-                        dom: 'Bfrtip',
-                        buttons: [
-                            { extend: 'pageLength', className: 'btn btn-warning' },
-                            { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-                            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-                            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-                            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-                        ],
-                        columnDefs: [
-                			{ width: "150px", targets: 7 },  
-                			{width: "350px", targets: 8}
-                			],
-                        
-                        	lengthMenu: [
-                            	[200, 400, -1],
-                                ['200 rows', '400 rows', 'Show all']
-                            ],
-	      		            
-                        scrollY: '80vh',
-                        scrollX: true,
-                        responsive: false
-                    });
-                 
-                    tableContainer.off('click', '.btn-view');
-                    // Bind view buttons
-                    tableContainer.on('click', '.btn-view', function () {
-                        let id = $(this).data('id');                      
-                        $.ajax({
-                            url: `/gcc/api/greencommittee/monitoring/getdetailsbyrefid?refid=${id}`,
-                            method: 'GET',
-                            success: function (details) {
-                                if (!details) {
-                                    $('#modalBodyContent').html("<p>No data found for this request.</p>");
-                                    $('#viewModal').modal('show');
-                                    return;
-                                }
-                            
-                                renderDetails(details);
-
-                                $('#viewModalLabel').text(`Application Details - ${id}`);
-                                $('#viewModal').modal('show');
-                            },
-                            error: function (xhr) {
-                                console.error("Error fetching detail:", xhr.responseText);
-                                alert("Failed to fetch green committe details.");
-                            }
-                        });
-                    });
-                },
-
-                error: function (xhr, status, error) {
-                	$('#pageLoader').hide();
-                    console.error("Error fetching data:", error);
-                    alert("Failed to load green committe list.");
-                }
-            });
-        }
-        
-function renderDetails(details) {
-
-    let app = details.application;
-    let inspections = details.inspections;
-    let com=details.committee;
-    let reinspections = details.reinspections; 
-    
- // Conditional fields for Petitioner section
-    let petitionerHtml = "";
-
-    if (app.cby === "public") {
-
-        petitionerHtml = `
-            <div class="col-md-6">
-                <p><strong>Petitioner:</strong> ${app.p_name}</p>
-            </div>
-            <div class="col-md-6">
-                <p><strong>Phone:</strong> ${app.ph_no}</p>
-            </div>
-        `;
-
-    } else if (app.cby === "department") {
-
-        petitionerHtml = `
-            <div class="col-md-6">
-                <p><strong>Department:</strong> ${app.dept_name}</p>
-            </div>
-            <div class="col-md-6">
-                <p><strong>Designation:</strong> ${app.designation}</p>
-            </div>
-            <div class="col-md-6">
-                <p><strong>Govt Type:</strong> ${app.govt_type}</p>
-            </div>
-            <div class="col-md-6">
-                <p><strong>Phone:</strong> ${app.ph_no}</p>
-            </div>
-        `;
-    }
-    
-    let reinsHtml = "";
-
-    if (reinspections.length > 0) {
-
-        reinsHtml = `
-            <hr>
-            <h5>Re-Inspection History</h5>
-            <div class="row">
-        `;
-
-        reinspections.forEach(r => {
-            reinsHtml += `
-                <div class="col-md-4">
-                    <div class="card mb-3 shadow-sm">
-                        <div class="card-header bg-secondary text-center">
-                            <strong class="text-white">Re-Inspection</strong>
-                        </div>
-                        <div class="card-body">
-
-                            <p><strong>Meeting:</strong> ${r.event_name || '-'} (${r.event_date || '-'})</p>                                   
-                            <p><strong>Remarks:</strong> ${r.reins_remarks || '-'}</p>
-                            <p><strong>Date:</strong> ${r.reins_date}</p>
-                        </div>
-                    </div>
-                </div>
-            `;
-        });
-
-        reinsHtml += `</div>`;
-    }
-
-
-    // Complaint Chips
-    let complaintChips = app.complaints.map(c =>
-        `<span class="badge badge-info mr-1">${c.nature}: ${c.count}</span>`
-    ).join("");
-    
-    let com_chips=com.com_complaints.map(c =>
-        `<span class="badge badge-success mr-1">${c.nature}: ${c.count}</span>`
-    ).join("");
-
-    // Complaint Images
-    let compImages = app.images.map(img =>
-        `<img src="${img}" class="img-thumbnail thumb-img mb-1" onclick="openFullImage('${img}')">`
-    ).join("");
-
-    // Inspection Cards
-    let inspCards = inspections.map(ins => {
-
-        let recChips = ins.recommendations.map(r =>
-            `<span class="badge badge-warning mr-1">${r.name}: ${r.count}</span>`
-        ).join("");
-
-        let inspThumbs = ins.images.map(i =>
-            `<img src="${i}" class="img-thumbnail thumb-img mb-1" onclick="openFullImage('${i}')">`
-        ).join("");
-
-        return `
-        <div class="col-md-4">
-            <div class="card mb-3 shadow-sm">
-                <div class="card-header text-white text-center" style="background:#404e67">
-                    <strong>${ins.inspection_by}</strong>
-                </div>
-                <div class="card-body">
-                    <p><strong>Inspector:</strong> ${ins.inspector_name}</p>
-                    <p><strong>Date:</strong> ${ins.f_Cdate}</p>
-                    <p><strong>Remarks:</strong> ${ins.remarks}</p>
-
-                    <p><strong>Recommendation:</strong><br>${recChips}</p>
-
-                    <p><strong>Images (${ins.images.length}):</strong><br>${inspThumbs}</p>
-                </div>
-            </div>
-        </div>
-        `;
-    }).join("");
-
-    let content = `
-    <h5>Application Information</h5>
-    <div class="row">
-        <div class="col-md-8">
-        
-        <div class="row">
-        		${petitionerHtml}
-            <div class="col-md-6">
-                <p><strong>Zone/Ward:</strong> ${app.zone} / ${app.ward}</p>
-            </div>
-            <div class="col-md-6">
-                <p><strong>No. of Trees:</strong> ${app.total_trees}</p>
-            </div>
-        </div>    
-            
-            <p><strong>Complaints:</strong> ${complaintChips}</p>
-            <p><strong>Address:</strong> ${app.address}</p>
-            <p><strong>Remarks:</strong> ${app.remarks}</p>
-            <p><strong>Submitted Date:</strong> ${app.r_Cdate}</p>
-        </div>
-        <div class="col-md-4">
-            <p><strong>Images (${app.images.length}):</strong></p>
-            ${compImages}
-        </div>
-    </div>
-
-    ${reinsHtml}
-    
-    <hr>
-    <h5>Inspection Details (GCC / NGO / TNFD)</h5>
-    <div class="row">${inspCards}</div>
-    
-    <hr>
-    
-    <h5>Committee Decision Details</h5>
-    <div class="row">	
-        <div class="col-md-6">
-            <p><strong>Meeting:</strong> ${com.meeting_name} - ${com.meeting_date}</p>
-        </div>
-        <div class="col-md-6">
-        	<p><strong>Date:</strong> ${com.c_Cdate}</p>
-    	</div>
-        <div class="col-md-6">
-            <p><strong>Decision:</strong> ${com_chips}</p>
-        </div>
-        <div class="col-md-6">
-        	<p><strong>Remarks:</strong> ${com.remarks && com.remarks.trim() ? com.remarks : '-'}</p>
-    	</div>
-    </div>    
-
-    
-    
-    `;
-
-    $("#modalBodyContent").html(content);
-}
-        
-        function fetchZones() {
-            $.ajax({
-                url: '/gcc/api/greencommittee/pendinglist/getzones',
-                type: 'GET',
-                dataType: 'json',
-                success: function (data) {
-                    let zoneDropdown = $('#zonedropdown');
-                    zoneDropdown.empty();
-                    zoneDropdown.append('<option value="" >Select Zone</option>');
-
-                    data.forEach(function (res) {
-                         
-                    	zoneDropdown.append(
-                                $('<option></option>')
-                                    .val(res.zone_name)
-                                    .text(`${res.zone_name}`)
-                            );
-                        
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching Zone dropdown:', error);
-                    Swal.fire('Error', 'Unable to load Zones', 'error');
-                }
-            });
-        }
-
-        function fetchEventDropdown() {
-            $.ajax({
-                url: '/gcc/api/greencommittee/pendinglist/dropdown-Event',
-                type: 'GET',
-                dataType: 'json',
-                success: function (data) {
-                    let eventDropdown = $('#dropdownevent');
-                    eventDropdown.empty();
-                    eventDropdown.append('<option value="" >Select an Meeting</option>');
-
-                    data.forEach(function (event) {
-                        if (event.isactive && !event.isdelete) {  
-                            eventDropdown.append(
-                                $('<option></option>')
-                                    .val(event.id)
-                                    .text(`${event.event_name} - ${event.event_date}`)
-                            );
-                        }
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching meeting dropdown:', error);
-                    Swal.fire('Error', 'Unable to load meetings', 'error');
-                }
-            });
-        }
-		
-        </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/greencommittee/pendinglist.html b/src/main/resources/templates/modules/greencommittee/pendinglist.html
deleted file mode 100644
index 88a63260..00000000
--- a/src/main/resources/templates/modules/greencommittee/pendinglist.html
+++ /dev/null
@@ -1,1077 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .thumb-img {
-        width: 90px;
-        height: 70px;
-        object-fit: cover;
-        cursor: pointer;
-        border: 2px solid #ddd;
-        margin-right: 5px;
-    }
-
-    .thumb-img:hover {
-        border-color: #007bff;
-    }
-
-    #viewModal .modal-body {
-        max-height: 70vh;
-        /* Limit the height to 70% of the viewport */
-        overflow-y: auto;
-        /* Enable vertical scrolling */
-    }
-
-    /* #imageViewModal .modal-body {
-        max-height: 60vh; 
-        overflow-y: auto;  
-    } */
-
-    .full-image-modal {
-        width: 50%;
-        height: 70vh;
-        /* fixed height */
-        object-fit: cover;
-        /* fills modal without distortion */
-        object-position: center;
-        background-color: #000;
-        /* if image is smaller */
-    }
-</style>
-
-<body>
-
-
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="far fa-calendar-plus bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Pending Application</h5>
-                                        <span>Green Committee</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">Green Committee</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pending List</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                    <br>
-
-                    <div class="row">
-
-                        <div class="col-md-12">
-                            <div class="card">
-                                <div class="card-block">
-                                    <div class="row">
-                                        <div class="form-group col-sm-8">
-                                            <label for="dropdownevent">Select Meeting
-                                                <span class="text-danger">*</span></label>
-                                            <select id="dropdownevent" class="form-control">
-                                            </select>
-                                        </div>
-
-                                        <div class="form-group col-sm-4">
-                                            <label for="zonedropdown">Select Zone
-                                            </label>
-                                            <select id="zonedropdown" class="form-control">
-                                                <option value="">Select Zone </option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="page-header-title">
-                                        <h5 style="margin: 0;font-weight: bold;">Green Committee Pending List</h5><span
-                                            th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span>
-                                        <hr>
-                                    </div>
-
-                                    <div>
-                                        <table id="RequestListDatatable"
-                                            class="table table-striped table-bordered table-hover dataTable"
-                                            role="grid">
-                                            <thead class="thead-dark">
-                                                <tr role="row">
-                                                    <th class="text-center">S.No</th>
-                                                    <th class="text-center">Application No</th>
-                                                    <th class="text-center">Zone</th>
-                                                    <th class="text-center">Ward</th>
-                                                    <th class="text-center">Type</th>
-                                                    <th class="text-center">Name</th>
-                                                    <th class="text-center">Mobile</th>
-                                                    <th class="text-center">Address</th>
-                                                    <th class="text-center">Remarks</th>
-                                                    <th class="text-center">No of trees</th>
-                                                    <th class="text-center">Details of Complaints</th>
-                                                    <th class="text-center no-sort">Action</th>
-                                                </tr>
-                                            </thead>
-
-                                            <tbody>
-
-                                            </tbody>
-
-
-
-
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-
-
-                </div>
-            </div>
-
-
-            <!--View Modal -->
-            <div class="modal fade" id="viewModal" tabindex="-1">
-                <div class="modal-dialog modal-xl">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title" id="viewModalLabel">Request Details</h5>
-                            <button type="button" class="close" data-dismiss="modal">
-                                <span>&times;</span>
-                            </button>
-                        </div>
-                        <div class="modal-body" id="modalBodyContent"></div>
-                        <div class="modal-footer">
-                            <button class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!--Image Modal -->
-            <div class="modal fade" id="imageViewModal" tabindex="-1">
-                <div class="modal-dialog modal-lg">
-                    <div class="modal-content">
-                        <div class="modal-body text-center p-0">
-                            <img id="fullImagePreview" src="" class="full-image-modal" />
-                        </div>
-                        <div class="modal-footer">
-                            <button class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-
-
-            <div id="pageLoader"
-                style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-                <div style="position: relative; top: 50%; transform: translateY(-50%);">
-                    <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                        <span class="sr-only">Loading...</span>
-                    </div>
-                    <!-- Add the 'Please wait' text below the spinner -->
-                    <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-                </div>
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-
-    </div>
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-
-
-    <script type="text/javascript">
-
-        let userId = document.getElementById('userIdSpan').textContent;
-
-        function openFullImage(src) {
-            $("#fullImagePreview").attr("src", src);
-            $("#imageViewModal").modal("show");
-        }
-
-        $(document).ready(function () {
-            var table = $('#RequestListDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { width: "150px", targets: 7 },
-                    { width: "350px", targets: 8 }
-                ],
-                lengthMenu: [
-                    [200, 400, -1],
-                    ['200 rows', '400 rows', 'Show all']
-                ],
-                scrollY: '50vh',
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: false,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false
-
-
-            });
-
-            fetchEventDropdown();
-            fetchZones();
-
-
-            $('#dropdownevent').on('change', function () {
-
-                $('#zonedropdown').val("");
-
-                fetchgreenCommitteeList();
-
-            });
-
-            $('#zonedropdown').on('change', function () {
-                let miss_meet = $('#dropdownevent').val();
-
-                if (!miss_meet) {
-                    Swal.fire("Warning", "Please select an meeting!", "warning");
-                    return;
-                }
-                fetchgreenCommitteeList();
-
-            });
-
-
-        });
-
-        $(document).on("click", "#btnCommitteeSave", function () {
-
-            const $submitBtn = $(this);  // ONLY this button
-            $submitBtn.prop('disabled', true).text('Saving...');
-
-
-            let refId = $("#selectedRefId").val();
-            let finalTotalTrees = parseInt($("#finaltotaltrees").val());
-            let remarks = $("#committeeRemarks").val();
-            let meetingid = $('#dropdownevent').val();
-
-            // Check if user selected only Re-Inspection (ID = 8)
-            let isReInspection = $(".decision-check[value='8']").is(":checked");
-
-            if (isReInspection) {
-                // Ignore other validations → Call separate AJAX
-                saveReInspection(refId, meetingid, remarks, userId, $submitBtn);
-                return;
-            }
-
-            let selected = [];
-            let hasError = false;
-            let emptyField = null;
-
-            $("#decisionInputs input").each(function () {
-
-                let count = $(this).val().trim();
-                let id = $(this).data("id");
-
-                // If empty count → validation fail
-                if (count === "") {
-                    hasError = true;
-                    emptyField = this; // store input element
-                    return false; // break loop
-                }
-
-                // Add to final data
-                selected.push({
-                    id: id,
-                    count: parseInt(count)
-                });
-            });
-
-            // Validation failed
-            if (hasError) {
-                $submitBtn.prop('disabled', false).text('Save');
-                Swal.fire({
-                    icon: "warning",
-                    title: "Missing Count",
-                    text: "Please enter number of trees for all selected decisions!",
-                });
-
-                // optional highlight
-                $(emptyField).addClass("border-danger");
-
-                setTimeout(() => {
-                    $(emptyField).removeClass("border-danger");
-                }, 2000);
-
-                return; // stop further processing
-            }
-
-            // If selected is empty – user selected nothing
-            if (selected.length === 0) {
-                $submitBtn.prop('disabled', false).text('Save');
-                Swal.fire({
-                    icon: "warning",
-                    title: "No Decision Selected",
-                    text: "Please select at least one committee decision!",
-                });
-                return;
-            }
-
-            let sumCounts = selected.reduce((sum, item) => sum + item.count, 0);
-
-            if (sumCounts !== finalTotalTrees) {
-                $submitBtn.prop('disabled', false).text('Save');
-                Swal.fire({
-                    icon: "warning",
-                    title: "Count Mismatch",
-                    text: `Total entered trees (${sumCounts}) must equal total trees (${finalTotalTrees}).`
-                });
-                return;
-            }
-
-            console.log("Final Submit:",
-                "Ref ID:", refId,
-                "meetingid:", meetingid,
-                "userId:", userId,
-                "Selected decisions:", selected,
-                "Remarks:", remarks
-            );
-
-            // 4️ Example AJAX send
-
-            $.ajax({
-                url: '/gcc/api/greencommittee/pendinglist/savecommittee',
-                method: 'POST',
-                contentType: 'application/json',
-                data: JSON.stringify({
-                    ref_id: refId,
-                    decisions: selected,
-                    remarks: remarks,
-                    userId: userId,
-                    meetingid: meetingid
-                }),
-                success: function (res) {
-                    $submitBtn.prop('disabled', false).text('Save');
-
-                    if (res.status === "success") {
-                        Swal.fire({
-                            icon: 'success',
-                            title: 'Success',
-                            text: res.message,
-                            allowOutsideClick: false,
-                            allowEscapeKey: false,
-                            allowEnterKey: false,
-                            showConfirmButton: true,
-                        }).then((result) => {
-                            if (result.isConfirmed) {
-                                $("#viewModal").modal("hide");
-                                console.log("ok button");
-                                fetchgreenCommitteeList();
-
-                            }
-                        });
-
-                    } else {
-                        // If backend sent error response
-                        Swal.fire({
-                            icon: "error",
-                            title: "Save Failed",
-                            text: res.message || "Something went wrong.",
-                        });
-                    }
-                },
-
-                error: function (xhr) {
-                    $submitBtn.prop('disabled', false).text('Save');
-                    Swal.fire({
-                        icon: "error",
-                        title: "Error Occurred",
-                        text: "Failed to save committee details. Please try again.",
-                    });
-
-                    console.error("Error in saving details:", xhr.responseText);
-                }
-            });
-
-
-        });
-
-        function saveReInspection(refId, meetingid, remarks, userId, $submitBtn) {
-
-            $.ajax({
-                url: "/gcc/api/greencommittee/pendinglist/savereinspection",
-                method: "POST",
-                contentType: "application/json",
-                data: JSON.stringify({
-                    ref_id: refId,
-                    committee_action: 8,
-                    meeting_id: meetingid,
-                    remarks: remarks,
-                    userId: userId
-                }),
-                success: function (res) {
-                    $submitBtn.prop("disabled", false).text("Save");
-
-                    if (res.status === "success") {
-                        Swal.fire({
-                            icon: "success",
-                            title: "Success",
-                            text: res.message,
-                        }).then(() => {
-                            $("#viewModal").modal("hide");
-                            fetchgreenCommitteeList();
-                        });
-
-                    } else {
-                        Swal.fire({
-                            icon: "error",
-                            title: "Save Failed",
-                            text: res.message,
-                        });
-                    }
-                },
-                error: function (xhr) {
-                    $submitBtn.prop("disabled", false).text("Save");
-
-                    Swal.fire({
-                        icon: "error",
-                        title: "Error",
-                        text: "Failed to save re-inspection.",
-                    });
-
-                    console.error(xhr.responseText);
-                }
-            });
-        }
-
-
-        function renderDetails(details) {
-
-            let app = details.application;
-            let inspections = details.inspections;
-            let reinspections = details.reinspections;
-
-            // Conditional fields for Petitioner section
-            let petitionerHtml = "";
-
-            if (app.cby === "public") {
-
-                petitionerHtml = `
-                    <div class="col-md-6">
-                        <p><strong>Petitioner:</strong> ${app.p_name}</p>
-                    </div>
-                    <div class="col-md-6">
-                        <p><strong>Phone:</strong> ${app.ph_no}</p>
-                    </div>
-                `;
-
-            } else if (app.cby === "department") {
-
-                petitionerHtml = `
-                    <div class="col-md-6">
-                        <p><strong>Department:</strong> ${app.dept_name}</p>
-                    </div>
-                    <div class="col-md-6">
-                        <p><strong>Designation:</strong> ${app.designation}</p>
-                    </div>
-                    <div class="col-md-6">
-                        <p><strong>Govt Type:</strong> ${app.govt_type}</p>
-                    </div>
-                    <div class="col-md-6">
-                        <p><strong>Phone:</strong> ${app.ph_no}</p>
-                    </div>
-                `;
-            }
-
-            let reinsHtml = "";
-
-            if (reinspections.length > 0) {
-
-                reinsHtml = `
-                    <hr>
-                    <h5>Re-Inspection History</h5>
-                    <div class="row">
-                `;
-
-                reinspections.forEach(r => {
-                    reinsHtml += `
-                        <div class="col-md-4">
-                            <div class="card mb-3 shadow-sm">
-                                <div class="card-header bg-secondary text-center">
-                                    <strong class="text-white">Re-Inspection</strong>
-                                </div>
-                                <div class="card-body">
-
-                                    <p><strong>Meeting:</strong> ${r.event_name || '-'} (${r.event_date || '-'})</p>                                   
-                                    <p><strong>Remarks:</strong> ${r.reins_remarks || '-'}</p>
-                                    <p><strong>Date:</strong> ${r.reins_date}</p>
-                                </div>
-                            </div>
-                        </div>
-                    `;
-                });
-
-                reinsHtml += `</div>`;
-            }
-
-
-
-            // Complaint Chips
-            let complaintChips = app.complaints.map(c =>
-                `<span class="badge badge-info mr-1">${c.nature}: ${c.count}</span>`
-            ).join("");
-
-            // Complaint Images
-            let compImages = app.images.map(img =>
-                `<img src="${img}" class="img-thumbnail thumb-img mb-1" onclick="openFullImage('${img}')">`
-            ).join("");
-
-            // Inspection Cards
-            let inspCards = inspections.map(ins => {
-
-                // Pending card
-                if (ins.status === "PENDING") {
-                    return `
-        <div class="col-md-4">
-            <div class="card mb-3 shadow-sm">
-                <div class="card-header text-white text-center" style="background:#404e67">
-                    <strong>${ins.inspection_by}</strong>
-                </div>
-                <div class="card-body text-center">
-                    <h5 class="text-warning">
-                        <i class="fa fa-clock-o"></i> Pending
-                    </h5>
-                    <p class="text-muted mb-0">
-                        Inspection is yet to be completed.
-                    </p>
-                </div>
-            </div>
-        </div>
-        `;
-                }
-
-                // Completed card
-                let recChips = (ins.recommendations || []).map(r =>
-                    `<span class="badge badge-warning mr-1 mb-2">
-            ${r.name}: ${r.count} (${r.treename})
-        </span>`
-                ).join("");
-
-                let inspThumbs = (ins.images || []).map(i =>
-                    `<img src="${i}" class="img-thumbnail thumb-img mb-1"
-              onclick="openFullImage('${i}')">`
-                ).join("");
-
-                return `
-    <div class="col-md-4">
-        <div class="card mb-3 shadow-sm">
-            <div class="card-header text-white text-center" style="background:#404e67">
-                <strong>${ins.inspection_by}</strong>
-            </div>
-            <div class="card-body">
-                <p><strong>Inspector:</strong> ${ins.inspector_name}</p>
-                <p><strong>Date:</strong> ${ins.f_Cdate}</p>
-                <p><strong>Remarks:</strong> ${ins.remarks}</p>
-
-                <p><strong>Recommendation:</strong><br>${recChips}</p>
-
-                <p><strong>Images (${ins.images.length}):</strong><br>${inspThumbs}</p>
-            </div>
-        </div>
-    </div>
-    `;
-            }).join("");
-            /*let inspCards = inspections.map(ins => {
-
-                let recChips = ins.recommendations.map(r =>
-                    `<span class="badge badge-warning mr-1 mb-2">${r.name}: ${r.count} (${r.treename})</span>`
-                ).join("");
-
-                let inspThumbs = ins.images.map(i =>
-                    `<img src="${i}" class="img-thumbnail thumb-img mb-1" onclick="openFullImage('${i}')">`
-                ).join("");
-
-                return `
-                <div class="col-md-4">
-                    <div class="card mb-3 shadow-sm">
-                        <div class="card-header text-white text-center" style="background:#404e67">
-                            <strong>${ins.inspection_by}</strong>
-                        </div>
-                        <div class="card-body">
-                            <p><strong>Inspector:</strong> ${ins.inspector_name}</p>
-                            <p><strong>Date:</strong> ${ins.f_Cdate}</p>
-                            <p><strong>Remarks:</strong> ${ins.remarks}</p>
-
-                            <p><strong>Recommendation:</strong><br>${recChips}</p>
-
-                            <p><strong>Images (${ins.images.length}):</strong><br>${inspThumbs}</p>
-                        </div>
-                    </div>
-                </div>
-                `;
-            }).join("");*/
-
-            let content = `
-            <h5>Application Information</h5>
-            <div class="row">
-                <div class="col-md-8">
-                
-                <div class="row">
-                		${petitionerHtml}
-	                <div class="col-md-6">
-	                    <p><strong>Zone/Ward:</strong> ${app.zone} / ${app.ward}</p>
-	                </div>
-	                <div class="col-md-6">
-	                    <p><strong>No. of Trees:</strong> ${app.total_trees}</p>
-                    </div>
-                </div>    
-                    
-                    <p><strong>Complaints:</strong> ${complaintChips}</p>
-                    <p><strong>Address:</strong> ${app.address}</p>
-                    <p><strong>Remarks:</strong> ${app.remarks}</p>
-                    <p><strong>Submitted Date:</strong> ${app.r_Cdate}</p>
-                </div>
-                <div class="col-md-4">
-                    <p><strong>Images (${app.images.length}):</strong></p>
-                    ${compImages}
-                </div>
-            </div>
-
-           
-            ${reinsHtml}
-            <hr>
-            <h5>Inspection Details (GCC / NGO / TNFD)</h5>
-            <div class="row">${inspCards}</div>
-            
-            
-            
-            <hr>
-            
-            <h5>Committee Decision</h5>
-            
-            <div class="committee-section mt-3"><span class="text-danger">*</span>
-
-            <!-- Dropdown -->
-            <div class="dropdown mb-3">
-                <button class="btn btn-light dropdown-toggle w-50 text-left" type="button" id="decisionDropdown" data-toggle="dropdown">
-                    Select Decision(s)
-                </button>
-                <div class="dropdown-menu w-50 px-2" id="decisionList">
-                    <!-- Checkbox items loaded by AJAX -->
-                </div>
-            </div>
-
-            <!-- Container where dynamic inputs will appear -->
-            <div id="decisionInputs" class="row"></div>
-
-            <!-- Remarks -->
-            <div class="form-group mt-3">
-                <label><strong>Remarks</strong></label>
-                <textarea class="form-control" id="committeeRemarks" rows="3"></textarea>
-            </div>
-
-            <button class="btn btn-primary d-block mx-auto mb-3" id="btnCommitteeSave">Save</button>
-            <input type="hidden" id="selectedRefId" value="${app.ref_id}">
-            <input type="hidden" id="finaltotaltrees" value="${app.total_trees}">
-            
-
-        </div>
-            
-            `;
-
-            $("#modalBodyContent").html(content);
-        }
-
-
-
-
-
-        function fetchgreenCommitteeList() {
-
-            const selectedOption = $('#dropdownevent option:selected').text();
-
-            // Assuming the format is: "Event Name - yyyy-mm-dd"
-            const eventDateRaw = selectedOption.split(' - ')[1];
-
-            if (!eventDateRaw) {
-                console.error("No date found in selected option.");
-                location.reload();
-                return;
-            }
-
-            const dateParts = eventDateRaw.split('-'); // yyyy-mm-dd
-            if (dateParts.length !== 3) {
-                console.error("Date format is incorrect.");
-                return;
-            }
-
-            const formattedDate = `${dateParts[2]}-${dateParts[1]}-${dateParts[0]}`;
-
-
-            // Read zone dropdown value
-            let selectedZone = $('#zonedropdown').val();
-
-            $('#pageLoader').show();
-
-            $.ajax({
-                url: '/gcc/api/greencommittee/pendinglist/getgreencommitteelist',
-                data: { date: formattedDate, zones: selectedZone },
-                method: 'GET',
-                contentType: 'application/json',
-                success: function (data) {
-
-                    $('#pageLoader').hide();
-                    let tableContainer = $('#RequestListDatatable');
-
-                    // Destroy any existing DataTable instance
-                    if ($.fn.DataTable.isDataTable(tableContainer)) {
-                        tableContainer.DataTable().destroy();
-                    }
-
-                    // Initialize DataTable
-                    tableContainer.DataTable({
-                        destroy: true,
-                        searching: true,
-                        autoWidth: true,
-                        paging: true,
-                        info: true,
-                        data: data,
-                        columns: [
-                            {
-                                data: null,
-                                render: (data, type, row, meta) => meta.row + 1,
-                                className: 'text-center'
-                            },
-                            { data: 'ref_id', defaultContent: '-', className: 'text-center' },
-                            { data: 'zone', defaultContent: '-', className: 'text-center' },
-                            { data: 'ward', defaultContent: '-', className: 'text-center' },
-                            { data: 'cby', defaultContent: '-', className: 'text-center' },
-                            {
-                                data: null,
-                                render: function (data, type, row) {
-
-                                    // public user
-                                    if (row.cby === "public") {
-                                        return row.p_name ?? "-";
-                                    }
-
-                                    // department user
-                                    if (row.cby === "department") {
-                                        let deptName = row.dept_name ? row.dept_name : "-";
-                                        let desg = row.designation ? row.designation : "";
-                                        return `${deptName} / ${desg}`;
-                                    }
-
-                                    return "-";
-                                },
-                                className: 'text-center'
-                            },
-
-                            { data: 'ph_no', defaultContent: '-', className: 'text-center' },
-                            { data: 'address', defaultContent: '-', className: 'text-center' },
-                            { data: 'remarks', defaultContent: '-', className: 'text-center' },
-                            { data: 'total_trees', defaultContent: '-', className: 'text-center' },
-                            {
-                                data: 'comp_details',
-                                render: function (compList) {
-
-                                    if (!compList || compList.length === 0) return "-";
-
-                                    // Convert array → "name - total, name - total"
-                                    return compList
-                                        .map(item => `${item.nature} - ${item.total_trees}`)
-                                        .join(", ");
-                                },
-                                className: 'text-center'
-                            },
-                            {
-                                data: 'ref_id',
-                                render: function (data, type, row) {
-                                    return `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
-                                },
-                                className: 'text-center'
-                            }
-                        ],
-                        dom: 'Bfrtip',
-                        buttons: [
-                            { extend: 'pageLength', className: 'btn btn-warning' },
-                            { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-                            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-                            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-                            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-                        ],
-                        columnDefs: [
-                            { width: "150px", targets: 7 },
-                            { width: "350px", targets: 8 }
-                        ],
-
-                        lengthMenu: [
-                            [200, 400, -1],
-                            ['200 rows', '400 rows', 'Show all']
-                        ],
-
-                        scrollY: '80vh',
-                        scrollX: true,
-                        responsive: false
-                    });
-
-                    tableContainer.off('click', '.btn-view');
-                    // Bind view buttons
-                    tableContainer.on('click', '.btn-view', function () {
-                        let id = $(this).data('id');
-                        $.ajax({
-                            url: `/gcc/api/greencommittee/pendinglist/getdetailsbyrefid?refid=${id}`,
-                            method: 'GET',
-                            success: function (details) {
-                                if (!details) {
-                                    $('#modalBodyContent').html("<p>No data found for this request.</p>");
-                                    $('#viewModal').modal('show');
-                                    return;
-                                }
-
-                                renderDetails(details);
-                                loadCommitteeDecisions();
-
-
-                                $('#viewModalLabel').text(`Application Details - ${id}`);
-                                $('#viewModal').modal('show');
-                            },
-                            error: function (xhr) {
-                                console.error("Error fetching detail:", xhr.responseText);
-                                alert("Failed to fetch green committe details.");
-                            }
-                        });
-                    });
-                },
-
-                error: function (xhr, status, error) {
-                    $('#pageLoader').hide();
-                    console.error("Error fetching data:", error);
-                    alert("Failed to load green committe list.");
-                }
-            });
-        }
-
-        function loadCommitteeDecisions() {
-
-            $.ajax({
-                url: "/gcc/api/greencommittee/pendinglist/getCommitteeActions", // your API endpoint
-                method: "GET",
-                success: function (list) {
-
-                    let html = "";
-
-                    list.forEach(item => {
-                        html += `
-                            <div class="dropdown-item">
-                                <input type="checkbox" class="decision-check mr-2" 
-                                       value="${item.id}" 
-                                       data-name="${item.name}">
-                                ${item.name}
-                            </div>
-                        `;
-                    });
-
-                    $("#decisionList").html(html);
-
-                    bindDecisionEvents();
-                }
-            });
-        }
-
-        function bindDecisionEvents() {
-
-            $(".decision-check").on("change", function () {
-
-                let id = $(this).val();
-                let name = $(this).data("name");
-
-                // 1️ If "Re-Inspection" (id = 8)
-                if (id == "8") {
-
-                    if ($(this).is(":checked")) {
-
-                        // Uncheck all other checkboxes
-                        $(".decision-check").not(this).prop("checked", false);
-
-                        // Remove all decision inputs
-                        $("#decisionInputs").empty();
-
-                        // Update dropdown label
-                        $("#decisionDropdown").text("Re-Inspection");
-
-                    } else {
-                        // Reset to default when unchecked
-                        $("#decisionDropdown").text("Select Decision(s)");
-                    }
-
-                    return; // stop further normal processing
-                }
-
-                // 2️ If any other checkbox is clicked, uncheck Re-Inspection
-                $(".decision-check[value='8']").prop("checked", false);
-
-                // 3️ Normal behavior for other IDs
-                if ($(this).is(":checked")) {
-
-                    $("#decisionInputs").append(`
-                        <div class="col-md-4 mb-2 decision-input" id="decision-${id}">
-                            <label><strong>No. of Trees - ${name}</strong></label>
-                            <input type="number" min="0" class="form-control" data-id="${id}">
-                        </div>
-                    `);
-
-                } else {
-                    $("#decision-" + id).remove();
-                }
-
-                // Update dropdown label
-                updateDropdownLabel();
-            });
-        }
-
-
-        function updateDropdownLabel() {
-
-            let names = [];
-
-            $(".decision-check:checked").each(function () {
-
-                if ($(this).val() != "8") {
-                    names.push($(this).data("name"));
-                }
-            });
-
-            if (names.length === 0) {
-                $("#decisionDropdown").text("Select Decision(s)");
-            } else {
-                $("#decisionDropdown").text(names.join(", "));
-            }
-        }
-
-
-
-        function fetchZones() {
-            $.ajax({
-                url: '/gcc/api/greencommittee/pendinglist/getzones',
-                type: 'GET',
-                dataType: 'json',
-                success: function (data) {
-                    let zoneDropdown = $('#zonedropdown');
-                    zoneDropdown.empty();
-                    zoneDropdown.append('<option value="" >Select Zone</option>');
-
-                    data.forEach(function (res) {
-
-                        zoneDropdown.append(
-                            $('<option></option>')
-                                .val(res.zone_name)
-                                .text(`${res.zone_name}`)
-                        );
-
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching Zone dropdown:', error);
-                    Swal.fire('Error', 'Unable to load Zones', 'error');
-                }
-            });
-        }
-
-        function fetchEventDropdown() {
-            $.ajax({
-                url: '/gcc/api/greencommittee/pendinglist/dropdown-Event',
-                type: 'GET',
-                dataType: 'json',
-                success: function (data) {
-                    let eventDropdown = $('#dropdownevent');
-                    eventDropdown.empty();
-                    eventDropdown.append('<option value="" >Select an Meeting</option>');
-
-                    data.forEach(function (event) {
-                        if (event.isactive && !event.isdelete) {
-                            eventDropdown.append(
-                                $('<option></option>')
-                                    .val(event.id)
-                                    .text(`${event.event_name} - ${event.event_date}`)
-                            );
-                        }
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching meeting dropdown:', error);
-                    Swal.fire('Error', 'Unable to load meetings', 'error');
-                }
-            });
-        }
-
-        $(document).on("input", "#decisionInputs input[type='number']", function () {
-            let val = $(this).val();
-
-            // Case 1: user typed only "0"
-            if (val === "0") {
-                $(this).val("");
-                return;
-            }
-
-            // Case 2: Remove leading zeros (but keep valid numbers intact)
-            let cleaned = val.replace(/^0+(?=\d)/, "");  // keeps normal numbers safe
-
-            $(this).val(cleaned);
-        });
-
-
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/greencommittee/reports.html b/src/main/resources/templates/modules/greencommittee/reports.html
deleted file mode 100644
index 20066437..00000000
--- a/src/main/resources/templates/modules/greencommittee/reports.html
+++ /dev/null
@@ -1,560 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-
-</style>
-
-<body>
-
-
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="far fa-calendar-plus bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Reports</h5>
-                                        <span>Green Committee</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">Green Committee</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Reports</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                    <br>
-
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="card" style="margin-top: 0px;"><span th:text="${LoginUserId}" id="userIdSpan"
-                                    style="display: none;"></span>
-
-                                <div class="card-block">
-                                    <div class="row">
-                                        <div class="form-group col-sm-8">
-                                            <label for="dropdownevent">Select Meeting
-                                            </label>
-                                            <select id="dropdownevent" class="form-control">
-                                            </select>
-                                        </div>
-
-                                        <div class="form-group col-sm-4">
-                                            <label for="zonedropdown">Select Zone
-                                            </label>
-                                            <select id="zonedropdown" class="form-control">
-                                                <option value="">Select Zone </option>
-                                            </select>
-                                        </div>
-                                        <div class="form-group col-sm-4">
-                                            <label for="applicationType">Application Type</label>
-                                            <select id="applicationType" class="form-control">
-                                                <option value="">Select Application Type</option>
-                                                <option value="Department">Department</option>
-                                                <option value="Public">Public</option>
-                                            </select>
-                                        </div>
-                                        <div class="form-group col-sm-4" id="departmentdropdownDiv">
-                                            <label for="departmentdropdown">Select Department</label>
-                                            <select id="departmentdropdown" class="form-control">
-                                                <option value="">Select All</option>
-                                            </select>
-                                        </div>
-
-                                    </div>
-                                    <div class="page-header-title">
-                                        <h5 style="margin: 0;font-weight: bold;">Green Committee Reports</h5><span
-                                            th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span>
-                                        <hr>
-                                    </div>
-
-                                    <div>
-                                        <table id="RequestListDatatable"
-                                            class="table table-striped table-bordered table-hover dataTable"
-                                            role="grid">
-                                            <thead class="thead-dark">
-                                                <tr role="row">
-                                                    <th class="text-center" rowspan="2">S.No</th>
-                                                    <th class="text-center" rowspan="2">Application No</th>
-                                                    <th class="text-center" rowspan="2">Department Name</th>
-                                                    <th class="text-center" rowspan="2">Name</th>
-                                                    <th class="text-center" rowspan="2">Address</th>
-                                                    <th class="text-center" rowspan="2">Reason</th>
-                                                    <th class="text-center" rowspan="2">No of trees</th>
-                                                    <th class="text-center" colspan="3">Inspected</th>
-                                                    <th class="text-center" rowspan="2">Committee Decision</th>
-                                                </tr>
-                                                <tr>
-                                                    <th class="text-center">TNFD</th>
-                                                    <th class="text-center">GCC</th>
-                                                    <th class="text-center">NGO</th>
-                                                </tr>
-                                            </thead>
-
-                                            <tbody>
-
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-
-                </div>
-            </div>
-
-
-            <div id="pageLoader"
-                style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-                <div style="position: relative; top: 50%; transform: translateY(-50%);">
-                    <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                        <span class="sr-only">Loading...</span>
-                    </div>
-                    <!-- Add the 'Please wait' text below the spinner -->
-                    <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-                </div>
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-
-    </div>
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-
-
-    <script type="text/javascript">
-
-        $(document).ready(function () {
-            var table = $('#RequestListDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { width: "150px", targets: 3 },
-                    { width: "350px", targets: 4 }
-                ],
-                lengthMenu: [
-                    [200, 400, -1],
-                    ['200 rows', '400 rows', 'Show all']
-                ],
-                scrollY: '50vh',
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: false,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false
-
-
-            });
-
-            fetchEventDropdown();
-            fetchZones();
-            loadDepartments();
-            fetchgreenCommitteeList();
-
-
-            $('#dropdownevent').on('change', function () {
-
-                $('#zonedropdown').val("");
-
-                fetchgreenCommitteeList();
-
-            });
-            function loadDepartments() {
-
-                $.ajax({
-                    url: "/gcc/api/greencommittee/report/getDepartments",
-                    type: "GET",
-                    success: function (data) {
-
-                        $("#departmentdropdown").empty();
-                        $("#departmentdropdown").append('<option value="">Select All</option>');
-
-                        $.each(data, function (i, dept) {
-                            $("#departmentdropdown").append(
-                                '<option value="' + dept.id + '">' +
-                                dept.name +
-                                '</option>'
-                            );
-                        });
-                    }
-                });
-
-            }
-            $('#departmentdropdown').on('change', function () {
-                fetchgreenCommitteeList();
-            });
-
-            $('#zonedropdown').on('change', function () {
-                let miss_meet = $('#dropdownevent').val();
-
-                if (!miss_meet) {
-                    Swal.fire("Warning", "Please select an meeting!", "warning");
-                    return;
-                }
-                fetchgreenCommitteeList();
-
-            });
-
-        });
-        $('#applicationType').on('change', function () {
-
-            if ($('#applicationType').val() == "Public") {
-                $('#departmentdropdown').val("");
-                $('#departmentdropdownDiv').hide();
-            } else {
-                $('#departmentdropdownDiv').show();
-            }
-            fetchgreenCommitteeList();
-        });
-
-
-        function fetchZones() {
-            $.ajax({
-                url: '/gcc/api/greencommittee/pendinglist/getzones',
-                type: 'GET',
-                dataType: 'json',
-                success: function (data) {
-                    let zoneDropdown = $('#zonedropdown');
-                    zoneDropdown.empty();
-                    zoneDropdown.append('<option value="" >Select Zone</option>');
-
-                    data.forEach(function (res) {
-
-                        zoneDropdown.append(
-                            $('<option></option>')
-                                .val(res.zone_name)
-                                .text(`${res.zone_name}`)
-                        );
-
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching Zone dropdown:', error);
-                    Swal.fire('Error', 'Unable to load Zones', 'error');
-                }
-            });
-        }
-
-        function fetchEventDropdown() {
-            $.ajax({
-                url: '/gcc/api/greencommittee/pendinglist/dropdown-Event',
-                type: 'GET',
-                dataType: 'json',
-                success: function (data) {
-                    let eventDropdown = $('#dropdownevent');
-                    eventDropdown.empty();
-                    eventDropdown.append('<option value="" >Select an Meeting</option>');
-
-                    data.forEach(function (event) {
-                        if (event.isactive && !event.isdelete) {
-                            eventDropdown.append(
-                                $('<option></option>')
-                                    .val(event.id)
-                                    .text(`${event.event_name} - ${event.event_date}`)
-                            );
-                        }
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching meeting dropdown:', error);
-                    Swal.fire('Error', 'Unable to load meetings', 'error');
-                }
-            });
-        }
-
-        function fetchgreenCommitteeList() {
-
-            let selectedevent = $('#dropdownevent').val();
-            let selectedappType = $('#applicationType').val();
-
-            let selecteddepartment = $('#departmentdropdown').val();
-            console.log("selecteddepartment=" + selecteddepartment);
-
-            // Read zone dropdown value
-            let selectedZone = $('#zonedropdown').val();
-
-            console.log("selectedevent=" + selectedevent + "AND selectedZone" + selectedZone);
-
-            $('#pageLoader').show();
-
-            $.ajax({
-                url: '/gcc/api/greencommittee/report/getgreencommitteelist',
-                data: { meetingid: selectedevent, zones: selectedZone, deptid: selecteddepartment, appType: selectedappType },
-                method: 'GET',
-                contentType: 'application/json',
-                success: function (data) {
-                    console.log(data);
-
-                    $('#pageLoader').hide();
-
-                    let tableContainer = $('#RequestListDatatable');
-
-                    // Destroy any existing DataTable instance
-                    if ($.fn.DataTable.isDataTable(tableContainer)) {
-                        tableContainer.DataTable().destroy();
-                    }
-
-                    // Initialize DataTable
-                    tableContainer.DataTable({
-                        destroy: true,
-                        searching: true,
-                        autoWidth: true,
-                        paging: true,
-                        info: true,
-                        data: data,
-                        columns: [
-                            {
-                                data: null,
-                                render: (data, type, row, meta) => meta.row + 1,
-                                className: 'text-center'
-                            },
-                            { data: 'ref_id', className: 'text-center' },
-                            {
-                                data: 'department_name',
-                                className: 'text-center',
-                                render: function (data) {
-                                    return (data === null || data === undefined || data.trim() === '') ? '-' : data;
-                                }
-                            },
-                            // { data: 'department_name', className: 'text-center' },
-                            {
-                                data: null, className: 'text-center',
-                                render: d => d.p_name && d.p_name.trim() !== '' ? d.p_name : d.dept_name || '-'
-                            },
-                            { data: 'address', className: 'text-center' },
-
-                            // Reason
-                            { data: 'remarks', className: 'text-center' },
-
-                            // No of trees
-                            { data: 'total_trees', className: 'text-center' },
-                            // TNFD
-                            {
-                                data: null,
-                                render: d => getInspectionRecommendation(d.inspections, 'TNFD'),
-                                className: 'text-center'
-                            },
-
-                            // GCC
-                            {
-                                data: null,
-                                render: d => getInspectionRecommendation(d.inspections, 'GCC'),
-                                className: 'text-center'
-                            },
-
-                            // NGO
-                            {
-                                data: null,
-                                render: d => getInspectionRecommendation(d.inspections, 'NGO'),
-                                className: 'text-center'
-                            },
-
-                            // Committee Decision
-                            {
-                                data: null,
-                                render: d => getCommitteeDecision(d),
-                                className: 'text-center'
-                            }
-
-                        ],
-                        dom: 'Bfrtip',
-                        buttons: [
-                            {
-                                extend: 'pageLength',
-                                className: 'btn btn-warning'
-                            },
-                            {
-                                extend: 'copyHtml5',
-                                className: 'btn btn-secondary',
-                                title: () => getExportTitle(),
-                                filename: () => getExportFileName()
-                            },
-                            {
-                                extend: 'excelHtml5',
-                                className: 'btn btn-secondary',
-                                title: () => getExportTitle(),
-                                filename: () => getExportFileName()
-                            },
-                            {
-                                extend: 'csvHtml5',
-                                className: 'btn btn-secondary',
-                                title: () => getExportTitle(),
-                                filename: () => getExportFileName()
-                            },
-                            {
-                                extend: 'pdfHtml5',
-                                className: 'btn btn-secondary',
-                                title: () => getExportTitle(),
-                                filename: () => getExportFileName(),
-                                orientation: 'landscape',
-                                pageSize: 'A4'
-                            }
-                        ],
-
-                        columnDefs: [
-                            { width: "150px", targets: 3 },
-                            { width: "150px", targets: 4 },
-                            { width: "350px", targets: 5 },
-
-                            { width: "120px", targets: 6 },
-                            { width: "120px", targets: 7 },
-                            { width: "120px", targets: 8 },
-                            { width: "120px", targets: 9 }
-                        ],
-
-                        lengthMenu: [
-                            [200, 400, -1],
-                            ['200 rows', '400 rows', 'Show all']
-                        ],
-
-                        scrollY: '80vh',
-                        scrollX: true,
-                        responsive: false
-                    });
-
-                },
-
-                error: function (xhr, status, error) {
-                    $('#pageLoader').hide();
-                    console.error("Error fetching data:", error);
-                    alert("Failed to load green committe list.");
-                }
-            });
-        }
-
-        function getInspectionRecommendation(inspections, type) {
-            if (!Array.isArray(inspections)) return '-';
-
-            let ins = inspections.find(i => i.inspection_by === type);
-            if (!ins || !Array.isArray(ins.recommendations) || ins.recommendations.length === 0) {
-                return '-';
-            }
-
-            return ins.recommendations
-                .map(r => `${r.name} - ${r.count}`)
-                .join('<br>');
-        }
-
-
-        function getCommitteeDecision(row) {
-
-            // Case 1: reinspections empty → committee.com_complaints
-            if ((!row.reinspections || row.reinspections.length === 0) && row.committee) {
-                let comp = row.committee.com_complaints || [];
-                return comp.length
-                    ? comp.map(c => `${c.nature} - ${c.count}`).join('<br>')
-                    : '-';
-            }
-
-            // Case 2: committee empty → reinspections details
-            if ((!row.committee || Object.keys(row.committee).length === 0) && Array.isArray(row.reinspections)
-                && row.reinspections.length > 0) {
-                let r = row.reinspections[0];
-                return `
-                    ${r.event_name}<br>
-                    ${r.event_date}<br>
-                    ${r.ins_name}
-                `;
-            }
-
-            // Case 3: both present → prefer committee.com_complaints
-            if (row.committee && row.reinspections?.length) {
-                let comp = row.committee.com_complaints || [];
-                return comp.length
-                    ? comp.map(c => `${c.nature} - ${c.count}`).join('<br>')
-                    : '-';
-            }
-
-            return '-';
-        }
-        function getExportTitle() {
-            let ddl = $('#dropdownevent');
-            let selectedText = ddl.find('option:selected').text();
-
-            if (!ddl.val() || selectedText === 'Select an Meeting') {
-                return 'All Green Committee Meeting List';
-            }
-            return selectedText;
-        }
-
-        function getExportFileName() {
-            let title = getExportTitle().replace(/\s+/g, '_').replace(/[^a-zA-Z0-9_]/g, '');
-
-            let now = new Date();
-            let timestamp =
-                now.getFullYear().toString() +
-                String(now.getMonth() + 1).padStart(2, '0') +
-                String(now.getDate()).padStart(2, '0') + '_' +
-                String(now.getHours()).padStart(2, '0') +
-                String(now.getMinutes()).padStart(2, '0') +
-                String(now.getSeconds()).padStart(2, '0');
-
-            return `${title}_${timestamp}`;
-        }
-
-
-
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/greencommittee/treepruningreports.html b/src/main/resources/templates/modules/greencommittee/treepruningreports.html
deleted file mode 100644
index 6c028818..00000000
--- a/src/main/resources/templates/modules/greencommittee/treepruningreports.html
+++ /dev/null
@@ -1,1136 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .section-title {
-        font-size: 13px;
-        font-weight: 700;
-        color: #555;
-        letter-spacing: 1px;
-        margin-bottom: 8px;
-    }
-
-    .modal-body label {
-        font-size: 11px;
-        color: #8d8d8d;
-        margin-bottom: 2px;
-        display: block;
-    }
-
-    .modal-body p {
-        font-size: 15px;
-        color: #222;
-        font-weight: 500;
-        margin-bottom: 18px;
-        word-break: break-word;
-    }
-
-    .modal-body hr {
-        margin-top: 5px;
-        margin-bottom: 18px;
-    }
-
-    .modal-header {
-        background: #3f4d67 !important;
-    }
-
-    .modal-header h4 {
-        color: #fff;
-    }
-
-    #complaintStatus {
-        font-size: 13px;
-        padding: 6px 14px;
-        border-radius: 20px;
-    }
-
-    .img-thumbnail {
-        border-radius: 8px;
-    }
-</style>
-
-<body>
-
-
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="far fa-calendar-plus bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Reports</h5>
-                                        <span>Green Committee</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">Green Committee</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Reports</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                    <br>
-
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="card" style="margin-top: 0px;"><span th:text="${LoginUserId}" id="userIdSpan"
-                                    style="display: none;"></span>
-
-                                <div class="card-block">
-                                    <div class="row">
-
-                                        <!-- From Date -->
-                                        <div class="form-group col-md-3">
-                                            <label for="fromDate">From Date</label>
-                                            <input type="date" id="fromDate" class="form-control">
-                                        </div>
-
-                                        <!-- To Date -->
-                                        <div class="form-group col-md-3">
-                                            <label for="toDate">To Date</label>
-                                            <input type="date" id="toDate" class="form-control">
-                                        </div>
-
-                                        <!-- Zone -->
-                                        <div class="form-group col-md-3">
-                                            <label for="zoneDropdown">Zone</label>
-                                            <select id="zoneDropdown" class="form-control">
-                                                <option value="">Select Zone</option>
-                                            </select>
-                                        </div>
-
-                                        <!-- Ward -->
-                                        <div class="form-group col-md-3">
-                                            <label for="wardDropdown">Ward</label>
-                                            <select id="wardDropdown" class="form-control">
-                                                <option value="">Select Ward</option>
-                                            </select>
-                                        </div>
-
-                                    </div>
-
-
-
-                                    <!-- Complaint Status -->
-                                    <div class="row align-items-end">
-
-                                        <!-- Complaint Status -->
-                                        <div class="form-group col-md-3">
-                                            <label for="statusDropdown">Complaint Status</label>
-                                            <select id="statusDropdown" class="form-control">
-                                                <option value="">Select Status</option>
-                                                <option value="closed">Completed</option>
-                                                <option value="processing">Processing</option>
-                                            </select>
-                                        </div>
-
-                                        <!-- Buttons -->
-                                        <div class="form-group col-md-3">
-                                            <button type="button" class="btn btn-primary" id="btnSearch">
-                                                Search
-                                            </button>
-
-                                            <button type="button" class="btn btn-secondary" id="btnReset">
-                                                <i class="fa fa-refresh"></i> Reset
-                                            </button>
-                                        </div>
-
-                                    </div>
-
-                                </div>
-
-                            </div>
-                            <div class="page-header-title">
-                                <h5 style="margin: 0;font-weight: bold;">Green Committee Reports</h5><span
-                                    th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span>
-                                <hr>
-                            </div>
-
-                            <div>
-                                <table id="RequestListDatatable" class="table table-striped table-bordered table-hover">
-
-                                    <thead class="thead-dark">
-                                        <tr>
-
-                                            <th class="text-center">S.No</th>
-
-                                            <th class="text-center">Complaint No</th>
-
-                                            <th class="text-center">Person Name</th>
-
-                                            <th class="text-center">Zone / Ward</th>
-
-                                            <th class="text-center">Address</th>
-
-                                            <th class="text-center">Mode</th>
-
-                                            <th class="text-center">Opened Date</th>
-
-                                            <th class="text-center">Status</th>
-
-                                            <th class="text-center">Action</th>
-
-                                        </tr>
-                                    </thead>
-
-                                    <tbody></tbody>
-
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-
-        </div>
-    </div>
-    <!-- Complaint Details Modal -->
-    <div class="modal fade" id="complaintModal" tabindex="-1">
-        <div class="modal-dialog modal-xl modal-dialog-scrollable">
-            <div class="modal-content">
-
-                <!-- Header -->
-                <div class="modal-header bg-dark text-white">
-
-                    <div>
-                        <h4 class="mb-0">
-                            Complaint Details -
-                            <span id="complaintNo"></span>
-                        </h4>
-                    </div>
-
-                    <span id="complaintStatus" class="badge badge-warning ml-3"
-                        style="font-size:14px;height:28px;line-height:20px;">
-                    </span>
-
-                    <button type="button" class="close text-white" data-dismiss="modal">
-                        &times;
-                    </button>
-
-                </div>
-
-                <div class="modal-body">
-
-                    <!-- ================= COMPLAINT ================= -->
-
-                    <h6 class="section-title">COMPLAINT</h6>
-                    <hr>
-
-                    <div class="row">
-
-                        <div class="col-md-6">
-                            <label>Complaint Type</label>
-                            <p id="complaintType"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>Mode</label>
-                            <p id="mode"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>Department</label>
-                            <p id="department"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>SLA</label>
-                            <p id="sla"></p>
-                        </div>
-
-                        <div class="col-md-12">
-                            <label>Remarks</label>
-                            <p id="remarks"></p>
-                        </div>
-
-                    </div>
-
-                    <!-- ================= CUSTOMER ================= -->
-
-                    <h6 class="section-title mt-4">CUSTOMER</h6>
-                    <hr>
-
-                    <div class="row">
-
-                        <div class="col-md-6">
-                            <label>Name</label>
-                            <p id="personName"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>Mobile</label>
-                            <p id="mobile"></p>
-                        </div>
-
-                    </div>
-
-                    <!-- ================= LOCATION ================= -->
-
-                    <h6 class="section-title mt-4">LOCATION</h6>
-                    <hr>
-
-                    <div class="row">
-
-                        <div class="col-md-6">
-                            <label>Zone</label>
-                            <p id="zone"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>Division / Ward</label>
-                            <p id="ward"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>Area</label>
-                            <p id="area"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>Street</label>
-                            <p id="street"></p>
-                        </div>
-
-                        <div class="col-md-12">
-                            <label>Landmark</label>
-                            <p id="landmark"></p>
-                        </div>
-
-                    </div>
-
-                    <!-- ================= OFFICIAL ================= -->
-
-                    <h6 class="section-title mt-4">OFFICIAL</h6>
-                    <hr>
-
-                    <div class="row">
-
-                        <div class="col-md-6">
-                            <label>Name</label>
-                            <p id="officialName"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>Mobile</label>
-                            <p id="officialMobile"></p>
-                        </div>
-
-                        <div class="col-md-12">
-                            <label>Response</label>
-                            <p id="officialResponse"></p>
-                        </div>
-
-                    </div>
-
-                    <!-- ================= TIMELINE ================= -->
-
-                    <h6 class="section-title mt-4">TIMELINE</h6>
-                    <hr>
-
-                    <div class="row">
-
-                        <div class="col-md-6">
-                            <label>Opened</label>
-                            <p id="openedDate"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>Closed</label>
-                            <p id="closedDate"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>Reopen Date</label>
-                            <p id="reopenDate"></p>
-                        </div>
-
-                        <div class="col-md-6">
-                            <label>Final Closed</label>
-                            <p id="finalClosedDate"></p>
-                        </div>
-
-                    </div>
-
-                    <!-- ================= IMAGES ================= -->
-
-                    <h6 class="section-title mt-4">IMAGES</h6>
-                    <hr>
-
-                    <div class="row">
-
-                        <div class="col-md-6 text-center">
-                            <label>Before (Citizen)</label>
-
-                            <img id="citizenImg" class="img-thumbnail"
-                                style="width:100%;height:220px;object-fit:cover;display:none;">
-
-                            <div id="citizenNoImage" class="border p-5 mt-2 text-muted">
-                                No Image Available
-                            </div>
-                        </div>
-
-                        <div class="col-md-6 text-center">
-                            <label>After (Official)</label>
-
-                            <img id="officialImg" class="img-thumbnail"
-                                style="width:100%;height:220px;object-fit:cover;display:none;">
-
-                            <div id="officialNoImage" class="border p-5 mt-2 text-muted">
-                                No Image Available
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
-    </div>
-    <div class="modal fade" id="imageModal" tabindex="-1">
-        <div class="modal-dialog modal-dialog-centered modal-lg">
-            <div class="modal-content">
-
-                <div class="modal-header">
-                    <h5 class="modal-title">Image Preview</h5>
-
-                    <button type="button" class="close" data-dismiss="modal">
-                        &times;
-                    </button>
-
-                </div>
-
-                <div class="modal-body text-center">
-
-                    <img id="modalImage" src="" class="img-fluid" style="max-height:80vh;">
-
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-
-    <div id="pageLoader"
-        style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-        <div style="position: relative; top: 50%; transform: translateY(-50%);">
-            <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                <span class="sr-only">Loading...</span>
-            </div>
-            <!-- Add the 'Please wait' text below the spinner -->
-            <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-        </div>
-    </div>
-
-    <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-    </div>
-
-    </div>
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-
-
-    <script type="text/javascript">
-
-        $(document).ready(function () {
-
-            initializeReportTable();
-
-            loadZones();
-
-
-
-
-
-
-
-
-
-        });
-        $(document).on("click", ".preview-img", function () {
-
-            let src = $(this).attr("src");
-
-            if (src && src !== "") {
-                $("#modalImage").attr("src", src);
-                $("#imageModal").modal("show");
-            }
-
-        });
-        $("#fromDate").on("change", function () {
-
-            let fromDate = $(this).val();
-
-            // Set minimum selectable To Date
-            $("#toDate").attr("min", fromDate);
-
-            // If current To Date is less than From Date, clear it
-            if ($("#toDate").val() && $("#toDate").val() < fromDate) {
-                $("#toDate").val("");
-            }
-
-        });
-        function initializeReportTable() {
-
-            $('#RequestListDatatable').DataTable({
-
-                destroy: true,
-                searching: true,
-                paging: true,
-                info: true,
-                autoWidth: false,
-                responsive: false,
-                processing: true,
-                data: [],
-
-                columns: [
-
-                    {
-                        data: null,
-                        className: 'text-center',
-                        render: function (data, type, row, meta) {
-                            return meta.row + 1;
-                        }
-                    },
-
-                    { data: "Complaint Number", defaultContent: "" },
-
-                    { data: "Complaint Person Name", defaultContent: "" },
-
-                    {
-                        data: null,
-                        defaultContent: "",
-                        render: function (row) {
-
-                            if (!row)
-                                return "";
-
-                            return row.Zone + " / " + row.Ward;
-                        }
-                    },
-
-                    { data: "Address", defaultContent: "" },
-
-                    { data: "Complaint Mode", defaultContent: "" },
-
-                    { data: "Complaint Opened Date", defaultContent: "" },
-
-                    {
-                        data: "Current Status",
-                        defaultContent: "",
-                        render: function (data) {
-
-                            if (data == "Completed") {
-                                return '<span class="badge badge-success">Completed</span>';
-                            }
-
-                            if (data == "Processing") {
-                                return '<span class="badge badge-warning">Processing</span>';
-                            }
-
-                            return "";
-                        }
-                    },
-
-                    {
-                        data: null,
-                        orderable: false,
-                        defaultContent: "",
-                        render: function () {
-                            return "";
-                        }
-                    }
-
-                ]
-
-            });
-
-        }
-        $("#btnSearch").click(function () {
-
-            let fromDate = $("#fromDate").val();
-            let toDate = $("#toDate").val();
-
-            if (fromDate == "") {
-
-                Swal.fire({
-                    icon: "info",
-                    title: "From Date Missing",
-                    text: "Please select From Date.",
-                });
-                return;
-            }
-
-            if (toDate == "") {
-                Swal.fire({
-                    icon: "info",
-                    title: "To Date Missing",
-                    text: "Please select To Date.",
-                });
-                return;
-            }
-
-            loadTreePruningReport();
-
-        });
-        $("#btnReset").click(function () {
-
-            $("#fromDate").val("");
-            $("#toDate").val("");
-            $("#zoneDropdown").val("");
-            $("#wardDropdown").empty()
-                .append('<option value="">Select Ward</option>');
-            $("#statusDropdown").val("");
-
-            if ($.fn.DataTable.isDataTable("#RequestListDatatable")) {
-                $("#RequestListDatatable").DataTable().clear().draw();
-            }
-
-        });
-        function formatDate(date) {
-
-            if (!date) return "";
-
-            let parts = date.split("-");
-
-            return parts[2] + "/" + parts[1] + "/" + parts[0];
-        }
-        function viewComplaint(complaintId) {
-
-            $.ajax({
-
-                url: "/gcc/api/greencommittee/report/details",
-
-                data: {
-                    complaintId: complaintId
-                },
-
-                success: function (data) {
-                    console.log(data);
-                    $("#complaintNo").text(getValue(data.complaintid));
-                    $("#complaintStatus").text(getValue(data.complaintcurrentstatus));
-
-                    $("#complaintType").text(getValue(data.complainttype));
-                    $("#mode").text(getValue(data.COMP_MODE));
-                    $("#department").text(getValue(data.DEPT_NAME));
-                    $("#sla").text(getValue(data.SLA));
-                    $("#remarks").text(getValue(data.complaintdetails));
-
-                    $("#personName").text(getValue(data.CustomerName));
-                    $("#mobile").text(getValue(data.CustomerMobile));
-
-                    $("#zone").text(getValue(data.Zone));
-                    $("#ward").text(getValue(data.Division));
-                    $("#area").text(getValue(data.Area));
-                    $("#street").text(getValue(data.Street));
-                    $("#landmark").text(getValue(data.Landmark));
-
-                    $("#officialName").text(getValue(data.Officialname));
-                    $("#officialMobile").text(getValue(data.OfficialMobile));
-                    $("#officialResponse").text(getValue(data.Officialresponsemessage));
-
-                    $("#openedDate").text(getValue(data.complaintopendate));
-                    $("#closedDate").text(getValue(data.complaintcloseddate));
-                    $("#reopenDate").text(getValue(data.REOPENDDATE));
-                    $("#finalClosedDate").text(getValue(data.FINALCLOSEDDATE));
-
-                    /* $("#complaintNo").text(data.complaintid);
-                     $("#complaintStatus").text(data.Status);
- 
-                     $("#complaintType").text(data.complainttype);
-                     $("#mode").text(data.COMP_MODE);
-                     $("#department").text(data.DEPT_NAME);
-                     $("#sla").text(data.SLA);
- 
-                     $("#remarks").text(data.complaintdetails);
- 
-                     $("#personName").text(data.CustomerName);
-                     $("#mobile").text(data.CustomerMobile);
- 
-                     $("#zone").text(data.Zone);
-                     $("#ward").text(data.Division);
-                     $("#area").text(data.Area);
-                     $("#landmark").text(data.Landmark);
- 
-                     $("#officialName").text(data.Officialname);
-                     $("#officialMobile").text(data.OfficialMobile);
-                     $("#officialResponse").text(data.Officialresponsemessage);
-                     $("#reopenDate").text(data.REOPENDDATE);
-                     $("#finalClosedDate").text(data.FINALCLOSEDDATE);
- 
- 
- 
-                     $("#street").text(data.Street);
- 
-                     $("#openedDate").text(data.complaintopendate);
-                     $("#closedDate").text(data.complaintcloseddate);*/
-
-                    // Citizen Image
-                    if (data.userimages &&
-                        data.userimages.length > 0 &&
-                        data.userimages[0].Comp_Image &&
-                        data.userimages[0].Comp_Image !== "null") {
-
-                        $("#citizenImg")
-                            .attr("src", data.userimages[0].Comp_Image)
-                            .addClass("preview-img")
-                            .css("cursor", "pointer")
-                            .show();
-
-                        $("#citizenNoImage").hide();
-
-                    } else {
-
-                        $("#citizenImg").hide();
-                        $("#citizenNoImage").show();
-                    }
-
-                    if (data.empimages &&
-                        data.empimages.length > 0 &&
-                        data.empimages[0].Comp_Image &&
-                        data.empimages[0].Comp_Image !== "null") {
-
-                        $("#officialImg")
-                            .attr("src", data.empimages[0].Comp_Image)
-                            .addClass("preview-img")
-                            .css("cursor", "pointer")
-                            .show();
-
-                        $("#officialNoImage").hide();
-
-                    } else {
-
-                        $("#officialImg").hide();
-                        $("#officialNoImage").show();
-                    }
-                    $("#complaintModal").modal("show");
-
-                }
-
-            });
-
-        }
-        function getValue(value) {
-            return (value === null ||
-                value === undefined ||
-                value === " " ||
-                value === "null")
-                ? "-"
-                : value;
-        }
-        function loadTreePruningReport() {
-
-            let fromDate = formatDate($("#fromDate").val());
-            let toDate = formatDate($("#toDate").val());
-            let zone = $("#zoneDropdown").val();
-            let ward = $("#wardDropdown").val();
-            let status = $("#statusDropdown").val();
-            console.log("Zone :", zone);
-            console.log("Ward :", ward);
-            console.log("Status :", status);
-
-
-            $("#pageLoader").show();
-
-            $.ajax({
-                url: "/gcc/api/greencommittee/report/getreport",
-                type: "GET",
-                data: {
-                    fromDate: fromDate,
-                    toDate: toDate,
-                    zone: zone,
-                    ward: ward,
-                    status: status
-                },
-                success: function (data) {
-                    console.log(data);
-
-                    $("#pageLoader").hide();
-
-                    let table = $("#RequestListDatatable");
-
-                    if ($.fn.DataTable.isDataTable("#RequestListDatatable")) {
-                        table.DataTable().destroy();
-                    }
-
-                    table.DataTable({
-                        destroy: true,
-                        data: data,
-                        searching: true,
-                        paging: true,
-                        info: true,
-                        autoWidth: false,
-
-                        columns: [
-                            {
-                                data: null,
-                                render: function (data, type, row, meta) {
-                                    return meta.row + 1;
-                                }
-                            },
-                            { data: "Complaint Number" },
-                            { data: "Complaint Person Name" },
-                            {
-                                data: null,
-                                render: function (d) {
-                                    return d.Zone + " / " + d.Ward;
-                                }
-                            },
-                            { data: "Address" },
-                            { data: "Complaint Mode" },
-                            { data: "Complaint Opened Date" },
-                            {
-                                data: "Current Status",
-                                render: function (data) {
-                                    if (data === "Completed") {
-                                        return '<span class="badge badge-success">Completed</span>';
-                                    }
-                                    return '<span class="badge badge-warning">Processing</span>';
-                                }
-                            },
-                            {
-                                data: null,
-                                className: "text-center",
-                                render: function (data) {
-
-                                    return `
-            <button class="btn btn-info btn-sm"
-                onclick="viewComplaint('${data["Complaint Number"]}')">
-                View Details
-            </button>
-        `;
-                                }
-                            }
-                        ]
-                    });
-
-                },
-                error: function () {
-
-                    $("#pageLoader").hide();
-
-                    alert("Unable to fetch report");
-
-                }
-
-            });
-
-        }
-
-
-
-        function loadZones() {
-
-            $.get("/gcc/api/greencommittee/report/zones", function (data) {
-
-                let ddl = $("#zoneDropdown");
-
-                ddl.empty();
-
-                ddl.append('<option value="">Select Zone</option>');
-
-                $.each(data, function (i, row) {
-
-                    ddl.append(
-                        `<option value="${row.id}">
-                    ${row.zone_name}
-                </option>`
-                    );
-
-                });
-
-            });
-
-        }
-        $("#zoneDropdown").change(function () {
-
-            let zoneId = $(this).val();
-
-            $("#wardDropdown").empty();
-
-            $("#wardDropdown").append('<option value="">Select Ward</option>');
-
-            if (zoneId == "")
-                return;
-
-            $.get("/gcc/api/greencommittee/report/wards",
-                {
-                    zoneId: zoneId
-                },
-                function (data) {
-
-                    $.each(data, function (i, row) {
-
-                        $("#wardDropdown").append(
-                            `<option value="${row.id}">
-                    ${row.ward_name}
-                </option>`
-                        );
-
-                    });
-
-                });
-
-        });
-
-        function fetchgreenCommitteeList() {
-
-            let selectedevent = $('#dropdownevent').val();
-            let selectedappType = $('#applicationType').val();
-
-            let selecteddepartment = $('#departmentdropdown').val();
-            console.log("selecteddepartment=" + selecteddepartment);
-
-            // Read zone dropdown value
-            let selectedZone = $('#zonedropdown').val();
-
-            console.log("selectedevent=" + selectedevent + "AND selectedZone" + selectedZone);
-
-            $('#pageLoader').show();
-
-            $.ajax({
-                url: '/gcc/api/greencommittee/report/getgreencommitteelist',
-                data: { meetingid: selectedevent, zones: selectedZone, deptid: selecteddepartment, appType: selectedappType },
-                method: 'GET',
-                contentType: 'application/json',
-                success: function (data) {
-                    console.log(data);
-
-                    $('#pageLoader').hide();
-
-                    let tableContainer = $('#RequestListDatatable');
-
-                    // Destroy any existing DataTable instance
-                    if ($.fn.DataTable.isDataTable(tableContainer)) {
-                        tableContainer.DataTable().destroy();
-                    }
-
-                    // Initialize DataTable
-                    tableContainer.DataTable({
-                        destroy: true,
-                        searching: true,
-                        autoWidth: true,
-                        paging: true,
-                        info: true,
-                        data: data,
-                        columns: [
-                            {
-                                data: null,
-                                render: (data, type, row, meta) => meta.row + 1,
-                                className: 'text-center'
-                            },
-                            { data: 'ref_id', className: 'text-center' },
-                            {
-                                data: 'department_name',
-                                className: 'text-center',
-                                render: function (data) {
-                                    return (data === null || data === undefined || data.trim() === '') ? '-' : data;
-                                }
-                            },
-                            // { data: 'department_name', className: 'text-center' },
-                            {
-                                data: null, className: 'text-center',
-                                render: d => d.p_name && d.p_name.trim() !== '' ? d.p_name : d.dept_name || '-'
-                            },
-                            { data: 'address', className: 'text-center' },
-
-                            // Reason
-                            { data: 'remarks', className: 'text-center' },
-
-                            // No of trees
-                            { data: 'total_trees', className: 'text-center' },
-                            // TNFD
-                            {
-                                data: null,
-                                render: d => getInspectionRecommendation(d.inspections, 'TNFD'),
-                                className: 'text-center'
-                            },
-
-                            // GCC
-                            {
-                                data: null,
-                                render: d => getInspectionRecommendation(d.inspections, 'GCC'),
-                                className: 'text-center'
-                            },
-
-                            // NGO
-                            {
-                                data: null,
-                                render: d => getInspectionRecommendation(d.inspections, 'NGO'),
-                                className: 'text-center'
-                            },
-
-                            // Committee Decision
-                            {
-                                data: null,
-                                render: d => getCommitteeDecision(d),
-                                className: 'text-center'
-                            }
-
-                        ],
-                        dom: 'Bfrtip',
-                        buttons: [
-                            {
-                                extend: 'pageLength',
-                                className: 'btn btn-warning'
-                            },
-                            {
-                                extend: 'copyHtml5',
-                                className: 'btn btn-secondary',
-                                title: () => getExportTitle(),
-                                filename: () => getExportFileName()
-                            },
-                            {
-                                extend: 'excelHtml5',
-                                className: 'btn btn-secondary',
-                                title: () => getExportTitle(),
-                                filename: () => getExportFileName()
-                            },
-                            {
-                                extend: 'csvHtml5',
-                                className: 'btn btn-secondary',
-                                title: () => getExportTitle(),
-                                filename: () => getExportFileName()
-                            },
-                            {
-                                extend: 'pdfHtml5',
-                                className: 'btn btn-secondary',
-                                title: () => getExportTitle(),
-                                filename: () => getExportFileName(),
-                                orientation: 'landscape',
-                                pageSize: 'A4'
-                            }
-                        ],
-
-                        columnDefs: [
-                            { width: "150px", targets: 3 },
-                            { width: "150px", targets: 4 },
-                            { width: "350px", targets: 5 },
-
-                            { width: "120px", targets: 6 },
-                            { width: "120px", targets: 7 },
-                            { width: "120px", targets: 8 },
-                            { width: "120px", targets: 9 }
-                        ],
-
-                        lengthMenu: [
-                            [200, 400, -1],
-                            ['200 rows', '400 rows', 'Show all']
-                        ],
-
-                        scrollY: '80vh',
-                        scrollX: true,
-                        responsive: false
-                    });
-
-                },
-
-                error: function (xhr, status, error) {
-                    $('#pageLoader').hide();
-                    console.error("Error fetching data:", error);
-                    alert("Failed to load green committe list.");
-                }
-            });
-        }
-
-        function getInspectionRecommendation(inspections, type) {
-            if (!Array.isArray(inspections)) return '-';
-
-            let ins = inspections.find(i => i.inspection_by === type);
-            if (!ins || !Array.isArray(ins.recommendations) || ins.recommendations.length === 0) {
-                return '-';
-            }
-
-            return ins.recommendations
-                .map(r => `${r.name} - ${r.count}`)
-                .join('<br>');
-        }
-
-
-        function getCommitteeDecision(row) {
-
-            // Case 1: reinspections empty → committee.com_complaints
-            if ((!row.reinspections || row.reinspections.length === 0) && row.committee) {
-                let comp = row.committee.com_complaints || [];
-                return comp.length
-                    ? comp.map(c => `${c.nature} - ${c.count}`).join('<br>')
-                    : '-';
-            }
-
-            // Case 2: committee empty → reinspections details
-            if ((!row.committee || Object.keys(row.committee).length === 0) && Array.isArray(row.reinspections)
-                && row.reinspections.length > 0) {
-                let r = row.reinspections[0];
-                return `
-                    ${r.event_name}<br>
-                    ${r.event_date}<br>
-                    ${r.ins_name}
-                `;
-            }
-
-            // Case 3: both present → prefer committee.com_complaints
-            if (row.committee && row.reinspections?.length) {
-                let comp = row.committee.com_complaints || [];
-                return comp.length
-                    ? comp.map(c => `${c.nature} - ${c.count}`).join('<br>')
-                    : '-';
-            }
-
-            return '-';
-        }
-        function getExportTitle() {
-            let ddl = $('#dropdownevent');
-            let selectedText = ddl.find('option:selected').text();
-
-            if (!ddl.val() || selectedText === 'Select an Meeting') {
-                return 'All Green Committee Meeting List';
-            }
-            return selectedText;
-        }
-
-        function getExportFileName() {
-            let title = getExportTitle().replace(/\s+/g, '_').replace(/[^a-zA-Z0-9_]/g, '');
-
-            let now = new Date();
-            let timestamp =
-                now.getFullYear().toString() +
-                String(now.getMonth() + 1).padStart(2, '0') +
-                String(now.getDate()).padStart(2, '0') + '_' +
-                String(now.getHours()).padStart(2, '0') +
-                String(now.getMinutes()).padStart(2, '0') +
-                String(now.getSeconds()).padStart(2, '0');
-
-            return `${title}_${timestamp}`;
-        }
-
-
-
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/aadhar.html b/src/main/resources/templates/modules/homelesssurvey/aadhar.html
deleted file mode 100644
index 549bc2c2..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/aadhar.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Aadhar No Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Aadhar No Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Aadhar No Reason</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Aadhar No Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Aadhar No Reason </label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Aadhar No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/aadharnoreasonlst",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Aadhar No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/aadharnoreasonsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/aadharnoreason-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/bankpassbook.html b/src/main/resources/templates/modules/homelesssurvey/bankpassbook.html
deleted file mode 100644
index e1a59ca4..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/bankpassbook.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Bank Passbook No Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Bank Passbook No Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Bank Passbook No Reason Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Bank Passbook No Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Bank Passbook No Reason Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Bank Passbook No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/bankpassbookreasonmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Bank Passbook No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/bankpassbookreasonmaster-save",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/bankpassbookreasonmasterstatus",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/birthcertficatenoreason.html b/src/main/resources/templates/modules/homelesssurvey/birthcertficatenoreason.html
deleted file mode 100644
index c71abc95..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/birthcertficatenoreason.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Birth Certificate no Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Birth Certificate Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Birth Certificate no Reason</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Birth Certificate no Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Birth Certificate no Reason</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Birth Certificate no Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/birthcertificatmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Birth Certificate no Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/birthcertificatmasterdatasave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/birthcertificatmasterdata-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/caste.html b/src/main/resources/templates/modules/homelesssurvey/caste.html
deleted file mode 100644
index 20ff1581..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/caste.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Caste Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Caste
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Caste Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Caste</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Caste Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Caste");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/castemasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Caste");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/castemasterdatasave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/castemasterdata-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/cminsurance.html b/src/main/resources/templates/modules/homelesssurvey/cminsurance.html
deleted file mode 100644
index 8dfdb33d..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/cminsurance.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">CM Insurance No Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add CM Insurance No Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>CM Insurance No Reason</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add CM Insurance No Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>CM Insurance No Reason</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add CM Insurance No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/cminsurancemasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit CM Insurance No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/cminsurancesave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/cminsurance-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/comeoutshelter.html b/src/main/resources/templates/modules/homelesssurvey/comeoutshelter.html
deleted file mode 100644
index ffbe2ba3..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/comeoutshelter.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Coming Out of Shelter Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Coming Out of Shelter
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Coming Out of Shelter</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Coming Out of Shelter</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Coming Out of Shelter Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Coming Out of Shelter");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/comeoutsheltermasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Coming Out of Shelter");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/comeoutsheltersave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/comeoutshelter-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/communitynoreason.html b/src/main/resources/templates/modules/homelesssurvey/communitynoreason.html
deleted file mode 100644
index bc05c339..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/communitynoreason.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Community No Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Community No Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Community No Reason Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Community No Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Community No Reason Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Community No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/communitymasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Community No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/communitycertmasterdatasave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/communitycertmasterdata-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/currentlyliving.html b/src/main/resources/templates/modules/homelesssurvey/currentlyliving.html
deleted file mode 100644
index fc1a63a0..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/currentlyliving.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Currently Living Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Currently Living
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Currently Living Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Currently Living</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Currently Living Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Currently Living");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/currentlylivingmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Currently Living");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/currentlylivingsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/currentlyliving-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/disability.html b/src/main/resources/templates/modules/homelesssurvey/disability.html
deleted file mode 100644
index 2fe1248b..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/disability.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Disablity Type Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Disablity Type
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Disablity Type</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Disablity Type</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Disablity Type</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Disablity Type");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/disabilitytype",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Disablity Type");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/disabilitytypesave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/disabilitytype-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/disabiltycertificate.html b/src/main/resources/templates/modules/homelesssurvey/disabiltycertificate.html
deleted file mode 100644
index 3d01ec35..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/disabiltycertificate.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Disabilty Certificate Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Disability Certificate Master
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Disabilty Certificate Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Disability Certificate</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Disabilty Certificate Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add disabilty certificate");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/disabiltycertificatelist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit disabilty certificate");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/disabiltycertificategersave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/disabiltycertificate-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/discontinued.html b/src/main/resources/templates/modules/homelesssurvey/discontinued.html
deleted file mode 100644
index 46856b20..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/discontinued.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Discontinued Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Discontinued Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Discontinued Reason</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Discontinued Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Discontinued Reason</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Discontinued Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/discontinuedlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Discontinued Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/discontinuedsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/discontinued-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/driver.html b/src/main/resources/templates/modules/homelesssurvey/driver.html
deleted file mode 100644
index eb2d3b18..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/driver.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Driver License No Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Driver License No Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Driver License No Reason</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Driver License No Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Driver License No Reason</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Driver License No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/driverlicensemasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Driver License No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/driverlicensesave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/driverlicense-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/education.html b/src/main/resources/templates/modules/homelesssurvey/education.html
deleted file mode 100644
index 8601ff1d..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/education.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Education Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Education
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Education Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Education</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Education Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Education");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/educationmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Education");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/educationsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/education-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/employmenttype.html b/src/main/resources/templates/modules/homelesssurvey/employmenttype.html
deleted file mode 100644
index dec98d3f..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/employmenttype.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Employment Type Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Employment Type
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Employment Type</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Employment Type</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Employment Type</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Employment Type");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/employmenttypelist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Employment Type");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/employmenttypesave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/employmenttype-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/gccshelter.html b/src/main/resources/templates/modules/homelesssurvey/gccshelter.html
deleted file mode 100644
index 19973853..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/gccshelter.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">GCCShelter Not Stayed Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add GCCshelter Not Stayed
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>GCCShelter Not Stayed Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add GCCShelter Not Stayed</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>GCCshelter Not Stayed Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add GCCshelter Not Stayed");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/gccsheltermasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit GCCShelter Not Stayed");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/gccsheltermasterdatasave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/gccsheltermasterdata-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/gendermaster.html b/src/main/resources/templates/modules/homelesssurvey/gendermaster.html
deleted file mode 100644
index b9964d87..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/gendermaster.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Gender Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Gender
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Gender Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Gender</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Gender Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Gender");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/gendermasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Gender");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/gendersave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/gender-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/healthcondition.html b/src/main/resources/templates/modules/homelesssurvey/healthcondition.html
deleted file mode 100644
index e60aa679..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/healthcondition.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Health Condition Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Health Condition
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Health Condition Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Health Condition</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Health Condition Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Health Condition");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/healthconditionlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Health Condition");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/healthconditionsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/healthcondition-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/homelesslist.html b/src/main/resources/templates/modules/homelesssurvey/homelesslist.html
deleted file mode 100644
index 8eadaed2..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/homelesslist.html
+++ /dev/null
@@ -1,2085 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-		.nav-pills .nav-link {
-
-			border-radius: 50px;
-
-			margin-right: 8px;
-
-			border: 1px solid #dee2e6;
-
-			color: #495057;
-		}
-
-		.nav-pills .nav-link.active {
-
-			background-color: #2c3e50;
-
-			color: #fff;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-		.pill-tabs {
-			display: flex;
-			flex-wrap: wrap;
-			gap: 10px;
-			margin-bottom: 20px;
-		}
-
-		.pill-tab {
-			border: 1px solid #d0d7de;
-			border-radius: 30px;
-			padding: 10px 20px;
-			background: #fff;
-			cursor: pointer;
-			font-weight: 600;
-			color: #495057;
-			transition: .3s;
-		}
-
-		.pill-tab.active {
-			background: #0d6efd;
-			color: #fff;
-			border-color: #0d6efd;
-		}
-
-		.tab-content-box {
-			background: #fff;
-			border: 1px solid #e9ecef;
-			border-radius: 10px;
-			padding: 20px;
-			min-height: 250px;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<!-- LEFT SIDE -->
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-thumbs-up bg-blue me-2"></i>
-									<h5 class="mb-0">Homeless Survey Dashboard</h5>
-								</div>
-							</div>
-
-							<!-- RIGHT SIDE (DATE FILTER) -->
-							<!--<div class="col-lg-6 text-end">
-								<label class="form-label fw-semibold me-2">From Date:</label>
-								<input type="date" id="fromDate" class="form-control d-inline-block"
-									style="width:150px;">
-								<label class="form-label fw-semibold me-2">To Date:</label>
-								<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-							</div>-->
-
-						</div>
-
-						<!-- BREADCRUMB (SEPARATE ROW) -->
-						<div class="row mt-2">
-							<div class="col-lg-12">
-								<nav class="breadcrumb-container">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active"> Homeless Survey List</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row mb-3 align-items-end">
-
-						<div class="col-md-3">
-							<label class="fw-semibold">Zone</label>
-							<select id="zone" class="form-control">
-								<option value="">Select Zone</option>
-							</select>
-						</div>
-
-						<div class="col-md-3">
-							<label class="fw-semibold">Ward</label>
-							<select id="ward" class="form-control">
-								<option value="">Select Ward</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<label class="fw-semibold">From Date</label>
-							<input type="date" id="fromDate" class="form-control">
-						</div>
-
-						<div class="col-md-2">
-							<label class="fw-semibold">To Date</label>
-							<input type="date" id="toDate" class="form-control">
-						</div>
-
-						<div class="col-md-2 d-flex align-items-end">
-							<button class="btn btn-primary me-2" onclick="fetchHomelessSurveyData()">
-								Search
-							</button>
-
-							<button class="btn btn-secondary" onclick="resetFilters()">
-								Reset
-							</button>
-						</div>
-
-					</div>
-					<!--<div class="row mb-3">
-
-
-
-						<div class="col-md-2">
-							<select id="gender" class="form-control">
-								<option value="">Gender</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="age" class="form-control">
-								<option value="">Age</option>
-								<option value="4-8">4-8</option>
-								<option value="9-13">9-13</option>
-								<option value="14-18">14-18</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="area" class="form-control">
-								<option value="">Area Wise</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="education" class="form-control">
-								<option value="">Education</option>
-							</select>
-						</div>
-						<div class="col-lg-6 text-end">
-							<label class="form-label fw-semibold me-2">From Date:</label>
-							<input type="date" id="fromDate" class="form-control d-inline-block" style="width:150px;">
-							<label class="form-label fw-semibold me-2">To Date:</label>
-							<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-						</div>
-					</div>
-					<div class="row mb-3 justify-content-center">
-
-						<div class="col-md-2 text-center">
-							<button class="btn btn-primary w-100 " onclick="fetchSurveyData()">Search</button>
-
-						</div>
-						<div class="col-md-2 text-center">
-							<button class="btn btn-secondary w-100 " onclick="resetFilters()">Reset</button>
-						</div>
-					</div>-->
-
-				</div>
-				<!-- Salary Report Table -->
-				<div class="card-block mt-3">
-					<table id="surveyTable" class="table table-striped table-bordered">
-						<div class="mb-3">
-
-							<button class="btn btn-success" onclick="downloadBulkHomelessExcel()">
-
-								<i class="fa fa-file-excel"></i>
-								Bulk Download Excel
-
-							</button>
-
-						</div>
-						<thead class="thead-dark">
-							<tr>
-								<th>Date</th>
-								<th>Survey ID</th>
-								<th>Name</th>
-								<th>Gender</th>
-								<th>Zone</th>
-								<th>Ward</th>
-								<th>Action</th>
-
-							</tr>
-						</thead>
-						<tbody>
-
-						</tbody>
-						<tfoot class="thead-dark">
-
-						</tfoot>
-					</table>
-				</div>
-
-			</div>
-
-			<div class="modal fade" id="surveyModal" tabindex="-1">
-				<div class="modal-dialog modal-lg modal-dialog-scrollable" style="max-width:70%; width:70%;">
-					<div class="modal-content">
-
-						<div class="modal-header">
-							<h5 class="modal-title">Child Survey Details</h5>
-							<button type="button" class="close" data-bs-dismiss="modal">
-								&times;
-							</button>
-						</div>
-						<div class="modal-body">
-
-							<ul class="nav nav-pills mb-3" id="categoryTabs">
-							</ul>
-
-							<div class="tab-content" id="categoryTabContent">
-							</div>
-
-						</div>
-
-						<div class="modal-footer">
-							<button class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-						</div>
-
-					</div>
-
-
-
-				</div>
-
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-
-	</div>
-
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-
-	<script th:inline="javascript">
-
-		function loadZones() {
-
-			$.ajax({
-				url: "/gcc/api/homeless-survey/zones",
-				type: "GET",
-				success: function (data) {
-
-					let html =
-						'<option value="">Select Zone</option>';
-
-					data.forEach(function (row) {
-
-						html += `
-                    <option value="${row.id}">
-                        ${row.zone_name}
-                    </option>
-                `;
-					});
-
-					$("#zone").html(html);
-				}
-			});
-		}
-		$("#zone").change(function () {
-
-			let zoneId = $(this).val();
-
-			$("#ward").html(
-				'<option value="">Select Ward</option>'
-			);
-
-			if (!zoneId) {
-				return;
-			}
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/wards",
-
-				type: "GET",
-
-				data: {
-					zoneId: zoneId
-				},
-
-				success: function (data) {
-
-					let html =
-						'<option value="">Select Ward</option>';
-
-					data.forEach(function (row) {
-
-						html += `
-                    <option value="${row.id}">
-                        ${row.ward_name}
-                    </option>
-                `;
-					});
-
-					$("#ward").html(html);
-				}
-			});
-		});
-		async function downloadBulkHomelessExcel() {
-
-			try {
-
-				const questionOrder = [
-
-
-					"Full Name as per document",
-					"Native Place State",
-					"Native Place District",
-
-					"Mobile Availability",
-					"Mobile Number",
-					"Relation Type",
-					"Relationship's Mobile Number",
-
-					"Gender",
-					"Date of Birth",
-					"Age",
-					"current address",
-					"Religion",
-					"Caste",
-					"Currently Living Status",
-					"Current Martial Status",
-
-					"Does the person identity themselves as a person with a disability?",
-					"select the type of disability",
-					"Does the person have a disability certificate?",
-					"Upload Disability Certificate if available",
-					"If No, why?",
-					"Does the person have any health conditions",
-
-					"Educational Qualification",
-					"Educational Status",
-					"Reasons for discontinuing education",
-					"Interested in further education?",
-					"Remarks",
-
-					"Is the person employed?",
-					"Nature of employment?",
-					"Type of employment?",
-					"Occupation Status",
-					"Duration of Occupation",
-					"Place of Occupation (street/Area)",
-					"Landmark",
-					"monthly income of the family",
-					"Is the work place and place of living the same?",
-					"Reason for not employment",
-
-					"Reason for being homeless",
-					"Place of sleeping",
-					"Type of sleeping space",
-					"How long have you been living in this place?",
-					"Do you shift locations?",
-					"If yes, how often?",
-					"Reason for moving",
-					"Have you ever stayed in a GCC shelter?",
-					"If yes, where?",
-					"If yes, Why did you come out of the shelter?",
-					"Do you wish to stay in a GCC shelter?",
-					"If No, why GCC shelter?",
-
-					// DOCUMENTS
-
-					"Birth Certificate",
-					"Birth Certificate File Upload",
-					"Birth Certificate If No Why",
-
-					"Community Certificate",
-					"Community Certificate File Upload",
-					"Community Certificate If No Why",
-
-					"Voter Id Card",
-					"Voter Id File Upload",
-					"Voter Id If No Why",
-
-					"Adhar card",
-					"Adhar File Upload",
-					"Adhar If No Why",
-
-					"Smart card",
-					"Smart Card File Upload",
-					"Smart Card If No Why",
-
-					"Driving licence",
-					"Driving Licence File Upload",
-					"Driving Licence If No Why",
-
-					"CM Health insurance",
-					"CM Health Insurance File Upload",
-					"CM Health Insurance If No Why",
-
-					"Bank Passbook",
-					"Bank Passbook File Upload",
-					"Bank Passbook If No Why",
-
-					"Have you enrolled in any welfare board",
-					"If yes, specify",
-					"Any remarks/comments"
-				];
-
-				Swal.fire({
-					title: 'Preparing Excel...',
-					text: 'Please wait',
-					allowOutsideClick: false,
-					didOpen: () => {
-						Swal.showLoading();
-					}
-				});
-
-				let table = $('#surveyTable').DataTable();
-
-				let rows = table.rows().data().toArray();
-
-				if (rows.length === 0) {
-
-					Swal.fire({
-						icon: 'warning',
-						title: 'No Data Found'
-					});
-
-					return;
-				}
-
-				let excelData = [];
-
-				let slno = 1;
-
-				for (const rowNode of rows) {
-
-					let surveyId = rowNode[1];
-
-					surveyId = surveyId.toString().trim();
-
-					if (!surveyId) {
-						continue;
-					}
-
-					let surveyData = await $.ajax({
-
-						url: "/gcc/api/homeless-survey/details",
-
-						type: "GET",
-
-						data: {
-							surveyId: surveyId
-						}
-					});
-
-					let rowData = {
-
-						"S.No": slno,
-
-						"Survey ID": surveyId
-					};
-
-					questionOrder.forEach(function (question) {
-
-						rowData[question] = "";
-					});
-
-					surveyData.forEach(function (item) {
-
-						let qid = parseInt(item.qid);
-
-						let answer = item.answer || '';
-
-						if (typeof answer === 'string') {
-
-							answer = answer
-								.replace(/<[^>]*>/g, '')
-								.trim();
-						}
-
-						switch (qid) {
-							case 48:
-								rowData["If No, why GCC shelter?"] = answer;
-								return;
-
-							case 50:
-								rowData["Birth Certificate File Upload"] = answer;
-								return;
-
-							case 51:
-								rowData["Birth Certificate If No Why"] = answer;
-								return;
-
-							case 53:
-								rowData["Community Certificate File Upload"] = answer;
-								return;
-
-							case 54:
-								rowData["Community Certificate If No Why"] = answer;
-								return;
-
-							case 56:
-								rowData["Voter Id File Upload"] = answer;
-								return;
-
-							case 57:
-								rowData["Voter Id If No Why"] = answer;
-								return;
-
-							case 59:
-								rowData["Adhar File Upload"] = answer;
-								return;
-
-							case 60:
-								rowData["Adhar If No Why"] = answer;
-								return;
-
-							case 62:
-								rowData["Smart Card File Upload"] = answer;
-								return;
-
-							case 63:
-								rowData["Smart Card If No Why"] = answer;
-								return;
-
-							case 65:
-								rowData["Driving Licence File Upload"] = answer;
-								return;
-
-							case 66:
-								rowData["Driving Licence If No Why"] = answer;
-								return;
-
-							case 68:
-								rowData["CM Health Insurance File Upload"] = answer;
-								return;
-
-							case 69:
-								rowData["CM Health Insurance If No Why"] = answer;
-								return;
-
-							case 71:
-								rowData["Bank Passbook File Upload"] = answer;
-								return;
-
-							case 72:
-								rowData["Bank Passbook If No Why"] = answer;
-								return;
-						}
-
-						let question = item.question
-							? item.question.trim()
-							: "";
-
-						if (rowData.hasOwnProperty(question)) {
-
-							rowData[question] = answer;
-						}
-					});
-
-					excelData.push(rowData);
-
-					slno++;
-				}
-
-				if (excelData.length === 0) {
-
-					Swal.fire({
-						icon: 'warning',
-						title: 'No Data Found'
-					});
-
-					return;
-				}
-
-				const worksheet = XLSX.utils.json_to_sheet(excelData);
-
-				const workbook = XLSX.utils.book_new();
-
-				XLSX.utils.book_append_sheet(
-					workbook,
-					worksheet,
-					"Homeless Survey"
-				);
-
-				const columns = [];
-
-				Object.keys(excelData[0]).forEach(function (key) {
-
-					if (key === "S.No") {
-
-						columns.push({ wch: 8 });
-
-					} else if (key === "Survey ID") {
-
-						columns.push({ wch: 30 });
-
-					} else {
-
-						columns.push({ wch: 40 });
-					}
-				});
-
-				worksheet['!cols'] = columns;
-
-				XLSX.writeFile(
-					workbook,
-					"Homeless_Survey_Report.xlsx"
-				);
-
-				Swal.close();
-
-			} catch (e) {
-
-				console.log(e);
-
-				Swal.fire({
-
-					icon: 'error',
-
-					title: 'Excel Download Failed',
-
-					text: e.message
-				});
-			}
-		}
-		async function downloadBulkHomelessExcel2() {
-
-			try {
-
-				const questionOrder = [
-
-					"Is the person willing to participate in the survey",
-					"Full Name as per document",
-					"Mobile Availability",
-					"Mobile Number",
-					"Relation Type",
-					"Relationship's Mobile Number",
-					"Native Place",
-					"select district",
-					"Gender",
-					"Date of Birth",
-					"Age",
-
-					"current address",
-					"Religion",
-					"Caste",
-					"Currently Living Status",
-					"Current Martial Status",
-					"Does the person have any health conditions",
-					"Does the person identity themselves as a person with a disability?",
-					"select the type of disability",
-					"Does the person have a disability certificate?",
-					"Upload Disability Certificate if available",
-					"If No, why?",
-
-					"Educational Qualification",
-					"Educational Status",
-					"Reasons for discontinuing education",
-					"Interested in further education?",
-					"Remarks",
-					"Is the person employed?",
-
-					"Type of employment?",
-					"Occupation Status",
-					"Duration of Occupation",
-					"Place of Occupation (street/Area)",
-					"Landmark",
-					"Is the work place and place of living the same?",
-					"Reason for not employment",
-
-					"Reason for being homeless",
-					"Place of sleeping",
-					"Type of sleeping space",
-					"How long have you been living in this place?",
-					"Do you shift locations?",
-
-					"Reason for moving",
-					"Have you ever stayed in a GCC shelter?",
-					"If yes, where?",
-					"If yes, Why did you come out of the shelter?",
-					"Do you wish to stay in a GCC shelter?",
-					"If No, why?",
-					"Birth Certificate",
-					"File Upload",
-					"If No, why?",
-					"Community Certificate",
-					"File Upload",
-					"If No, why?",
-
-
-					"Voter Id Card",
-					"File Upload",
-					"If No, why?",
-					"Adhar card",
-					"File Upload",
-					"If No, why?",
-					"Smart card",
-					"File Upload",
-					"If No, why?",
-					"Driving licence",
-					"File Upload",
-					"If No, why?",
-					"CM Health insurance",
-					"File Upload",
-					"If No, why?",
-					"Bank Passbook",
-					"File Upload",
-					"If No, why?",
-
-					"Have you enrolled in any welfare board",
-					"If yes, specify",
-					"Any remarks/comments"
-
-
-
-				];
-
-				Swal.fire({
-
-					title: 'Preparing Excel...',
-					text: 'Please wait',
-					allowOutsideClick: false,
-
-					didOpen: () => {
-
-						Swal.showLoading();
-					}
-				});
-
-				let table =
-					$('#surveyTable').DataTable();
-
-				let rows =
-					table.rows().data().toArray();
-
-				if (rows.length === 0) {
-
-					Swal.fire({
-
-						icon: 'warning',
-						title: 'No Data Found'
-					});
-
-					return;
-				}
-
-				let excelData = [];
-
-				let slno = 1;
-
-				for (const rowNode of rows) {
-
-					let surveyId =
-						rowNode[1];
-
-					surveyId =
-						surveyId.toString().trim();
-
-					if (!surveyId) {
-
-						continue;
-					}
-
-					let surveyData =
-						await $.ajax({
-
-							url:
-								"/gcc/api/homeless-survey/details",
-
-							type:
-								"GET",
-
-							data: {
-
-								surveyId:
-									surveyId
-							}
-						});
-
-					let rowData = {
-
-						"S.No": slno,
-
-						"Survey ID": surveyId
-					};
-
-					// Create all columns first in required order
-					questionOrder.forEach(function (question) {
-
-						rowData[question] = "";
-					});
-
-					// Fill answers
-					surveyData.forEach(function (item) {
-
-						let question =
-							item.question
-								? item.question.trim()
-								: "";
-
-						let answer =
-							item.answer || '';
-
-						if (typeof answer === 'string') {
-
-							answer = answer
-								.replace(/<[^>]*>/g, '')
-								.trim();
-						}
-
-						if (
-							rowData.hasOwnProperty(question)
-						) {
-
-							rowData[question] =
-								answer;
-						}
-					});
-
-					excelData.push(
-						rowData
-					);
-
-					slno++;
-				}
-
-				if (excelData.length === 0) {
-
-					Swal.fire({
-
-						icon: 'warning',
-						title: 'No Data Found'
-					});
-
-					return;
-				}
-
-				const worksheet =
-					XLSX.utils.json_to_sheet(
-						excelData
-					);
-
-				const workbook =
-					XLSX.utils.book_new();
-
-				XLSX.utils.book_append_sheet(
-
-					workbook,
-
-					worksheet,
-
-					"Homeless Survey"
-				);
-				const columns = [];
-
-				worksheet['!cols'] =
-
-					/*Object.keys(excelData[0])
-						.map(() => ({
-							wch: 35
-						}));*/
-
-
-					Object.keys(excelData[0]).forEach(function (key) {
-
-						if (key === "S.No") {
-
-							columns.push({ wch: 8 });
-
-						} else if (key === "Survey ID") {
-
-							columns.push({ wch: 25 });
-
-						} else {
-
-							columns.push({ wch: 40 });
-						}
-					});
-
-				worksheet['!cols'] = columns;
-
-				XLSX.writeFile(
-
-					workbook,
-
-					"Homeless_Survey_Report.xlsx"
-				);
-
-				Swal.close();
-
-			} catch (e) {
-
-				console.log(e);
-
-				Swal.fire({
-
-					icon: 'error',
-
-					title: 'Excel Download Failed',
-
-					text: e.message
-				});
-			}
-		}
-
-		async function downloadBulkHomelessExcel1() {
-
-			try {
-
-				Swal.fire({
-
-					title: 'Preparing Excel...',
-
-					text: 'Please wait',
-
-					allowOutsideClick: false,
-
-					didOpen: () => {
-
-						Swal.showLoading();
-					}
-				});
-
-				let table =
-					$('#surveyTable').DataTable();
-
-				let rows =
-					table.rows().data().toArray();
-
-				if (rows.length === 0) {
-
-					Swal.fire({
-
-						icon: 'warning',
-
-						title: 'No Data Found'
-					});
-
-					return;
-				}
-
-				let excelData = [];
-
-				let slno = 1;
-
-				for (const rowNode of rows) {
-
-					let surveyId =
-						rowNode[1];
-
-					surveyId =
-						surveyId.toString().trim();
-
-					if (!surveyId) {
-
-						continue;
-					}
-
-					let surveyData =
-						await $.ajax({
-
-							url:
-								"/gcc/api/homeless-survey/details",
-
-							type:
-								"GET",
-
-							data: {
-
-								surveyId:
-									surveyId
-							}
-						});
-
-					let rowData = {
-
-						"S.No":
-							slno,
-
-						"Survey ID":
-							surveyId
-					};
-
-					surveyData.forEach(function (item) {
-
-						let question =
-							item.question;
-
-						let answer =
-							item.answer || '';
-
-						// Remove HTML if any
-						if (typeof answer === 'string') {
-
-							answer = answer
-								.replace(/<[^>]*>/g, '')
-								.trim();
-						}
-
-						rowData[question] =
-							answer;
-					});
-
-					excelData.push(
-						rowData
-					);
-
-					slno++;
-				}
-
-				if (excelData.length === 0) {
-
-					Swal.fire({
-
-						icon: 'warning',
-
-						title: 'No Data Found'
-					});
-
-					return;
-				}
-
-				const worksheet =
-					XLSX.utils.json_to_sheet(
-						excelData
-					);
-
-				const workbook =
-					XLSX.utils.book_new();
-
-				XLSX.utils.book_append_sheet(
-
-					workbook,
-
-					worksheet,
-
-					"Homeless Survey"
-				);
-
-				// Auto width
-				const columns = [];
-
-				Object.keys(excelData[0]).forEach(function () {
-
-					columns.push({
-
-						wch: 30
-					});
-				});
-
-				worksheet['!cols'] =
-					columns;
-
-				XLSX.writeFile(
-
-					workbook,
-
-					"Homeless_Survey_Report.xlsx"
-				);
-
-				Swal.close();
-
-			} catch (e) {
-
-				console.log(e);
-
-				Swal.fire({
-
-					icon: 'error',
-
-					title: 'Excel Download Failed',
-
-					text: e.message
-				});
-			}
-		}
-		$(document).ready(function () {
-
-			// 🔹 Load dropdowns when page loads
-			loadZones();
-			fetchHomelessSurveyData(true);
-
-			// 🔹 (Optional) Load table initially
-			// fetchSurveyData();
-			// Restrict To Date based on From Date
-			$("#fromDate").on("change", function () {
-
-				let fromDate = $(this).val();
-
-				// Set minimum selectable date for To Date
-				$("#toDate").attr("min", fromDate);
-
-				// If current To Date is less than From Date, clear it
-				if ($("#toDate").val() < fromDate) {
-					$("#toDate").val('');
-				}
-			});
-
-		});
-		function resetFilters() {
-			$("#zone").val('');
-			$("#ward").val('');
-			$("#gender").val('');
-			$("#age").val('');
-			$("#area").val('');
-			$("#education").val('');
-			$("#fromDate").val('');
-			$("#toDate").val('');
-
-			// Re-load table with all data
-			fetchHomelessSurveyData(true);
-		}
-
-		function fetchHomelessSurveyData(isInitialLoad) {
-			let zone = $("#zone").val();
-			let ward = $("#ward").val();
-			let fromDate = $("#fromDate").val();
-			let toDate = $("#toDate").val();
-			console.log("zone: " + $("#zone").val());
-			console.log("ward: " + $("#ward").val());
-			console.log("fromDate: " + $("#fromDate").val());
-			console.log("toDate: " + $("#toDate").val());
-			if (!isInitialLoad &&
-				zone == '' &&
-				ward == '' &&
-				fromDate == '' &&
-				toDate == '') {
-
-				Swal.fire({
-					icon: 'warning',
-					title: 'Warning',
-					text: 'Please select at least one filter.',
-					confirmButtonColor: '#3085d6'
-				});
-
-				return;
-			}
-			if (fromDate != '') {
-				if (toDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-			if (toDate != '') {
-				if (fromDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-
-
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/list",
-
-				type: "GET",
-
-
-				data: {
-
-					zone: $("#zone").val(),
-					ward: $("#ward").val(),
-					fromDate: $("#fromDate").val(),
-					toDate: $("#toDate").val()
-				},
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row) {
-
-						tbody += `
-                    <tr>
-
-                       <!--td>
-                            ${formatDate(row.survey_date)}
-                        </td>-->
-
-						<td data-order="${row.survey_date}">
-							${formatDate(row.survey_date)}
-						</td>
-
-                        <td>
-                            ${row.survey_id || ''}
-                        </td>
-
-                        <td>
-                            ${row.name || ''}
-                        </td>
-
-                        <td>
-                            ${row.gender || ''}
-                        </td>
-
-                        <td>
-                            ${row.zone || ''}
-                        </td>
-
-                        <td>
-                            ${row.ward || ''}
-                        </td>
-
-                        <td>
-                            <button
-                                class="btn btn-info btn-sm"
-                                onclick="viewSurvey('${row.survey_id}')">
-
-                                <i class="fa fa-eye"></i>
-
-                            </button>
-                        </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable(
-						'#surveyTable')) {
-
-						$('#surveyTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#surveyTable tbody")
-						.html(tbody);
-
-					$("#surveyTable tbody").html(tbody);
-
-					// 🔥 Reinitialize DataTable WITH BUTTONS
-					$('#surveyTable').DataTable({
-						dom: 'Bfrtip',
-						buttons: [
-							{
-								extend: 'pageLength',
-								className: 'btn btn-warning'
-							},
-							{
-								extend: 'excelHtml5',
-								text: 'Excel',
-								className: 'btn btn-success'
-							},
-							{
-								extend: 'pdfHtml5',
-								text: 'PDF',
-								className: 'btn btn-secondary',
-								orientation: 'landscape',
-								pageSize: 'A4'
-							}
-						],
-						responsive: true,
-						destroy: true
-
-
-					});
-				}
-			});
-		}
-		/*function viewSurvey(surveyId) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/details",
-
-				type: "GET",
-
-				data: {
-					surveyId: surveyId
-				},
-
-				success: function (data) {
-
-					renderSurveyModal(data, surveyId);
-
-					$("#surveyModal").modal("show");
-				}
-			});
-		}*/
-		function viewSurvey1(surveyId) {
-
-			$.when(
-
-				$.ajax({
-
-					url: "/gcc/api/homeless-survey/details",
-
-					type: "GET",
-
-					data: {
-						surveyId: surveyId
-					}
-				}),
-
-				$.ajax({
-
-					url: "/gcc/api/homeless-survey/categories",
-
-					type: "GET"
-				})
-
-			).done(function (
-
-				detailsResponse,
-				categoryResponse
-
-			) {
-
-				let details =
-					detailsResponse[0];
-
-				let categories =
-					categoryResponse[0];
-
-				renderSurveyModal(
-					details,
-					categories,
-					surveyId
-				);
-
-				$("#surveyModal").modal("show");
-			});
-		}
-		function viewSurvey(surveyId) {
-
-			$.when(
-
-				$.ajax({
-					url: "/gcc/api/homeless-survey/details",
-					type: "GET",
-					data: {
-						surveyId: surveyId
-					}
-				}),
-
-				$.ajax({
-					url: "/gcc/api/homeless-survey/categories",
-					type: "GET"
-				})
-
-			).done(function (
-
-				detailsResponse,
-				categoryResponse
-
-			) {
-
-				let details =
-					detailsResponse[0];
-
-				let categories =
-					categoryResponse[0];
-
-				renderCategoryTabs(
-					details,
-					categories,
-					surveyId
-				);
-
-				$('#surveyModal')
-					.modal('show');
-
-			});
-		}
-		function renderCategoryTabs(
-			data,
-			categories,
-			surveyId
-		) {
-
-			let grouped = {};
-
-			data.forEach(function (row) {
-
-				let category =
-					row.category_name;
-
-				if (!grouped[category]) {
-
-					grouped[category] = [];
-				}
-
-				grouped[category].push(row);
-			});
-
-			let tabsHtml = '';
-			let contentHtml = '';
-
-			categories.forEach(function (cat, index) {
-
-				let category =
-					cat.english_name;
-
-				let questions =
-					grouped[category] || [];
-
-				tabsHtml += `
-
-            <li class="nav-item me-2">
-
-                <button
-                    class="nav-link
-                    ${index === 0 ? 'active' : ''}"
-
-                    data-bs-toggle="pill"
-
-                    data-bs-target="#tab${index}"
-
-                    type="button">
-
-                    ${category}
-
-                </button>
-
-            </li>
-        `;
-
-				contentHtml += `
-
-            <div
-                class="tab-pane fade
-                ${index === 0 ? 'show active' : ''}"
-
-                id="tab${index}">
-        `;
-
-				// Documents Download Button
-				if (
-					category === "Documents" &&
-					questions.length > 0
-				) {
-
-					contentHtml += `
-
-                <div class="text-end mb-3">
-
-                    <button
-                        class="btn btn-success btn-sm"
-
-                        onclick="
-                            downloadAllDocuments(
-                                '${surveyId}'
-                            )">
-
-                        <i class="fa fa-download"></i>
-
-                        Download All Documents
-
-                    </button>
-
-                </div>
-            `;
-				}
-
-				// No Data
-				if (questions.length === 0) {
-
-					contentHtml += `
-
-                <div
-                    class="alert alert-light border">
-
-                    No Data Available
-
-                </div>
-            `;
-				}
-				else {
-
-					contentHtml += `
-                <div class="row">
-            `;
-
-					questions.forEach(function (q) {
-
-						let answer =
-							q.answer || '-';
-
-						// IMAGE
-						if (
-							q.question_type === 'image'
-							||
-							answer.match(/\.(jpg|jpeg|png|gif|webp)$/i)
-						) {
-
-							answer = `
-
-                        <img
-                            src="${answer}"
-
-                            class="img-thumbnail"
-
-                            style="
-                                max-width:250px;
-                                max-height:250px;
-                                cursor:pointer;
-                            "
-
-                            onclick="
-                                window.open(
-                                    '${answer}',
-                                    '_blank'
-                                )
-                            ">
-                    `;
-						}
-
-						// FILE URL
-						else if (
-							String(answer)
-								.startsWith("http")
-						) {
-
-							answer = `
-
-                        <a
-                            href="${answer}"
-
-                            target="_blank"
-
-                            class="btn btn-primary btn-sm">
-
-                            View File
-
-                        </a>
-                    `;
-						}
-
-						contentHtml += `
-
-                    <div
-                        class="col-md-6 mb-3">
-
-                        <div class="detail-card">
-
-                            <div class="detail-label">
-
-                                ${q.question}
-
-                            </div>
-
-                            <div class="detail-value">
-
-                                ${answer}
-
-                            </div>
-
-                        </div>
-
-                    </div>
-                `;
-					});
-
-					contentHtml += `
-                </div>
-            `;
-				}
-
-				contentHtml += `
-            </div>
-        `;
-			});
-
-			$('#categoryTabs')
-				.html(tabsHtml);
-
-			$('#categoryTabContent')
-				.html(contentHtml);
-		}
-		/*function renderSurveyModal(
-			data,
-			categories,
-			surveyId
-		) {
-
-			let grouped = {};
-
-			data.forEach(function (row) {
-
-				let category =
-					row.category_name;
-
-				if (!grouped[category]) {
-
-					grouped[category] = [];
-				}
-
-				grouped[category].push(row);
-			});
-
-			let html =
-				'<div class="accordion" id="surveyAccordion">';
-
-			let index = 0;
-
-			categories.forEach(function (cat) {
-
-				let category =
-					cat.english_name;
-
-				let questions =
-					grouped[category] || [];
-
-				html += `
-
-		<div class="accordion-item">
-
-			<h2 class="accordion-header">
-
-				<button
-					class="accordion-button
-					${index > 0 ? 'collapsed' : ''}"
-
-					type="button"
-
-					data-bs-toggle="collapse"
-
-					data-bs-target="#collapse${index}">
-
-					${category}
-
-				</button>
-
-			</h2>
-
-			<div
-				id="collapse${index}"
-
-				class="accordion-collapse collapse
-				${index === 0 ? 'show' : ''}"
-
-				data-bs-parent="#surveyAccordion">
-
-				<div class="accordion-body">
-		`;
-
-				if (
-					category === "Documents" &&
-					questions.length > 0
-				) {
-
-					html += `
-	<div class="text-end mb-3">
-
-		<button
-			class="btn btn-success btn-sm"
-			onclick="downloadAllDocuments('${surveyId}')">
-
-			<i class="fa fa-download"></i>
-			Download All Documents
-
-		</button>
-
-	</div>
-	`;
-				}
-
-				if (questions.length === 0) {
-
-					html += `
-
-			<div class="alert alert-light border">
-
-				No Data Available
-
-			</div>
-			`;
-				}
-				else {
-
-					html += `<div class="row">`;
-
-					questions.forEach(function (q) {
-
-						let answer =
-							q.answer || "-";
-
-						if (q.question_type === "image") {
-
-							answer = `
-
-					<img
-						src="${q.answer}"
-
-						class="img-thumbnail"
-
-						style="
-							max-width:200px;
-							max-height:200px;
-							cursor:pointer;
-						"
-
-						onclick="
-							window.open(
-								'${q.answer}',
-								'_blank'
-							)
-						">
-					`;
-						}
-						else if (
-							String(answer)
-								.startsWith("http")
-						) {
-
-							answer = `
-
-					<a
-						href="${answer}"
-
-						target="_blank">
-
-						View File
-
-					</a>
-					`;
-						}
-
-						html += `
-
-				<div class="col-md-6 mb-3">
-
-					<div class="detail-card">
-
-						<div class="detail-label">
-
-							${q.question || '-'}
-
-						</div>
-
-						<div class="detail-value">
-
-							${answer}
-
-						</div>
-
-					</div>
-
-				</div>
-				`;
-					});
-
-					html += `</div>`;
-				}
-
-				html += `
-
-				</div>
-
-			</div>
-
-		</div>
-		`;
-
-				index++;
-			});
-
-			html += `</div>`;
-
-			$("#surveyDetails").html(html);
-		}*/
-
-
-
-		function formatDate(dateString) {
-
-			if (!dateString) return '';
-
-			const date = new Date(dateString);
-
-			const day = String(date.getDate()).padStart(2, '0');
-
-			const month = String(date.getMonth() + 1).padStart(2, '0');
-
-			const year = date.getFullYear();
-
-			return `${day} -${month} -${year} `;
-		}
-		/*function downloadAllDocuments(surveyId) {
-
-			window.location.href =
-				'/gcc/api/homeless-survey/download-all-documents?surveyId='
-				+ encodeURIComponent(surveyId);
-		}*/
-		function downloadAllDocuments(surveyId) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/document-count",
-
-				type: "GET",
-
-				data: {
-					surveyId: surveyId
-				},
-
-				success: function (count) {
-
-					if (count === 0) {
-
-						Swal.fire({
-							icon: 'info',
-							title: 'No Documents',
-							text: 'No documents have been uploaded for this survey.'
-						});
-
-						return;
-					}
-
-					window.location.href =
-						'/gcc/api/homeless-survey/download-all-documents?surveyId='
-						+ encodeURIComponent(surveyId);
-				},
-
-				error: function () {
-
-					Swal.fire({
-						icon: 'error',
-						title: 'Error',
-						text: 'Unable to verify documents.'
-					});
-				}
-			});
-		}
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/homelessreason.html b/src/main/resources/templates/modules/homelesssurvey/homelessreason.html
deleted file mode 100644
index 8da2b584..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/homelessreason.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Homeless Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Homeless Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Homeless Reason Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Homeless Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Homeless Reason Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Homeless Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/homelessreasonmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Homeless Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/homelessreasonmasterlist",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/homelessreasonmaster-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/martial.html b/src/main/resources/templates/modules/homelesssurvey/martial.html
deleted file mode 100644
index f75e2457..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/martial.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Martial Status Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Martial Status
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Martial Status Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Martial Status</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Martial Status Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Martial Status");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/martialmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Martial Status");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/martialsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/martial-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/movingreason.html b/src/main/resources/templates/modules/homelesssurvey/movingreason.html
deleted file mode 100644
index 89f961a5..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/movingreason.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Moving Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Moving Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Moving Reason</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Moving Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Moving Reason</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Moving Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/movingreasonmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Moving Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/movingreasonmasterdatasave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/movingreasonmasterdata-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/nonsurveyedhomelist.html b/src/main/resources/templates/modules/homelesssurvey/nonsurveyedhomelist.html
deleted file mode 100644
index 1e7eb7a5..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/nonsurveyedhomelist.html
+++ /dev/null
@@ -1,1007 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<!-- LEFT SIDE -->
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-thumbs-up bg-blue me-2"></i>
-									<h5 class="mb-0">Homeless Survey Dashboard</h5>
-								</div>
-							</div>
-
-							<!-- RIGHT SIDE (DATE FILTER) -->
-							<!--<div class="col-lg-6 text-end">
-								<label class="form-label fw-semibold me-2">From Date:</label>
-								<input type="date" id="fromDate" class="form-control d-inline-block"
-									style="width:150px;">
-								<label class="form-label fw-semibold me-2">To Date:</label>
-								<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-							</div>-->
-
-						</div>
-
-						<!-- BREADCRUMB (SEPARATE ROW) -->
-						<div class="row mt-2">
-							<div class="col-lg-12">
-								<nav class="breadcrumb-container">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active"> Homeless Survey List</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row mb-3 align-items-end">
-
-						<div class="col-md-3">
-							<label class="fw-semibold">Zone</label>
-							<select id="zone" class="form-control">
-								<option value="">Select Zone</option>
-							</select>
-						</div>
-
-						<div class="col-md-3">
-							<label class="fw-semibold">Ward</label>
-							<select id="ward" class="form-control">
-								<option value="">Select Ward</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<label class="fw-semibold">From Date</label>
-							<input type="date" id="fromDate" class="form-control">
-						</div>
-
-						<div class="col-md-2">
-							<label class="fw-semibold">To Date</label>
-							<input type="date" id="toDate" class="form-control">
-						</div>
-
-						<div class="col-md-2 d-flex align-items-end">
-							<button class="btn btn-primary me-2" onclick="loadHomelessNonSurveyedList()">
-								Search
-							</button>
-
-							<button class="btn btn-secondary" onclick="resetFilters()">
-								Reset
-							</button>
-						</div>
-
-					</div>
-					<!--<div class="row mb-3">
-
-
-
-						<div class="col-md-2">
-							<select id="gender" class="form-control">
-								<option value="">Gender</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="age" class="form-control">
-								<option value="">Age</option>
-								<option value="4-8">4-8</option>
-								<option value="9-13">9-13</option>
-								<option value="14-18">14-18</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="area" class="form-control">
-								<option value="">Area Wise</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="education" class="form-control">
-								<option value="">Education</option>
-							</select>
-						</div>
-						<div class="col-lg-6 text-end">
-							<label class="form-label fw-semibold me-2">From Date:</label>
-							<input type="date" id="fromDate" class="form-control d-inline-block" style="width:150px;">
-							<label class="form-label fw-semibold me-2">To Date:</label>
-							<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-						</div>
-					</div>
-					<div class="row mb-3 justify-content-center">
-
-						<div class="col-md-2 text-center">
-							<button class="btn btn-primary w-100 " onclick="fetchSurveyData()">Search</button>
-
-						</div>
-						<div class="col-md-2 text-center">
-							<button class="btn btn-secondary w-100 " onclick="resetFilters()">Reset</button>
-						</div>
-					</div>-->
-
-				</div>
-				<!-- Salary Report Table -->
-				<div class="card-block mt-3">
-					<table id="surveyTable" class="table table-striped table-bordered">
-						<div class="mb-3">
-
-							<!-- <button class="btn btn-success" onclick="downloadBulkSurveyExcel()">
-
-								<i class="fa fa-file-excel"></i>
-								Bulk Download Excel
-
-							</button>-->
-
-						</div>
-						<thead class="thead-dark">
-							<tr>
-								<th>Date</th>
-								<th>Survey ID</th>
-								<th>Name</th>
-								<th>Age</th>
-								<th>DOB</th>
-								<th>Zone</th>
-								<th>Ward</th>
-								<th>Photo</th>
-								<th>Remarks</th>
-
-							</tr>
-						</thead>
-						<tbody>
-
-						</tbody>
-						<tfoot class="thead-dark">
-
-						</tfoot>
-					</table>
-				</div>
-
-			</div>
-
-			<div class="modal fade" id="surveyModal" tabindex="-1">
-				<div class="modal-dialog modal-lg modal-dialog-scrollable" style="max-width:70%; width:70%;">
-					<div class="modal-content">
-
-						<div class="modal-header">
-							<h5 class="modal-title">Child Survey Details</h5>
-							<button type="button" class="close" data-bs-dismiss="modal">
-								&times;
-							</button>
-						</div>
-
-						<div class="modal-body">
-							<div id="surveyDetails"></div>
-						</div>
-
-						<div class="modal-footer">
-							<button class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-						</div>
-
-					</div>
-
-
-
-				</div>
-
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-
-	</div>
-
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-
-	<script th:inline="javascript">
-
-		function loadZones() {
-
-			$.ajax({
-				url: "/gcc/api/homeless-survey/zones",
-				type: "GET",
-				success: function (data) {
-
-					let html =
-						'<option value="">Select Zone</option>';
-
-					data.forEach(function (row) {
-
-						html += `
-                    <option value="${row.id}">
-                        ${row.zone_name}
-                    </option>
-                `;
-					});
-
-					$("#zone").html(html);
-				}
-			});
-		}
-		$("#zone").change(function () {
-
-			let zoneId = $(this).val();
-
-			$("#ward").html(
-				'<option value="">Select Ward</option>'
-			);
-
-			if (!zoneId) {
-				return;
-			}
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/wards",
-
-				type: "GET",
-
-				data: {
-					zoneId: zoneId
-				},
-
-				success: function (data) {
-
-					let html =
-						'<option value="">Select Ward</option>';
-
-					data.forEach(function (row) {
-
-						html += `
-                    <option value="${row.id}">
-                        ${row.ward_name}
-                    </option>
-                `;
-					});
-
-					$("#ward").html(html);
-				}
-			});
-		});
-
-		async function downloadBulkSurveyExcel() {
-
-			try {
-
-				Swal.fire({
-					title: 'Preparing Excel...',
-					text: 'Please wait',
-					allowOutsideClick: false,
-					didOpen: () => {
-						Swal.showLoading();
-					}
-				});
-
-				// GET TABLE DATA
-				let table = $('#surveyTable').DataTable();
-
-				let rows = table.rows().data().toArray();
-
-				if (rows.length === 0) {
-
-					Swal.fire({
-						icon: 'warning',
-						title: 'No Data Found'
-					});
-
-					return;
-				}
-
-				let excelData = [];
-
-				let slno = 1;
-
-				/*for (const rowNode of rows) {
-	
-					// GET SURVEY ID FROM TABLE
-					let surveyId = $(rowNode[1]).text() || rowNode[1];
-	
-					surveyId = surveyId.toString().trim();
-	
-					// CALL DETAILS API
-					let surveyData = await $.ajax({
-						url: "/gcc/api/children-survey/details",
-						type: "GET",
-						data: {
-							surveyId: surveyId
-						}
-					});
-	
-					// MERGE ALL SECTIONS
-					let allQuestions = {
-	
-						...surveyData.personalInformation,
-						...surveyData.locationDetails,
-						...surveyData.educationDetails,
-						...surveyData.healthDetails,
-						...surveyData.documentDetails,
-						...surveyData.vulnerabilityDetails
-					};
-	
-					// CREATE ROW OBJECT
-					let rowData = {
-						"S.No": slno,
-						"Survey ID": surveyId
-					};
-	
-					// ADD ALL QUESTIONS AS COLUMNS
-					Object.keys(allQuestions).forEach(function (question) {
-	
-						rowData[question] = allQuestions[question];
-	
-					});
-	
-					excelData.push(rowData);
-	
-					slno++;
-				}*/
-				for (const rowNode of rows) {
-
-					let surveyId = $(rowNode[1]).text() || rowNode[1];
-
-					surveyId = surveyId.toString().trim();
-
-					// SKIP EMPTY ROWS
-					if (!surveyId || surveyId === "") {
-						continue;
-					}
-
-					let surveyData = await $.ajax({
-						url: "/gcc/api/children-survey/details",
-						type: "GET",
-						data: {
-							surveyId: surveyId
-						}
-					});
-
-
-					let allQuestions = {
-
-
-						...surveyData.locationDetails,
-						...surveyData.personalInformation,
-						...surveyData.educationDetails,
-						...surveyData.healthDetails,
-						...surveyData.documentDetails,
-						...surveyData.vulnerabilityDetails
-					};
-
-					let rowData = {
-						"S.No": slno,
-						"Survey ID": surveyId
-					};
-
-					Object.keys(allQuestions).forEach(function (question) {
-
-						rowData[question] = allQuestions[question];
-
-					});
-
-					excelData.push(rowData);
-
-					slno++;
-				}
-
-				// CREATE WORKSHEET
-				//const worksheet = XLSX.utils.json_to_sheet(excelData);
-				// FIXED COLUMN ORDER
-				const headers = [
-
-					"S.No",
-					"Survey ID",
-
-					// LOCATION
-					"Select the Area",
-					"Type of House Ownership",
-					"How Long You Have Been Staying Here?",
-					"Block No",
-					"House No",
-
-					// PERSONAL
-					"Name of the Child",
-					"Gender",
-					"Do you know DOB?",
-					"Date of Birth",
-					"Age",
-					"Place of Birth",
-					"Hospital of Birth",
-					"Religion",
-					"Caste",
-					"Sub Caste",
-					"Child Living With",
-					"Father Name",
-					"Mother Name",
-					"Where about of Father?",
-					"Where about of Mother?",
-					"Guardian Name",
-					"Relationship",
-					"Occupation",
-					"Family Monthly Income",
-					"Contact Number",
-
-					// EDUCATION
-					"Are they Currently Studying",
-					"Education Status",
-					"School Name",
-					"School Location",
-					"Which standard they stopped",
-					"Which year did they stopped",
-
-					"Reason for Dropout",
-					"Is The Child Interested In Continuing Education?",
-					"What are you Interested In?",
-					"Are you Staying in any Educational Hostel",
-					"Name of the Hostel?",
-					"Location of the Hostel?",
-
-					// HEALTH
-					"Does the child have any history of health issues?",
-					"Health Details",
-
-					// DOCUMENT
-
-					"Aadhar card",
-					"Aadhar No",
-					"Any corrections to be made in Aadhar card document?",
-					"If Not Why Aadhar card?",
-					"Community Certificate",
-					"Any corrections to be made in community certificate document?",
-					"If Not Why community certificate?",
-					"Birth Certificate",
-					"Any corrections to be made in birth certificate document?",
-					"If Not Why birth certificate?",
-
-					// VULNERABILITY
-					"Vulnerability Assessment",
-					"Any Other Support Needed?",
-					"Comments & Remarks",
-
-				];
-
-				// CREATE NEW ORDERED DATA
-				let orderedExcelData = [];
-
-				excelData.forEach(function (row) {
-
-					let orderedRow = {};
-
-					headers.forEach(function (header) {
-
-						orderedRow[header] = row[header] || '';
-
-					});
-
-					orderedExcelData.push(orderedRow);
-
-				});
-
-				// CREATE SHEET
-				const worksheet = XLSX.utils.json_to_sheet(
-					orderedExcelData,
-					{
-						header: headers
-					}
-				);
-				// DYNAMIC HEADERS
-
-
-				// AUTO COLUMN WIDTH
-				//const columns = [];
-
-				/*Object.keys(excelData[0]).forEach(function () {
-	
-					columns.push({ wch: 30 });
-	
-				});
-	
-				worksheet['!cols'] = columns;*/
-				const columns = [];
-
-				Object.keys(excelData[0]).forEach(function (key) {
-
-					if (key === "S.No") {
-
-						columns.push({ wch: 8 });
-
-					} else {
-
-						columns.push({ wch: 25 });
-
-					}
-
-				});
-
-				worksheet['!cols'] = columns;
-
-
-				// CREATE WORKBOOK
-				const workbook = XLSX.utils.book_new();
-
-				XLSX.utils.book_append_sheet(
-					workbook,
-					worksheet,
-					"Children Survey"
-				);
-
-				// DOWNLOAD
-				XLSX.writeFile(
-					workbook,
-					"Children_Survey_Report.xlsx"
-				);
-
-				Swal.close();
-
-			} catch (e) {
-
-				console.log(e);
-
-				Swal.fire({
-					icon: 'error',
-					title: 'Excel Download Failed'
-				});
-			}
-		}
-		$(document).ready(function () {
-
-			// 🔹 Load dropdowns when page loads
-			loadZones();
-			loadHomelessNonSurveyedList(true);
-
-			// 🔹 (Optional) Load table initially
-			// fetchSurveyData();
-			// Restrict To Date based on From Date
-			$("#fromDate").on("change", function () {
-
-				let fromDate = $(this).val();
-
-				// Set minimum selectable date for To Date
-				$("#toDate").attr("min", fromDate);
-
-				// If current To Date is less than From Date, clear it
-				if ($("#toDate").val() < fromDate) {
-					$("#toDate").val('');
-				}
-			});
-
-		});
-
-		function resetFilters() {
-			$("#zone").val('');
-			$("#ward").val('');
-			$("#fromDate").val('');
-			$("#toDate").val('');
-
-			// Re-load table with all data
-			loadHomelessNonSurveyedList(true);
-		}
-
-		function loadHomelessNonSurveyedList(isInitialLoad) {
-
-			let zone = $("#zone").val();
-			let ward = $("#ward").val();
-			let fromDate = $("#fromDate").val();
-			let toDate = $("#toDate").val();
-			if (!isInitialLoad &&
-				zone == '' &&
-				ward == '' &&
-				fromDate == '' &&
-				toDate == '') {
-
-				Swal.fire({
-					icon: 'warning',
-					title: 'Warning',
-					text: 'Please select at least one filter.',
-					confirmButtonColor: '#3085d6'
-				});
-
-				return;
-			}
-			if (fromDate != '') {
-				if (toDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-			if (toDate != '') {
-				if (fromDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-
-
-
-			$('#surveyTable').DataTable({
-
-				destroy: true,
-
-				ajax: {
-
-					url: "/gcc/api/homeless-survey/nonsurveyed/list",
-
-					data: {
-						zone: zone,
-						ward: ward,
-						fromDate: fromDate,
-						toDate: toDate
-					},
-
-					dataSrc: ""
-				},
-				createdRow: function (row, data, dataIndex) {
-					// 🔹 Format the date in the first column
-					const surveyDate = data.survey_date;
-					if (surveyDate) {
-						$('td:eq(0)', row).text(formatDate(surveyDate));
-					}
-				},
-
-				dom: 'Bfrtip',
-
-				buttons: [
-
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-
-					{
-						extend: 'excelHtml5',
-						text: 'Excel',
-						className: 'btn btn-success'
-					},
-
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						orientation: 'landscape',
-						pageSize: 'A4'
-					}
-				],
-
-				responsive: true,
-
-				columns: [
-
-					{ data: "survey_date" },
-					{ data: "survey_id" },
-					{ data: "name" },
-					{ data: "age" },
-					{ data: "dob" },
-					{ data: "zone" },
-					{ data: "ward" },
-
-					{
-						data: "image_url",
-						render: function (data) {
-
-							if (data) {
-
-								return '<a href="' + data +
-									'" target="_blank">View Photo</a>';
-							}
-
-							return "-";
-						}
-					},
-
-					{ data: "remarks" }
-				]
-			});
-		}
-		function formatDate(dateString) {
-
-			if (!dateString) return '';
-
-			const date = new Date(dateString);
-
-			const day = String(date.getDate()).padStart(2, '0');
-
-			const month = String(date.getMonth() + 1).padStart(2, '0');
-
-			const year = date.getFullYear();
-
-			return `${day}-${month}-${year}`;
-		}
-		function loadDropdowns() {
-
-			// Gender
-			$.ajax({
-				url: "/gcc/api/children-survey/gender",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Gender</option>';
-
-					data.forEach(function (g) {
-						options += `<option value="${g.id}">${g.english_name}</option>`;
-					});
-
-					$("#gender").html(options);
-				}
-			});
-
-			// Area
-			$.ajax({
-				url: "/gcc/api/children-survey/location",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Area</option>';
-
-					data.forEach(function (a) {
-						options += `<option value="${a.id}">${a.english_name}</option>`;
-					});
-
-					$("#area").html(options);
-				}
-			});
-
-			// Education
-			$.ajax({
-				url: "/gcc/api/children-survey/education",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Education</option>';
-
-					data.forEach(function (e) {
-						options += `<option value="${e.id}">${e.english_name}</option>`;
-					});
-
-					$("#education").html(options);
-				}
-			});
-
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/notemployed.html b/src/main/resources/templates/modules/homelesssurvey/notemployed.html
deleted file mode 100644
index 8126ae7d..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/notemployed.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Not Employed Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Not Employed Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Not Employed Reason Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Not Employed Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Not Employed Reason Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Not Employed Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/notemployedlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Not Employed Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/notemployedsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/notemployed-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/occupation.html b/src/main/resources/templates/modules/homelesssurvey/occupation.html
deleted file mode 100644
index b93a8642..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/occupation.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Occupation Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Occupation
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Occupation Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Occupation</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Occupation Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Occupation");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/occupationlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Occupation");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/occupationsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/occupation-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/relationtype.html b/src/main/resources/templates/modules/homelesssurvey/relationtype.html
deleted file mode 100644
index 0383ed5e..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/relationtype.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Relation Type Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Relation Type
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Relation Type Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Relation Type</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Relation Type Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Relation Type");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/relationtypemasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Relation Type");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/relationtypesave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/relationtype-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/religion.html b/src/main/resources/templates/modules/homelesssurvey/religion.html
deleted file mode 100644
index 59a0ab15..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/religion.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Religion Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Religion
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Religion Name</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Religion</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Religion Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Religion");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/religionmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Religion");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/religionmasterdatasave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/religionmasterdata-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/sleepingspace.html b/src/main/resources/templates/modules/homelesssurvey/sleepingspace.html
deleted file mode 100644
index 62b47aae..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/sleepingspace.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Sleeping Space Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Sleeping Space
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Sleeping Space</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Sleeping Space</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Sleeping Space</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Sleeping Space");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/sleepingspacemasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Sleeping Space");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/sleepingspacesave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/sleepingspace-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/smart.html b/src/main/resources/templates/modules/homelesssurvey/smart.html
deleted file mode 100644
index ec2df2ba..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/smart.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">Smart Card No Reason Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add Smart Card No Reason
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>Smart Card No Reason</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add Smart Card No Reason</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>Smart Card No Reason</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add Smart Card No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/smartcardnoreasonmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit Smart Card No Reason");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/smartcardnoreasonsave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/smartcardnoreasonstatus",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/surveyorlist.html b/src/main/resources/templates/modules/homelesssurvey/surveyorlist.html
deleted file mode 100644
index e1db2384..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/surveyorlist.html
+++ /dev/null
@@ -1,1257 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		.nav-pills .nav-link {
-
-			border-radius: 50px;
-
-			margin-right: 8px;
-
-			border: 1px solid #dee2e6;
-
-			color: #495057;
-		}
-
-		.nav-pills .nav-link.active {
-
-			background-color: #0d6efd;
-
-			color: #fff;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<!-- LEFT SIDE -->
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-thumbs-up bg-blue me-2"></i>
-									<h5 class="mb-0">Homeless Survey Dashboard</h5>
-								</div>
-							</div>
-
-							<!-- RIGHT SIDE (DATE FILTER) -->
-							<!--<div class="col-lg-6 text-end">
-								<label class="form-label fw-semibold me-2">From Date:</label>
-								<input type="date" id="fromDate" class="form-control d-inline-block"
-									style="width:150px;">
-								<label class="form-label fw-semibold me-2">To Date:</label>
-								<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-							</div>-->
-
-						</div>
-
-						<!-- BREADCRUMB (SEPARATE ROW) -->
-						<div class="row mt-2">
-							<div class="col-lg-12">
-								<nav class="breadcrumb-container">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active"> Survey Homeless List</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row mb-3 align-items-end">
-
-						<div class="col-md-3">
-							<label class="fw-semibold">Zone</label>
-							<select id="zone" class="form-control">
-								<option value="">Select Zone</option>
-							</select>
-						</div>
-
-						<div class="col-md-3">
-							<label class="fw-semibold">Ward</label>
-							<select id="ward" class="form-control">
-								<option value="">Select Ward</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<label class="fw-semibold">From Date</label>
-							<input type="date" id="fromDate" class="form-control">
-						</div>
-
-						<div class="col-md-2">
-							<label class="fw-semibold">To Date</label>
-							<input type="date" id="toDate" class="form-control">
-						</div>
-
-						<div class="col-md-2 d-flex align-items-end">
-							<button class="btn btn-primary me-2" onclick="loadSurveyors()">
-								Search
-							</button>
-
-							<button class="btn btn-secondary" onclick="resetFilters()">
-								Reset
-							</button>
-						</div>
-
-					</div>
-					<!--<div class="row mb-3">
-
-
-
-						<div class="col-md-2">
-							<select id="gender" class="form-control">
-								<option value="">Gender</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="age" class="form-control">
-								<option value="">Age</option>
-								<option value="4-8">4-8</option>
-								<option value="9-13">9-13</option>
-								<option value="14-18">14-18</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="area" class="form-control">
-								<option value="">Area Wise</option>
-							</select>
-						</div>
-
-						<div class="col-md-2">
-							<select id="education" class="form-control">
-								<option value="">Education</option>
-							</select>
-						</div>
-						<div class="col-lg-6 text-end">
-							<label class="form-label fw-semibold me-2">From Date:</label>
-							<input type="date" id="fromDate" class="form-control d-inline-block" style="width:150px;">
-							<label class="form-label fw-semibold me-2">To Date:</label>
-							<input type="date" id="toDate" class="form-control d-inline-block" style="width:150px;">
-						</div>
-					</div>
-					<div class="row mb-3 justify-content-center">
-
-						<div class="col-md-2 text-center">
-							<button class="btn btn-primary w-100 " onclick="fetchSurveyData()">Search</button>
-
-						</div>
-						<div class="col-md-2 text-center">
-							<button class="btn btn-secondary w-100 " onclick="resetFilters()">Reset</button>
-						</div>
-					</div>-->
-
-				</div>
-				<!-- Salary Report Table -->
-				<div class="card-block mt-3">
-					<table id="surveyorTable" class="table table-bordered table-striped">
-
-						<thead class="thead-dark">
-							<tr>
-
-								<th>Date</th>
-								<th>Surveyor Name</th>
-								<th>Mobile Number</th>
-								<th>Zone</th>
-								<th>Ward</th>
-								<th>Total Survey Done</th>
-								<th>Action</th>
-
-							</tr>
-						</thead>
-
-						<tbody></tbody>
-
-					</table>
-				</div>
-
-			</div>
-
-			<div class="modal fade" id="surveyModal" tabindex="-1">
-
-				<div class="modal-dialog modal-xl">
-
-					<div class="modal-content">
-
-						<div class="modal-header">
-
-							<h5 class="modal-title">
-								Homeless Survey Details
-							</h5>
-
-							<button type="button" class="close" data-bs-dismiss="modal">
-								&times;
-							</button>
-
-						</div>
-
-						<div class="modal-body">
-
-							<table id="surveyDetailsTable" class="table table-bordered table-striped">
-
-								<thead class="thead-dark">
-
-									<tr>
-
-										<th>Date</th>
-										<th>Survey ID</th>
-										<th>Name</th>
-										<th>Gender</th>
-										<th>Zone</th>
-										<th>Ward</th>
-										<th>Action</th>
-
-									</tr>
-
-								</thead>
-
-								<tbody></tbody>
-
-							</table>
-
-						</div>
-
-					</div>
-
-				</div>
-
-			</div>
-			<!-- Survey Details Modal -->
-			<div class="modal fade" id="surveyDetailsModal" tabindex="-1" aria-hidden="true">
-
-				<div class="modal-dialog modal-xl modal-dialog-scrollable">
-
-					<div class="modal-content">
-
-						<div class="modal-header bg-secondary text-white">
-
-							<h5 class="modal-title">
-								Homeless Survey Details
-							</h5>
-
-
-							<button type="button" class="close" data-bs-dismiss="modal">
-								&times;
-							</button>
-
-						</div>
-
-						<div class="modal-body">
-
-							<!-- Dynamic Tabs -->
-							<ul class="nav nav-pills mb-3" id="categoryTabs">
-							</ul>
-
-							<!-- Dynamic Content -->
-							<div class="tab-content" id="categoryTabContent">
-							</div>
-
-						</div>
-
-						<div class="modal-footer">
-
-							<button type="button" class="close" data-bs-dismiss="modal">
-								&times;
-							</button>
-
-						</div>
-
-					</div>
-
-				</div>
-
-			</div>
-
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-
-	</div>
-
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-
-	<script th:inline="javascript">
-
-		function loadZones() {
-
-			$.ajax({
-				url: "/gcc/api/homeless-survey/zones",
-				type: "GET",
-				success: function (data) {
-
-					let html =
-						'<option value="">Select Zone</option>';
-
-					data.forEach(function (row) {
-
-						html += `
-                    <option value="${row.id}">
-                        ${row.zone_name}
-                    </option>
-                `;
-					});
-
-					$("#zone").html(html);
-				}
-			});
-		}
-		$("#zone").change(function () {
-
-			let zoneId = $(this).val();
-
-			$("#ward").html(
-				'<option value="">Select Ward</option>'
-			);
-
-			if (!zoneId) {
-				return;
-			}
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/wards",
-
-				type: "GET",
-
-				data: {
-					zoneId: zoneId
-				},
-
-				success: function (data) {
-
-					let html =
-						'<option value="">Select Ward</option>';
-
-					data.forEach(function (row) {
-
-						html += `
-                    <option value="${row.id}">
-                        ${row.ward_name}
-                    </option>
-                `;
-					});
-
-					$("#ward").html(html);
-				}
-			});
-		});
-		function viewSurvey(
-			loginId,
-			zone,
-			ward,
-			surveyDate
-		) {
-
-			$.ajax({
-
-				url:
-					"/gcc/api/homeless-survey/surveyor-details",
-
-				type: "GET",
-
-				data: {
-
-					loginId: loginId,
-					zone: zone,
-					ward: ward,
-					surveyDate: surveyDate
-
-				},
-
-				success: function (response) {
-
-					let html = "";
-
-					response.forEach(function (item) {
-
-						html += `
-
-                <tr>
-
-                    <!-- <td>
-                        ${item.survey_date || ''}
-                    </td>-->
-
-					<td data-order="${item.survey_date}">
-        ${formatDate(item.survey_date)}
-    </td>
-
-                    <td>
-                        ${item.survey_id || ''}
-                    </td>
-
-                    <td>
-                        ${item.name || ''}
-                    </td>
-
-                    <td>
-                        ${item.gender || ''}
-                    </td>
-
-                    <td>
-                        ${item.zone || ''}
-                    </td>
-
-                    <td>
-                        ${item.ward || ''}
-                    </td>
-
-                    <td>
-
-                        <button
-                            class="btn btn-info btn-sm"
-
-                            onclick="
-                            viewSurveyDetails(
-                            '${item.survey_id}'
-                            )">
-
-                            <i class="fa fa-eye"></i>
-
-                        </button>
-
-                    </td>
-
-                </tr>
-                `;
-					});
-
-					if (
-						$.fn.DataTable.isDataTable(
-							'#surveyDetailsTable'
-						)
-					) {
-
-						$('#surveyDetailsTable')
-							.DataTable()
-							.destroy();
-					}
-
-					$('#surveyDetailsTable tbody')
-						.html(html);
-
-					$('#surveyDetailsTable')
-						.DataTable({
-							pageLength: 10,
-
-							lengthChange: false, // Hide Show Entries dropdown
-
-							info: false,
-
-
-
-							dom: 'Blfrtip',
-
-							buttons: [
-								{
-									extend: 'pageLength',
-									className: 'btn btn-warning'
-								},
-								{
-									extend: 'excelHtml5',
-									text: 'Excel',
-									className: 'btn btn-success'
-								},
-								{
-									extend: 'pdfHtml5',
-									text: 'PDF',
-									className: 'btn btn-secondary',
-									orientation: 'landscape',
-									pageSize: 'A4'
-								}
-							]
-						});
-
-					$('#surveyModal')
-						.modal('show');
-				}
-			});
-		}
-		$(document).ready(function () {
-
-			// 🔹 Load dropdowns when page loads
-			loadZones();
-			loadSurveyors(true);
-
-			// 🔹 (Optional) Load table initially
-			// fetchSurveyData();
-			// Restrict To Date based on From Date
-			$("#fromDate").on("change", function () {
-
-				let fromDate = $(this).val();
-
-				// Set minimum selectable date for To Date
-				$("#toDate").attr("min", fromDate);
-
-				// If current To Date is less than From Date, clear it
-				if ($("#toDate").val() < fromDate) {
-					$("#toDate").val('');
-				}
-			});
-
-		});
-		function viewSurveyDetails(surveyId) {
-
-			$.when(
-
-				$.ajax({
-					url: "/gcc/api/homeless-survey/details",
-					type: "GET",
-					data: {
-						surveyId: surveyId
-					}
-				}),
-
-				$.ajax({
-					url: "/gcc/api/homeless-survey/categories",
-					type: "GET"
-				})
-
-			).done(function (
-
-				detailsResponse,
-				categoryResponse
-
-			) {
-
-				let details =
-					detailsResponse[0];
-
-				let categories =
-					categoryResponse[0];
-
-				renderCategoryTabs(
-					details,
-					categories,
-					surveyId
-				);
-
-				$('#surveyDetailsModal')
-					.modal('show');
-				$("#surveyModal")
-					.modal("hide");
-			});
-		}
-		function renderCategoryTabs(
-			data,
-			categories,
-			surveyId
-		) {
-
-			let grouped = {};
-
-			data.forEach(function (row) {
-
-				let category =
-					row.category_name;
-
-				if (!grouped[category]) {
-
-					grouped[category] = [];
-				}
-
-				grouped[category].push(row);
-			});
-
-			let tabsHtml = '';
-			let contentHtml = '';
-
-			categories.forEach(function (cat, index) {
-
-				let category =
-					cat.english_name;
-
-				let questions =
-					grouped[category] || [];
-
-				tabsHtml += `
-
-            <li class="nav-item me-2">
-
-                <button
-                    class="nav-link
-                    ${index === 0 ? 'active' : ''}"
-
-                    data-bs-toggle="pill"
-
-                    data-bs-target="#tab${index}"
-
-                    type="button">
-
-                    ${category}
-
-                </button>
-
-            </li>
-        `;
-
-				contentHtml += `
-
-            <div
-                class="tab-pane fade
-                ${index === 0 ? 'show active' : ''}"
-
-                id="tab${index}">
-        `;
-
-				// Documents Download Button
-				if (
-					category === "Documents" &&
-					questions.length > 0
-				) {
-
-					contentHtml += `
-
-                <div class="text-end mb-3">
-
-                    <button
-                        class="btn btn-success btn-sm"
-
-                        onclick="
-                            downloadAllDocuments(
-                                '${surveyId}'
-                            )">
-
-                        <i class="fa fa-download"></i>
-
-                        Download All Documents
-
-                    </button>
-
-                </div>
-            `;
-				}
-
-				// No Data
-				if (questions.length === 0) {
-
-					contentHtml += `
-
-                <div
-                    class="alert alert-light border">
-
-                    No Data Available
-
-                </div>
-            `;
-				}
-				else {
-
-					contentHtml += `
-                <div class="row">
-            `;
-
-					questions.forEach(function (q) {
-
-						let answer =
-							q.answer || '-';
-
-						// IMAGE
-						if (
-							q.question_type === 'image'
-							||
-							answer.match(/\.(jpg|jpeg|png|gif|webp)$/i)
-						) {
-
-							answer = `
-
-                        <img
-                            src="${answer}"
-
-                            class="img-thumbnail"
-
-                            style="
-                                max-width:250px;
-                                max-height:250px;
-                                cursor:pointer;
-                            "
-
-                            onclick="
-                                window.open(
-                                    '${answer}',
-                                    '_blank'
-                                )
-                            ">
-                    `;
-						}
-
-						// FILE URL
-						else if (
-							String(answer)
-								.startsWith("http")
-						) {
-
-							answer = `
-
-                        <a
-                            href="${answer}"
-
-                            target="_blank"
-
-                            class="btn btn-primary btn-sm">
-
-                            View File
-
-                        </a>
-                    `;
-						}
-
-						contentHtml += `
-
-                    <div
-                        class="col-md-6 mb-3">
-
-                        <div class="detail-card">
-
-                            <div class="detail-label">
-
-                                ${q.question}
-
-                            </div>
-
-                            <div class="detail-value">
-
-                                ${answer}
-
-                            </div>
-
-                        </div>
-
-                    </div>
-                `;
-					});
-
-					contentHtml += `
-                </div>
-            `;
-				}
-
-				contentHtml += `
-            </div>
-        `;
-			});
-
-			$('#categoryTabs')
-				.html(tabsHtml);
-
-			$('#categoryTabContent')
-				.html(contentHtml);
-		}
-
-		/*function downloadAllDocuments(surveyId) {
-
-			window.location.href =
-				'/gcc/api/homeless-survey/download-all-documents?surveyId='
-				+ encodeURIComponent(surveyId);
-		}*/
-
-
-		function downloadAllDocuments(surveyId) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/document-count",
-
-				type: "GET",
-
-				data: {
-					surveyId: surveyId
-				},
-
-				success: function (count) {
-
-					if (count === 0) {
-
-						Swal.fire({
-							icon: 'info',
-							title: 'No Documents',
-							text: 'No documents have been uploaded for this survey.'
-						});
-
-						return;
-					}
-
-					window.location.href =
-						'/gcc/api/homeless-survey/download-all-documents?surveyId='
-						+ encodeURIComponent(surveyId);
-				},
-
-				error: function () {
-
-					Swal.fire({
-						icon: 'error',
-						title: 'Error',
-						text: 'Unable to verify documents.'
-					});
-				}
-			});
-		}
-
-
-		function resetFilters() {
-			$("#zone").val('');
-			$("#ward").val('');
-			$("#fromDate").val('');
-			$("#toDate").val('');
-
-			// Re-load table with all data
-			loadSurveyors(true);
-		}
-
-		function loadSurveyors(isInitialLoad = false) {
-			console.log('zone:', $("#zone").val());
-			console.log('ward:', $("#ward").val());
-			console.log('fromDate:', $("#fromDate").val());
-			console.log('toDate:', $("#toDate").val());
-
-			var zone = $("#zone").val();
-			var ward = $("#ward").val();
-			var fromDate = $("#fromDate").val();
-			var toDate = $("#toDate").val();
-
-			if (!isInitialLoad &&
-				zone == '' &&
-				ward == '' &&
-				fromDate == '' &&
-				toDate == '') {
-
-				Swal.fire({
-					icon: 'warning',
-					title: 'Warning',
-					text: 'Please select at least one filter.',
-					confirmButtonColor: '#3085d6'
-				});
-
-				return;
-			}
-			if (fromDate != '') {
-				if (toDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-			if (toDate != '') {
-				if (fromDate == '') {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please select both from date and to date.',
-						confirmButtonColor: '#3085d6'
-					});
-					return;
-				}
-			}
-
-
-
-			if ($.fn.DataTable.isDataTable('#surveyorTable')) {
-
-				$('#surveyorTable')
-					.DataTable()
-					.destroy();
-			}
-
-			$("#surveyorTable tbody").empty();
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/getSurveyorsList",
-
-				type: "GET",
-
-				data: {
-
-					zone: zone,
-					ward: ward,
-					fromDate: fromDate,
-					toDate: toDate
-				},
-
-				success: function (response) {
-
-					let rows = "";
-
-					$.each(response, function (i, item) {
-
-						rows += `
-
-                    <tr>
-
-                        <!--td>${formatDate(item.survey_date)}</td-->
-						 <td data-order="${item.survey_date}">
-        ${formatDate(item.survey_date)}
-    </td>
-
-                        <td>${item.user_name || ''}</td>
-
-                        <td>${item.mobile_no || ''}</td>
-
-                        <td>${item.zone || ''}</td>
-
-                        <td>${item.ward || ''}</td>
-
-                        <td>${item.total_survey_done || 0}</td>
-
-                        <td>
-
-                            <button
-                                class="btn btn-info btn-sm"
-
-                                onclick="
-                                    viewSurvey(
-                                        '${item.loginId}',
-                                        '${item.zone}',
-                                        '${item.ward}',
-                                        '${item.survey_date}'
-                                    )">
-
-                                <i class="fa fa-eye"></i>
-
-                            </button>
-
-                        </td>
-
-                    </tr>
-                `;
-					});
-
-					$("#surveyorTable tbody").html(rows);
-
-					$('#surveyorTable').DataTable({
-
-						dom: 'Bfrtip',
-
-						buttons: [
-
-							{
-								extend: 'pageLength',
-								className: 'btn btn-warning'
-							},
-
-							{
-								extend: 'excelHtml5',
-								text: 'Excel',
-								className: 'btn btn-success'
-							},
-
-							{
-								extend: 'pdfHtml5',
-								text: 'PDF',
-								className: 'btn btn-secondary'
-							}
-						],
-
-						pageLength: 10,
-						responsive: true
-					});
-				}
-			});
-		}
-		function formatDate(dateString) {
-
-			if (!dateString) return '';
-
-			const date = new Date(dateString);
-
-			const day = String(date.getDate()).padStart(2, '0');
-
-			const month = String(date.getMonth() + 1).padStart(2, '0');
-
-			const year = date.getFullYear();
-
-			return `${day}-${month}-${year}`;
-		}
-		function loadDropdowns() {
-
-			// Gender
-			$.ajax({
-				url: "/gcc/api/children-survey/gender",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Gender</option>';
-
-					data.forEach(function (g) {
-						options += `<option value="${g.id}">${g.english_name}</option>`;
-					});
-
-					$("#gender").html(options);
-				}
-			});
-
-			// Area
-			$.ajax({
-				url: "/gcc/api/children-survey/location",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Area</option>';
-
-					data.forEach(function (a) {
-						options += `<option value="${a.id}">${a.english_name}</option>`;
-					});
-
-					$("#area").html(options);
-				}
-			});
-
-			// Education
-			$.ajax({
-				url: "/gcc/api/children-survey/education",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Education</option>';
-
-					data.forEach(function (e) {
-						options += `<option value="${e.id}">${e.english_name}</option>`;
-					});
-
-					$("#education").html(options);
-				}
-			});
-
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/surveyorsreports.html b/src/main/resources/templates/modules/homelesssurvey/surveyorsreports.html
deleted file mode 100644
index f71ade93..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/surveyorsreports.html
+++ /dev/null
@@ -1,1012 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<link rel="stylesheet" th:href="@{/assets/css/bootstrap.min.css}">
-
-	<link rel="stylesheet" th:href="@{/assets/css/style.css}">
-
-	<script th:src="@{/assets/js/jquery.min.js}"></script>
-
-	<script th:src="@{/assets/js/bootstrap.bundle.min.js}"></script>
-
-	<style>
-		.report-card {
-			border-radius: 12px;
-			padding: 20px;
-			background: #fff;
-			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08);
-			height: 100%;
-		}
-
-		.report-title {
-			font-size: 12px;
-			color: #777;
-			text-transform: uppercase;
-		}
-
-		.report-count {
-			font-size: 32px;
-			font-weight: 700;
-			color: #222;
-		}
-
-		.section-box {
-			border-radius: 12px;
-			background: #fff;
-			padding: 20px;
-			margin-top: 20px;
-			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08);
-		}
-
-		.section-title {
-			font-size: 18px;
-			font-weight: 600;
-			margin-bottom: 15px;
-		}
-
-		.progress {
-			height: 10px;
-			border-radius: 20px;
-		}
-
-		.report-row {
-			margin-bottom: 15px;
-		}
-
-		.container-fluid {
-			padding: 25px;
-		}
-
-		.report-card {
-			min-height: 130px;
-		}
-
-		.report-count {
-			margin-top: 10px;
-		}
-
-		.section-box {
-			min-height: 100%;
-		}
-
-		.progress-bar {
-			border-radius: 20px;
-		}
-
-		body {
-			background: #f5f7fb;
-		}
-
-		.dashboard-card {
-			border-radius: 12px;
-			background: #fff;
-			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08);
-			min-height: 160px;
-			/*height: 160px;*/
-		}
-
-		/*.dashboard-card .card-body {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-		}*/
-		.dashboard-card .card-body {
-			padding: 20px;
-		}
-
-		.dashboard-card .card-title {
-			font-size: 18px;
-			font-weight: 500;
-			min-height: 48px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			text-align: center;
-			line-height: 1.3;
-		}
-
-		.dashboard-count {
-			font-size: 48px;
-			font-weight: 700;
-			margin-top: 10px;
-		}
-
-		/* AREA CARD SCROLL */
-
-		/* AREA WISE FIXED SCROLL CARD */
-
-		/* AREA WISE CARD FIXED HEIGHT */
-
-		/*.area-scroll-card {
-			height: 500px !important;
-			overflow: hidden !important;
-		}
-
-	
-
-		.area-scroll-card .card-body {
-			height: 100% !important;
-			overflow-y: auto !important;
-			overflow-x: hidden !important;
-			padding-right: 10px;
-		}
-
-		
-
-		.area-scroll-card .card-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		.area-scroll-card .card-body::-webkit-scrollbar-thumb {
-			background: #bdbdbd;
-			border-radius: 10px;
-		}
-
-		.area-scroll-card {
-			height: 500px;
-		}
-
-		#areaWiseDiv {
-			max-height: 380px;
-			overflow-y: auto;
-			overflow-x: hidden;
-			padding-right: 8px;
-		}
-
-		
-
-		#areaWiseDiv::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#areaWiseDiv::-webkit-scrollbar-thumb {
-			background: #bdbdbd;
-			border-radius: 10px;
-		}
-
-		*/
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-center mb-4">
-
-							<div class="col-lg-6">
-
-								<div class="page-header-title">
-
-									<i class="ik ik-thumbs-up bg-blue"></i>
-
-									<div class="d-inline">
-
-										<h3 class="mb-0">
-											Survey Analytics & Reports
-										</h3>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-lg-6 text-right">
-
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-
-									<ol class="breadcrumb justify-content-end">
-
-										<li class="breadcrumb-item">
-
-											<a href="/index">
-
-												<i class="ik ik-home"></i>
-
-											</a>
-
-										</li>
-
-										<li class="breadcrumb-item active">
-
-											Survey Reports
-
-										</li>
-
-									</ol>
-
-								</nav>
-
-							</div>
-
-						</div>
-						<!-- TOP COUNTS -->
-
-						<!--	<div class="row">
-
-							<div class="col-lg-2 col-md-4 col-sm-6 mb-4 d-flex">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h6 class="card-title">
-											Total Surveyed Children
-										</h6>
-
-										<h1 id="totalChildren" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-2 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h6 class="card-title">
-											Areas Covered
-										</h6>
-
-										<h1 id="areasCovered" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-2 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h6 class="card-title">
-											Gender - Male
-										</h6>
-
-										<h1 id="maleCount" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-2 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h6 class="card-title">
-											Gender - Female
-										</h6>
-
-										<h1 id="femaleCount" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-2 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h6 class="card-title">
-											Currently Studying
-										</h6>
-
-										<h1 id="currentlyStudying" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-						</div>-->
-						<div class="row">
-
-							<div class="col mb-4">
-								<div class="card dashboard-card text-center">
-									<div class="card-body">
-										<h6 class="card-title">
-											Total Surveyed Homeless
-										</h6>
-										<h1 id="totalHomeless" class="dashboard-count">0</h1>
-									</div>
-								</div>
-							</div>
-
-							<!--<div class="col mb-4">
-								<div class="card dashboard-card text-center">
-									<div class="card-body">
-										<h6 class="card-title">
-											Zones Covered
-										</h6>
-										<h1 id="zonesCovered" class="dashboard-count">0</h1>
-									</div>
-								</div>
-							</div>-->
-
-							<div class="col mb-4">
-								<div class="card dashboard-card text-center">
-									<div class="card-body">
-										<h6 class="card-title">
-											Gender - Male
-										</h6>
-										<h1 id="maleCount" class="dashboard-count">0</h1>
-									</div>
-								</div>
-							</div>
-
-							<div class="col mb-4">
-								<div class="card dashboard-card text-center">
-									<div class="card-body">
-										<h6 class="card-title">
-											Gender - Female
-										</h6>
-										<h1 id="femaleCount" class="dashboard-count">0</h1>
-									</div>
-								</div>
-							</div>
-
-							<div class="col mb-4">
-								<div class="card dashboard-card text-center">
-									<div class="card-body">
-										<h6 class="card-title">
-											Gender - Others
-										</h6>
-										<h1 id="othersCount" class="dashboard-count">0</h1>
-									</div>
-								</div>
-							</div>
-
-						</div>
-
-						<!-- AGE DISTRIBUTION -->
-
-						<div class="row">
-
-							<div class="col-md-4 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h5>18 - 34 Years</h5>
-
-										<h1 id="age18to34" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-4 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h5>35 - 54 Years</h5>
-
-										<h1 id="age35to54" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-4 mb-4">
-
-								<div class="card dashboard-card text-center">
-
-									<div class="card-body">
-
-										<h5>55 Years & Above</h5>
-
-										<h1 id="age55above" class="dashboard-count">
-											0
-										</h1>
-
-									</div>
-
-								</div>
-
-							</div>
-
-						</div>
-
-						<!--<div class="row mt-3">
-
-							
-
-							<div class="col-md-6">
-
-
-
-								<div class="card" style="height:500px;">
-
-									<div class="card-body">
-
-										<h5 class="section-title">
-											Area-wise Distribution
-										</h5>
-
-										<div id="areaWiseDiv" style="
-                    max-height:400px;
-                    overflow-y:auto;
-                    overflow-x:hidden;
-                    padding-right:8px;
-                 ">
-										</div>
-
-
-
-									</div>
-
-								</div>
-
-							</div>
-
-							
-
-							<div class="col-md-6">
-
-								<div class="card dashboard-card">
-
-									<h5 class="section-title">
-										Vulnerability Assessment
-									</h5>
-									<div class="card-body">
-										<div id="vulnerabilityDiv"></div>
-									</div>
-
-								</div>
-
-							</div>
-
-						</div>-->
-						<div class="row mt-4">
-
-							<div class="col-md-6">
-
-								<div class="card h-100" style="height:500px;">
-
-									<div class="card-body">
-
-										<h5 class="section-title">
-											Zone Wise Distribution
-										</h5>
-
-										<div id="zoneWiseDiv"></div>
-
-									</div>
-
-								</div>
-
-							</div>
-
-							<div class="col-md-6">
-
-								<div class="card shadow-sm">
-
-									<div class="card-body">
-
-										<h5>Caste Wise Distribution</h5>
-
-										<div id="casteWiseDiv"></div>
-
-										<hr>
-
-										<h4 class="mb-3">Employment Status</h4>
-
-										<div class="row text-center">
-
-											<div class="col-6">
-
-												<div class="card border-success shadow-sm">
-
-													<div class="card-body p-3">
-
-														<h6 class="text-muted mb-2">
-															Employed
-														</h6>
-
-														<h2 class="text-success mb-0" id="employedCount">
-															0
-														</h2>
-
-													</div>
-
-												</div>
-
-											</div>
-
-											<div class="col-6">
-
-												<div class="card border-danger shadow-sm">
-
-													<div class="card-body p-3">
-
-														<h6 class="text-muted mb-2">
-															Unemployed
-														</h6>
-
-														<h2 class="text-danger mb-0" id="unEmployedCount">
-															0
-														</h2>
-
-													</div>
-
-												</div>
-
-											</div>
-
-										</div>
-
-										<hr>
-
-										<h4 class="mb-3">
-											GCC Shelter Status
-										</h4>
-
-										<div class="row text-center">
-
-											<div class="col-6">
-
-												<div class="card border-primary shadow-sm">
-
-													<div class="card-body p-3">
-
-														<h6 class="text-muted mb-2">
-															Stayed
-														</h6>
-
-														<h2 class="text-success mb-0" id="shelterStayedYes">
-															0
-														</h2>
-
-													</div>
-
-												</div>
-
-											</div>
-
-											<div class="col-6">
-
-												<div class="card border-secondary shadow-sm">
-
-													<div class="card-body p-3">
-
-														<h6 class="text-muted mb-2">
-															Not Stayed
-														</h6>
-
-														<h2 class="text-danger mb-0" id="shelterStayedNo">
-															0
-														</h2>
-
-													</div>
-
-												</div>
-
-											</div>
-
-										</div>
-
-									</div>
-
-								</div>
-
-							</div>
-
-						</div>
-						<div class="modal fade" id="wardModal">
-
-							<div class="modal-dialog modal-lg">
-
-								<div class="modal-content">
-
-									<div class="modal-header">
-
-										<h5>
-											Ward Wise Count
-										</h5>
-
-										<button type="button" class="close" data-bs-dismiss="modal">
-											&times;
-										</button>
-
-									</div>
-
-									<div class="modal-body">
-
-										<table class="table table-bordered">
-
-											<thead>
-
-												<tr>
-
-													<th>Ward</th>
-
-													<th>Total Homeless</th>
-
-												</tr>
-
-											</thead>
-
-											<tbody id="wardTableBody">
-
-											</tbody>
-
-										</table>
-
-									</div>
-
-								</div>
-
-							</div>
-
-						</div>
-
-
-
-
-					</div>
-
-
-
-
-
-				</div>
-
-
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		$(document).ready(function () {
-
-			loadDashboard();
-
-		});
-
-		function loadDashboard() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/dashboard",
-
-				type: "GET",
-
-				success: function (data) {
-
-					console.log(data);
-
-					$("#totalHomeless")
-						.text(data.totalHomeless || 0);
-
-					$("#zonesCovered")
-						.text(data.zonesCovered || 0);
-
-					$("#maleCount")
-						.text(data.maleCount || 0);
-
-					$("#femaleCount")
-						.text(data.femaleCount || 0);
-
-					$("#othersCount")
-						.text(data.othersCount || 0);
-
-					$("#age18to34")
-						.text(data.youngAdults || 0);
-
-					$("#age35to54")
-						.text(data.middleAgedAdults || 0);
-
-					$("#age55above")
-						.text(data.olderAdults || 0);
-					$("#employedCount").text(data.employedCount || 0);
-
-					$("#unEmployedCount").text(data.unEmployedCount || 0);
-
-					$("#shelterStayedYes").text(data.shelterStayedYes || 0);
-
-					$("#shelterStayedNo").text(data.shelterStayedNo || 0);
-
-					loadZoneWise(
-						data.zoneWise);
-
-					loadCasteWise(
-						data.casteWise);
-				},
-
-				error: function (xhr) {
-
-					console.log(xhr);
-
-					Swal.fire({
-
-						icon: 'error',
-
-						title: 'Dashboard Load Failed'
-					});
-				}
-			});
-		}
-		function loadZoneWise(data) {
-
-			let html = "";
-
-			$.each(data, function (i, row) {
-
-				let zoneLabel = "";
-
-				if (row.total > 0) {
-
-					zoneLabel = `
-                <a href="javascript:void(0)"
-                   onclick="loadWardWise('${row.zone}')"
-                   style="
-                        color:#007bff;
-                        font-weight:600;
-                        text-decoration:underline;
-                        cursor:pointer;
-                   ">
-                    Zone ${row.zone}
-                </a>
-            `;
-
-				} else {
-
-					zoneLabel = `
-                <span>
-                    Zone ${row.zone}
-                </span>
-            `;
-				}
-
-				html += `
-
-            <div class="report-row">
-
-                <div class="d-flex justify-content-between">
-
-                    ${zoneLabel}
-
-                    <span>
-                        ${row.total}
-                    </span>
-
-                </div>
-
-                <div class="progress mt-2">
-
-                    <div class="progress-bar bg-success"
-                         style="width:${row.total}px">
-
-                    </div>
-
-                </div>
-
-            </div>
-        `;
-			});
-
-			$("#zoneWiseDiv").html(html);
-		}
-		function loadZoneWise1(data) {
-
-			let html = "";
-
-			$.each(data, function (i, row) {
-
-				html += `
-
-        <div class="report-row">
-
-            <div class="d-flex justify-content-between">
-
-                <a href="javascript:void(0)"
-                   onclick="loadWardWise('${row.zone}')">
-
-                    Zone ${row.zone}
-
-                </a>
-
-                <span>
-
-                    ${row.total}
-
-                </span>
-
-            </div>
-
-            <div class="progress mt-2">
-
-                <div class="progress-bar bg-success"
-
-                     style="width:${row.total}%">
-
-                </div>
-
-            </div>
-
-        </div>
-        `;
-			});
-
-			$("#zoneWiseDiv")
-				.html(html);
-		}
-		function loadWardWise(zone) {
-
-			$.ajax({
-
-				url:
-					"/gcc/api/homeless-survey/ward-wise",
-
-				type:
-					"GET",
-
-				data: {
-
-					zone: zone
-				},
-
-				success: function (data) {
-
-					let html = "";
-
-					$.each(data, function (i, row) {
-
-						html += `
-
-                <tr>
-
-                    <td>
-
-                        ${row.ward}
-
-                    </td>
-
-                    <td>
-
-                        ${row.total}
-
-                    </td>
-
-                </tr>
-                `;
-					});
-
-					$("#wardTableBody")
-						.html(html);
-
-					$("#wardModal")
-						.modal("show");
-				}
-			});
-		}
-		function loadCasteWise(data) {
-			console.log(data);
-
-			let html = "";
-
-			$.each(data, function (i, row) {
-
-				html += `
-
-            <div class="d-flex justify-content-between mb-3">
-
-                <span>
-                    ${row.caste}
-                </span>
-
-                <span>
-                    ${row.total}
-                </span>
-
-            </div>
-
-        `;
-			});
-
-			$("#casteWiseDiv").html(html);
-		}
-		function loadCasteWise1(data) {
-
-			let html = "";
-
-			$.each(data, function (i, row) {
-
-				html += `
-
-        <div class="d-flex justify-content-between mb-2">
-
-            <span>
-
-                ${row.caste}
-
-            </span>
-
-            <span>
-
-                ${row.total}
-
-            </span>
-
-        </div>
-        `;
-			});
-
-			$("#casteWiseDiv")
-				.html(html);
-		}
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/homelesssurvey/voterid.html b/src/main/resources/templates/modules/homelesssurvey/voterid.html
deleted file mode 100644
index fdd788ee..00000000
--- a/src/main/resources/templates/modules/homelesssurvey/voterid.html
+++ /dev/null
@@ -1,576 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		#surveyModal .modal-dialog {
-			max-width: 70%;
-			width: 70%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 10px;
-		}
-
-
-
-		#surveyModal .modal-header {
-			background-color: #f8f9fa;
-			border-bottom: 2px solid #007bff;
-		}
-
-		#surveyModal .modal-title {
-			font-weight: 600;
-			color: #2c3e50;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px 40px;
-		}
-
-		#surveyDetails .row {
-			margin-bottom: 15px;
-			padding-bottom: 10px;
-			border-bottom: 1px solid #e9ecef;
-		}
-
-		#surveyDetails .col-md-5 {
-			font-weight: 600;
-			color: #34495e;
-			font-size: 14px;
-		}
-
-		#surveyDetails .col-md-7 {
-			font-weight: 500;
-			color: #555;
-			font-size: 14px;
-		}
-
-		/* Modal scrollbar styling */
-		#surveyModal .modal-body::-webkit-scrollbar {
-			width: 6px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-track {
-			background: #f1f1f1;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb {
-			background: #007bff;
-			border-radius: 10px;
-		}
-
-		#surveyModal .modal-body::-webkit-scrollbar-thumb:hover {
-			background: #0056b3;
-		}
-
-		@media (max-width: 768px) {
-			#surveyModal .modal-dialog {
-				max-width: 96%;
-				width: 96%;
-			}
-
-			#surveyModal .modal-body {
-				padding: 20px;
-			}
-		}
-
-		#surveyModal .modal-dialog {
-			max-width: 75%;
-		}
-
-		#surveyModal .modal-content {
-			border-radius: 12px;
-			overflow: hidden;
-		}
-
-		#surveyModal .modal-header {
-			background: #44506A;
-			color: white;
-			border: none;
-		}
-
-		#surveyModal .modal-title {
-			font-size: 32px;
-			font-weight: 600;
-		}
-
-		#surveyModal .modal-body {
-			padding: 30px;
-			background: #f7f8fa;
-		}
-
-
-		.detail-card {
-			background: #fff;
-			border-radius: 12px;
-			padding: 14px 18px;
-			border: 1px solid #e9ecef;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
-			height: 100%;
-		}
-
-		.detail-label {
-			font-size: 13px;
-			font-weight: 700;
-			color: #7f8c8d;
-			text-transform: uppercase;
-			line-height: 1.5;
-		}
-
-		.detail-value {
-			font-size: 16px;
-			font-weight: 600;
-			color: #2c3e50;
-			line-height: 1.6;
-			word-break: break-word;
-		}
-
-		.section-heading {
-			font-size: 24px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e5e7eb;
-			color: #2c3e50;
-		}
-
-
-
-		.section-heading {
-			font-size: 20px;
-			font-weight: 700;
-			margin-bottom: 20px;
-			padding-bottom: 10px;
-			border-bottom: 2px solid #e74c3c;
-			color: #2c3e50;
-		}
-
-		.detail-card {
-			background: white;
-			border-radius: 10px;
-			padding: 15px 18px;
-			height: 100%;
-			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
-			border: 1px solid #edf0f2;
-		}
-
-
-
-		@media(max-width:768px) {
-
-			#surveyModal .modal-dialog {
-				max-width: 95%;
-			}
-
-			.detail-card {
-				margin-bottom: 10px;
-			}
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<!--<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Children Survey Dashboard</h5>
-
-									</div>
-
-									<div class="col-lg-6 text-end">
-										<input type="date" id="fromDate" class="form-control d-inline-block"
-											style="width:150px;">
-										<span class="mx-1">to</span>
-										<input type="date" id="toDate" class="form-control d-inline-block"
-											style="width:150px;">
-									</div>
-								</div>
-								<div class="col-lg-6">
-									<nav class="breadcrumb-container" aria-label="breadcrumb">
-										<ol class="breadcrumb">
-											<li class="breadcrumb-item">
-												<a href="/index"><i class="ik ik-home"></i></a>
-											</li>
-											<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-										</ol>
-									</nav>
-								</div>
-							</div>
-						</div>-->
-					<div class="page-header">
-						<div class="row align-items-center">
-
-							<div class="col-lg-6">
-								<div class="page-header-title d-flex align-items-center">
-									<i class="ik ik-book bg-blue me-2"></i>
-									<h5 class="mb-0">VoterId Master</h5>
-								</div>
-							</div>
-
-							<div class="col-lg-6 text-end">
-								<button class="btn btn-primary" onclick="openAddModal()">
-									<i class="fa fa-plus"></i> Add VoterId Reason Master
-								</button>
-							</div>
-
-						</div>
-					</div>
-
-					<hr>
-
-					<div class="card-block">
-
-						<table id="educationTable" class="table table-bordered table-striped">
-
-							<thead class="thead-dark">
-								<tr>
-									<th>Slno</th>
-									<th>VoterId No Reason</th>
-									<th>Status</th>
-									<th>Delete</th>
-									<th>Edit</th>
-
-								</tr>
-							</thead>
-
-							<tbody></tbody>
-
-						</table>
-
-					</div>
-					<div class="modal fade" id="educationModal">
-
-						<div class="modal-dialog">
-							<div class="modal-content">
-
-								<div class="modal-header bg-primary text-white">
-									<h5 class="modal-title">Add VoterId Reason Master</h5>
-
-									<button type="button" class="close" data-bs-dismiss="modal">
-										&times;
-									</button>
-								</div>
-
-								<div class="modal-body">
-
-									<div class="form-group">
-										<label>VoterId Reason Name</label>
-
-										<input type="text" id="educationName" class="form-control">
-									</div>
-
-								</div>
-
-								<div class="modal-footer">
-
-									<button class="btn btn-primary" onclick="saveEducation()">
-										Save
-									</button>
-
-									<button class="btn btn-secondary" data-bs-dismiss="modal">
-										Close
-									</button>
-
-								</div>
-
-							</div>
-						</div>
-					</div>
-
-					<!--<hr>-->
-
-					<!-- Filters Section -->
-
-
-
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-	
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-	
-			// Call this on page load to reset the URL
-			clearUrlParams();
-	
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-	
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-	
-	
-		});*/
-		$(document).ready(function () {
-
-			loadEducationTable();
-
-		});
-		function openAddModal() {
-
-			editId = 0;
-
-			$("#educationName").val('');
-
-			$(".modal-title").text("Add VoterId Reason Master");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-		/*function openAddModal() {
-
-			$("#educationName").val('');
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}*/
-
-		function loadEducationTable() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/voteridmasterlist",
-				type: "GET",
-
-				success: function (data) {
-
-					let tbody = "";
-
-					data.forEach(function (row, index) {
-
-						let statusBadge = `<span class="badge">Active</span>`;
-
-						let actionButton = row.isactive == 1
-							? `
-                        <button class="btn btn-danger btn-sm"
-                            onclick="toggleStatus(${row.id},0)">
-                            Delete
-                        </button>
-                    `
-							: `
-                        <button class="btn btn-success btn-sm"
-                            onclick="toggleStatus(${row.id},1)">
-                            Enable
-                        </button>
-                    `;
-
-						tbody += `
-                    <tr>
-
-                        <td>${index + 1}</td>
-
-                        <td>${row.english_name}</td>
-
-                        <td>${statusBadge}</td>
-
-                        <td>${actionButton}</td>
-
-    <td>
-        <button class="btn btn-primary btn-sm"
-            onclick="editEducation(${row.id},'${row.english_name}')">
-            Edit
-        </button>
-    </td>
-
-                    </tr>
-                `;
-					});
-
-					if ($.fn.DataTable.isDataTable('#educationTable')) {
-
-						$('#educationTable')
-							.DataTable()
-							.clear()
-							.destroy();
-					}
-
-					$("#educationTable tbody").html(tbody);
-
-					$('#educationTable').DataTable({
-						responsive: true
-					});
-				}
-			});
-		}
-
-		//update logic
-		let editId = 0;
-
-		function editEducation(id, name) {
-
-			editId = id;
-
-			$("#educationName").val(name);
-
-			$(".modal-title").text("Edit VoterId Reason Master");
-
-			let modal = new bootstrap.Modal(
-				document.getElementById('educationModal')
-			);
-
-			modal.show();
-		}
-
-
-		function saveEducation() {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/voteridmastersave",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-					id: editId,
-
-					english_name: $("#educationName").val()
-
-				}),
-
-				success: function () {
-					editId = 0;
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Saved Successfully'
-					});
-
-					bootstrap.Modal.getInstance(
-						document.getElementById('educationModal')
-					).hide();
-
-					loadEducationTable();
-				}
-			});
-		}
-
-		function toggleStatus(id, status) {
-
-			$.ajax({
-
-				url: "/gcc/api/homeless-survey/voteridmaster-status",
-
-				type: "POST",
-
-				contentType: "application/json",
-
-				data: JSON.stringify({
-
-					id: id,
-					status: status
-
-				}),
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Status Updated'
-					});
-
-					loadEducationTable();
-				}
-			});
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/m_petition/complaint_list.html b/src/main/resources/templates/modules/m_petition/complaint_list.html
deleted file mode 100644
index 9504d067..00000000
--- a/src/main/resources/templates/modules/m_petition/complaint_list.html
+++ /dev/null
@@ -1,881 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Complaint List</h5>
-                                            <span>Mayor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Mayor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Complaint List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                        	<div class="col-md-12">
-                        		<form onsubmit="return callsearch();">
-                        			<div class="card">
-                        				<div class="card-block row">
-	                        				<div class="col-md-4">
-	                        					<div class="form-group">
-						                            <label for="searchmonth">Select Month:</label>
-														<select class="form-control" id="searchmonth" name="searchmonth">
-															<option value="" selected="" disabled="">Select Month</option>
-														    <option value="01">January</option>
-														    <option value="02">February</option>
-														    <option value="03">March</option>
-														    <option value="04">April</option>
-														    <option value="05">May</option>
-														    <option value="06">June</option>
-														    <option value="07">July</option>
-														    <option value="08">August</option>
-														    <option value="09">September</option>
-														    <option value="10">October</option>
-														    <option value="11">November</option>
-														    <option value="12">December</option>
-														</select>
-						                        </div>
-						                    </div>
-						                    <div class="col-md-4">
-	                        					<div class="form-group">
-						                            <label for="searchyear">Select Year</label>
-						                            <select class="form-control" name="searchyear" id="searchyear" required="">
-														<option value="" selected="" disabled="">Select Year</option>
-														<option value="2026">2026</option>
-														<option value="2025">2025</option>
-														<option value="2024">2024</option>
-														<option value="2023">2023</option>
-														<option value="2023">2022</option>
-													</select>
-						                        </div>
-						                    </div>
-						                    <div class="col-md-4 pt-5"><br>
-	                        					<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            			<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						                    </div>
-                        				</div>
-                        			</div>
-                        		</form>
-                        	</div>
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="complaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Address&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-													</tr>
-                                                </tfoot>
-                                                 
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/m_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/m_petition/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_complaint_data(month,year){
-	        	var apiUrl = '/gcc/api/m_petition/getComplaintList?loginId='+createdBy+'&searchmonth='+month+'&searchyear='+year;
-	        	//alert(apiUrl);
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-	        
-	        /* Get Complaints List */
-	        function get_complaint_list(month,year){
-	        	get_complaint_data(month,year).then(function(complaintList) {
-	    		    // Handle the complaint list
-	    		    generate_table(complaintList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching complaint list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching complaint list:', error);
-			        }
-	    		});
-			}
-	        
-	        function viewPetitionSummary(petitionNo){
-	        	$("#viewpetition").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				var url = '/gcc/m_petition/view-petition-modal?petitionNo='+petitionNo;
-				$.ajax({
-				    url: url,
-				    type: 'GET',
-				    dataType: 'html',
-				    success: function(data) {
-				      $('#viewPetitionBoxBody').html(data); // Inject content into modal body
-				    },
-				    error: function(xhr, status, error) {
-				      console.error("Error loading URL:", error);
-				      // Handle error, display a message, etc.
-				    }
-				  });
-				
-				return false;
-			}
-	        
-	        function updateStatus(mapId){
-	        	$("#ComplaintStatusBox").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				callComplaintDetails(mapId);
-				return false;
-			}
-	        
-	        function callComplaintDetails(mapId){
-	        	loading_text_msg = getLoadingMessage(); // get Loading random text
-	        	var loading=searchinfo("<b>"+loading_text_msg+"</b>");
-	    		var complaintContentHTML=`
-	    							<div class="row">
-	    							    <div class="col-lg-6">
-	    						        <div class="block block-rounded">
-	    						           
-	    						                <div id="leftContainer">${loading}</div>
-	    						            
-	    						        </div>
-	    						    </div>
-	    						    
-	    						    <div class="col-lg-6 printack2">
-	    						        <div class="block block-rounded">
-	    						            
-	    						                <div id="rightContainer">${loading}</div>
-	    						           
-	    						        </div>
-	    						    </div>
-	    						    <!--<div class="col-lg-12 text-center block-options pt-10">
-	    						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-	    						    </div>-->
-	    						</div>`;
-	    		
-	    		$('#ComplaintStatusBoxBody').html(complaintContentHTML); // Box content (Body)
-	    		
-	    		getComplaintData(mapId);
-			}
-	        
-	        function getComplaintData(mapId){
-	        	get_complaint_details_byId(mapId).then(function(complaintDetails) {
-	        		
-	        		var complaintStatus = complaintDetails[0].status;
-					
-	        		var statusBadge = complaintStatus.charAt(0).toUpperCase() + complaintStatus.slice(1);
-	        		var refRibben = `<div class="card-header-right" style="top:auto;">
-	        							Ref ID: ${mapId}
-				              	      </div>`;
-           	        var statusRibben = ""; 
-	        		if(complaintStatus=='pending'){
-	        			statusRibben = `<div class="ribbon">
-		              	      <div class="wrap">
-		              	        <span class="ribbon6 bg-danger"><div styel="color:#fff;">${statusBadge}</div></span>
-		              	      </div>
-		              	    </div>`;
-		              	statusRibben = "";    
-	        			statusBadge = `<span class="badge badge-danger" style="font-size:10px;padding:0.25em 0.4em;">${statusBadge}</span>`;
-	        			
-					}
-	        		else if(complaintStatus=='close'){   
-	        			statusBadge = `<span class="badge badge-success" style="font-size:10px;padding:0.25em 0.4em;">${statusBadge}</span>`;
-					}
-	        		var complaintRightBody = "";
-	        		
-	        		var fileType_c = complaintDetails[0].file_type;
-					fileType_c = fileType_c.split("/").pop();
-					var filetypeico_c = "file-lines";
-					if(fileType_c=='pdf'){
-						filetypeico_c = "file-pdf";
-					}
-					else{
-						filetypeico_c = "file-image";
-					}
-					
-					var complaintLeftBody = `<div class="card mb-0">
-								             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                	<h3>Complaint Details</h3>
-								                	${statusRibben}
-								                </div>
-								                <div class="card-body">
-									                <table class="table table-borderless table-vcenter mb-0" style="font-size:12px;">
-												      <tbody>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${convertdate(complaintDetails[0].cdate)}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petition_no}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petitioner_name}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petitioner_mobile}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th colspan="2" style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:<br><p class="fw-semibold mb-0" style="font-weight:normal;">${complaintDetails[0].complaint_nature}</p></th>
-												        </tr>
-												        <tr>
-												        	<td colspan="2" style="padding: 0.45rem 0.45rem;">
-													        	<div class="like-comm mt-20 mb-0"> 
-					                                        	<b>ஆவணப் பதிவேற்றம் / Document Upload:</b><br>
-					                                        	
-						                                        	<table class="table table-bordered table-vcenter mb-0">
-														                <thead>
-														                  <tr>
-														                    <th>S.no</th>
-														                    <th>File Name</th>
-														                    <th>Size</th>
-														                    <th>Type</th>
-														                    <th><i class="ik ik-more-horizontal"></i></th>
-														                  </tr>
-														                </thead>
-													                	<tbody>
-													                 		<tr>
-																            	<td class="fw-semibold">1</td>
-																            	<td class="fw-semibold">${complaintDetails[0].file_name}</td>
-																            	<td class="fw-semibold">${formatFileSize(complaintDetails[0].file_size)}</td>
-																            	<td class="fw-semibold">${fileType_c}</td>
-																            	<td class="fw-semibold">
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="downloadFile('petition','${complaintDetails[0].file_name}','${complaintDetails[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Download File"><i class="fa fa-fw fa-download" style="font-size: 18px;"></i></a>
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="viewFile('petition','${complaintDetails[0].file_name}','${complaintDetails[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View File"><i class="far fa-3x fa-${filetypeico_c}" style="font-size: 18px;"></i></a>
-																            	</td>
-														                  	</tr>
-													                	</tbody>
-													              	</table>
-					                                   			</div>
-													        	<table class="table table-bordered table-vcenter mb-0">
-													                <thead>
-													                  <tr>
-													                    <th>Complaint <i class="fa fa-arrow-right"></i> Status</th>
-													                    <th class="text-right" id="complaint_forward_link">
-													                    <!--
-													                    <a href="javascript:void(0);" onclick="return forward_compliant(${complaintDetails[0].mapid}, '${complaintDetails[0].complaint_type}');" class="link" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Click here to forward this complaint to another department officer."><i class="far fa-share-square"></i> Click to forward </a>
-													                    -->
-													                    </th>
-													                  </tr>
-													                </thead>
-												                	<tbody>
-												                 		<tr>
-															            	<td colspan="2" class="fw-semibold">
-															            	${complaintDetails[0].complaint_type} <i class="fa fa-arrow-right"></i> ${statusBadge} <i class="fa fa-arrow-right"></i> ${complaintDetails[0].off_nm}
-														                    </td>
-													                  	</tr>
-												                	</tbody>
-												              	</table>
-												        	</td>
-												        </tr>
-												      </tbody>
-												    </table>
-								                </div>
-								            </div>`;
-					
-					$('#leftContainer').html(complaintLeftBody);
-					
-					if(complaintStatus!='close'){
-						complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-												<div class="card mb-0">
-							                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-							                    		<h3>Complaint Update Details</h3>
-							                    	    ${refRibben}
-							                		</div>
-							                		<div class="card-body">
-								                		<div class="form-group">
-					                                    	<label for="complaintActionText">நடவடிக்கை / Action:</label>
-									   						<textarea class="form-control" id="complaintActionText" name="complaintActionText" rows="6" maxlength="250" placeholder="புகாரின் தன்மை..." required></textarea>
-									   					</div>
-									   					<div class="form-group">
-									                       <label for="action_san_page1">ஆவணப் பதிவேற்றம் / Document Upload:</label>
-														   <input name="action_san_page1" id="action_san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*" required>
-														 </div>
-														 <div class="form-group mb-0 text-center">
-														 	<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveandclose(${mapId},${complaintDetails[0].petition_id},'${complaintDetails[0].petition_no}');" id="updatebtn"><i class="ik ik-save"></i> Save and Close </button>
-														 </div>
-							                		</div>
-							            		</div>
-						            		</form>`;
-						$('#rightContainer').html(complaintRightBody);
-					}
-					else{
-						// first remove forward link
-						$("#complaint_forward_link").html("");
-						
-						get_complaint_action_byId(mapId).then(function(complaintAction) {
-							var fileType = complaintAction[0].file_type;
-							fileType = fileType.split("/").pop();
-							var filetypeico = "file-lines";
-							if(fileType=='pdf'){
-								filetypeico = "file-pdf";
-							}
-							else{
-								filetypeico = "file-image";
-							}
-							
-							complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-													<div class="card mb-0">
-								                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                    		<h3>Complaint Update Details</h3>
-								                    	    ${refRibben}
-								                		</div>
-								                		<div class="card-body">
-									                		<div>
-									                			<b>நடவடிக்கை தேதி / Action Date:</b> ${convertdate(complaintAction[0].cdate)}
-					                                            <hr>
-					                                            <b>நடவடிக்கை / Action:</b><br>
-					                                            <p class="mt-10">${complaintAction[0].comments}</p>
-					                                        </div>
-					                                        	<hr>
-					                                        <div class="like-comm mt-20 mb-0"> 
-					                                        	<b>ஆவணப் பதிவேற்றம் / Document Upload:</b><br>
-					                                        	
-						                                        	<table class="table table-bordered table-vcenter mb-0">
-														                <thead>
-														                  <tr>
-														                    <th>S.no</th>
-														                    <th>File Name</th>
-														                    <th>Size</th>
-														                    <th>Type</th>
-														                    <th><i class="ik ik-more-horizontal"></i></th>
-														                  </tr>
-														                </thead>
-													                	<tbody>
-													                 		<tr>
-																            	<td class="fw-semibold">1</td>
-																            	<td class="fw-semibold">${complaintAction[0].file_name}</td>
-																            	<td class="fw-semibold">${formatFileSize(complaintAction[0].file_size)}</td>
-																            	<td class="fw-semibold">${fileType}</td>
-																            	<td class="fw-semibold">
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="downloadFile('action','${complaintAction[0].file_name}','${complaintAction[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Download File"><i class="fa fa-fw fa-download" style="font-size: 18px;"></i></a>
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="viewFile('action','${complaintAction[0].file_name}','${complaintAction[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View File"><i class="far fa-3x fa-${filetypeico}" style="font-size: 18px;"></i></a>
-																            	</td>
-														                  	</tr>
-													                	</tbody>
-													              	</table>
-					                                   		</div>
-								                		</div>
-								            		</div>
-							            		</form>`;
-							$('#rightContainer').html(complaintRightBody);
-							// Enable tooltips for all elements with data-toggle="tooltip"
-				            $('[data-toggle="tooltip"]').tooltip();
-						}).catch(function(error) {
-			    		    // Handle errors
-			    		    console.error('Error fetching action details ('+mapId+'):', error);
-			    		});	 
-						
-					}
-					// Enable tooltips for all elements with data-toggle="tooltip"
-		            $('[data-toggle="tooltip"]').tooltip();
-	        	}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching Complaint details ('+mapId+'):', error);
-	    		});	            
-	        	
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	// Check if the DataTable is already initialized and destroy it
-	            if ($.fn.dataTable.isDataTable('#complaintDatatable')) {
-	                $('#complaintDatatable').DataTable().destroy();
-	            }
-	            var table = $('#complaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        /*scrollY: '50vh',*/
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	            	var complaint_status=row["status"];
-					complaint_status=complaint_status.charAt(0).toUpperCase() + complaint_status.slice(1);
-					
-					actionHTML = `<div class="dropdown d-inline-block show">
-			                        <a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="ik ik-more-horizontal"></i></a>
-			                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-			                        Action for: `+row['petition_no']+` 
-			                        	<a class="dropdown-item" href="" onclick="return viewAck('`+row['petition_no']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Acknowledgement"><i class="ik ik-eye"></i> Acknowledgement</a>
-			                        	<a class="dropdown-item" href="/gcc/m_petition/petition-ack/`+row['petition_no']+`" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Print Acknowledgement"><i class="ik ik-printer"></i> Acknowledgement</a>
-			                        </div>
-			                    </div>`
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/m_petition/update-petition?petitionNo='+row['petitionNoEncode']+'" onclick="return viewPetitionSummary(\''+row['petitionNoEncode']+'\');">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    row['petitioner_address'],
-	                    row['petitioner_pincode'],
-	                    row['complaint_type'],
-	                    convertdate(row['cdate']),
-	                    '<a href="#" onclick="return updateStatus('+row['mapid']+');" style="text-transform: capitalize;"">'+complaint_status+'</a>',
-	                    row['off_nm'],
-	                    actionHTML
-	                ]).draw(false);
-	            });
-	            
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-	            onSearchComplete();
-			}
-			
-	     // Save New Action  
-			function saveandclose(mapId,petitionId,petitionNo){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var comments = $('#complaintActionText');
-				var textLength = comments.val().length;
-				comments.removeClass('is-invalid');
-				
-				var fileInput = $("#action_san_page1");
-				fileInput.removeClass('is-invalid');
-				var selectedFile = fileInput.val();
-				
-				if (textLength>=10 && selectedFile) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#action-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        formData.append('mapId',mapId);
-			        formData.append('petitionId',petitionId);
-			        formData.append('petitionNo',petitionNo);
-			        formData.append('complaintStatus','close');
-			        
-			        saveActionFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Complaint action saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					$("#ComplaintStatusBox").modal('hide');
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save complaint action. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					if(textLength<10){
-						comments.addClass('is-invalid');
-					}
-					
-					if (!selectedFile) {
-						fileInput.addClass('is-invalid');
-					}
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveActionFormData(formData){
-				var apiUrl = '/gcc/api/m_petition/saveComplanitStatus';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#updatebtn").prop("disabled", false);
-				$("#updatebtn").html('<i class="ik ik-save"></i> Save and Close ');
-			}
-			
-			function form_btn_disable(){
-				$("#updatebtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#updatebtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			// For Complient Map Select HTML 
-			function calloffice(val,id){
-				if(val==1){ // Intenal
-					var officeSelectHTML = `<div class="mb-4">
-	                							<label for="office${id}">Select Office</label>
-	                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-									                <option value="0">Select Office</option>
-									                <option value="1">HQ</option>
-									                <option value="2">Zonal Office</option>
-							                	</select>
-						                	</div>`;
-					$("#officedata"+id).html(officeSelectHTML);
-				}
-				else if(val==2){ // External
-					$("#officers"+id).html('');
-					var ExSelectHTML = getselect(id,"ExSelect");
-					var departmentSelectHTML = `<div class="mb-4">
-													<label for="dept3">Select Department</label>
-													${ExSelectHTML}
-											 	</div>`;
-					$("#officedata"+id).html(departmentSelectHTML);
-				}
-				else{
-					$("#officedata"+id).html('');
-					$("#officers"+id).html('');
-				}
-				$("#officers"+id).html('');
-			}
-			
-			function callofficers(val,id){
-				
-				if(val==1){
-					// HQ
-					var HQSelectHTML = getselect(id,"HQSelect");
-				 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-				}
-				else if(val==2){
-					// Zone Office
-					var ZoneSelectHTML = getselect(id,"ZoneSelect");
-					$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-				}
-				else{
-					$("#officers"+id).html('');
-				}
-				
-			}
-			
-			function getselect(comid,type){
-		  	  var HQSelect = '';
-		  	  var ZoneSelect = '';
-		  	  var ExSelect = '';
-		  
-		  	  for (var i = 0; i < officerMasterList.length; i++) {
-		  		  if(officerMasterList[i].zone_id=="HQ"){
-		  			  HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else if(officerMasterList[i].zone_id=="99"){
-		  			  ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else{
-		  			  ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  	  }
-		  	  
-		  	// Forward Save Button
-			  var forward_Btn = `<div class="col-12 pt-3 mb-0 pb-0" id="submitdiv">
-									<label class="form-label" for="forwardcomp">Forward Comments</label>
-									<textarea class="js-maxlength form-control" id="forwardcomp" name="forwardcomp" rows="6" maxlength="250" placeholder="கருத்துகள்..." data-always-show="true" data-placement="right" th:utext="" required></textarea>
-			  						<div class="text-center pt-3">
-									<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveForward(${comid});" id="updatebtn"><i class="si si-rocket me-1"></i> Save and Forward</button>
-			  						<div id="forwardFormError" class="text-danger"></div>
-			  						</div>
-								</div>`;
-								
-		  	  if(type=="HQSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ZoneSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ExSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  return '';
-			}
-			$(document).ready(function() {
-				// Get the current date
-			    var currentDate = new Date();
-			    
-			    // Get the current month (0-based, so +1 to get the correct month)
-			    var currentMonth = currentDate.getMonth() + 1; // getMonth() returns 0-11
-			    var currentYear = currentDate.getFullYear();
-			    var finalMonth = ("0" + currentMonth).slice(-2); // Format to 2 digits
-			    // Set the month and year to the current values
-			    document.getElementById("searchmonth").value = finalMonth;
-			    document.getElementById("searchyear").value = currentYear;
-			    
-				call_loading();
-				get_officer_master_data();
-				get_complaint_list(finalMonth,currentYear);
-				
-			});
-			
-			function callsearch() {
-			    // Get selected month and year from the dropdown
-			    var finalMonth = document.getElementById("searchmonth").value;
-			    var finalYear = document.getElementById("searchyear").value;
-
-			    // Check if both month and year are selected
-			    if (finalMonth && finalYear) {
-			    	// Disable the submit button
-			        document.getElementById('searchSubmitBtn').disabled = true;
-			        document.getElementById('searchSubmitBtn').innerHTML = 'Searching...'; // Change button text
-			        
-			    	call_loading();
-			        // Call the function to get the petition list
-			        get_complaint_list(finalMonth, finalYear);
-			    } else {
-			        // If month or year is not selected, you can show an alert or do nothing
-			        alert("Please select both month and year.");
-			        return false;
-			    }
-
-			    return false; // To prevent form submission (optional, if you don't want to reload the page)
-			}
-			function onSearchComplete() {
-			    // Re-enable the submit button
-			    document.getElementById('searchSubmitBtn').disabled = false;
-			    document.getElementById('searchSubmitBtn').innerHTML = '<i class="ik ik-search"></i>Search'; // Reset button text
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/m_petition/new_petition.html b/src/main/resources/templates/modules/m_petition/new_petition.html
deleted file mode 100644
index 9427a509..00000000
--- a/src/main/resources/templates/modules/m_petition/new_petition.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Add New Petition</h5>
-                                            <span>Mayor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Mayor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Add Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-                        	<div class="col-md-2"></div>
-							<div class="col-md-8">
-                                <div class="card">
-									<form class="request-form" id="request-form" onsubmit="return saveRequest();" enctype="multipart/form-data">
-	                                    <div class="card-header"><h3>New Petition Form</h3></div>
-	                               		<div class="card-body">
-											<div class="form-group">
-	                                            <label for="petitionerName">Petition Type / மனுவின் வகை</label>
-	                                            <div class="form-radio" id="petition_type">
-		                                          
-		                                        </div>
-	                                        </div>
-											<div class="form-group">
-	                                            <label for="petitionerName">Petitioner's Name / மனுதாரரின் பெயர்</label>
-	                                            <input type="text" class="form-control" name="petitionerName" id="petitionerName" autocomplete="off" placeholder="மனுதாரரின் பெயர்"  maxlength="250" required>
-	                                        </div>
-	                                        <div class="form-group">
-	                                            <label for="petitionerMobile">Mobile NO / கைபேசி எண்</label>
-			                       				<input type="text" class="js-maxlength form-control" id="petitionerMobile" name="petitionerMobile" autocomplete="off" placeholder="கைபேசி எண்" maxlength="10" data-always-show="true" data-placement="top" required>
-	                                        </div>
-											<div class="form-group">
-                                          		<label for="complaintType">Type of complaint / புகார் வகை (பலவற்றை தேர்ந்தெடு..) </label>
-												<select class="select2" id="complaintType" name="complaintType" style="width: 100%;" data-placeholder="பலவற்றை தேர்ந்தெடு.." multiple required>
-													<option th:each="complaintType : ${complaintTypesList}" th:value="${complaintType.complaintTypeId}" th:text="${complaintType.complaintType}"></option>
-												</select>
-											</div>
-	                                        <div class="row">
-												 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page1">Petition Page 1 / மனு பக்கம் 1</label>
-													   <input name="san_page1" id="san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*">
-													 </div>
-												 </div>
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page2">Petition Page 2 / மனு பக்கம் 2</label>
-													   <input name="san_page2" id="san_page2" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-												 
-											</div>	 
-											<div class="row">	 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page3">Petition Page 3 / மனு பக்கம் 3</label>
-													   <input name="san_page3" id="san_page3" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-												 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page4">Petition Page 4 / மனு பக்கம் 4</label>
-													   <input name="san_page4" id="san_page4" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-											</div>
-										 	
-	                                  	</div>
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-							<div class="col-md-2"></div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/m_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var complaintTypeList = "";
-			/* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(complaintTypeList, function(index, complaintType) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: complaintType.complaint_typeid, // case-sensitive as per object
-	    	                text: complaintType.complaint_type
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#complaintType').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			
-	        /* Get Petition Type Data */
-	        function get_petition_type_data(){
-	        	var petitionTypeHTML="";
-	    		get_petition_type_list().then(function(petitionTypes) {
-	    		    // Handle the Complaint list
-	    		    petitionTypeList = petitionTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(petitionTypeList, function(index, petitionType) {
-	    	            // Create an option element
-	    	            
-	    	            petitionTypeHTML +=`<div class="radio radiofill ${petitionType.color_class} radio-inline">
-						                            <label class="cursure_poiter">
-						                            <input type="radio" name="petitionType" value="${petitionType.petition_type_id}">
-						                            <i class="helper"></i>${petitionType.name}
-						                        </label>
-						                    </div>`;
-	    	        });
-	    		 // Append the option to the select element
-    	         $('#petition_type').html(petitionTypeHTML);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching petition type list:', error);
-	    		});
-			}
-			 
-			// Save New petition 
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null && mobileFormatRegex.test(mobileNo) && mobileNo.length == 10) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#request-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        saveFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Petition data saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					// Reload the current page
-		        					//location.reload();
-		        					// Navigate to a Ack page
-		        					window.location = "/gcc/m_petition/petition-ack/"+response;
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save petition data. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveFormData(formData){
-				var apiUrl = '/gcc/api/m_petition/savePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#resetFormBtn").prop("disabled", false);
-				$("#requestSubmitBtn").prop("disabled", false);
-				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-			}
-			
-			function form_btn_disable(){
-				$("#resetFormBtn").prop("disabled", true);
-				$("#requestSubmitBtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			$(document).ready(function() {
-				get_complaint_type_data();
-				get_petition_type_data();
-				$('#petitionerMobile').mask('0000000000');
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/m_petition/pending_list.html b/src/main/resources/templates/modules/m_petition/pending_list.html
deleted file mode 100644
index da2b9233..00000000
--- a/src/main/resources/templates/modules/m_petition/pending_list.html
+++ /dev/null
@@ -1,351 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    /* Add space between buttons inside the container */
-    .col-md-3.d-flex button {
-        margin-right: 10px; /* Adjust the value as needed */
-    }
-    /* Remove extra margin from the last button */
-    .col-md-3.d-flex button:last-child {
-        margin-right: 0;
-    }
-</style>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Pending List</h5>
-                                            <span>Mayor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Mayor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Pending List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <!-- <div class="card">
-                                    
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-										
-
-
-										
-							<!-- 			<div class="row mb-3">
-										    <div class="col-md-3">
-										        <label for="fromDate">From Date:</label>
-										        <input type="date" id="fromDate" class="form-control">
-										    </div>
-										    <div class="col-md-3">
-										        <label for="toDate">To Date:</label>
-										        <input type="date" id="toDate" class="form-control">
-										    </div>
-											<div class="col-md-3 d-flex align-items-end">
-											    <button id="filterBtn" class="btn btn-primary">Search</button>
-											    <button id="resetBtn" class="btn btn-secondary">Reset</button>
-											</div>
-                                        </div>										
-										
-										<div class="form-group">
-                                            <label for="eventid">Select Petition Type / மனுவின் வகை</label>
-                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required onchange="get_complaint_list(this.value);">
-												<option value=""></option>
-											</select>
-                                        </div> -->
-                                        
-                                        <div class="row mb-3">
-    <div class="col-md-3">
-        <label for="fromDate">From Date:</label>
-        <input type="date" id="fromDate" class="form-control">
-    </div>
-    <div class="col-md-3">
-        <label for="toDate">To Date:</label>
-        <input type="date" id="toDate" class="form-control">
-    </div>
-<div class="col-md-3">
-    <label for="petitionType">Select Petition Type / மனுவின் வகை</label>
-    <select class="form-control" id="petitionType" name="petitionType">
-        <option value="">-- All Types --</option>
-    </select>
-</div>
-
-    <div class="col-md-3 d-flex align-items-end">
-        <button id="filterBtn" class="btn btn-primary me-2">Search</button>
-        <button id="resetBtn" class="btn btn-secondary">Reset</button>
-    </div>
-</div>
-                                         
-                                        <div>
-											<table id="ReportDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-														<!-- <th class="text-center">Counsilor Ward</th>
-						 								<th class="text-center">Counsilor Zone</th> -->
-						 								<th class="text-center">Counsilor Name</th>
-						 								<th class="text-center">Petition Type </th>
-						 								<th class="text-center">Content</th>
-						 								<!-- <th class="text-center">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Address&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th> -->
-														<!-- <th class="text-center">Postal Code</th> -->
-						                                <!-- <th class="text-center">Type of Complaint</th> -->
-						                                <!-- <th class="text-center">Date</th> -->
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center">Status</th>
-						                                
-						                                <!-- <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th> -->
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                          
-                          
-                                                 
-                                            </table>
-                                        </div>
-                                 
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/zerohours_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-			
-			//Report List
-			
-// Function to load petition types into dropdown
-function loadPetitionTypes() {
-    $.ajax({
-        url: '/gcc/api/m_petition/getPetitionTypes',
-        type: 'GET',
-        dataType: 'json',
-        success: function (response) {
-            let $dropdown = $("#petitionType");
-            $dropdown.empty(); 
-            $dropdown.append('<option value="">-- All Types --</option>');
-
-            // If response is an array
-            if (Array.isArray(response)) {
-                $.each(response, function (index, item) {
-                    $dropdown.append('<option value="' + item.petition_type_id + '">' + item.name + '</option>');
-                });
-            } else {
-                // If response is a single object
-                $dropdown.append('<option value="' + response.petition_type_id + '">' + response.name + '</option>');
-            }
-        },
-        error: function (xhr, status, error) {
-            console.error("Error loading petition types:", error);
-        }
-    });
-}
-
-			
-function loadReportData(fromDate, toDate, petitionTypeId = "", isReset = false) {
-    let apiUrl = '/gcc/api/m_petition/getReportList';
-    let params = [];
-
-    if (!isReset) {
-        if (fromDate && toDate) {
-            params.push("fromDate=" + fromDate);
-            params.push("toDate=" + toDate);
-        }
-        if (petitionTypeId) {
-            params.push("petitionType=" + petitionTypeId);
-        }
-    }
-
-    if (params.length > 0) {
-        apiUrl += "?" + params.join("&");
-    }
-
-    $.ajax({
-        url: apiUrl,
-        type: 'GET',
-        dataType: 'json',
-        success: function (response) {
-            if ($.fn.DataTable.isDataTable('#ReportDatatable')) {
-                $('#ReportDatatable').DataTable().clear().destroy();
-            }
-
-            $('#ReportDatatable').DataTable({
-                data: response,
-                dom: 'Bfrtip',
-                buttons: buttons,
-                columns: [
-                    {
-                        data: null,
-                        className: "text-center",
-                        render: function (data, type, row, meta) {
-                            return meta.row + 1;
-                        }
-                    },
-                    { data: 'petition_no', className: "text-center" },
-                    { data: 'petitioner_name', className: "text-center" },
-                    { data: 'petition_type', className: "text-center" },
-                    { data: 'complaint_nature', className: "text-center" },
-                    { data: 'officer_name', className: "text-center" },
-                    { data: 'status', className: "text-center" }
-                ]
-            });
-        },
-        error: function (xhr, status, error) {
-            console.error("Error fetching report list:", error);
-        }
-    });
-}
-
-
-$(document).ready(function () {
-    // Load petition types dynamically
-    loadPetitionTypes();
-
-    // Default load today's data
-    let today = new Date().toISOString().split('T')[0];
-    $("#fromDate").val(today);
-    $("#toDate").val(today);
-    loadReportData(today, today);
-
-    // On Filter Button Click
-    $("#filterBtn").click(function () {
-        let fromDate = $("#fromDate").val();
-        let toDate = $("#toDate").val();
-        let petitionTypeId = $("#petitionType").val();
-
-        if (fromDate && toDate) {
-            loadReportData(fromDate, toDate, petitionTypeId);
-        } else {
-            alert("Please select both From Date and To Date");
-        }
-    });
-
-    // Reset button click
-    $("#resetBtn").click(function () {
-        location.reload();
-    });
-});
-
-
-    
-
-    
-			
- 
-		    
-		    //////////
-			
-
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/m_petition/petition_ack.html b/src/main/resources/templates/modules/m_petition/petition_ack.html
deleted file mode 100644
index a0814cd5..00000000
--- a/src/main/resources/templates/modules/m_petition/petition_ack.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5 th:utext="'Petition Acknowledgement ('+${petitionNo}+')'">Petition Acknowledgement</h5>
-                                            <span>Mayor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Mayor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition Acknowledgement</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr class="print_no">
-                        <!-- 
-                        <div class="row">
-                        	<div class="col-lg-6">
-								<div class="block block-rounded ack ack-container">
-									<div id="ack1table" style="border: 1px solid black;">
-										<div id="ack1"></div>
-									</div>
-								</div>
-							</div>
-						 
-							<div class="col-lg-6">
-								<div class="block block-rounded ack ack-container">
-									<div id="ack2table" style="border: 1px solid black;">
-										<div id="ack2"></div>
-									</div>
-								</div>
-							</div>
-		   	 	            <div class="col-lg-12 text-center block-options pt-10">
-		   	 					<button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-		   	 	            </div>
-                        </div>
-                         -->
-                        <div class="row">
-						    <div class="col-lg-6">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack1table" class="ack-content">
-						                <div id="ack1">This is ack1</div>
-						            </div>
-						        </div>
-						    </div>
-						    
-						    <div class="col-lg-6 printack2">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack2table" class="ack-content">
-						                <div id="ack2">This is ack2</div>
-						            </div>
-						        </div>
-						    </div>
-						    <div class="col-lg-12 text-center block-options pt-10">
-						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-						    </div>
-						</div>
-						                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/m_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var complaintTypeList = "";
-			
-			 /* Get Complaint Type Data */
-			function get_complaint_type_data(){
-			
-				get_complaint_type_list().then(function(complaintTypes) {
-				    // Handle the Complaint list
-				    complaintTypeList = complaintTypes;
-					
-				    // After Complaint Type list created we call petition details
-				    get_petition_data();
-				    
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching complaint type list:', error);
-				});
-			}
-			
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint_txt;
-					
-					var complaintArray = complaint.split(',');
-					
-					for(j = 0; j < complaintArray.length; j++){
-						if(j>0){
-							complaintHTML+="<br>";
-						}
-						complaintHTML+= (j+1)+') '+complaintArray[j];
-					}
-					var ack =`
-					<table class="table table-borderless table-vcenter p-0 m-0">
-					  <tbody>
-					    <tr>
-					      <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-					      <td class="fw-semibold text-center">
-								<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-								மக்களை தேடி மேயர் திட்டம்<br>
-								ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-						  </td>
-						  <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-					    </tr>
-					</tbody>
-					</table>
-					<hr style="margin:0px">
-					  <div class="block-content p-0 m-0">
-					    <table class="table table-borderless table-vcenter" style="font-size:12px;">
-					      <tbody>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${convertdate(petitionDetails[0].cdate)}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petition_no}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petitioner_name}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petitioner_mobile}
-					          </td>
-					        </tr>
-					        <tr style="font-size:12px;">
-					          <th style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${complaintHTML}
-							</td>
-					        </tr>
-					        <tr>
-					          <td scope="row" colspan="2" style="font-size:10px">இம்மனுவின் ஒப்புகைச் சீட்டு எண் மனு தாரரின் கைபேசி எண்ணிற்கு குறுஞ்செய்தி மூலம் அனுப்பி வைக்கப்படும் . இம்மனுவின் நிலை குறித்து https://chennaicorporation.gov.in/MTM/ என்ற இணையதளத்தில் மனுவின் எண்ணை குறிப்பிட்டு அறிந்துகொள்ளலாம்</th>
-					        </tr>
-					        <tr style="text-align: right;">
-					          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-					        </tr>
-					      </tbody>
-					    </table>
-					  `;
-				    
-					$("#ack1").html(ack);
-					$("#ack2").html(ack);
-					  
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition details ('+petitionNo+'):', error);
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/m_petition/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                resolve(jsonResponse);
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			$(document).ready(function() {
-				get_complaint_type_data();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/m_petition/petition_list.html b/src/main/resources/templates/modules/m_petition/petition_list.html
deleted file mode 100644
index 34476689..00000000
--- a/src/main/resources/templates/modules/m_petition/petition_list.html
+++ /dev/null
@@ -1,370 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Petition List</h5>
-                                            <span>Mayor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Mayor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                        	<div class="col-md-12">
-                        		<form onsubmit="return callsearch();">
-                        			<div class="card">
-                        				<div class="card-block row">
-	                        				<div class="col-md-4">
-	                        					<div class="form-group">
-						                            <label for="searchmonth">Select Month:</label>
-														<select class="form-control" id="searchmonth" name="searchmonth">
-															<option value="" selected="" disabled="">Select Month</option>
-														    <option value="01">January</option>
-														    <option value="02">February</option>
-														    <option value="03">March</option>
-														    <option value="04">April</option>
-														    <option value="05">May</option>
-														    <option value="06">June</option>
-														    <option value="07">July</option>
-														    <option value="08">August</option>
-														    <option value="09">September</option>
-														    <option value="10">October</option>
-														    <option value="11">November</option>
-														    <option value="12">December</option>
-														</select>
-						                        </div>
-						                    </div>
-						                    <div class="col-md-4">
-	                        					<div class="form-group">
-						                            <label for="searchyear">Select Year</label>
-						                            <select class="form-control" name="searchyear" id="searchyear" required="">
-														<option value="" selected="" disabled="">Select Year</option>
-														<option value="2026">2026</option>
-														<option value="2025">2025</option>
-														<option value="2024">2024</option>
-														<option value="2023">2023</option>
-														<option value="2023">2022</option>
-													</select>
-						                        </div>
-						                    </div>
-						                    <div class="col-md-4 pt-5"><br>
-	                        					<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            			<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						                    </div>
-                        				</div>
-                        			</div>
-                        		</form>
-                        	</div>
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="petitionDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Petition Type</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Petition Type</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/m_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/m_petition/script :: script}"></script>
-        <script th:inline="javascript">
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_petitions_data(month,year){
-	        	var apiUrl = '/gcc/api/m_petition/getPetitionList?searchmonth='+month+'&searchyear='+year;
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_petitions_list(month,year){
-	        	get_petitions_data(month,year).then(function(petitionList) {
-	    		    // Handle the department list
-	    		    generate_table(petitionList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching petition list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching petition list:', error);
-			        }
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	// Check if the DataTable is already initialized and destroy it
-	            if ($.fn.dataTable.isDataTable('#petitionDatatable')) {
-	                $('#petitionDatatable').DataTable().destroy();
-	            }
-	            
-	            var table = $('#petitionDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        //scrollY: '150vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-
-	            	//View Acknowledgement: View the acknowledgement for petition MP10000001.
-					//Print Acknowledgement: Print the acknowledgement for petition MP10000001.
-					//View Petition Details: View the details of petition MP10000001.
-					//View Uploaded Files: View the files uploaded for petition MP10000001.
-
-					actionHTML = `<div class="dropdown d-inline-block show">
-			                        <a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="ik ik-more-horizontal"></i></a>
-			                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-			                        
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the acknowledgement for petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Acknowledgement</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Print the acknowledgement for petition `+row['petition_no']+`."><i class="ik ik-printer"></i> Print Acknowledgement</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the details of petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Petition Details</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the files uploaded for petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Uploaded Files</a>
-			                        </div>
-			                    </div>`
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/m_petition/update-petition?petitionNo='+row['petitionNoEncode']+'">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    row['petitioner_address'],
-	                    row['petitioner_pincode'],
-	                    row['petitioner_complaint_txt'],
-	                    convertdate(row['cdate']),
-	                    row['status'],
-	                    row['petition_type_name'],
-	                    actionHTML
-	                ]).draw(false);
-	            });
-	            
-	           // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-	            onSearchComplete();
-			}
-			
-			$(document).ready(function() {
-				// Get the current date
-			    var currentDate = new Date();
-			    
-			    // Get the current month (0-based, so +1 to get the correct month)
-			    var currentMonth = currentDate.getMonth() + 1; // getMonth() returns 0-11
-			    var currentYear = currentDate.getFullYear();
-			    var finalMonth = ("0" + currentMonth).slice(-2); // Format to 2 digits
-			    // Set the month and year to the current values
-			    document.getElementById("searchmonth").value = finalMonth;
-			    document.getElementById("searchyear").value = currentYear;
-			    
-				call_loading();
-	            get_petitions_list(finalMonth,currentYear);
-	            
-			});
-			function callsearch() {
-			    // Get selected month and year from the dropdown
-			    var finalMonth = document.getElementById("searchmonth").value;
-			    var finalYear = document.getElementById("searchyear").value;
-
-			    // Check if both month and year are selected
-			    if (finalMonth && finalYear) {
-			    	// Disable the submit button
-			        document.getElementById('searchSubmitBtn').disabled = true;
-			        document.getElementById('searchSubmitBtn').innerHTML = 'Searching...'; // Change button text
-			        
-			    	call_loading();
-			        // Call the function to get the petition list
-			        get_petitions_list(finalMonth, finalYear);
-			    } else {
-			        // If month or year is not selected, you can show an alert or do nothing
-			        alert("Please select both month and year.");
-			        return false;
-			    }
-
-			    return false; // To prevent form submission (optional, if you don't want to reload the page)
-			}
-			function onSearchComplete() {
-			    // Re-enable the submit button
-			    document.getElementById('searchSubmitBtn').disabled = false;
-			    document.getElementById('searchSubmitBtn').innerHTML = '<i class="ik ik-search"></i>Search'; // Reset button text
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/m_petition/petition_not_mapped_list.html b/src/main/resources/templates/modules/m_petition/petition_not_mapped_list.html
deleted file mode 100644
index 4eb62635..00000000
--- a/src/main/resources/templates/modules/m_petition/petition_not_mapped_list.html
+++ /dev/null
@@ -1,267 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Unmapped Petition List</h5>
-                                            <span>Mayor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Mayor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Unmapped Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                	<div class="card-header">
-                                        <h3>These are the petitions that are currently not assigned to any department officer:</h3>
-                                    </div>
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="petitionDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/m_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/m_petition/script :: script}"></script>
-        <script th:inline="javascript">
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_petitions_data(){
-	        	var apiUrl = '/gcc/api/m_petition/getUnmapPetitionList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_petitions_list(){
-	        	get_petitions_data().then(function(petitionList) {
-	    		    // Handle the department list
-	    		    generate_table(petitionList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching petition list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching petition list:', error);
-			        }
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#petitionDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-				        	{ targets: 'no-sort', "orderable": false },
-							{ targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/m_petition/update-petition?petitionNo='+row['petitionNoEncode']+'">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    row['petitioner_address'],
-	                    row['petitioner_pincode'],
-	                    row['petitioner_complaint_txt'],
-	                    convertdate(row['cdate']),
-	                    row['status'],
-	                    row['created_by'],
-	                    '<a href="" onclick="return viewAck(\''+row['petition_no']+'\');"data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Ack"><i class="far fa-handshake"></i></a>',
-	                ]).draw(false);
-	            });
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-	            get_petitions_list();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/m_petition/petition_update.html b/src/main/resources/templates/modules/m_petition/petition_update.html
deleted file mode 100644
index 6b10599c..00000000
--- a/src/main/resources/templates/modules/m_petition/petition_update.html
+++ /dev/null
@@ -1,758 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Edit / Update Petition</h5>
-                                            <span>Mayor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Mayor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Edit/Update Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card" id="petitionUpdateForm">
-									<form class="update-request-form" id="update-request-form" onsubmit="return updateRequest();">
-										<div class="card-header">
-		                                    <h3>Edit / Update Petition Form</h3>
-		                                    <div class="card-header-right">
-	                                            <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-	                                        </div>
-	                                    </div>
-	                               		<div class="card-body">
-	                               			<div class="row">
-	                               				<div class="col-12">
-	                               					<div class="form-group">
-			                                            <label for="petitionerName">Petition Type / மனுவின் வகை</label>
-			                                            <div class="form-radio" id="petition_type">
-				                                          
-				                                        </div>
-			                                        </div>
-	                               				</div>
-												<div class="col-6">
-													<div class="form-group">
-			                                            <label for="petitionerName">Petitioner's Name / மனுதாரரின் பெயர்</label>
-			                                            <input type="text" class="form-control" name="petitionerName" id="petitionerName" autocomplete="off" placeholder="மனுதாரரின் பெயர்"  maxlength="250" required>
-			                                        </div>
-			                                        <div class="form-group">
-			                                            <label for="petitionerMobile">Mobile NO / கைபேசி எண்</label>
-					                       				<input type="text" class="form-control" id="petitionerMobile" name="petitionerMobile" autocomplete="off" placeholder="கைபேசி எண்" maxlength="10" required>
-			                                        </div>
-			                                        <div class="form-group">
-			                                        	<label for="complaintNature">புகாரின் தன்மை / Nature Of Complaint</label>
-								   						<textarea class="form-control" id="complaintNature" name="complaintNature" rows="6" maxlength="250" placeholder="புகாரின் தன்மை..."></textarea>
-								   					</div>
-												</div>
-												<div class="col-6">
-													<div class="form-group">
-														<label for="petitionerAddress">Address of petitioner / மனுதாரரின் முகவரி</label>
-									   					<textarea class="form-control" id="petitionerAddress" name="petitionerAddress" rows="6" maxlength="250" placeholder="மனுதாரரின் முகவரி..."></textarea>
-													</div>
-													<div class="form-group">
-														<label for="petitionerPincode">Postal code / தபால் குறியீடு</label>
-	   			                       					<input type="text" class="form-control" id="petitionerPincode" name="petitionerPincode" placeholder="தபால் குறியீடு" maxlength="6" required>
-													</div>
-													<div class="form-group">
-		                                          		<label for="complaintType">Type of complaint / புகார் வகை (பலவற்றை தேர்ந்தெடு..) </label>
-														<select class="select2" id="complaintType" name="complaintType" style="width: 100%;" data-placeholder="பலவற்றை தேர்ந்தெடு.." multiple required onchange="javascript:load_mapper();">
-															<option></option>
-														</select>
-													</div>
-												</div>
-												<div class="col-12">
-													<div class="block-content" id="userinfo2">
-														<div id="comp_mapping_to_officers" class="row"></div>
-													</div>
-											 	</div>
-											</div>
-	                                  	</div>
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/m_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Iterate through the Master Complanint Type and add options to the select element
-	    		    $.each(complaintTypeList, function(index, complaintType) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: complaintType.complaint_typeid, // case-sensitive as per object
-	    	                text: complaintType.complaint_type
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#complaintType').append(option);
-	    	        });
-	    		    // Call Petition function to fetch the data
-	    		    get_petition_data();
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-	        /* Get Petition Type Data */
-	        function get_petition_type_data(){
-	        	var petitionTypeHTML="";
-	    		get_petition_type_list().then(function(petitionTypes) {
-	    		    // Handle the Complaint list
-	    		    petitionTypeList = petitionTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(petitionTypeList, function(index, petitionType) {
-	    	            // Create an option element
-	    	            
-	    	            petitionTypeHTML +=`<div class="radio radiofill ${petitionType.color_class} radio-inline">
-						                            <label class="cursure_poiter">
-						                            <input type="radio" name="petitionType" id="petition_type_${petitionType.petition_type_id}" value="${petitionType.petition_type_id}" disable>
-						                            <i class="helper"></i>${petitionType.name}
-						                        </label>
-						                    </div>`;
-	    	        });
-	    		 // Append the option to the select element
-    	         $('#petition_type').html(petitionTypeHTML);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching petition type list:', error);
-	    		});
-			}
-	        
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-			 
-	     	// Function to get complaint_type and complaint_typeid by complaint_typeid
-	        function getComplaintTypeById(complaintTypeId) {
-	            for (var i = 0; i < complaintTypeList.length; i++) {
-	                if (complaintTypeList[i].complaint_typeid == complaintTypeId) {
-	                    return {
-	                        complaint_type: complaintTypeList[i].complaint_type,
-	                        complaint_typeid: complaintTypeList[i].complaint_typeid
-	                    };
-	                }
-	            }
-	            return null; // Return null if no matching complaint_typeid is found
-	        }
-	     
-			// Save New petition 
-			function updateRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null && mobileFormatRegex.test(mobileNo) && mobileNo.length == 10) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#update-request-form')[0]);
-			        formData.append('petitionNo',petitionNo);
-			        formData.append('createdBy',createdBy);
-			        formData.append('petitionId',petitionId);
-			        updateFormData(formData).then(function(response) {
-		    		    // Handle the response
-		    		    if(response==true){
-							// Delete Old data in Petition Mapping table
-		    		    	savePetitionMapData(formData).then(function(response) {
-		    		    		if(response==true){
-		    		    			Swal.fire({
-				        				title: 'Petition updated successfully!',
-				        				customClass: {
-				        			        title: 'swal-title-custom' // Add a custom class for the title
-				        			    },
-				        				//text: "Error",
-				        				icon: 'success',
-				        				showCancelButton: false,
-				        				confirmButtonColor: '#3085d6',
-				        				cancelButtonColor: '#d33',
-				        				confirmButtonText: 'Ok',
-				        				}).then(function(result) {
-				        				if (result.isConfirmed) {
-				        					form_btn_enable();
-				        				}
-				        			});
-		    		    		}
-		    		    		else{
-		    		    			Swal.fire({
-				        				title: 'Petition details have been updated, but mapping the complaint to the officer has failed.',
-				        				customClass: {
-				        			        title: 'swal-title-custom' // Add a custom class for the title
-				        			    },
-				        				//text: "Error",
-				        				icon: 'warning',
-				        				showCancelButton: false,
-				        				confirmButtonColor: '#3085d6',
-				        				cancelButtonColor: '#d33',
-				        				confirmButtonText: 'Ok',
-				        				}).then(function(result) {
-				        				if (result.isConfirmed) {
-				        					form_btn_enable();
-				        				}
-				        			});
-								}
-		    		    	}).catch(function(error) {
-		    	    		    // Handle errors
-		    	    		    console.error('Error fetching offcier master data:', error);
-		    	    		    form_btn_enable();
-		    	    		});
-		    		    	
-						}
-		    		    else{
-		    		    	Swal.fire({
-		        				title: 'Failed to update petition details!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-	    		    	
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function updateFormData(formData){
-				var apiUrl = '/gcc/api/m_petition/updatePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function savePetitionMapData(formData){
-				var apiUrl = '/gcc/api/m_petition/mapComplientToOfficer';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint;
-					petitionId = petitionDetails[0].petition_id;
-					var complaintArray = complaint.split(",");
-					$("#complaintType").val(complaintArray);
-					
-					$('#complaintType').trigger('change');
-					
-					closedComplaintsList = complaintArray;
-					var petition_type = "#petition_type_"+petitionDetails[0].petition_type;
-					// Suppose you want to select the radio button with the value 'option2'
-					$(petition_type).prop('checked', true);
-
-					$("#petitionerName").val(petitionDetails[0].petitioner_name);
-					$("#petitionerMobile").val(petitionDetails[0].petitioner_mobile);
-					$("#petitionerAddress").val(petitionDetails[0].petitioner_address);
-					$("#petitionerPincode").val(petitionDetails[0].petitioner_pincode);
-					
-					$("#complaintNature").val(petitionDetails[0].complaint_nature);
-					
-					//load_mapper(); // Call for Complaint Mapping Form
-					
-					// IDs of the values you want to prevent from being deselected
-					var valuesToPreventDeselection = closedComplaintsList;//['value1', 'value2', 'value3'];
-
-					$('#complaintType').on('select2:unselect', function (e) {
-					    var deselectedValue = e.params.data.id;
-					    
-					    // Check if the deselected value should be prevented from being deselected
-					    if (valuesToPreventDeselection.includes(deselectedValue)) {
-					        // Prevent the deselection
-					        e.preventDefault();
-					    	// Re-select the deselected value to prevent it from being deselected
-					        $(this).val(valuesToPreventDeselection).trigger('change.select2');
-					        // Optionally, you can display a message or perform any other action
-					        console.log('Deselection of value ' + deselectedValue + ' prevented');
-					        alert('Deselection of value ' + deselectedValue + ' prevented');
-					    }
-					});
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition Data ('+petitionNo+'):', error.message);
-				    call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/m_petition/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			function load_mapper(){
-			  	var complaintArray = $("#complaintType").val();
-			  	//var complaintArray = complaint.split(',');
-				var compPetitionNo = petitionNo;
-				var compPetitionId = petitionId;
-				
-				var compmapHTML='';
-				for(j = 0; j < complaintArray.length; j++){
-					var complaintTypeDetails = getComplaintTypeById(complaintArray[j]); // Pass the complaint_typeid
-					var title=(j+1)+') '+ complaintTypeDetails.complaint_type; // Map form title
-					var compID="comp"+j;
-					var complaintTypeId = complaintTypeDetails.complaint_typeid;
-					
-					getMappingByComplaintsID(complaintTypeId);
-					
-					compmapHTML+=`<div class="col-lg-6" id="comp${complaintArray[j]}">
-										
-										<div class="widget">
-					                        <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                            <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-					                        </div>
-					                        <div class="widget-body">
-					                        	<div class="form-group">
-						                        	<label for="dept${complaintArray[j]}">Select Department Type</label>
-													<select name="dept[]" id="dept${complaintArray[j]}" class="form-control" onchange="javascript:calloffice(this.value,${complaintArray[j]})">
-														<option value="0">Select Department</option>
-														<option value="1">GCC Department</option>
-														<option value="2">External Department</option>
-												    </select>
-												</div>
-												<div id="officedata${complaintArray[j]}"></div>
-												<div id="officers${complaintArray[j]}"></div>
-					                        </div>
-					                    </div>
-									
-								  </div>`;
-						
-				}
-				$('#comp_mapping_to_officers').html(compmapHTML);
-				
-			  }
-			
-		</script>
-		
-		<script>
-		// For Complient Map Select HTML 
-		function calloffice(val,id){
-			if(val==1){ // Intenal
-				var officeSelectHTML = `<div class="mb-4">
-                							<label for="office${id}">Select Office</label>
-                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-								                <option value="0">Select Office</option>
-								                <option value="1">HQ</option>
-								                <option value="2">Zonal Office</option>
-						                	</select>
-					                	</div>`;
-				$("#officedata"+id).html(officeSelectHTML);
-			}
-			else if(val==2){ // External
-				$("#officers"+id).html('');
-				var ExSelectHTML = getselect(id,"ExSelect");
-				var departmentSelectHTML = `<div class="mb-4">
-												<label for="dept3">Select Department</label>
-												${ExSelectHTML}
-										 	</div>`;
-				$("#officedata"+id).html(departmentSelectHTML);
-			}
-			else{
-				$("#officedata"+id).html('');
-				$("#officers"+id).html('');
-			}
-			$("#officers"+id).html('');
-		}
-		
-		function callofficers(val,id){
-			
-			if(val==1){
-				// HQ
-				var HQSelectHTML = getselect(id,"HQSelect");
-			 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-			}
-			else if(val==2){
-				// Zone Office
-				var ZoneSelectHTML = getselect(id,"ZoneSelect");
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-			}
-			else{
-				$("#officers"+id).html('');
-			}
-			
-		}
-		
-		function getselect(comid,type){
-	  	  var HQSelect = '';
-	  	  var ZoneSelect = '';
-	  	  var ExSelect = '';
-	  
-	  	  for (var i = 0; i < officerMasterList.length; i++) {
-	  		  if(officerMasterList[i].zone_id=="HQ"){
-	  			  HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  		  else if(officerMasterList[i].zone_id=="99"){
-	  			  ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  		  else{
-	  			  ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  	  }
-	  	  
-	  	  if(type=="HQSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>`;
-	  	  }
-	  	  if(type=="ZoneSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>`;
-	  	  }
-	  	  if(type=="ExSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>`;
-	  	  }
-	  	  return '';
-		}
-		
-		function form_btn_enable(){
-			$("#resetFormBtn").prop("disabled", false);
-			$("#requestSubmitBtn").prop("disabled", false);
-			$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-		}
-		
-		function form_btn_disable(){
-			$("#resetFormBtn").prop("disabled", true);
-			$("#requestSubmitBtn").prop("disabled", true);
-			// Show the loading icon on the button
-			$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-		}
-		
-		function getMappingByComplaintsID(complaintTypeId){
-				
-				$.ajax({
-				    type: "GET",
-				    url: '/gcc/api/m_petition/getComplaintMappingDetails',
-				    data: {
-				        'petitionId': petitionId,
-						'petitionNo': petitionNo,
-						'complaintTypeId': complaintTypeId
-				    },
-					dataType: 'json',
-				}).done(function(response) {
-					
-					//console.log(response);
-					
-					if(response.length>0){
-						var comid = response[0]["complaint_typeid"];
-						var offid = response[0]["off_id"];
-						var mapid = response[0]["mapid"];
-						loadSelectforUpdate(comid,offid,comid);
-					}
-					
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-						
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-					    
-				});
-		}
-		
-		function loadSelectforUpdate(comid,offid,id){
-			var type ="NULL";
-	  	  	var HQSelect = '';
-	  	  	var ZoneSelect = '';
-	  	  	var ExSelect = '';
-	  
-			for (var i = 0; i < officerMasterList.length; i++) {
-		  		//console.log(officerMasterList[i]);
-				if(officerMasterList[i].zone_id=="HQ"){
-			  
-				  	if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "HQSelect";
-				  		HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-				  	}
-				  	else{
-				  		HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-				  	}
-					  
-				}
-				else if(officerMasterList[i].zone_id=="99"){
-					if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "ExSelect";
-						ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-		  			}
-		  			else{
-		  				ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  			}
-				}
-				else{
-					if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "ZoneSelect";
-						//console.log(type + " === "+ officerMasterList[i].offId +" == "+ offid);
-						ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-				  	}
-				  	else{
-				  		ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-				  	}  
-				}
-			}  
-			
-			//console.log("comid : "+comid +",\noffid : "+offid+",\nid : "+id+",\ntype : "+type);
-			
-			if(type=="HQSelect"){
-				//console.log("I am from HQSelect: \n #officers"+id);
-				$("#officedata"+id).html('<div class="mb-4">' +
-				           '<label for="office$'+id+'">Select Office</label>' +
-				           '<select name="office[]" id="office$'+id+'" class="form-control" onchange="javascript:callofficers(this.value,'+id+')">' +
-				           '<option value="0">Select Office</option>' +
-				           '<option value="1" Selected>HQ</option>' +
-				           '<option value="2">Zonal Office</option>' +
-				           '</select>' +
-				           '</div>');
-			  	 HQSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>`;
-		 		$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${HQSelectHTML}</div>`);
-		 
-			}
-			if(type=="ZoneSelect"){
-				//console.log("I am from ZoneSelect: \n #officers"+id);
-				$("#officedata"+id).html('<div class="mb-4">' +
-				           '<label for="office$'+id+'">Select Office</label>' +
-				           '<select name="office[]" id="office$'+id+'" class="form-control" onchange="javascript:callofficers(this.value,'+id+')">' +
-				           '<option value="0">Select Office</option>' +
-				           '<option value="1">HQ</option>' +
-				           '<option value="2" Selected>Zonal Office</option>' +
-				           '</select>' +
-				           '</div>');
-				  
-				ZoneSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>`;
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${ZoneSelectHTML}</div>`);
-			}
-			if(type=="ExSelect"){
-				//console.log("I am from ExSelect: \n #officers"+id);
-				ExSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>`;
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${ExSelectHTML}</div>`);
-			}
-		 
-		}
-		
-		function call_petition_search_from(errorTXT){
-			var errorHTML = "";
-			if(errorTXT!=""){
-				errorHTML = `<div class="form-group text-center text-danger">${errorTXT}</div>`;
-			}
-			var searchFormHTML = `<form class="search-form" id="search-form" onsubmit="return searchRequest();">
-										<div class="card-header">
-						                <h3>Edit / Update Petition Form</h3>
-						                <div class="card-header-right">
-						                    <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-						                </div>
-						            </div>
-						       		<div class="card-body">
-						       			<div class="row">
-											<div class="col-12 text-center">
-												${errorHTML}
-												<div class="form-group">
-						                            <label for="petitionNoSearch">Petition No / மனு எண் </label>
-						                            <input type="text" class="form-control text-center" name="petitionNoSearch" id="petitionNoSearch" autocomplete="off" placeholder="MP00000000" maxlength="10" required>
-						                        </div>
-						                        
-											</div>
-											<div class="col-12">
-												<div class="block-content" id="userinfo2">
-													<div id="comp_mapping_to_officers" class="row"></div>
-												</div>
-										 	</div>
-										</div>
-						          	</div>
-						          	<div class="card-footer text-center">
-										<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            	<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						        	</div>
-						    	</form>`;
-			
-			$("#petitionUpdateForm").html(searchFormHTML);
-			$('#petitionNoSearch').mask('MP00000000');
-		}
-		
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/m_petition/update-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			
-			if(petitionNo!=null && petitionNo!="error"){
-				get_complaint_type_data();
-				get_petition_type_data();
-				get_officer_master_data();
-			}
-			else{
-				if(petitionNo=="error"){
-					call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				}
-				else{
-					call_petition_search_from("");
-				}
-			}
-			
-		});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/m_petition/petition_view.html b/src/main/resources/templates/modules/m_petition/petition_view.html
deleted file mode 100644
index 778187d7..00000000
--- a/src/main/resources/templates/modules/m_petition/petition_view.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>View Petition</h5>
-                                            <span>Mayor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Mayor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">View Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Petition Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="window.print()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">நாள் / Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="cdate_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petition_no_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_name_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_mobile_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Address of petitioner / மனுதாரரின் முகவரி:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_address_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">புகாரின் தன்மை / Nature of complaint:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="complaint_nature_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											      	<tr>
-											          <th style="padding: 0.45rem 0.45rem;">Petition Status: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_status_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total number of complaints in this petition: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Completed:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_completed_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Pending:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_pending_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-												
-												
-												<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th id="petition_summary_title">Pending Summary</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-									                	<tr style="background-color:#fbffe0;">
-												          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_summary_html"></td>
-												        </tr>
-								                	</tbody>
-								              	</table>
-								              	
-											</div>
-										</div>
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/m_petition/script :: script}"></script>
-        <script th:replace="~{fragments/modules/m_petition/petition_view_script :: script}"></script>
-       	
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/m_petition/petition_view_modal_page.html b/src/main/resources/templates/modules/m_petition/petition_view_modal_page.html
deleted file mode 100644
index d97dd7ac..00000000
--- a/src/main/resources/templates/modules/m_petition/petition_view_modal_page.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Petition Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="window.print()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">நாள் / Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="cdate_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petition_no_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_name_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_mobile_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">மனுதாரரின் முகவரி / Address of petitioner:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_address_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">புகாரின் தன்மை / Nature of complaint:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="complaint_nature_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											      	<tr>
-											          <th style="padding: 0.45rem 0.45rem;">Petition Status: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_status_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total number of complaints in this petition: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Completed:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_completed_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Pending:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_pending_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-												
-												
-												<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th id="petition_summary_title">Pending Summary</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-									                	<tr style="background-color:#fbffe0;">
-												          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_summary_html"></td>
-												        </tr>
-								                	</tbody>
-								              	</table>
-								              	
-											</div>
-										</div>
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/m_petition/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/m_petition/petition_view_script :: script}"></script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/index.html b/src/main/resources/templates/modules/mtm/index.html
deleted file mode 100644
index bb10a7f9..00000000
--- a/src/main/resources/templates/modules/mtm/index.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-bar-chart-2 bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Makkalai Thedi Mayor Module</h5>
-                                            <span>Makkalai Thedi Mayoral Petition and the Complaints Proceeding from It</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							
-							<!-- analytic card start - First Tile Start -->
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-facebook mb-20"><i class="ik ik-layers"></i></h2>
-                                        <h3 class="text-facebook fw-700">6,750</h3>
-                                        <p>Total Petitions</p>
-                                        <p class="mb-0 mt-15">View Petition List<i class="fas fa-arrow-right ml-5 f-10 text-facebook"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-twitter mb-20"><i class="fas fa-comments"></i></h2>
-                                        <h3 class="text-twitter fw-700">9,752</h3>
-                                        <p>Petition Completed</p>
-                                        <p class="mb-0 mt-15">View Completed List<i class="fas fa-arrow-right ml-5 f-10 text-twitter"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-green mb-20"><i class="far fa-smile-beam"></i></h2>
-                                        <h3 class="text-green fw-700">8,752</h3>
-                                        <p>Petition Partially Completed</p>
-                                        <p class="mb-0 mt-15">View Partially Completed<i class="fas fa-arrow-right ml-5 f-10 text-green"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-red mb-20"><i class="far fa-frown"></i></h2>
-                                        <h3 class="text-red fw-700">952</h3>
-                                        <p>Petitions Pending</p>
-                                        <p class="mb-0 mt-15">View Pending List<i class="fas fa-arrow-right ml-5 f-10 text-red"></i></p>
-                                    </div>
-                                </div>
-								</a>
-                            </div>
-                            <!-- First Tile End -->
-			                
-			                <div class="col-md-12">
-				                <div class="card sale-card">
-		                            <div class="card-header">
-		                                <h3>Deals Analytics</h3>
-		                            </div>
-		                            <div class="card-block">
-		                                <div id="deal-analytic-chart" class="chart-shadow" style="height:300px"></div>
-		                            </div>
-		                        </div>    
-	                        </div>    
-	                          
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>Page Title</h3>
-                                    </div>
-                                    <div class="card-block">
-                                        
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <script>
-			
-			var chartData = [];
-		    var currentDate = new Date();
-		    var currentMonth = currentDate.getMonth() + 1;
-		    var currentYear = currentDate.getFullYear();
-		    var daysInMonth = new Date(currentYear, currentMonth, 0).getDate();
-		
-		    // Generate random data for each date in the current month
-		    for (var i = 1; i <= daysInMonth; i++) {
-		        var randomValue1 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		        var randomValue2 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		
-		        var dateString = currentYear + '-' + (currentMonth < 10 ? '0' : '') + currentMonth + '-' + (i < 10 ? '0' : '') + i;
-		        var dataPoint = {
-		            "date": dateString,
-		            "market1": randomValue1,
-		            "market2": randomValue2
-		        };
-		        chartData.push(dataPoint);
-		    }
-			// deal-analytic-chart
-    var chart = AmCharts.makeChart("deal-analytic-chart", {
-        "type": "serial",
-        "theme": "light",
-        "dataDateFormat": "YYYY-MM-DD",
-        "precision": 2,
-        "valueAxes": [{
-            "id": "v1",
-            "position": "left",
-            "autoGridCount": false,
-            "labelFunction": function(value) {
-                return "$" + Math.round(value) + "M";
-            }
-        }, {
-            "id": "v2",
-            "gridAlpha": 0,
-            "autoGridCount": false
-        }],
-        "graphs": [{
-            "id": "g1",
-            "valueAxis": "v2",
-            /*"bullet": "round",
-            "bulletBorderAlpha": 1,
-            "bulletColor": "#FFFFFF",
-            "bulletSize": 8,
-            "hideBulletsCount": 50,
-            "lineThickness": 3,
-            "lineColor": "#2ed8b6",*/
-            "lineColor": "#2ed8b6",
-            "fillColors": "#2ed8b6",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Positive Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market1",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }, {
-            "id": "g2",
-            "valueAxis": "v2",
-            //"bullet": "round",
-            //"bulletBorderAlpha": 1,
-            //"bulletColor": "#FFFFFF",
-            //"bulletSize": 8,
-            //"hideBulletsCount": 50,
-            //"lineThickness": 3,
-            //"lineColor": "#e95753",
-            "lineColor": "#F22613",
-            "fillColors": "#F22613",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Negative Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market2",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }],
-        "chartCursor": {
-            "pan": true,
-            "valueLineEnabled": true,
-            "valueLineBalloonEnabled": true,
-            "cursorAlpha": 0,
-            "valueLineAlpha": 0.2
-        },
-        "categoryField": "date",
-        "categoryAxis": {
-            "parseDates": true,
-            "dashLength": 1,
-            "minorGridEnabled": true
-        },
-        "legend": {
-            "useGraphSettings": true,
-            "position": "top"
-        },
-        "balloon": {
-            "borderThickness": 1,
-            "shadowAlpha": 0
-        },
-        "dataProvider": chartData,
-    });
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/mayor/by-event-list.html b/src/main/resources/templates/modules/mtm/mayor/by-event-list.html
deleted file mode 100644
index b2a697f8..00000000
--- a/src/main/resources/templates/modules/mtm/mayor/by-event-list.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-th-large bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Event based report</h5>
-                                            <span>Makkalai Thedi Mayoral Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayoral </li>
-                                            <li class="breadcrumb-item">Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Event Report</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/mtm/event_search_form :: div}"></div>
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-													<tr class="table-bordered">
-														<th class="text-center" colspan=3>Event Info</th>
-					 									<th class="text-center" colspan=4>Petitions</th>
-														<th class="text-center" colspan=3>Compliants</th>
-												    </tr>
-						                            <tr class="table-bordered">
-														<th class="text-center no-sort">S.No</th>
-														<th class="">Name</th>
-														<th class="">Date</th>
-														<th class="text-center">Total</th>
-														<th class="text-center">Completed</th>
-														<th class="text-center">Partially</th>
-														<th class="text-center">Pending</th>
-														<th class="text-center">Total</th>
-														<th class="text-center">Completed</th>
-														<th class="text-center">Pending</th>
-						                            </tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="event, i : ${mtmEventsTableList}" class="${mtmEventsTableList}">
-						                                <td th:text="${i.index + 1}">0</td>
-														<td th:text="${event.eventName}"></td>
-														<td th:text="${event.event_date}"></td>
-														<td class=""><a th:href="@{#}" th:text="${event.total_petitions}" th:onclick="return callSetEventById( [[${event.mtmId}]],'/mtm/mayor/petition-list');" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Total List"></a></td>
-														<td class=""><a th:href="@{#}" th:text="${event.petitions_completed}" th:onclick="return callSetEventById( [[${event.mtmId}]],'/mtm/mayor/completed-petition-list');" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Completed Petition List"></a></td>
-						 								<td class=""><a th:href="@{#}" th:text="${event.petition_partially_completed}" th:onclick="return callSetEventById( [[${event.mtmId}]],'/mtm/mayor/partial-petition-list');" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Partially Completed Petition List"></a></td> 
-														<td class=""><a th:href="@{#}" th:text="${event.petitions_pending}" th:onclick="return callSetEventById( [[${event.mtmId}]],'/mtm/mayor/pending-petition-list');" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Pending Petition List"></a></td>  
-														<td class=""><a th:href="@{#}" th:text="${event.total_compliants}" th:onclick="return callSetEventById( [[${event.mtmId}]],'/mtm/mayor/complaint-list');" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Complaint List"></a></td>
-						 								<td class=""><a th:href="@{#}" th:text="${event.compliants_completed}" th:onclick="return callSetEventById( [[${event.mtmId}]],'/mtm/mayor/completed-complaint-list');" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Completed Complaint List"></a></td> 
-														<td class=""><a th:href="@{#}" th:text="${event.compliants_pending}" th:onclick="return callSetEventById( [[${event.mtmId}]],'/mtm/mayor/pending-complaint-list');" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Pending Complaint List"></a></td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr class="table-bordered">
-														<th class="text-center" colspan=3>Event Info</th>
-					 									<th class="text-center" colspan=4>Petitions</th>
-														<th class="text-center" colspan=3>Compliants</th>
-												    </tr>
-						                            <tr>
-														<th class="text-center no-sort">S.No</th>
-														<th class="">Name</th>
-														<th class="">Date</th>
-														<th class="text-center">Total</th>
-														<th class="text-center">Completed</th>
-														<th class="text-center">Partially</th>
-														<th class="text-center">Pending</th>
-														<th class="text-center">Total</th>
-														<th class="text-center">Completed</th>
-														<th class="text-center">Pending</th>
-						                            </tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/mtm/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script th:inline="javascript">
-			
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: 'Event Report',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: 'Event Report',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: 'Event Report',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-			            
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/mayor/by-officer-list.html b/src/main/resources/templates/modules/mtm/mayor/by-officer-list.html
deleted file mode 100644
index 388075af..00000000
--- a/src/main/resources/templates/modules/mtm/mayor/by-officer-list.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-th-large bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Officer`s report based on complaint`s</h5>
-                                            <span>Makkalai Thedi Mayoral Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayoral </li>
-                                            <li class="breadcrumb-item">Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/mtm/event_search_form :: div}"></div>
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="">Officer`s</th>
-														<th class="">Off&nbsp;ID</th>
-														<th class="">Event</th>
-														<th class="text-center">Total</th>
-														<th class="text-center">Completed</th>
-														<th class="text-center">Pending</th>
-						                             </tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="officers, i : ${officerTableList}" class="${officerTableList}">
-						                                <td th:text="${i.index + 1}">0</td>
-														<td th:text="${officers.officerName}"></td>
-														<td th:text="${officers.offID}"></td>
-														<td th:text="${officers.eventName}"></td>
-														<td th:text="${officers.officerPetitionCount}"></td>
-						 								<td th:text="${officers.officerCompletedCount}"></td> 
-														<td th:text="${officers.officerPendingCount}"></td>
-						                             </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="">Officer`s</th>
-														<th class="">Event</th>
-														<th class="">Off ID</th>
-														<th class="text-center">Total</th>
-														<th class="text-center">Completed</th>
-														<th class="text-center">Pending</th>
-						                             </tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/mtm/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script th:inline="javascript">
-			//var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: 'Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: 'Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: 'Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-			            
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/mayor/complaint-list.html b/src/main/resources/templates/modules/mtm/mayor/complaint-list.html
deleted file mode 100644
index 2f0a7b8b..00000000
--- a/src/main/resources/templates/modules/mtm/mayor/complaint-list.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-th-large bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Complaint List</h5>
-                                            <span>Makkalai Thedi Mayoral Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayoral </li>
-                                            <li class="breadcrumb-item">Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/mtm/event_search_form :: div}"></div>
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<!--<th class="text-center">Postal code</th>-->
-														<th class="text-center">Type of complaint</th>
-														<th class="text-center">Department(Officer)</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center export-hidden" width="10%">Action</th>
-						                             </tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="petition, i : ${petitionlist}" class="${petitionlist}">
-						                                <td th:text="${i.count}">0</td>
-														<td th:text="${petition.mtmEventsPetitionId.petitionNumber}"></td>
-						 								<td th:text="${petition.mtmEventsPetitionId.petitionerName}" class="text-center"></td>  
-						                              	<td th:text="${petition.mtmEventsPetitionId.petitionerMobile}"></td>
-						 								<td th:utext="${petition.mtmEventsPetitionId.petitionerAddress + '<br/>' + petition.mtmEventsPetitionId.petitionerPincode}"></td>
-														<!--<td th:utext="${petition.mtmEventsPetitionId.petitionerPincode}"></td>-->
-														<td th:text="${petition.mtmComplaintTypes.complaintType}"></td>
-														<td th:text="${petition.officer_name}"></td>
-						                                <td class="text-center">
-															<span th:if="${petition.status == 'pending'}">
-																<a th:href="@{#}" th:onclick="return call_view_complaint([[${petition.mapId}]]);" data-toggle="tooltip" data-animation="true" data-placement="top" title="Update Status" class="text-danger">Pending</a>
-															</span>
-															<span th:if="${petition.status == 'close'}">
-																<a th:href="@{#}" th:onclick="return call_close_petition_details([[${petition.mapId}]]);" data-toggle="tooltip" data-animation="true" data-placement="top" title="Update Status" class="text-success">Close</a>
-															</span>
-						                                </td>
-						                                <td class="text-center">
-						 									<a th:href="@{#}" th:onclick="return callViewFiles( [[${petition.mtmEventsPetitionId.petitionId}]],[[${petition.mtmEventsPetitionId.petitionNumber}]]);" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Files"><i class="ik ik-file-text" style="font-size: 18px;"></i></a>
-															<a th:href="@{#}" th:onclick="return call_view_complaint([[${petition.mapId}]]);"
-															   data-toggle="tooltip" data-animation="true" data-placement="top" title="View ACK">
-															  <i class="far fa-thumbs-up" style="font-size: 18px;"></i>
-															</a>
-						                                </td>
-						                              </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<!--<th class="text-center">Postal code</th>-->
-														<th class="text-center">Type of complaint</th>
-														<th class="text-center">Department(Officer)</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/mtm/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script th:inline="javascript">
-			//var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: 'Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: 'Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: 'Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-			            
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/mayor/completed-complaint-list.html b/src/main/resources/templates/modules/mtm/mayor/completed-complaint-list.html
deleted file mode 100644
index ca045037..00000000
--- a/src/main/resources/templates/modules/mtm/mayor/completed-complaint-list.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-th-large bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Completed Complaint List</h5>
-                                            <span>Makkalai Thedi Mayoral Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayoral </li>
-                                            <li class="breadcrumb-item">Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/mtm/event_search_form :: div}"></div>
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<!--<th class="text-center">Postal code</th>-->
-														<th class="text-center">Type of complaint</th>
-														<th class="text-center">Department(Officer)</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center export-hidden" width="10%">Action</th>
-						                             </tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="petition, i : ${petitionlist}" class="${petitionlist}">
-						                                <td th:text="${i.count}">0</td>
-														<td th:text="${petition.mtmEventsPetitionId.petitionNumber}"></td>
-						 								<td th:text="${petition.mtmEventsPetitionId.petitionerName}" class="text-center"></td>  
-						                              	<td th:text="${petition.mtmEventsPetitionId.petitionerMobile}"></td>
-						 								<td th:utext="${petition.mtmEventsPetitionId.petitionerAddress + '<br/>' + petition.mtmEventsPetitionId.petitionerPincode}"></td>
-														<!--<td th:utext="${petition.mtmEventsPetitionId.petitionerPincode}"></td>-->
-														<td th:text="${petition.mtmComplaintTypes.complaintType}"></td>
-														<td th:text="${petition.officer_name}"></td>
-						                                <td class="text-center">
-															<span th:if="${petition.status == 'pending'}">
-																<a th:href="@{#}" th:onclick="return call_view_complaint([[${petition.mapId}]]);" data-toggle="tooltip" data-animation="true" data-placement="top" title="Update Status" class="text-danger">Pending</a>
-															</span>
-															<span th:if="${petition.status == 'close'}">
-																<a th:href="@{#}" th:onclick="return call_close_petition_details([[${petition.mapId}]]);" data-toggle="tooltip" data-animation="true" data-placement="top" title="Update Status" class="text-success">Close</a>
-															</span>
-						                                </td>
-						                                <td class="text-center">
-						 									<a th:href="@{#}" th:onclick="return callViewFiles( [[${petition.mtmEventsPetitionId.petitionId}]],[[${petition.mtmEventsPetitionId.petitionNumber}]]);" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Files"><i class="ik ik-file-text" style="font-size: 18px;"></i></a>
-															<a th:href="@{#}" th:onclick="return call_view_complaint([[${petition.mapId}]]);"
-															   data-toggle="tooltip" data-animation="true" data-placement="top" title="View ACK">
-															  <i class="far fa-thumbs-up" style="font-size: 18px;"></i>
-															</a>
-						                                </td>
-						                              </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<!--<th class="text-center">Postal code</th>-->
-														<th class="text-center">Type of complaint</th>
-														<th class="text-center">Department(Officer)</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/mtm/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script th:inline="javascript">
-			//var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: 'Completed Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: 'Completed Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: 'Completed Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-			            
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/mayor/completed-petition-list.html b/src/main/resources/templates/modules/mtm/mayor/completed-petition-list.html
deleted file mode 100644
index 843c494b..00000000
--- a/src/main/resources/templates/modules/mtm/mayor/completed-petition-list.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-th-large bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Completed Petition List</h5>
-                                            <span>Makkalai Thedi Mayoral Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayoral </li>
-                                            <li class="breadcrumb-item">Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Completed Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/mtm/event_search_form :: div}"></div>
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal code</th>
-														<th class="text-center">Type of complaint</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-						                             </tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="petition, i : ${petitionlist}" class="${petitionlist}">
-						                                <td th:utext="${i.count}">0</td>
-														<td th:utext="${petition.petitionNumber}"></td>
-						 								<td th:utext="${petition.petitionerName}" class="text-center"></td>  
-						                              	<td th:text="${petition.petitionerMobile}"></td>
-						 								<td th:utext="${petition.petitionerAddress}"></td>
-														<td th:utext="${petition.petitionerPincode}"></td>
-														<td th:text="${petition.PetitionerComplaint_txt}"></td>
-														<td style="text-transform: capitalize;" class="text-center"><a href="#" th:onclick="return call_view_petition([[${petition.petitionNumber}]]);" th:utext="${petition.status}" class="text-warning"></a></td>
-						                                <td class="text-center">
-						 									<a th:href="@{#}" th:onclick="return callViewFiles( [[${petition.petitionId}]],[[${petition.petitionNumber}]] );" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Files" data-original-title="View Files"><i class="ik ik-file-text text-green" style="font-size: 18px;"></i></a>
-															<a th:href="@{/petition-ack/{petitionNumber}(petitionNumber=${petition.petitionNumber})}"
-															   data-toggle="tooltip" data-animation="true" data-placement="top" title="View ACK" data-original-title="View ACK">
-															  <i class="far fa-thumbs-up" style="font-size: 18px;"></i>
-															</a>
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal code</th>
-														<th class="text-center">Type of complaint</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/mtm/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script th:inline="javascript">
-			//var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: 'Completed Petition List'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: 'Completed Petition List'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: 'Completed Petition List'
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/mayor/index.html b/src/main/resources/templates/modules/mtm/mayor/index.html
deleted file mode 100644
index ac262126..00000000
--- a/src/main/resources/templates/modules/mtm/mayor/index.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-bar-chart-2 bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Makkalai Thedi Mayor Module</h5>
-                                            <span>Makkalai Thedi Mayoral Petition and the Complaints Proceeding from It</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							
-							<!-- analytic card start - First Tile Start -->
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-facebook mb-20"><i class="ik ik-layers"></i></h2>
-                                        <h3 class="text-facebook fw-700">6,750</h3>
-                                        <p>Total Petitions</p>
-                                        <p class="mb-0 mt-15">View Petition List<i class="fas fa-arrow-right ml-5 f-10 text-facebook"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-twitter mb-20"><i class="fas fa-comments"></i></h2>
-                                        <h3 class="text-twitter fw-700">9,752</h3>
-                                        <p>Petition Completed</p>
-                                        <p class="mb-0 mt-15">View Completed List<i class="fas fa-arrow-right ml-5 f-10 text-twitter"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-green mb-20"><i class="far fa-smile-beam"></i></h2>
-                                        <h3 class="text-green fw-700">8,752</h3>
-                                        <p>Petition Partially Completed</p>
-                                        <p class="mb-0 mt-15">View Partially Completed<i class="fas fa-arrow-right ml-5 f-10 text-green"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-red mb-20"><i class="far fa-frown"></i></h2>
-                                        <h3 class="text-red fw-700">952</h3>
-                                        <p>Petitions Pending</p>
-                                        <p class="mb-0 mt-15">View Pending List<i class="fas fa-arrow-right ml-5 f-10 text-red"></i></p>
-                                    </div>
-                                </div>
-								</a>
-                            </div>
-                            <!-- First Tile End -->
-			                
-			                <div class="col-md-12">
-				                <div class="card sale-card">
-		                            <div class="card-header">
-		                                <h3>Deals Analytics</h3>
-		                            </div>
-		                            <div class="card-block">
-		                                <div id="deal-analytic-chart" class="chart-shadow" style="height:300px"></div>
-		                            </div>
-		                        </div>    
-	                        </div>    
-	                          
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>Page Title</h3>
-                                    </div>
-                                    <div class="card-block">
-                                        
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script src="/assets/node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="/assets/node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="/assets/node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <script>
-			
-			var chartData = [];
-		    var currentDate = new Date();
-		    var currentMonth = currentDate.getMonth() + 1;
-		    var currentYear = currentDate.getFullYear();
-		    var daysInMonth = new Date(currentYear, currentMonth, 0).getDate();
-		
-		    // Generate random data for each date in the current month
-		    for (var i = 1; i <= daysInMonth; i++) {
-		        var randomValue1 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		        var randomValue2 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		
-		        var dateString = currentYear + '-' + (currentMonth < 10 ? '0' : '') + currentMonth + '-' + (i < 10 ? '0' : '') + i;
-		        var dataPoint = {
-		            "date": dateString,
-		            "market1": randomValue1,
-		            "market2": randomValue2
-		        };
-		        chartData.push(dataPoint);
-		    }
-			// deal-analytic-chart
-    var chart = AmCharts.makeChart("deal-analytic-chart", {
-        "type": "serial",
-        "theme": "light",
-        "dataDateFormat": "YYYY-MM-DD",
-        "precision": 2,
-        "valueAxes": [{
-            "id": "v1",
-            "position": "left",
-            "autoGridCount": false,
-            "labelFunction": function(value) {
-                return "$" + Math.round(value) + "M";
-            }
-        }, {
-            "id": "v2",
-            "gridAlpha": 0,
-            "autoGridCount": false
-        }],
-        "graphs": [{
-            "id": "g1",
-            "valueAxis": "v2",
-            /*"bullet": "round",
-            "bulletBorderAlpha": 1,
-            "bulletColor": "#FFFFFF",
-            "bulletSize": 8,
-            "hideBulletsCount": 50,
-            "lineThickness": 3,
-            "lineColor": "#2ed8b6",*/
-            "lineColor": "#2ed8b6",
-            "fillColors": "#2ed8b6",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Positive Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market1",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }, {
-            "id": "g2",
-            "valueAxis": "v2",
-            //"bullet": "round",
-            //"bulletBorderAlpha": 1,
-            //"bulletColor": "#FFFFFF",
-            //"bulletSize": 8,
-            //"hideBulletsCount": 50,
-            //"lineThickness": 3,
-            //"lineColor": "#e95753",
-            "lineColor": "#F22613",
-            "fillColors": "#F22613",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Negative Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market2",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }],
-        "chartCursor": {
-            "pan": true,
-            "valueLineEnabled": true,
-            "valueLineBalloonEnabled": true,
-            "cursorAlpha": 0,
-            "valueLineAlpha": 0.2
-        },
-        "categoryField": "date",
-        "categoryAxis": {
-            "parseDates": true,
-            "dashLength": 1,
-            "minorGridEnabled": true
-        },
-        "legend": {
-            "useGraphSettings": true,
-            "position": "top"
-        },
-        "balloon": {
-            "borderThickness": 1,
-            "shadowAlpha": 0
-        },
-        "dataProvider": chartData,
-    });
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/mayor/partial-petition-list.html b/src/main/resources/templates/modules/mtm/mayor/partial-petition-list.html
deleted file mode 100644
index dff3b7da..00000000
--- a/src/main/resources/templates/modules/mtm/mayor/partial-petition-list.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-th-large bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Partially Completed Petition List</h5>
-                                            <span>Makkalai Thedi Mayoral Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayoral </li>
-                                            <li class="breadcrumb-item">Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Partially Completed Petitions</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/mtm/event_search_form :: div}"></div>
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal code</th>
-														<th class="text-center">Type of complaint</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-						                             </tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="petition, i : ${petitionlist}" class="${petitionlist}">
-						                                <td th:utext="${i.count}">0</td>
-														<td th:utext="${petition.petitionNumber}"></td>
-						 								<td th:utext="${petition.petitionerName}" class="text-center"></td>  
-						                              	<td th:text="${petition.petitionerMobile}"></td>
-						 								<td th:utext="${petition.petitionerAddress}"></td>
-														<td th:utext="${petition.petitionerPincode}"></td>
-														<td th:text="${petition.PetitionerComplaint_txt}"></td>
-														<td style="text-transform: capitalize;" class="text-center"><a href="#" th:onclick="return call_view_petition([[${petition.petitionNumber}]]);" th:utext="${petition.status}" class="text-warning"></a></td>
-						                                <td class="text-center">
-						 									<a th:href="@{#}" th:onclick="return callViewFiles( [[${petition.petitionId}]],[[${petition.petitionNumber}]] );" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Files" data-original-title="View Files"><i class="ik ik-file-text text-green" style="font-size: 18px;"></i></a>
-															<a th:href="@{/petition-ack/{petitionNumber}(petitionNumber=${petition.petitionNumber})}"
-															   data-toggle="tooltip" data-animation="true" data-placement="top" title="View ACK" data-original-title="View ACK">
-															  <i class="far fa-thumbs-up" style="font-size: 18px;"></i>
-															</a>
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal code</th>
-														<th class="text-center">Type of complaint</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/mtm/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script th:inline="javascript">
-			//var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: 'Partially Completed Petition List'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: 'Partially Completed Petition List'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: 'Partially Completed Petition List'
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/mayor/pending-complaint-list.html b/src/main/resources/templates/modules/mtm/mayor/pending-complaint-list.html
deleted file mode 100644
index 3ef00d78..00000000
--- a/src/main/resources/templates/modules/mtm/mayor/pending-complaint-list.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-th-large bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Pending Complaint List</h5>
-                                            <span>Makkalai Thedi Mayoral Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayoral </li>
-                                            <li class="breadcrumb-item">Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/mtm/event_search_form :: div}"></div>
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<!--<th class="text-center">Postal code</th>-->
-														<th class="text-center">Type of complaint</th>
-														<th class="text-center">Department(Officer)</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center export-hidden" width="10%">Action</th>
-						                             </tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="petition, i : ${petitionlist}" class="${petitionlist}">
-						                                <td th:text="${i.count}">0</td>
-														<td th:text="${petition.mtmEventsPetitionId.petitionNumber}"></td>
-						 								<td th:text="${petition.mtmEventsPetitionId.petitionerName}" class="text-center"></td>  
-						                              	<td th:text="${petition.mtmEventsPetitionId.petitionerMobile}"></td>
-						 								<td th:utext="${petition.mtmEventsPetitionId.petitionerAddress + '<br/>' + petition.mtmEventsPetitionId.petitionerPincode}"></td>
-														<!--<td th:utext="${petition.mtmEventsPetitionId.petitionerPincode}"></td>-->
-														<td th:text="${petition.mtmComplaintTypes.complaintType}"></td>
-														<td th:text="${petition.officer_name}"></td>
-						                                <td class="text-center">
-															<span th:if="${petition.status == 'pending'}">
-																<a th:href="@{#}" th:onclick="return call_view_complaint([[${petition.mapId}]]);" data-toggle="tooltip" data-animation="true" data-placement="top" title="Update Status" class="text-danger">Pending</a>
-															</span>
-															<span th:if="${petition.status == 'close'}">
-																<a th:href="@{#}" th:onclick="return call_close_petition_details([[${petition.mapId}]]);" data-toggle="tooltip" data-animation="true" data-placement="top" title="Update Status" class="text-success">Close</a>
-															</span>
-						                                </td>
-						                                <td class="text-center">
-						 									<a th:href="@{#}" th:onclick="return callViewFiles( [[${petition.mtmEventsPetitionId.petitionId}]],[[${petition.mtmEventsPetitionId.petitionNumber}]]);" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Files"><i class="ik ik-file-text" style="font-size: 18px;"></i></a>
-															<a th:href="@{#}" th:onclick="return call_view_complaint([[${petition.mapId}]]);"
-															   data-toggle="tooltip" data-animation="true" data-placement="top" title="View ACK">
-															  <i class="far fa-thumbs-up" style="font-size: 18px;"></i>
-															</a>
-						                                </td>
-						                              </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<!--<th class="text-center">Postal code</th>-->
-														<th class="text-center">Type of complaint</th>
-														<th class="text-center">Department(Officer)</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/mtm/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script th:inline="javascript">
-			//var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: 'Pending Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: 'Pending Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: 'Pending Complaint List',
-	                    exportOptions: {
-			                columns: ':not(.export-hidden)', // Exclude columns with class 'export-hidden'
-			            },
-			            
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/mayor/pending-petition-list.html b/src/main/resources/templates/modules/mtm/mayor/pending-petition-list.html
deleted file mode 100644
index f3b8570f..00000000
--- a/src/main/resources/templates/modules/mtm/mayor/pending-petition-list.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-th-large bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Pending Petition List</h5>
-                                            <span>Makkalai Thedi Mayoral Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayoral </li>
-                                            <li class="breadcrumb-item">Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Pending Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/mtm/event_search_form :: div}"></div>
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal code</th>
-														<th class="text-center">Type of complaint</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-						                             </tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="petition, i : ${petitionlist}" class="${petitionlist}">
-						                                <td th:utext="${i.count}">0</td>
-														<td th:utext="${petition.petitionNumber}"></td>
-						 								<td th:utext="${petition.petitionerName}" class="text-center"></td>  
-						                              	<td th:text="${petition.petitionerMobile}"></td>
-						 								<td th:utext="${petition.petitionerAddress}"></td>
-														<td th:utext="${petition.petitionerPincode}"></td>
-														<td th:text="${petition.PetitionerComplaint_txt}"></td>
-														<td style="text-transform: capitalize;" class="text-center"><a href="#" th:onclick="return call_view_petition([[${petition.petitionNumber}]]);" th:utext="${petition.status}" class="text-warning"></a></td>
-						                                <td class="text-center">
-						 									<a th:href="@{#}" th:onclick="return callViewFiles( [[${petition.petitionId}]],[[${petition.petitionNumber}]] );" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Files" data-original-title="View Files"><i class="ik ik-file-text text-green" style="font-size: 18px;"></i></a>
-															<a th:href="@{/petition-ack/{petitionNumber}(petitionNumber=${petition.petitionNumber})}"
-															   data-toggle="tooltip" data-animation="true" data-placement="top" title="View ACK" data-original-title="View ACK">
-															  <i class="far fa-thumbs-up" style="font-size: 18px;"></i>
-															</a>
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal code</th>
-														<th class="text-center">Type of complaint</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/mtm/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script th:inline="javascript">
-			//var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: 'Pending Petition List'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: 'Pending Petition List'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: 'Pending Petition List'
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/mayor/petition-list.html b/src/main/resources/templates/modules/mtm/mayor/petition-list.html
deleted file mode 100644
index f2d02175..00000000
--- a/src/main/resources/templates/modules/mtm/mayor/petition-list.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-th-large bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Petition List</h5>
-                                            <span>Makkalai Thedi Mayoral Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayoral </li>
-                                            <li class="breadcrumb-item">Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/mtm/event_search_form :: div}"></div>
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal code</th>
-														<th class="text-center">Type of complaint</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-						                             </tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="petition, i : ${petitionlist}" class="${petitionlist}">
-						                                <td th:utext="${i.count}">0</td>
-														<td th:utext="${petition.petitionNumber}"></td>
-						 								<td th:utext="${petition.petitionerName}" class="text-center"></td>  
-						                              	<td th:text="${petition.petitionerMobile}"></td>
-						 								<td th:utext="${petition.petitionerAddress}"></td>
-														<td th:utext="${petition.petitionerPincode}"></td>
-														<td th:text="${petition.PetitionerComplaint_txt}"></td>
-														<td style="text-transform: capitalize;" class="text-center"><a href="#" th:onclick="return call_view_petition([[${petition.petitionNumber}]]);" th:utext="${petition.status}" class="text-warning"></a></td>
-						                                <td class="text-center">
-						 									<a th:href="@{#}" th:onclick="return callViewFiles( [[${petition.petitionId}]],[[${petition.petitionNumber}]] );" data-toggle="tooltip" data-animation="true" data-placement="top" title="View Files" data-original-title="View Files"><i class="ik ik-file-text text-green" style="font-size: 18px;"></i></a>
-															<a th:href="@{/petition-ack/{petitionNumber}(petitionNumber=${petition.petitionNumber})}"
-															   data-toggle="tooltip" data-animation="true" data-placement="top" title="View ACK" data-original-title="View ACK">
-															  <i class="far fa-thumbs-up" style="font-size: 18px;"></i>
-															</a>
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal code</th>
-														<th class="text-center">Type of complaint</th>
-						                                <th class="text-center" width="10%">Status</th>
-						                                <th class="text-center" width="10%">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/mtm/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/mtm/script :: script}"></script>
-        <script th:inline="javascript">
-			//var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn',
-	                    title: 'Petition List'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn',
-	                    title: 'Petition List'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn',
-	                    title: 'Petition List'
-	                }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/mtm/officer/index.html b/src/main/resources/templates/modules/mtm/officer/index.html
deleted file mode 100644
index bb10a7f9..00000000
--- a/src/main/resources/templates/modules/mtm/officer/index.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-bar-chart-2 bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Makkalai Thedi Mayor Module</h5>
-                                            <span>Makkalai Thedi Mayoral Petition and the Complaints Proceeding from It</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Makkalai Thedi Mayor</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							
-							<!-- analytic card start - First Tile Start -->
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-facebook mb-20"><i class="ik ik-layers"></i></h2>
-                                        <h3 class="text-facebook fw-700">6,750</h3>
-                                        <p>Total Petitions</p>
-                                        <p class="mb-0 mt-15">View Petition List<i class="fas fa-arrow-right ml-5 f-10 text-facebook"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-twitter mb-20"><i class="fas fa-comments"></i></h2>
-                                        <h3 class="text-twitter fw-700">9,752</h3>
-                                        <p>Petition Completed</p>
-                                        <p class="mb-0 mt-15">View Completed List<i class="fas fa-arrow-right ml-5 f-10 text-twitter"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-green mb-20"><i class="far fa-smile-beam"></i></h2>
-                                        <h3 class="text-green fw-700">8,752</h3>
-                                        <p>Petition Partially Completed</p>
-                                        <p class="mb-0 mt-15">View Partially Completed<i class="fas fa-arrow-right ml-5 f-10 text-green"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-red mb-20"><i class="far fa-frown"></i></h2>
-                                        <h3 class="text-red fw-700">952</h3>
-                                        <p>Petitions Pending</p>
-                                        <p class="mb-0 mt-15">View Pending List<i class="fas fa-arrow-right ml-5 f-10 text-red"></i></p>
-                                    </div>
-                                </div>
-								</a>
-                            </div>
-                            <!-- First Tile End -->
-			                
-			                <div class="col-md-12">
-				                <div class="card sale-card">
-		                            <div class="card-header">
-		                                <h3>Deals Analytics</h3>
-		                            </div>
-		                            <div class="card-block">
-		                                <div id="deal-analytic-chart" class="chart-shadow" style="height:300px"></div>
-		                            </div>
-		                        </div>    
-	                        </div>    
-	                          
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>Page Title</h3>
-                                    </div>
-                                    <div class="card-block">
-                                        
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <script>
-			
-			var chartData = [];
-		    var currentDate = new Date();
-		    var currentMonth = currentDate.getMonth() + 1;
-		    var currentYear = currentDate.getFullYear();
-		    var daysInMonth = new Date(currentYear, currentMonth, 0).getDate();
-		
-		    // Generate random data for each date in the current month
-		    for (var i = 1; i <= daysInMonth; i++) {
-		        var randomValue1 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		        var randomValue2 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		
-		        var dateString = currentYear + '-' + (currentMonth < 10 ? '0' : '') + currentMonth + '-' + (i < 10 ? '0' : '') + i;
-		        var dataPoint = {
-		            "date": dateString,
-		            "market1": randomValue1,
-		            "market2": randomValue2
-		        };
-		        chartData.push(dataPoint);
-		    }
-			// deal-analytic-chart
-    var chart = AmCharts.makeChart("deal-analytic-chart", {
-        "type": "serial",
-        "theme": "light",
-        "dataDateFormat": "YYYY-MM-DD",
-        "precision": 2,
-        "valueAxes": [{
-            "id": "v1",
-            "position": "left",
-            "autoGridCount": false,
-            "labelFunction": function(value) {
-                return "$" + Math.round(value) + "M";
-            }
-        }, {
-            "id": "v2",
-            "gridAlpha": 0,
-            "autoGridCount": false
-        }],
-        "graphs": [{
-            "id": "g1",
-            "valueAxis": "v2",
-            /*"bullet": "round",
-            "bulletBorderAlpha": 1,
-            "bulletColor": "#FFFFFF",
-            "bulletSize": 8,
-            "hideBulletsCount": 50,
-            "lineThickness": 3,
-            "lineColor": "#2ed8b6",*/
-            "lineColor": "#2ed8b6",
-            "fillColors": "#2ed8b6",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Positive Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market1",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }, {
-            "id": "g2",
-            "valueAxis": "v2",
-            //"bullet": "round",
-            //"bulletBorderAlpha": 1,
-            //"bulletColor": "#FFFFFF",
-            //"bulletSize": 8,
-            //"hideBulletsCount": 50,
-            //"lineThickness": 3,
-            //"lineColor": "#e95753",
-            "lineColor": "#F22613",
-            "fillColors": "#F22613",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Negative Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market2",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }],
-        "chartCursor": {
-            "pan": true,
-            "valueLineEnabled": true,
-            "valueLineBalloonEnabled": true,
-            "cursorAlpha": 0,
-            "valueLineAlpha": 0.2
-        },
-        "categoryField": "date",
-        "categoryAxis": {
-            "parseDates": true,
-            "dashLength": 1,
-            "minorGridEnabled": true
-        },
-        "legend": {
-            "useGraphSettings": true,
-            "position": "top"
-        },
-        "balloon": {
-            "borderThickness": 1,
-            "shadowAlpha": 0
-        },
-        "dataProvider": chartData,
-    });
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/nulm/.DS_Store b/src/main/resources/templates/modules/nulm/.DS_Store
deleted file mode 100644
index dc40944b0d7e6095d9d86afb9400fb71939fc570..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMO;6k~5Pb#?Nc6A^0&!`T1J@uxLR?cm)N<}0DC{nDrI1D0-B#t4JO6>dz_00#
z>50A>TP1jFpof-9or&ycC7$Q;v$N570l58Xe;Zf_u*f3VSz`4Iljl-qY%bjC5FP!2
zAu3F8fdSFX6fgx$0aL&fFa`ca1^CStTTFcS{Zp$=0aM_=R6u?oG8VxiVB=ALI#_86
zKwRK$HMS)k5T7hy5wP*dCp70>iQd(P6vKIU-p@k6B4FduyTgU#!-bJu$WWY)PX0{0
z!xbK_HU&(9Sq0>E>EHyHyhac5_X#%fNwfL#xE%FP%h9R!1>O=j@6?oVjs6o}lJ)o5
zuFzvUN6lJTYd%YG&7G6srp2}KJ6vSl!5+3)?`XZ78V9#g%w5JP@k!(ot3=snt4=Yv
z*Ac@j_OIzDGn}Sp=&mEbF7=tB<S9u`-xGWd=Osyv-1mrK1!MY^EH%AzqO6|8@|iPu
zOzHNj#Vj)W3Au)39w%A8MX|hzVyPHKg=3Z>*@om3eMPCK_kwV@_rh|-{S1!zgDAc(
zIeOg3164W4x#~2fUJ0FacgIl-sL2`Llcl8RyQerbiZ;h8qY!P+c;#fNl%XV>KPyYF
zz3$sK(-Qa2rM_jNYhn(%SKD6854`$};Xa-ehwR%n$11LLZRKtG!j&C!{Aa!6x_|GP
z?E6n)%}jw8S76>purB%kQTqJ<#pAR9OaW8i&ne&*4nG|3lRxCvGb2f^ow0mm5tDw6
nM|EMP={Ql-apKQE4B5`uReXwojYr<0*+GEHV3jHGR~7gH#QH1-

diff --git a/src/main/resources/templates/modules/nulm/addstaff.html b/src/main/resources/templates/modules/nulm/addstaff.html
deleted file mode 100644
index 89d43bac..00000000
--- a/src/main/resources/templates/modules/nulm/addstaff.html
+++ /dev/null
@@ -1,558 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Add Staff</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Add Staff</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-
-
-					<hr>
-
-					<div class="card">
-						<div class="card-header">
-							<h6><b>Create Employee</b></h6>
-						</div>
-						<div class="card-body">
-
-							<div class="row">
-								<div class="col-md-6"> <label>Employee Name</label> <input type="text" id="empName"
-										class="form-control"
-										oninput="this.value=this.value.replace(/[^a-zA-Z\s]/g,'').toUpperCase()"> </div>
-								<div class="col-md-6"> <label>Father / Husband Name</label>
-									<input type="text" id="fhName" class="form-control"
-										oninput="this.value=this.value.replace(/[^a-zA-Z\s]/g,'').toUpperCase()">
-								</div>
-								<div class="col-md-6 mt-3">
-									<label>Designation</label> <select id="designationId" class="form-control">
-										<option value="">Select</option>
-									</select>
-								</div>
-								<div class="col-md-6 mt-3">
-									<label>Zone</label> <select id="zoneId" class="form-control">
-										<option value="">Slect</option>
-									</select>
-								</div>
-								<div class="col-md-6 mt-3">
-									<label>Park Name</label>
-									<select id="parkId" class="form-control">
-										<option value="">Select</option>
-									</select>
-								</div>
-								<div class="col-md-6 mt-3">
-									<label>Incharge Name</label>
-									<input type="text" id="inchargeName" class="form-control" readonly>
-									<input type="hidden" id="inchargeId">
-									<input type="hidden" id="zone">
-									<input type="hidden" id="inchargeDesignation">
-									<input type="hidden" id="inchargePhone">
-								</div>
-								<div class="col-md-6 mt-3"> <label>Group Name</label>
-									<input type="text" id="groupName" disabled class="form-control">
-								</div>
-								<div class="col-md-6 mt-3"> <label>Aadhar Number</label>
-									<input type="text" id="aadharNo" maxlength="12" class="form-control"
-										oninput="this.value=this.value.replace(/[^0-9]/g,'')">
-								</div>
-								<div class="col-md-6 mt-3"> <label>Mobile Number</label>
-									<input type="text" id="mobileNo" class="form-control"
-										oninput="this.value=this.value.replace(/[^0-9]/g,'').slice(0,10)">
-								</div>
-								<div class="col-md-6 mt-3"> <label>Bank Account Number</label>
-									<input type="text" id="bankAccNo" class="form-control" minlength="9" maxlength="18"
-										oninput="this.value=this.value.replace(/[^0-9]/g,'')">
-								</div>
-								<div class="col-md-6 mt-3"> <label>Bank Name</label>
-									<input type="text" id="bankName" class="form-control"
-										oninput="this.value=this.value.replace(/[^a-zA-Z\s]/g,'').toUpperCase()">
-								</div>
-								<div class="col-md-6 mt-3"> <label>IFSC Code</label>
-									<input type="text" id="ifscCode" class="form-control" maxlength="11"
-										oninput="this.value=this.value.toUpperCase()">
-								</div>
-								<div class="col-md-6 mt-3"> <label>Branch</label>
-									<input type="text" id="branch" class="form-control"
-										oninput="this.value=this.value.replace(/[^a-zA-Z\s]/g,'').toUpperCase()">
-								</div>
-								<div class="col-md-6 mt-3"> <label>Branch Address</label>
-									<input type="text" id="branchAddress" class="form-control">
-								</div>
-								<div class="col-md-12 mt-3"> <label>Residential Address</label> <textarea id="address"
-										class="form-control"></textarea> </div>
-								<div class="col-md-6 mt-3"> <label>Upload Form</label>
-									<input type="file" id="formFile" class="form-control" accept=".jpg,.jpeg">
-								</div>
-								<div class="col-md-6 mt-3"> <label>Upload Aadhar Card</label>
-									<input type="file" id="aadharFile" class="form-control" accept=".jpg,.jpeg">
-								</div>
-								<div class="col-md-6 mt-3"> <label>Upload Bank Passbook</label>
-									<input type="file" id="bankPassbookFile" class="form-control" accept=".jpg,.jpeg">
-								</div>
-							</div>
-							<hr>
-							<div class="text-center mt-3"> <button class="btn btn-primary"
-									onclick="saveEmployee()">Submit</button> <button class="btn btn-secondary"
-									onclick="resetForm()">Reset</button> </div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		$(document).ready(function () {
-
-			$.ajax({
-				url: "/gcc/api/nulm/designations",
-				type: "GET",
-
-				success: function (data) {
-
-					let options = '<option value="">Select Designation</option>';
-
-					data.forEach(function (item) {
-
-						options += `<option value="${item.designation_id}">
-                                ${item.designation}
-                            </option>`;
-					});
-
-					$("#designationId").html(options);
-				}
-
-			});
-			/*$.ajax({
-				url: "/gcc/api/nulm/parks",
-				type: "GET",
-
-				success: function (data) {
-
-					let options = '<option value="">Select</option>';
-
-					data.forEach(function (p) {
-
-						options += `<option 
-							value="${p.park_id}"
-							data-supervisor="${p.supervisor_name}"
-							data-supervisorid="${p.supervisor_id}"
-							data-zone="${p.zone}"
-							  data-designation="${p.supervisor_designation}"
-	data-mobile="${p.supervisor_mobile}">
-							${p.park_name}
-						</option>`;
-					});
-
-					$("#parkId").html(options);
-				}
-			});*/
-			$("#zoneId").change(function () {
-
-				let zone = $(this).val();
-
-				$("#parkId").html('<option value="">Select</option>');
-				$("#inchargeName").val("");
-
-				if (!zone) return;
-
-				$.ajax({
-					url: "/gcc/api/nulm/parks",
-					type: "GET",
-					data: { zone: zone },
-
-					success: function (data) {
-
-						let options = '<option value="">Select</option>';
-
-						data.forEach(function (p) {
-
-							options += `<option 
-                    value="${p.park_id}"
-                    data-supervisor="${p.supervisor_name}"
-                    data-supervisorid="${p.supervisor_id}"
-                    data-zone="${p.zone}"
-                    data-designation="${p.supervisor_designation}"
-                    data-mobile="${p.supervisor_mobile}">
-                    ${p.park_name}
-                </option>`;
-						});
-
-						$("#parkId").html(options);
-					}
-				});
-
-			});
-
-		});
-
-		$("#parkId").change(function () {
-
-			let selected = $(this).find(":selected");
-
-			let supervisorName = selected.data("supervisor");
-			let supervisorId = selected.data("supervisorid");
-			let zone = selected.data("zone");
-			if (supervisorName) {
-				supervisorName = supervisorName.toUpperCase();
-			}
-			let supervisorDesignation = selected.data("designation");
-			let supervisorMobile = selected.data("mobile");
-			if (supervisorDesignation) {
-				supervisorDesignation = supervisorDesignation.toUpperCase();
-			}
-
-
-			$("#inchargeName").val(supervisorName || "");
-			$("#inchargeId").val(supervisorId || "");
-			$("#zone").val(zone || "");
-
-			$("#inchargeDesignation").val(supervisorDesignation);
-			$("#inchargePhone").val(supervisorMobile);
-
-
-
-		});
-		$.ajax({
-			url: "/gcc/api/nulm/zones",
-			type: "GET",
-			success: function (data) {
-
-				let options = '<option value="">Select Zone</option>';
-
-				data.forEach(function (z) {
-					options += `<option value="${z}"> ${z}</option>`;
-				});
-
-				$("#zoneId").html(options);
-			}
-		});
-		function resetForm() {
-
-			// Text fields
-			$("#empName").val("");
-			$("#fhName").val("");
-			$("#inchargeName").val("");
-			$("#groupName").val("");
-			$("#aadharNo").val("");
-			$("#mobileNo").val("");
-			$("#bankAccNo").val("");
-			$("#bankName").val("");
-			$("#ifscCode").val("");
-			$("#branch").val("");
-			$("#branchAddress").val("");
-			$("#address").val("");
-
-			// Dropdowns
-			$("#designationId").val("");
-			$("#parkId").val("");
-
-			// Hidden fields
-			$("#inchargeId").val("");
-			$("#zone").val("");
-			$("#inchargeDesignation").val("");
-			$("#inchargePhone").val("");
-
-			// File inputs
-			$("#formFile").val("");
-			$("#aadharFile").val("");
-			$("#bankPassbookFile").val("");
-
-		}
-		function saveEmployee() {
-
-			let empName = $("#empName").val().trim();
-			let fhName = $("#fhName").val().trim();
-			let parkId = $("#parkId").val();
-			let parkName = $("#parkId option:selected").text().trim();
-			let designationId = $("#designationId").val();
-			let designationText = $("#designationId option:selected").text().trim();
-			let inchargeId = $("#inchargeId").val();
-			let inchargeName = $("#inchargeName").val();
-			let zone = $("#parkId option:selected").data("zone");
-			let inchargeDesignation = $("#inchargeDesignation").val();
-			let inchargePhone = $("#inchargePhone").val();
-
-			//let groupName = $("#groupName").val().trim();
-			let aadhar = $("#aadharNo").val().trim();
-			let phone = $("#mobileNo").val().trim();
-			let bankAcc = $("#bankAccNo").val().trim();
-			let bankName = $("#bankName").val().trim();
-			let ifscCode = $("#ifscCode").val().trim();
-			let branch = $("#branch").val().trim();
-			let branchAddress = $("#branchAddress").val().trim();
-			let address = $("#address").val().trim();
-			//let createdBy = /*[[${LoginUserId}]]*/'';
-
-			let phonePattern = /^[6-9]\d{9}$/;
-			let aadharPattern = /^\d{12}$/;
-			let bankPattern = /^[0-9]{9,18}$/;
-			let ifscPattern = /^[A-Z]{4}0[A-Z0-9]{6}$/;
-
-			function showWarning(msg) {
-				Swal.fire({
-					icon: 'warning',
-					title: 'Warning',
-					text: msg
-				});
-			}
-
-			/* =========================
-			   VALIDATION
-			========================= */
-
-			if (!empName) {
-				showWarning("Please enter employee name");
-				$("#empName").focus();
-				return;
-			}
-
-			if (!fhName) {
-				showWarning("Please enter father / husband name");
-				$("#fhName").focus();
-				return;
-			}
-
-			if (!parkId) {
-				showWarning("Please select park");
-				return;
-			}
-
-			if (!designationId) {
-				showWarning("Please select designation");
-				return;
-			}
-
-			/*if (!groupName) {
-				showWarning("Please enter group name");
-				$("#groupName").focus();
-				return;
-			}*/
-
-			if (!aadhar) {
-				showWarning("Please enter aadhar number");
-				$("#aadharNo").focus();
-				return;
-			}
-
-			if (!aadharPattern.test(aadhar)) {
-				showWarning("Aadhar must be 12 digits");
-				$("#aadharNo").focus();
-				return;
-			}
-
-			if (!phone) {
-				showWarning("Please enter mobile number");
-				$("#mobileNo").focus();
-				return;
-			}
-
-			if (!phonePattern.test(phone)) {
-				showWarning("Invalid mobile number");
-				$("#mobileNo").focus();
-				return;
-			}
-
-			if (!bankAcc) {
-				showWarning("Please enter bank account number");
-				$("#bankAccNo").focus();
-				return;
-			}
-
-			if (!bankPattern.test(bankAcc)) {
-				showWarning("Bank account must be 9-18 digits");
-				$("#bankAccNo").focus();
-				return;
-			}
-
-			if (!bankName) {
-				showWarning("Please enter bank name");
-				$("#bankName").focus();
-				return;
-			}
-
-			if (!ifscCode) {
-				showWarning("Please enter IFSC code");
-				$("#ifscCode").focus();
-				return;
-			}
-
-			if (!ifscPattern.test(ifscCode)) {
-				showWarning("Invalid IFSC code (Example: SBIN0001234)");
-				$("#ifscCode").focus();
-				return;
-			}
-
-			if (!branch) {
-				showWarning("Please enter branch");
-				$("#branch").focus();
-				return;
-			}
-
-			if (!branchAddress) {
-				showWarning("Please enter branch address");
-				$("#branchAddress").focus();
-				return;
-			}
-
-			if (!address) {
-				showWarning("Please enter address");
-				$("#address").focus();
-				return;
-			}
-
-			/* =========================
-			   FILE VALIDATION
-			========================= */
-
-			let formFile = $("#formFile")[0].files[0];
-			let aadharFile = $("#aadharFile")[0].files[0];
-			let bankFile = $("#bankPassbookFile")[0].files[0];
-
-			function validateFile(file) {
-
-				if (!file) return true;
-
-				let allowed = ["image/jpeg", "image/jpg"];
-
-				if (!allowed.includes(file.type)) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Invalid File',
-						text: 'Only JPG/JPEG allowed'
-					});
-					return false;
-				}
-
-				return true;
-			}
-
-			if (!validateFile(formFile)) return;
-			if (!validateFile(aadharFile)) return;
-			if (!validateFile(bankFile)) return;
-
-			/* =========================
-			   FORM DATA
-			========================= */
-
-			let formData = new FormData();
-
-			formData.append("name", empName);
-			formData.append("fhName", fhName);
-			formData.append("designation", designationText);
-			formData.append("designationId", designationId);
-			formData.append("aadharNo", aadhar);
-			formData.append("bankAccNo", bankAcc);
-			formData.append("phoneNumber", phone);
-			formData.append("address", address);
-
-			formData.append("bankName", bankName);
-			formData.append("ifscCode", ifscCode);
-			formData.append("branch", branch);
-			formData.append("branchAddress", branchAddress);
-
-			formData.append("parkId", parkId);
-			formData.append("parkName", parkName);
-			formData.append("inchargeId", inchargeId);
-			formData.append("inchargeName", inchargeName);
-			formData.append("zone", zone);
-			formData.append("inchargeDesignation", inchargeDesignation);
-			formData.append("inchargePhone", inchargePhone);
-			//	formData.append("createdBy", createdBy);
-
-			if (formFile) formData.append("uploadform", formFile);
-			if (aadharFile) formData.append("aadharcard", aadharFile);
-			if (bankFile) formData.append("bankpassbook", bankFile);
-
-			/* =========================
-			   AJAX SAVE
-			========================= */
-
-			$.ajax({
-
-				url: "/gcc/api/nulm/create-employee",
-				type: "POST",
-				data: formData,
-				processData: false,
-				contentType: false,
-
-				success: function (res) {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Employee Added',
-						text: 'Employee ID ' + res.employeeId + ' added successfully'
-					}).then(() => {
-						location.reload();
-					});
-
-				},
-
-				error: function () {
-					Swal.fire({
-						icon: 'error',
-						title: 'Error',
-						text: 'Failed to create employee'
-					});
-				}
-
-			});
-
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/appointment.html b/src/main/resources/templates/modules/nulm/appointment.html
deleted file mode 100644
index 402290bd..00000000
--- a/src/main/resources/templates/modules/nulm/appointment.html
+++ /dev/null
@@ -1,485 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-
-<body>
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Appointment</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Appointment</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-					<div class="row align-items-center justify-content-center"
-						style="color: white;background-color:#414f69 ;padding: 10px;">
-						<h3 class="title resizable-content">Appoinment</h3>
-					</div>
-
-
-
-					<!-- Card Section -->
-					<div class="card mt-5 p-3 resizable-content" style="margin-bottom: 8px;color: #414f69;">
-
-
-						<!-- Add the resizable-content class to the card sections -->
-						<div class="card mb-3 resizable-content">
-
-							<div class="card-body">
-								<div class="row">
-									<div class="col-md-6 d-flex justify-content-between align-items-center">
-										<label
-											style="font-size: large; font-weight: 700; color: #414f69;">Order:</label>
-										<select id="orderNumberDropdown" class="form-control"
-											style="font-size: large; width: 70%;">
-											<option value="">Select Order</option>
-										</select>
-									</div>
-								</div>
-
-								<div class="mt-3" id="orderDetails" style="display: none;">
-									<div class="card-block" style="text-align:center;">
-										<div id="chart" class="row">
-											<div class="col-sm-12 col-lg-4">
-												<div class="card" style="height: 100px;">
-													<div class="card-body">
-														<h5 class="card-title" style="font-size:14px;">Total Staff</h5>
-														<p class="card-text" id="total"
-															style="font-size:large; font-weight: bold;">0</p>
-													</div>
-												</div>
-											</div>
-											<div class="col-sm-12 col-lg-4">
-												<div class="card" style="height: 100px;">
-													<div class="card-body">
-														<h5 class="card-title" style="font-size:14px;">Appointed</h5>
-														<p class="card-text" id="pending"
-															style="font-size: large;font-weight: bold;">0</p>
-													</div>
-												</div>
-											</div>
-											<div class="col-sm-12 col-lg-4">
-												<div class="card" style="height: 100px;">
-													<div class="card-body">
-														<h5 class="card-title" style="font-size:14px;">Available
-														</h5>
-														<p class="card-text" id="notappointed"
-															style="font-size: large;font-weight: bold;">0</p>
-													</div>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-
-								<br>
-								<div class="row" id="groupboxsection" style="display:none">
-									<div class="col-md-6 d-flex justify-content-between align-items-center">
-
-										<label
-											style="font-size: large; font-weight: 700; color: #414f69;">Self Help Group:</label>
-										<select id="grouplist" class="form-control"
-											style="font-size: large; width: 70%;">
-											<option value="">Select Group</option>
-										</select>
-									</div>
-								</div>
-
-								<!-- Appointment Date Section (Initially Hidden) -->
-								<div class="row mt-3" id="appointmentSection" style="display: none;">
-									<div class="col-md-6 d-flex align-items-center">
-										<label
-											style="font-size: large; font-weight: 700; color: #414f69; width: 30%;">Appointment
-											Date:</label>
-										<input type="date" id="appointmentDate" class="form-control"
-											style="font-size: large; width: 70%;">
-									</div>
-								</div>
-
-								<!-- Orders Table Section (Initially Hidden) -->
-								<div class="row mt-3" id="ordersTableSection" style="display: none;">
-									<div class="col-md-12">
-										<table class="table table-bordered">
-											<thead>
-												<tr>
-													<th style="width: 10%;">
-														<input type="checkbox" id="selectAll">
-													</th>
-													<th style="width: 30%;">Name</th>
-													<th style="width: 30%;">Phone Number</th>
-													<th style="width: 30%;">Address</th>
-													<th style="width: 30%;">Education Qualification</th>
-												</tr>
-											</thead>
-											<tbody id="ordersTableBody">
-												<!-- Table rows will be populated here -->
-											</tbody>
-										</table>
-									</div>
-								</div>
-								<div class="row mt-3" id="inchargemobilenosection" style="display: none;">
-									<div class="col-md-6 d-flex align-items-center">
-										<label style="font-size: large; font-weight: 700; color: #414f69; width: 30%;">Designation:</label>
-										<select id="designation" class="form-control"
-											style="font-size: large; width: 70%;">
-											<option value="">Select Designation</option>
-											<option>CI</option>
-											<option>Software Developer</option>
-										</select>
-									</div>
-									<div class="col-md-6 d-flex align-items-center">
-										<label
-											style="font-size: large; font-weight: 700; color: #414f69; width: 30%;">Incharge
-											Mobileno:</label>
-										<input type="text" id="inchargemobileno" class="form-control"
-											style="font-size: large; width: 70%;">
-									</div>
-									<div class="col-md-6 d-flex align-items-center">
-										<label
-											style="font-size: large; font-weight: 700; color: #414f69; width: 30%;">Incharge
-											Name:</label>
-										<input type="text" id="inchargeName" class="form-control"
-											style="font-size: large; width: 70%;">
-									</div>
-								</div>
-
-							</div>
-						</div>
-						<div class="d-flex justify-content-center">
-							<button class="btn"
-								style="background-color: #414f69; color: white; width: 200px;padding: 10px;margin-bottom: 10px;"
-								id="createorder">
-								Create Appointment
-							</button>
-						</div>
-
-					</div>
-
-
-
-
-				</div>
-
-
-
-			</div>
-
-
-		
-		<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-	</div>
-	</div>
-	<div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-	<script th:inline="javascript">
-
-
-
-		$(document).ready(function () {
-			// Function to load scheme group names
-			function loadSchemeGroupNames() {
-				$.ajax({
-					url: '/gcc/api/nulm/getAllSchemeGroupNames', // Endpoint URL
-					method: 'GET',
-					dataType: 'json',
-					success: function (data) {
-						// Get the dropdown element
-						var $dropdown = $('#schemeGroupDropdown');
-						// Clear existing options
-						$dropdown.empty();
-						// Add the default option
-						$dropdown.append('<option value="">Select Scheme Group</option>');
-						// Populate the dropdown with scheme group names
-						$.each(data, function (index, value) {
-							$dropdown.append('<option value="' + value + '">' + value + '</option>');
-						});
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching scheme group names:', error);
-					}
-				});
-			}
-
-			// Load the scheme group names when the document is ready
-			loadSchemeGroupNames();
-		});
-
-$(document).ready(function () {
-    // Function to load scheme group names
-    function loadNotappointed() {
-        $.ajax({
-            url: '/gcc/api/nulm/getAllSchemeGroupNames', // Endpoint URL
-            method: 'GET',
-            dataType: 'json',
-            success: function (data) {
-                var $dropdown = $('#grouplist');
-                $dropdown.empty();
-                $dropdown.append('<option value="">Select Group</option>');
-                $.each(data, function (index, group) {
-                    $dropdown.append('<option value="' + group.group_id + '">' + group.group_name + '</option>');
-                });
-            },
-            error: function (xhr, status, error) {
-                console.error('Error fetching scheme group names:', error);
-            }
-        });
-    }
-
-    // Load the scheme group names when the document is ready
-    loadNotappointed();
-
-    $('#grouplist').change(function () {
-        var groupId = $(this).val();
-
-        if (groupId) {
-            $.ajax({
-                url: '/gcc/api/nulm/enrollmentCountsbygroupId',
-                method: 'GET',
-                data: { groupId: groupId },
-                dataType: 'json',
-                success: function (data) {
-                    console.log("data==", data);
-                    function getTodayDate() {
-				return new Date().toISOString().split('T')[0];
-			}
-
-                    var $ordersTableBody = $('#ordersTableBody');
-                    $ordersTableBody.empty();
-                    $('#appointmentSection').show();
-					$('#inchargemobilenosection').show();
-					$('#appointmentDate').val(getTodayDate());
-
-                    if (data.length > 0) {
-                        $.each(data, function (index, enrollment) {
-                            var row = '<tr>' +
-                                '<td><input type="checkbox" class="form-check-input order-checkbox" name="selectRow" value="' + enrollment.enrollment_id + '" style="margin-left:0px"></td>' +
-                                '<td>' + enrollment.name + '</td>' +
-                                '<td>' + enrollment.phone_number + '</td>' +
-                                '<td>' + enrollment.address + '</td>' +
-                                '<td>' + enrollment.education_qualification + '</td>' +
-                                '</tr>';
-                            $ordersTableBody.append(row);
-                        });
-                        $('#ordersTableSection').show();
-                    } else {
-                        $ordersTableBody.append('<tr><td colspan="5">No enrollments found.</td></tr>');
-                        $('#ordersTableSection').show();
-                    }
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching enrollment counts:', error);
-                }
-            });
-        } else {
-            $('#ordersTableSection').hide(); // Hide the table if no group is selected
-            $('#appointmentSection').hide();
-			$('#inchargemobilenosection').hide();
-        }
-        
-        			$('#selectAll').click(function () {
-				var isChecked = $(this).is(':checked');
-				$('.order-checkbox').prop('checked', isChecked);
-			});
-
-			// Optionally, if you want to uncheck the "Select All" checkbox when any individual checkbox is unchecked
-			$(document).on('click', '.order-checkbox', function () {
-				if (!$(this).is(':checked')) {
-					$('#selectAll').prop('checked', false);
-				} else if ($('.order-checkbox:checked').length === $('.order-checkbox').length) {
-					$('#selectAll').prop('checked', true);
-				}
-			});
-    });
-});
-
-
-
-$(document).ready(function() {
-    // Function to load order details
-    function loadOrderDetails() {
-        $.ajax({
-            url: '/gcc/api/nulm/getAllOrderDetails', // Updated Endpoint URL
-            method: 'GET',
-            dataType: 'json',
-            success: function(data) {
-                var $dropdown = $('#orderNumberDropdown');
-                $dropdown.empty();
-                $dropdown.append('<option value="">Select Order</option>');
-                $.each(data, function(index, order) {
-                    $dropdown.append('<option value="' + order.order_id + '">' + order.order_number + '</option>');
-                });
-            },
-            error: function(xhr, status, error) {
-                console.error('Error fetching order details:', error);
-            }
-        });
-    }
-
-    // Load order details when the document is ready
-    loadOrderDetails();
-
-    // Handle order number selection
-    $('#orderNumberDropdown').change(function() {
-        var orderId = $(this).val();
-        var $orderDetails = $('#orderDetails');
-        var $groupBoxSection = $('#groupboxsection');
-
-        if (orderId) {
-            // Display the order details and group section
-            $orderDetails.show();
-            $groupBoxSection.show();
-
-            // Fetch the enrollment counts based on the selected order ID
-            $.ajax({
-                url: '/gcc/api/nulm/enrollmentCountsbyorderId',
-                method: 'GET',
-                data: { orderId: orderId },
-                dataType: 'json',
-                success: function(counts) {
-                    // Update the values in the cards
-                    $('#total').text(counts.total_count || 0);
-                    $('#pending').text(counts.total_yes || 0);
-                    $('#notappointed').text(counts.output_value || 0);
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error fetching enrollment counts:', error);
-                }
-            });
-        } else {
-            // Hide the order details and group section if no order is selected
-            $orderDetails.hide();
-            $groupBoxSection.hide();
-        }
-    });
-});
-
-		$(document).ready(function () {
-			// Function to load scheme group names
-			function loadStaffName() {
-				$.ajax({
-					url: '/gcc/api/nulm/getAllStaffNames', // Endpoint URL
-					method: 'GET',
-					dataType: 'json',
-					success: function (data) {
-						// Get the dropdown element
-						var $dropdown = $('#staffNameDropdown');
-						// Clear existing options
-						$dropdown.empty();
-						// Add the default option
-						$dropdown.append('<option value="">Select Staff Name</option>');
-						// Populate the dropdown with scheme group names
-						$.each(data, function (index, value) {
-							$dropdown.append('<option value="' + value + '">' + value + '</option>');
-						});
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching scheme group names:', error);
-					}
-				});
-			}
-
-			// Load the scheme group names when the document is ready
-			loadStaffName();
-		});
-$(document).ready(function () {
-    $('#createorder').click(function () {
-        var totalstaff = parseInt($('#total').text(), 10); // Convert total staff to an integer
-        var selectedEnrollments = [];
-        var orderId = parseInt($('#orderNumberDropdown').val(), 10); // Ensure orderId is an integer
-        var inchargePhoneno = $('#inchargemobileno').val(); // Get the in-charge mobile number
-        var designation = $('#designation').val(); // Get the designation
-        
-        $('.order-checkbox:checked').each(function () {
-            selectedEnrollments.push(parseInt($(this).val(), 10)); // Ensure enrollmentIds are integers
-        });
-
-        if (selectedEnrollments.length > totalstaff) {
-            // Show SweetAlert if the number of selected enrollments exceeds the total staff count
-            Swal.fire({
-                icon: 'warning',
-                title: 'Limit Exceeded',
-                text: `For this order, only ${totalstaff} staff members are allowed.`
-            });
-        } else {
-            // Proceed with the order creation logic
-            $.ajax({
-                url: '/gcc/api/nulm/assignAppointment',
-                method: 'POST',
-                contentType: 'application/json', // Set the content type to JSON
-                data: JSON.stringify({
-                    enrollmentIds: selectedEnrollments,
-                    orderId: orderId,
-                    incharge_phoneno: inchargePhoneno, // Include the in-charge mobile number
-                    designation: designation // Include the designation
-                }), // Convert the data to JSON string
-                success: function(response) {
-                    // Show SweetAlert on success
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Order Created',
-                        text: 'The order has been successfully created.',
-                        confirmButtonText: 'OK'
-                    }).then((result) => {
-                        if (result.isConfirmed) {
-                            // Reload the page after SweetAlert is confirmed
-                            location.reload();
-                        }
-                    });
-                },
-                error: function(xhr, status, error) {
-                    // Show error message using SweetAlert
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'An error occurred while creating the order. Please try again later.'
-                    });
-                    console.error('Error creating order:', error);
-                }
-            });
-        }
-    });
-});
-</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/attendance-report-park.html b/src/main/resources/templates/modules/nulm/attendance-report-park.html
deleted file mode 100644
index 4e884c5d..00000000
--- a/src/main/resources/templates/modules/nulm/attendance-report-park.html
+++ /dev/null
@@ -1,552 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="" xmlns="http://www.w3.org/1999/html">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-	<style>
-		/* Modal Styles */
-		.modal {
-			display: none;
-			position: fixed;
-			z-index: 1;
-			left: 0;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			background-color: rgba(0,0,0,0.5);
-
-		}
-		.modal-content {
-			background-color: white;
-			margin: 15% auto;
-			padding: 20px;
-			border: 1px solid #888;
-			width: 40%;
-			text-align: center;
-		}
-		.close {
-			color: red;
-			float: right;
-			font-size: 28px;
-			font-weight: bold;
-			cursor: pointer;
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Park STAFF</h5>
-										<span>Park Attendance Report</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Park Attendance Report</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row">
-						
-						<div class="col-sm-3">
-							<label for="zone">Zone</label>
-							<select id="zone" class="form-control">
-								<option value="">Select</option>
-								<option value="1">Zone 01</option>
-								<option value="2">Zone 02</option>
-								<option value="3">Zone 03</option>
-								<option value="4">Zone 04</option>
-								<option value="5">Zone 05</option>
-								<option value="6">Zone 06</option>
-								<option value="7">Zone 07</option>
-								<option value="8">Zone 08</option>
-								<option value="9">Zone 09</option>
-								<option value="10">Zone 10</option>
-								<option value="11">Zone 11</option>
-								<option value="12">Zone 12</option>
-								<option value="13">Zone 13</option>
-								<option value="14">Zone 14</option>
-								<option value="15">Zone 15</option>
-							</select>
-						</div>
-						
-						<!-- Division -->
-						<div class="col-md-3 form-group">
-							<label for="division">Division</label>
-							<select class="form-control" id="division" name="division" required>
-								<option value="">Select Division</option>
-								<option th:each="division : ${divisionList}" th:value="${division.division}" th:text="${division.division}"
-									th:selected="${division.division == selectedDivision}">
-								</option>
-							</select>	
-						</div>
-						
-						<!-- Year -->
-						<!--<div class="col-md-3 form-group">
-							<label for="year">Year</label>
-							<select class="form-control" id="year" name="year" required>
-								<option value="">Select Year</option>
-								<option th:each="year : ${yearList}" th:value="${year.year}" th:text="${year.year}"
-									th:selected="${year.year == selectedYear}">
-								</option>
-							</select>
-						</div>
-
-						 Month
-						<div class="col-md-3 form-group">
-							<label for="month">Month</label>
-							<select id="month" class="form-control" name="month" required>
-								<option value="">Select Month</option>
-								<option th:each="month : ${monthList}" th:value="${month.month}" th:text="${month.month}"
-									th:selected="${month.month == selectedMonth}">
-								</option>
-							</select>
-						</div>-->
-
-						<div class="col-sm-3">
-							<label for="fromdate">From Date</label>
-							<input type ='date' id = 'fromdate' name= 'fromdate' class="form-control">
-						</div>
-						
-						<div class="col-sm-3">
-							<label for="todate">To Date</label>
-							<input type ='date' id = 'todate' name= 'todate' class="form-control">
-						</div>
-
-						<div class="col-sm-3" style="display: none;">
-							<label for="selfhelp">Self Help Group </label>
-							<select id="selfhelp" class="form-control">
-								<option value="">Select</option>
-								<!-- Group names will be populated here -->
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<button class="btn btn-primary mt-4" onclick="fetchAttendanceReport()">Get Attendance Details</button>
-						</div>
-
-						<div class="col-sm-3">
-							<!--<label style="font-weight: bold;"> Month: </label>-->
-							<span class="btn btn-primary mt-4" id = "from_date" th:text="${fromdate}"></span>
-						</div>
-
-						<div class="col-sm-3">
-							<!--<label style="font-weight: bold">Year: </label>-->
-							<span class="btn btn-primary mt-4" id= "to_date" th:text="${todate}"></span>
-						</div>
-
-					</div>
-
-					<!-- Salary Report Table -->
-					<div class="card-block mt-3">
-						<table id="attendancereporttable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-<!--									<th>Date</th>-->
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Total no.of Days</th>
-									<th>Present Days</th>
-									<th>OD Days</th>
-									<th>Leave Days</th>
-									<th>Absent Days</th>
-<!--									<th>Attendance Status</th>-->
-									<th>Incharge Name</th>
-									<th>Incharge Mobile Number</th>
-									<th>Incharge Designation</th>
-									<th>Zone</th>
-									<th>Division</th>
-									<th>Department</th>
-									<th>Self Help Group</th>									
-								</tr>
-							</thead>
-							<tbody>
-								<tr th:each="attendance, i : ${consolidatedAttendanceReport}">
-									<td th:text="${i.count}">1</td>
-<!--									<td th:text="${attendance.attendance_date}"></td>-->
-									<td th:text="${attendance.emp_id}"></td>
-<!--									<td th:hidden="${attendance.enrollment_id}" ></td>-->
-									<td th:text="${attendance.name}"></td>
-									<td th:text="${attendance.total_days}"></td>
-									<td th:text="${attendance.totaldayspresent}"
-										th:onclick="fetchAttendanceDates('present', [[${attendance.enrollment_id}]], [[${fromdate}]], [[${todate}]], [[${attendance.name}]])"></td>
-									<td th:text="${attendance.totaldaysod}"
-										th:onclick="fetchAttendanceDates('od', [[${attendance.enrollment_id}]], [[${fromdate}]], [[${todate}]], [[${attendance.name}]])"></td>
-									<td th:text="${attendance.totaldaysleave}"
-										th:onclick="fetchAttendanceDates('leave', [[${attendance.enrollment_id}]], [[${fromdate}]], [[${todate}]], [[${attendance.name}]])"></td>
-									<td th:text="${attendance.totaldaysabsent}"></td>
-<!--									<td th:text="${attendance.attendance_status}"></td>-->
-									<td th:text="${attendance.incharge_name}"></td>
-									<td th:text="${attendance.incharge_phoneno}"></td>
-									<td th:text="${attendance.incharge_designation}"></td>
-									<td th:text="${attendance.zone}"></td>
-									<td th:text="${attendance.division}"></td>
-									<td th:text="${attendance.department}"></td>
-									<td th:text="${attendance.group_name}"></td>
-								</tr>
-							</tbody>
-							<tfoot class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<!--									<th>Date</th>-->
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Total no.of Days</th>
-									<th>Present Days</th>
-									<th>OD Days</th>
-									<th>Leave Days</th>
-									<th>Absent Days</th>
-									<!--									<th>Attendance Status</th>-->
-									<th>Incharge Name</th>
-									<th>Incharge Mobile Number</th>
-									<th>Incharge Designation</th>
-									<th>Zone</th>
-									<th>Division</th>
-									<th>Department</th>
-									<th>Self Help Group</th>
-								</tr>
-							</tfoot>
-						</table>
-					</div>
-
-
-					<div id="myModal" class="modal" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0, 0, 0, 0.5);">
-						<div class="modal-content" style="position: relative; width: 50%; margin: 10% auto; background: white; padding: 20px; border-radius: 10px;">
-							<!-- Close Button -->
-							<button type="button" class="btn btn-danger close-btn" onclick="closeModal()" style="position: absolute; top: 10px; right: 10px;">&times;</button>
-
-							<h4 id="modalTitle"></h4>
-
-							<!-- Scrollable Table -->
-							<div style="max-height: 300px; overflow-y: auto; border: 1px solid #ddd; padding: 5px;">
-								<table class="table table-striped table-bordered">
-									<thead class="thead-dark">
-									<tr>
-										<th>S.No</th>
-										<th>Dates</th>
-									</tr>
-									</thead>
-									<tbody id="modalTableBody">
-									<!-- Dynamic rows will be added here -->
-									</tbody>
-								</table>
-							</div>
-						</div>
-					</div>
-
-			
-		</div>
-		
-	</div>
-	<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-	</div>
-	</div>
-	
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-
-	<script th:inline="javascript">
-		
-		/*function loadYear(selectedYear) {
-				$.ajax({
-					url: '/gcc/api/nulm/getYear',
-					type: 'GET',
-					success: function (response) {
-						const yearDropdown = $('#year');
-						yearDropdown.empty(); // Clear existing options
-						yearDropdown.append('<option value="">Select Year</option>');
-
-						response.forEach(function (year) {
-							const yearName = year.year; // Correct the attribute name if necessary
-							const isSelected = yearName === selectedYear ? 'selected' : '';
-							yearDropdown.append(new Option(yearName, yearName, false, isSelected));
-						});
-
-						// If no department selected, show "Select Zone"
-						if (!selectedYear) {
-							yearDropdown.val('');
-						}
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching departments:', error);
-					}
-				});
-			}*/
-
-
-			//const selectedYear = /*[[${selectedYear}]]*/ ''; // Get this from Thymeleaf or other server-side context
-			//loadYear(selectedYear);
-
-			/*function loadMonth(selectedMonth) {
-				const year = document.getElementById('year').value; // Get the selected year
-				if (!year) {
-					$('#month').empty().append('<option value="">Select Month</option>'); // Clear month dropdown if no year selected
-					return; // Exit if no year is selected
-				}
-
-				$.ajax({
-					url: `/gcc/api/nulm/getMonth?year=${year}`,
-					type: 'GET',
-					success: function (response) {
-						const monthDropdown = $('#month');
-						monthDropdown.empty(); // Clear existing options
-						monthDropdown.append('<option value="">Select Month</option>');
-
-						response.forEach(function (month) {
-							const monthName = month.month;
-							monthDropdown.append(new Option(monthName, monthName));
-						});
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching months:', error);
-					}
-				});
-			}
-
-			// Load months when the year changes
-			document.getElementById('year').addEventListener('change', function () {
-				loadMonth(); // Call loadMonth when the year is selected
-			});*/
-			
-			function loadDivision(selectedDivision) {
-				const zone=document.getElementById('zone').value;
-				console.log(zone);
-					$.ajax({
-						url: '/gcc/api/nulm/getDivisionList',
-						type: 'GET',
-						data: {
-							zone: zone
-						},
-						success: function (response) {
-							const divisionDropdown = $('#division');
-							divisionDropdown.empty(); // Clear existing options
-							divisionDropdown.append('<option value="">Select Division</option>');
-
-							response.forEach(function (division) {
-								const divisionName = division.division; // Correct the attribute name if necessary
-								const isSelected = divisionName === selectedDivision ? 'selected' : '';
-								divisionDropdown.append(new Option(divisionName, divisionName, false, isSelected));
-							});
-
-							// If no department selected, show "Select Zone"
-							if (!selectedDivision) {
-								divisionDropdown.val('');
-							}
-						},
-						error: function (xhr, status, error) {
-							console.error('Error fetching zone:', error);
-						}
-					});
-				}
-				
-				// Load division when zone selected
-			document.getElementById('zone').addEventListener('change', function () {
-			loadDivision(); // Call loadDivision when the zone is selected
-			});
-
-
-
-		function fetchAttendanceReport() {
-			const zone=document.getElementById('zone').value;
-			const division=document.getElementById('division').value;
-			//const month = document.getElementById('month').value;
-			//const year = document.getElementById('year').value;
-			const groupName=document.getElementById('selfhelp').value;
-			const fromdate=document.getElementById('fromdate').value;
-			const todate=document.getElementById('todate').value;
-			console.log(fromdate);
-			console.log(todate);			
-			
-
-			if (fromdate && todate) {
-				// window.location.href = `/gcc/nulm/attendance-report?groupName=${groupName}&zone=${zone}&division=${division}&fromdate=${fromdate}
-				// &todate=${todate}`;
-				window.location.href = `/gcc/nulm/consolidated-attendance-report-park?groupName=${groupName}&zone=${zone}&division=${division}&fromdate=${fromdate}
-				&todate=${todate}`;
-			} else {
-				alert("Please select both From date and To date.");
-			}
-		}
-		$(document).ready(function () {
-
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-
-			// Call this on page load to reset the URL
-			clearUrlParams();
-
-			// Initialize DataTable
-			var table = $('#attendancereporttable').DataTable({
-				dom: 'Bftip',
-				columnDefs: [
-					{targets: 'no-sort', orderable: false}
-				],
-				lengthMenu: [
-					[50, 100, 200, 500, -1],
-					['50 rows', '100 rows', '200 rows', 'Show all']
-				],
-				scrollY: '50vh',
-				fixedColumns: {
-					left: 1,
-					right: 1
-				},
-				buttons: [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
-                },
-                orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							doc.content[1].table.widths = ['4%', '8%', '9%', '6%', '6%', '6%', '6%', '6%', '5%', '9%', '9%', '4%', '8%', '8%', '8%'];
-							
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'EXCEL',
-						className: 'btn btn-secondary',
-						id: 'excelBtn'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn'
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-		});
-
-		$(document).ready(function () {
-			$.ajax({
-				url: '/gcc/api/nulm/selfHelpGroups', 
-				type: 'GET',
-				success: function (data) {
-					// Clear existing options (if any)
-					$('#selfhelp').empty().append('<option value="">Select</option>');
-
-					// Check if data is an array and iterate through it
-					if (Array.isArray(data)) {
-						let options = '';
-						data.forEach(function (group) {
-							// Access the correct properties
-							options += `<option value="${group.groupName}">${group.groupName}</option>`;
-						});
-						$('#selfhelp').append(options);
-					} else {
-						console.error("Data is not an array:", data);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching self-help groups:", error);
-				}
-			});
-		});
-
-		function fetchAttendanceDates(type, enrollmentId, fromdate, todate, name) {
-			const apiUrl = `/gcc/api/nulm/attendance-dates?enrollmentId=${enrollmentId}&fromdate=${fromdate}&todate=${todate}&type=${type}`;
-
-			console.log("type="+type);
-			fetch(apiUrl)
-					.then(response => response.json())
-					.then(data => {
-						let dates = data[`${type}Dates`] || [];
-						
-						showModal(type, dates, fromdate, todate, name);
-					})
-					.catch(error => {
-						console.error("Error fetching data:", error);
-						alert("Failed to fetch attendance data.");
-					});
-		}
-
-		function showModal(type, dates, fromdate, todate, name) {
-			document.getElementById("modalTitle").innerText = `${type.toUpperCase()} Dates for ${name}, ${fromdate} to ${todate}`;
-
-			let tableBody = document.getElementById("modalTableBody");
-			tableBody.innerHTML = ""; // Clear previous data
-
-			if (dates.length > 0) {
-				dates.forEach((date, index) => {
-					let row = `<tr>
-                <td>${index + 1}</td>
-                <td>${date}</td>
-            </tr>`;
-					tableBody.innerHTML += row;
-				});
-			} else {
-				tableBody.innerHTML = `<tr><td colspan="2">No data available.</td></tr>`;
-			}
-
-			document.getElementById("myModal").style.display = "block";
-		}
-
-		function closeModal() {
-			document.getElementById("myModal").style.display = "none";
-		}
-
-		// Function to open the modal
-		function openModal() {
-			document.getElementById("myModal").style.display = "block";
-		}
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/attendance-report.html b/src/main/resources/templates/modules/nulm/attendance-report.html
deleted file mode 100644
index 423af53d..00000000
--- a/src/main/resources/templates/modules/nulm/attendance-report.html
+++ /dev/null
@@ -1,548 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="" xmlns="http://www.w3.org/1999/html">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-	<style>
-		/* Modal Styles */
-		.modal {
-			display: none;
-			position: fixed;
-			z-index: 1;
-			left: 0;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			background-color: rgba(0,0,0,0.5);
-
-		}
-		.modal-content {
-			background-color: white;
-			margin: 15% auto;
-			padding: 20px;
-			border: 1px solid #888;
-			width: 40%;
-			text-align: center;
-		}
-		.close {
-			color: red;
-			float: right;
-			font-size: 28px;
-			font-weight: bold;
-			cursor: pointer;
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Attendance Report</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Attendance Report</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row">
-						
-						<div class="col-sm-3">
-							<label for="zone">Zone</label>
-							<select id="zone" class="form-control">
-								<option value="">Select</option>
-								<option value="1">Zone 01</option>
-								<option value="2">Zone 02</option>
-								<option value="3">Zone 03</option>
-								<option value="4">Zone 04</option>
-								<option value="5">Zone 05</option>
-								<option value="6">Zone 06</option>
-								<option value="7">Zone 07</option>
-								<option value="8">Zone 08</option>
-								<option value="9">Zone 09</option>
-								<option value="10">Zone 10</option>
-								<option value="11">Zone 11</option>
-								<option value="12">Zone 12</option>
-								<option value="13">Zone 13</option>
-								<option value="14">Zone 14</option>
-								<option value="15">Zone 15</option>
-							</select>
-						</div>
-						
-						<!-- Division -->
-						<div class="col-md-3 form-group">
-							<label for="division">Division</label>
-							<select class="form-control" id="division" name="division" required>
-								<option value="">Select Division</option>
-								<option th:each="division : ${divisionList}" th:value="${division.division}" th:text="${division.division}"
-									th:selected="${division.division == selectedDivision}">
-								</option>
-							</select>	
-						</div>
-						
-						<!-- Year -->
-						<!--<div class="col-md-3 form-group">
-							<label for="year">Year</label>
-							<select class="form-control" id="year" name="year" required>
-								<option value="">Select Year</option>
-								<option th:each="year : ${yearList}" th:value="${year.year}" th:text="${year.year}"
-									th:selected="${year.year == selectedYear}">
-								</option>
-							</select>
-						</div>
-
-						 Month
-						<div class="col-md-3 form-group">
-							<label for="month">Month</label>
-							<select id="month" class="form-control" name="month" required>
-								<option value="">Select Month</option>
-								<option th:each="month : ${monthList}" th:value="${month.month}" th:text="${month.month}"
-									th:selected="${month.month == selectedMonth}">
-								</option>
-							</select>
-						</div>-->
-
-						<div class="col-sm-3">
-							<label for="fromdate">From Date</label>
-							<input type ='date' id = 'fromdate' name= 'fromdate' class="form-control">
-						</div>
-						
-						<div class="col-sm-3">
-							<label for="todate">To Date</label>
-							<input type ='date' id = 'todate' name= 'todate' class="form-control">
-						</div>
-
-						<div class="col-sm-3">
-							<label for="selfhelp">Self Help Group </label>
-							<select id="selfhelp" class="form-control">
-								<option value="">Select</option>
-								<!-- Group names will be populated here -->
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<button class="btn btn-primary mt-4" onclick="fetchAttendanceReport()">Get Attendance Details</button>
-						</div>
-
-						<div class="col-sm-3">
-							<!--<label style="font-weight: bold;"> Month: </label>-->
-							<span class="btn btn-primary mt-4" id = "from_date" th:text="${fromdate}"></span>
-						</div>
-
-						<div class="col-sm-3">
-							<!--<label style="font-weight: bold">Year: </label>-->
-							<span class="btn btn-primary mt-4" id= "to_date" th:text="${todate}"></span>
-						</div>
-
-					</div>
-
-					<!-- Salary Report Table -->
-					<div class="card-block mt-3">
-						<table id="attendancereporttable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-<!--									<th>Date</th>-->
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Total no.of Days</th>
-									<th>Present Days</th>
-									<th>OD Days</th>
-									<th>Leave Days</th>
-									<th>Absent Days</th>
-<!--									<th>Attendance Status</th>-->
-									<th>Incharge Name</th>
-									<th>Incharge Mobile Number</th>
-									<th>Incharge Designation</th>
-									<th>Zone</th>
-									<th>Division</th>
-									<th>Department</th>
-									<th>Self Help Group</th>									
-								</tr>
-							</thead>
-							<tbody>
-								<tr th:each="attendance, i : ${consolidatedAttendanceReport}">
-									<td th:text="${i.count}">1</td>
-<!--									<td th:text="${attendance.attendance_date}"></td>-->
-									<td th:text="${attendance.emp_id}"></td>
-<!--									<td th:hidden="${attendance.enrollment_id}" ></td>-->
-									<td th:text="${attendance.name}"></td>
-									<td th:text="${attendance.total_days}"></td>
-									<td th:text="${attendance.totaldayspresent}"
-										th:onclick="fetchAttendanceDates('present', [[${attendance.enrollment_id}]], [[${fromdate}]], [[${todate}]], [[${attendance.name}]])"></td>
-									<td th:text="${attendance.totaldaysod}"
-										th:onclick="fetchAttendanceDates('od', [[${attendance.enrollment_id}]], [[${fromdate}]], [[${todate}]], [[${attendance.name}]])"></td>
-									<td th:text="${attendance.totaldaysleave}"
-										th:onclick="fetchAttendanceDates('leave', [[${attendance.enrollment_id}]], [[${fromdate}]], [[${todate}]], [[${attendance.name}]])"></td>
-									<td th:text="${attendance.totaldaysabsent}"
-										th:onclick="fetchAttendanceDates('absent', [[${attendance.enrollment_id}]], [[${fromdate}]], [[${todate}]], [[${attendance.name}]])"></td>
-<!--									<td th:text="${attendance.attendance_status}"></td>-->
-									<td th:text="${attendance.incharge_name}"></td>
-									<td th:text="${attendance.incharge_phoneno}"></td>
-									<td th:text="${attendance.incharge_designation}"></td>
-									<td th:text="${attendance.zone}"></td>
-									<td th:text="${attendance.division}"></td>
-									<td th:text="${attendance.department}"></td>
-									<td th:text="${attendance.group_name}"></td>
-								</tr>
-							</tbody>
-							<tfoot class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<!--									<th>Date</th>-->
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Total no.of Days</th>
-									<th>Present Days</th>
-									<th>OD Days</th>
-									<th>Leave Days</th>
-									<th>Absent Days</th>
-									<!--									<th>Attendance Status</th>-->
-									<th>Incharge Name</th>
-									<th>Incharge Mobile Number</th>
-									<th>Incharge Designation</th>
-									<th>Zone</th>
-									<th>Division</th>
-									<th>Department</th>
-									<th>Self Help Group</th>
-								</tr>
-							</tfoot>
-						</table>
-					</div>
-
-
-					<div id="myModal" class="modal" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0, 0, 0, 0.5);">
-						<div class="modal-content" style="position: relative; width: 50%; margin: 10% auto; background: white; padding: 20px; border-radius: 10px;">
-							<!-- Close Button -->
-							<button type="button" class="btn btn-danger close-btn" onclick="closeModal()" style="position: absolute; top: 10px; right: 10px;">&times;</button>
-
-							<h4 id="modalTitle"></h4>
-
-							<!-- Scrollable Table -->
-							<div style="max-height: 300px; overflow-y: auto; border: 1px solid #ddd; padding: 5px;">
-								<table class="table table-striped table-bordered">
-									<thead class="thead-dark">
-									<tr>
-										<th>S.No</th>
-										<th>Dates</th>
-									</tr>
-									</thead>
-									<tbody id="modalTableBody">
-									<!-- Dynamic rows will be added here -->
-									</tbody>
-								</table>
-							</div>
-						</div>
-					</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-
-	<script th:inline="javascript">
-		
-		/*function loadYear(selectedYear) {
-				$.ajax({
-					url: '/gcc/api/nulm/getYear',
-					type: 'GET',
-					success: function (response) {
-						const yearDropdown = $('#year');
-						yearDropdown.empty(); // Clear existing options
-						yearDropdown.append('<option value="">Select Year</option>');
-
-						response.forEach(function (year) {
-							const yearName = year.year; // Correct the attribute name if necessary
-							const isSelected = yearName === selectedYear ? 'selected' : '';
-							yearDropdown.append(new Option(yearName, yearName, false, isSelected));
-						});
-
-						// If no department selected, show "Select Zone"
-						if (!selectedYear) {
-							yearDropdown.val('');
-						}
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching departments:', error);
-					}
-				});
-			}*/
-
-
-			//const selectedYear = /*[[${selectedYear}]]*/ ''; // Get this from Thymeleaf or other server-side context
-			//loadYear(selectedYear);
-
-			/*function loadMonth(selectedMonth) {
-				const year = document.getElementById('year').value; // Get the selected year
-				if (!year) {
-					$('#month').empty().append('<option value="">Select Month</option>'); // Clear month dropdown if no year selected
-					return; // Exit if no year is selected
-				}
-
-				$.ajax({
-					url: `/gcc/api/nulm/getMonth?year=${year}`,
-					type: 'GET',
-					success: function (response) {
-						const monthDropdown = $('#month');
-						monthDropdown.empty(); // Clear existing options
-						monthDropdown.append('<option value="">Select Month</option>');
-
-						response.forEach(function (month) {
-							const monthName = month.month;
-							monthDropdown.append(new Option(monthName, monthName));
-						});
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching months:', error);
-					}
-				});
-			}
-
-			// Load months when the year changes
-			document.getElementById('year').addEventListener('change', function () {
-				loadMonth(); // Call loadMonth when the year is selected
-			});*/
-			
-			function loadDivision(selectedDivision) {
-				const zone=document.getElementById('zone').value;
-				console.log(zone);
-					$.ajax({
-						url: '/gcc/api/nulm/getDivisionList',
-						type: 'GET',
-						data: {
-							zone: zone
-						},
-						success: function (response) {
-							const divisionDropdown = $('#division');
-							divisionDropdown.empty(); // Clear existing options
-							divisionDropdown.append('<option value="">Select Division</option>');
-
-							response.forEach(function (division) {
-								const divisionName = division.division; // Correct the attribute name if necessary
-								const isSelected = divisionName === selectedDivision ? 'selected' : '';
-								divisionDropdown.append(new Option(divisionName, divisionName, false, isSelected));
-							});
-
-							// If no department selected, show "Select Zone"
-							if (!selectedDivision) {
-								divisionDropdown.val('');
-							}
-						},
-						error: function (xhr, status, error) {
-							console.error('Error fetching zone:', error);
-						}
-					});
-				}
-				
-				// Load division when zone selected
-			document.getElementById('zone').addEventListener('change', function () {
-			loadDivision(); // Call loadDivision when the zone is selected
-			});
-
-
-
-		function fetchAttendanceReport() {
-			const zone=document.getElementById('zone').value;
-			const division=document.getElementById('division').value;
-			//const month = document.getElementById('month').value;
-			//const year = document.getElementById('year').value;
-			const groupName=document.getElementById('selfhelp').value;
-			const fromdate=document.getElementById('fromdate').value;
-			const todate=document.getElementById('todate').value;
-			console.log(fromdate);
-			console.log(todate);			
-			
-
-			if (fromdate && todate) {
-				// window.location.href = `/gcc/nulm/attendance-report?groupName=${groupName}&zone=${zone}&division=${division}&fromdate=${fromdate}
-				// &todate=${todate}`;
-				window.location.href = `/gcc/nulm/consolidated-attendance-report?groupName=${groupName}&zone=${zone}&division=${division}&fromdate=${fromdate}
-				&todate=${todate}`;
-			} else {
-				alert("Please select both From date and To date.");
-			}
-		}
-		$(document).ready(function () {
-
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-
-			// Call this on page load to reset the URL
-			clearUrlParams();
-
-			// Initialize DataTable
-			var table = $('#attendancereporttable').DataTable({
-				dom: 'Bftip',
-				columnDefs: [
-					{targets: 'no-sort', orderable: false}
-				],
-				lengthMenu: [
-					[50, 100, 200, 500, -1],
-					['50 rows', '100 rows', '200 rows', 'Show all']
-				],
-				scrollY: '50vh',
-				fixedColumns: {
-					left: 1,
-					right: 1
-				},
-				buttons: [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
-                },
-                orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							doc.content[1].table.widths = ['4%', '8%', '9%', '6%', '6%', '6%', '6%', '6%', '5%', '9%', '9%', '4%', '8%', '8%', '8%'];
-							
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'EXCEL',
-						className: 'btn btn-secondary',
-						id: 'excelBtn'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn'
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-		});
-
-		$(document).ready(function () {
-			$.ajax({
-				url: '/gcc/api/nulm/selfHelpGroups', 
-				type: 'GET',
-				success: function (data) {
-					// Clear existing options (if any)
-					$('#selfhelp').empty().append('<option value="">Select</option>');
-
-					// Check if data is an array and iterate through it
-					if (Array.isArray(data)) {
-						let options = '';
-						data.forEach(function (group) {
-							// Access the correct properties
-							options += `<option value="${group.groupName}">${group.groupName}</option>`;
-						});
-						$('#selfhelp').append(options);
-					} else {
-						console.error("Data is not an array:", data);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching self-help groups:", error);
-				}
-			});
-		});
-
-		function fetchAttendanceDates(type, enrollmentId, fromdate, todate, name) {
-			const apiUrl = `/gcc/api/nulm/attendance-dates?enrollmentId=${enrollmentId}&fromdate=${fromdate}&todate=${todate}&type=${type}`;
-
-			console.log("type="+type);
-			fetch(apiUrl)
-					.then(response => response.json())
-					.then(data => {
-						let dates = data[`${type}Dates`] || [];
-						console.log("dates="+dates);
-						showModal(type, dates, fromdate, todate, name);
-					})
-					.catch(error => {
-						console.error("Error fetching data:", error);
-						alert("Failed to fetch attendance data.");
-					});
-		}
-
-		function showModal(type, dates, fromdate, todate, name) {
-			document.getElementById("modalTitle").innerText = `${type.toUpperCase()} Dates for ${name}, ${fromdate} to ${todate}`;
-
-			let tableBody = document.getElementById("modalTableBody");
-			tableBody.innerHTML = ""; // Clear previous data
-
-			if (dates.length > 0) {
-				dates.forEach((date, index) => {
-					let row = `<tr>
-                <td>${index + 1}</td>
-                <td>${date}</td>
-            </tr>`;
-					tableBody.innerHTML += row;
-				});
-			} else {
-				tableBody.innerHTML = `<tr><td colspan="2">No data available.</td></tr>`;
-			}
-
-			document.getElementById("myModal").style.display = "block";
-		}
-
-		function closeModal() {
-			document.getElementById("myModal").style.display = "none";
-		}
-
-		// Function to open the modal
-		function openModal() {
-			document.getElementById("myModal").style.display = "block";
-		}
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/attendance-report.html.27022025.html b/src/main/resources/templates/modules/nulm/attendance-report.html.27022025.html
deleted file mode 100644
index 958662f0..00000000
--- a/src/main/resources/templates/modules/nulm/attendance-report.html.27022025.html
+++ /dev/null
@@ -1,422 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Attendance Report</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Attendance Report</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row">
-						
-						<div class="col-sm-3">
-							<label for="zone">Zone</label>
-							<select id="zone" class="form-control">
-								<option value="">Select</option>
-								<option value="1">Zone 01</option>
-								<option value="2">Zone 02</option>
-								<option value="3">Zone 03</option>
-								<option value="4">Zone 04</option>
-								<option value="5">Zone 05</option>
-								<option value="6">Zone 06</option>
-								<option value="7">Zone 07</option>
-								<option value="8">Zone 08</option>
-								<option value="9">Zone 09</option>
-								<option value="10">Zone 10</option>
-								<option value="11">Zone 11</option>
-								<option value="12">Zone 12</option>
-								<option value="13">Zone 13</option>
-								<option value="14">Zone 14</option>
-								<option value="15">Zone 15</option>
-							</select>
-						</div>
-						
-						<!-- Division -->
-						<div class="col-md-3 form-group">
-							<label for="division">Division</label>
-							<select class="form-control" id="division" name="division" required>
-								<option value="">Select Division</option>
-								<option th:each="division : ${divisionList}" th:value="${division.division}" th:text="${division.division}"
-									th:selected="${division.division == selectedDivision}">
-								</option>
-							</select>	
-						</div>
-						
-						<!-- Year -->
-						<!--<div class="col-md-3 form-group">
-							<label for="year">Year</label>
-							<select class="form-control" id="year" name="year" required>
-								<option value="">Select Year</option>
-								<option th:each="year : ${yearList}" th:value="${year.year}" th:text="${year.year}"
-									th:selected="${year.year == selectedYear}">
-								</option>
-							</select>
-						</div>
-						
-						 Month 
-						<div class="col-md-3 form-group">
-							<label for="month">Month</label>
-							<select id="month" class="form-control" name="month" required>
-								<option value="">Select Month</option>
-								<option th:each="month : ${monthList}" th:value="${month.month}" th:text="${month.month}"
-									th:selected="${month.month == selectedMonth}">
-								</option>
-							</select>
-						</div>-->
-
-						<div class="col-sm-3">
-							<label for="fromdate">From Date</label>
-							<input type ='date' id = 'fromdate' name= 'fromdate' class="form-control">
-						</div>
-						
-						<div class="col-sm-3">
-							<label for="todate">To Date</label>
-							<input type ='date' id = 'todate' name= 'todate' class="form-control">
-						</div>
-
-						<div class="col-sm-3">
-							<label for="selfhelp">Self Help Group </label>
-							<select id="selfhelp" class="form-control">
-								<option value="">Select</option>
-								<!-- Group names will be populated here -->
-							</select>
-						</div>
-
-
-
-						<div class="col-sm-3">
-
-							<button class="btn btn-primary mt-4" onclick="fetchAttendanceReport()">Get Attendance Details</button>
-						</div>
-					</div>
-
-					<!-- Salary Report Table -->
-					<div class="card-block mt-3">
-						<table id="attendancereporttable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Date</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Attendance Status</th>
-									<th>Incharge Name</th>
-									<th>Incharge Mobile Number</th>
-									<th>Incharge Designation</th>
-									<th>Zone</th>
-									<th>Division</th>
-									<th>Department</th>
-									<th>Self Help Group</th>									
-								</tr>
-							</thead>
-							<tbody>
-								<tr th:each="attendance, i : ${attendanceReport}">
-									<td th:text="${i.count}">1</td>
-									<td th:text="${attendance.attendance_date}"></td>
-									<td th:text="${attendance.emp_id}"></td>
-									<td th:text="${attendance.name}"></td>
-									<td th:text="${attendance.attendance_status}"></td>
-									<td th:text="${attendance.incharge_name}"></td>
-									<td th:text="${attendance.incharge_phoneno}"></td>
-									<td th:text="${attendance.incharge_designation}"></td>
-									<td th:text="${attendance.zone}"></td>
-									<td th:text="${attendance.division}"></td>
-									<td th:text="${attendance.department}"></td>
-									<td th:text="${attendance.group_name}"></td>
-								</tr>
-							</tbody>
-							<tfoot class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Date</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Attendance Status</th>
-									<th>Incharge Name</th>
-									<th>Incharge Mobile Number</th>
-									<th>Incharge Designation</th>
-									<th>Zone</th>
-									<th>Division</th>
-									<th>Department</th>
-									<th>Self Help Group</th>
-								</tr>
-							</tfoot>
-						</table>
-					</div>
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-
-	<script th:inline="javascript">
-		
-		/*function loadYear(selectedYear) {
-				$.ajax({
-					url: '/gcc/api/nulm/getYear',
-					type: 'GET',
-					success: function (response) {
-						const yearDropdown = $('#year');
-						yearDropdown.empty(); // Clear existing options
-						yearDropdown.append('<option value="">Select Year</option>');
-
-						response.forEach(function (year) {
-							const yearName = year.year; // Correct the attribute name if necessary
-							const isSelected = yearName === selectedYear ? 'selected' : '';
-							yearDropdown.append(new Option(yearName, yearName, false, isSelected));
-						});
-
-						// If no department selected, show "Select Zone"
-						if (!selectedYear) {
-							yearDropdown.val('');
-						}
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching departments:', error);
-					}
-				});
-			}*/
-
-
-			//const selectedYear = /*[[${selectedYear}]]*/ ''; // Get this from Thymeleaf or other server-side context
-			//loadYear(selectedYear);
-
-			/*function loadMonth(selectedMonth) {
-				const year = document.getElementById('year').value; // Get the selected year
-				if (!year) {
-					$('#month').empty().append('<option value="">Select Month</option>'); // Clear month dropdown if no year selected
-					return; // Exit if no year is selected
-				}
-
-				$.ajax({
-					url: `/gcc/api/nulm/getMonth?year=${year}`,
-					type: 'GET',
-					success: function (response) {
-						const monthDropdown = $('#month');
-						monthDropdown.empty(); // Clear existing options
-						monthDropdown.append('<option value="">Select Month</option>');
-
-						response.forEach(function (month) {
-							const monthName = month.month;
-							monthDropdown.append(new Option(monthName, monthName));
-						});
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching months:', error);
-					}
-				});
-			}
-
-			// Load months when the year changes
-			document.getElementById('year').addEventListener('change', function () {
-				loadMonth(); // Call loadMonth when the year is selected
-			});*/
-			
-			function loadDivision(selectedDivision) {
-				const zone=document.getElementById('zone').value;
-				console.log(zone);
-					$.ajax({
-						url: '/gcc/api/nulm/getDivisionList',
-						type: 'GET',
-						data: {
-							zone: zone
-						},
-						success: function (response) {
-							const divisionDropdown = $('#division');
-							divisionDropdown.empty(); // Clear existing options
-							divisionDropdown.append('<option value="">Select Division</option>');
-
-							response.forEach(function (division) {
-								const divisionName = division.division; // Correct the attribute name if necessary
-								const isSelected = divisionName === selectedDivision ? 'selected' : '';
-								divisionDropdown.append(new Option(divisionName, divisionName, false, isSelected));
-							});
-
-							// If no department selected, show "Select Zone"
-							if (!selectedDivision) {
-								divisionDropdown.val('');
-							}
-						},
-						error: function (xhr, status, error) {
-							console.error('Error fetching zone:', error);
-						}
-					});
-				}
-				
-				// Load division when zone selected
-			document.getElementById('zone').addEventListener('change', function () {
-			loadDivision(); // Call loadDivision when the zone is selected
-			});
-
-
-
-		function fetchAttendanceReport() {
-			const zone=document.getElementById('zone').value;
-			const division=document.getElementById('division').value;
-			//const month = document.getElementById('month').value;
-			//const year = document.getElementById('year').value;
-			const groupName=document.getElementById('selfhelp').value;
-			const fromdate=document.getElementById('fromdate').value;
-			const todate=document.getElementById('todate').value;
-			console.log(fromdate);
-			console.log(todate);			
-			
-
-			if (fromdate && todate) {
-				//window.location.href = `/gcc/nulm/attendance-report?month=${month}&year=${year}&groupName=${groupName}&zone=${zone}
-				//&division=${division}`;
-				window.location.href = `/gcc/nulm/attendance-report?groupName=${groupName}&zone=${zone}&division=${division}&fromdate=${fromdate}
-				&todate=${todate}`;
-			} else {
-				alert("Please select both From date and To date.");
-			}
-		}
-		$(document).ready(function () {
-
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-
-			// Call this on page load to reset the URL
-			clearUrlParams();
-
-			// Initialize DataTable
-			var table = $('#attendancereporttable').DataTable({
-				dom: 'Bftip',
-				columnDefs: [
-					{targets: 'no-sort', orderable: false}
-				],
-				lengthMenu: [
-					[50, 100, 200, 500, -1],
-					['50 rows', '100 rows', '200 rows', 'Show all']
-				],
-				scrollY: '50vh',
-				fixedColumns: {
-					left: 1,
-					right: 1
-				},
-				buttons: [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
-                },
-                orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A4', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							doc.content[1].table.widths = ['4%', '8%', '6%', '8%', '6%', '8%', '8%', '8%', '4%', '8%', '8%', '8%'];
-							
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'EXCEL',
-						className: 'btn btn-secondary',
-						id: 'excelBtn'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn'
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-
-
-		});
-		$(document).ready(function () {
-			$.ajax({
-				url: '/gcc/api/nulm/selfHelpGroups', 
-				type: 'GET',
-				success: function (data) {
-					// Clear existing options (if any)
-					$('#selfhelp').empty().append('<option value="">Select</option>');
-
-					// Check if data is an array and iterate through it
-					if (Array.isArray(data)) {
-						let options = '';
-						data.forEach(function (group) {
-							// Access the correct properties
-							options += `<option value="${group.groupName}">${group.groupName}</option>`;
-						});
-						$('#selfhelp').append(options);
-					} else {
-						console.error("Data is not an array:", data);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching self-help groups:", error);
-				}
-			});
-		});
-
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/create-order.html b/src/main/resources/templates/modules/nulm/create-order.html
deleted file mode 100644
index 78e068e1..00000000
--- a/src/main/resources/templates/modules/nulm/create-order.html
+++ /dev/null
@@ -1,425 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		label {
-			font-weight: 700;
-			color: #2d5263;
-		}
-
-		
-		.custom-file-upload {
-			position: relative;
-			display: flex;
-			align-items: center;
-			border: 1px solid #d9dde4;
-			border-radius: 5px;
-			padding: 5px;
-			background-color: #f9fafb;
-			cursor: pointer;
-			margin-top: 5px;
-		}
-
-		.custom-file-upload input[type="file"] {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			opacity: 0;
-			cursor: pointer;
-		}
-
-		.custom-file-upload label {
-			display: flex;
-			justify-content: space-between;
-			width: 100%;
-			align-items: center;
-		}
-
-		.upload-text {
-			color: #a6adb5;
-
-			font-weight: 700;
-		}
-
-		.upload-icon i {
-			color: #a6adb5;
-			font-size: 18px;
-		}
-
-		.file-name {
-			margin-left: 10px;
-			color: #414f69;
-			font-size: 14px;
-
-		}
-	</style>
-</head>
-
-<body>
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Create Order</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Create Order</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-					<div class="row align-items-center justify-content-center"
-						style="color: white;background-color:#414f69 ;padding: 10px;">
-						<h3 class="title resizable-content">Create Order</h3>
-					</div>
-					
-
-						<div class="mt-1">
-
-						</div>
-						<!-- Card Section -->
-						<div class="card p-3 resizable-content" style="margin-bottom: 8px;color: #414f69;">
-
-
-							<!-- Add the resizable-content class to the card sections -->
-							<div class="card mb-3 resizable-content">
-								<!--<div class="card-header text-white" style="background-color: #414f69;font-size: large;font-weight: 700;">Order Details
-								</div>-->
-								<div class="card-body">
-									<div class="row">
-										<div class="col-md-6">
-											<label style="font-size: large;font-weight: 700;">Order Number:</label>
-											<input type="text" class="form-control" id="orderNumber" value=""
-												placeholder="Enter Order Number" style="font-size: large;">
-										</div>
-										<div class="col-md-6">
-											<label style="font-size: large;font-weight: 700;">Order Date:</label>
-											<input type="date" class="form-control" id="orderDate" value="" style="font-size: large;">
-										</div>
-										<!--<div class="col-md-6">
-											<label style="font-size: large;font-weight: 700;">Order Given By:</label>
-											<select type="email" class="form-control" id="orderGeneratedBy" value=""
-												 style="font-size: large;">
-												<option value="select">select</option>
-												<option value="council">Council</option>
-												<option value="commissioner">Commissioner</option>
-												</select>
-										</div>-->
-										<div class="col-md-6">
-											<label style="font-size: large;font-weight: 700;">Order Given By:</label>
-											<input type="text" class="form-control" id="orderGeneratedBy" value=""
-												placeholder="Enter Order Given By" style="font-size: large;">
-										</div>									
-										
-										<div class="col-md-6">
-											<label style="font-size: large;font-weight: 700;">Order Description:</label>
-											<textarea class="form-control" id="details" rows="1"
-												placeholder="description..." maxlength="400" style="font-size: large;"></textarea >
-										</div>
-										<div class="col-md-6">
-												<label style="font-size: large;font-weight: 700;">Number Of Staff Required:</label>
-												<input type="number" class="form-control" value=""
-														placeholder="Enter Staff Required..." style="font-size: large;">
-										</div>
-										<div class="col-md-6">
-												<label style="font-size: large;font-weight: 700;">Validity Date:</label>
-												<input type="date" class="form-control" value=""
-														placeholder="Enter Validity date" style="font-size: large;">
-										</div>
-										<div class="col-md-6">
-											<label style="font-size: large;font-weight: 700;">Order Document:</label>
-											<div class="custom-file-upload">
-												<input type="file" id="file-upload" class="form-control"
-													onchange="displayFileName()" style="font-size: large;">
-												<label for="file-upload" id="file-label">
-													<span class="upload-text" id="upload-text">Upload Order
-														Document</span>
-													<span class="upload-icon">
-														<i class="fas fa-file-upload"></i>
-													</span>
-												</label>
-												<span id="file-name" class="file-name"></span>
-											</div>
-										</div>
-										
-										<div class="col-md-6">
-											<label style="font-size: large;font-weight: 700;">Enter Category:</label>
-											<input type="text" class="form-control" id="category" value=""
-												placeholder="Enter Category Name" style="font-size: large;">
-										</div>
-
-
-									</div>
-								</div>
-								<div class="d-flex justify-content-center">
-								    <button class="btn"
-								        style="background-color: #414f69; color: white; width: 200px;padding: 10px;margin-bottom: 10px;"
-								        id="createorder">
-								      Submit
-								    </button>
-								    <button class="btn"
-								        style="background-color: #6c757d; color: white; width: 200px;padding: 10px;margin-bottom: 10px;margin-left: 10px;"
-								        id="viewdetails">
-								        View Details
-								    </button>
-								</div>
-
-								<div id="detailsContainer" style="margin-top: 20px;"></div>
-
-							</div>
-							
-
-
-
-						</div>
-
-
-
-
-					
-
-				</div>
-
-
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-	<div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-<script th:inline="javascript">
-
-    function displayFileName() {
-        const fileInput = document.getElementById('file-upload');
-        const fileNameSpan = document.getElementById('file-name');
-
-        // Validate file
-        const allowedExtensions = ['pdf', 'doc', 'docx', 'png', 'jpg', 'jpeg'];
-        const maxSize = 20 * 1024 * 1024; // 20 MB
-        const file = fileInput.files[0];
-        
-        if (file) {
-            const fileName = file.name;
-            const fileSize = file.size;
-            const fileExtension = fileName.split('.').pop().toLowerCase();
-
-            // Check file type
-            if (!allowedExtensions.includes(fileExtension)) {
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error',
-                    text: 'Unsupported file type! Please upload a PDF, Word, or image file.'
-                });
-                fileInput.value = ''; // Reset the file input
-                fileNameSpan.textContent = '';
-                return;
-            }
-
-            // Check file size
-            if (fileSize > maxSize) {
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error',
-                    text: 'File size exceeds 20MB! Please upload a smaller file.'
-                });
-                fileInput.value = ''; // Reset the file input
-                fileNameSpan.textContent = '';
-                return;
-            }
-
-            fileNameSpan.textContent = fileName; // Show the file name if valid
-        } else {
-            fileNameSpan.textContent = ''; // Reset if no file
-        }
-    }
-
-    $(document).ready(function() {
-        $('#createorder').click(function(e) {
-            e.preventDefault();
-
-            // Get the file input
-            const fileInput = document.getElementById('file-upload');
-            const file = fileInput.files[0];
-
-            // Validate file before proceeding
-            if (file) {
-                const allowedExtensions = ['pdf', 'doc', 'docx', 'png', 'jpg', 'jpeg'];
-                const maxSize = 20 * 1024 * 1024; // 20 MB
-                const fileName = file.name;
-                const fileSize = file.size;
-                const fileExtension = fileName.split('.').pop().toLowerCase();
-
-                // Check file type
-                if (!allowedExtensions.includes(fileExtension)) {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Unsupported file type! Please upload a PDF, Word, or image file.'
-                    });
-                    return;
-                }
-
-                // Check file size
-                if (fileSize > maxSize) {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'File size exceeds 20MB! Please upload a smaller file.'
-                    });
-                    return;
-                }
-            }
-
-            // Create FormData object
-            const formData = new FormData();
-
-            // Append form data
-            formData.append('order_number', document.getElementById('orderNumber').value);
-            formData.append('order_date', document.getElementById('orderDate').value);
-            formData.append('order_generated_by', document.getElementById('orderGeneratedBy').value);
-            formData.append('order_description', document.getElementById('details').value);
-            formData.append('no_of_staffs', document.querySelector('input[placeholder="Enter Staff Required..."]').value);
-            formData.append('validity_date', document.querySelector('input[placeholder="Enter Validity date"]').value);
-            formData.append('category', document.getElementById('category').value);
-
-            // Append file if selected and valid
-            if (file) {
-                formData.append('ordercopyurl', file);
-            }
-
-            // Send AJAX request
-            $.ajax({
-                url: '/gcc/api/nulm/saveOrder',
-                type: 'POST',
-                processData: false,  // Required for FormData
-                contentType: false,  // Required for FormData
-                data: formData,
-                success: function(response) {
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Success',
-                        text: response,
-                    }).then(function() {
-                        location.reload(); // Reload the page after the user clicks 'OK'
-                    });
-                },
-                error: function(xhr, status, error) {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: xhr.responseText || 'An error occurred while saving the order.'
-                    });
-                }
-            });
-        });
-    });
-
-
-    $('#viewdetails').click(function(e) {
-        e.preventDefault();
-
-        $.ajax({
-            url: '/gcc/api/nulm/getAllOrders', // Assuming this is your endpoint for fetching all orders
-            type: 'GET',
-            success: function(data) {
-                displayTable(data);
-            },
-            error: function(xhr, status, error) {
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error',
-                    text: 'Could not retrieve order details'
-                });
-            }
-        });
-    });
-
-	function displayTable(data) {
-	    console.log(data);  // Inspect the structure of the API response
-
-	    let tableHtml = `
-	         <table class="table table-bordered">
-            <thead>
-                <tr>
-                    <th>Order Number</th>
-                    <th>Order Date</th>
-                    <th>Order Given By</th>
-                    <th>Order Description</th>
-                    <th>Number Of Staffs</th>
-                    <th>Validity Date</th>
-                    <th>Appointed</th>
-                    <th>Available</th>
-                    <th>Category</th>
-                </tr>
-            </thead>
-            <tbody>
-	    `;
-
-	    data.forEach(item => {
-			
-			 const imageUrl = `/gcc/api/nulm/getOrderDocument/${item.order_copy_url}`;
-	        tableHtml += `
-	            <tr>
-	                <td>${item.order_number || ''}</td>
-	                <td>${item.order_date || ''}</td>
-	                <td>${item.order_generated_by || ''}</td>
-	                <td>${item.order_description || ''}</td>
-	                <td>${item.no_of_staffs || ''}</td>
-	                <td>${item.validity_date || ''}</td>
-	                <td>${item.appointed_yes_count || 0}</td>
-	                <td>${item.output_value || 0}</td>
-	                <td>${item.category || 0}</td>
-	              
-	            </tr>
-	        `;
-	    });
-
-	    tableHtml += `
-	            </tbody>
-	        </table>
-	    `;
-
-	    document.getElementById('detailsContainer').innerHTML = tableHtml;
-	}
-
-
-</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/dropout.html b/src/main/resources/templates/modules/nulm/dropout.html
deleted file mode 100644
index 4cde5427..00000000
--- a/src/main/resources/templates/modules/nulm/dropout.html
+++ /dev/null
@@ -1,334 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-
-<body>
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>DropOut</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">DropOut</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-					<div class="row align-items-center justify-content-center"
-						style="color: white;background-color:#414f69 ;padding: 10px;">
-						<h3 class="title resizable-content">DropOut</h3>
-					</div>
-
-
-
-					<!-- Card Section -->
-					<div class="card mt-5 p-3 resizable-content" style="margin-bottom: 8px;color: #414f69;">
-
-
-						<!-- Add the resizable-content class to the card sections -->
-						<div class="card mb-3 resizable-content">
-
-							<div class="card-body">
-								<div class="row">
-									<div class="col-md-6 d-flex justify-content-between align-items-center">
-										<label
-											style="font-size: large; font-weight: 700; color: #414f69;">Order:</label>
-										<select id="orderNumberDropdown" class="form-control"
-											style="font-size: large; width: 70%;">
-											<option value="">Select Order</option>
-										</select>
-									</div>
-								</div>
-
-								<div class="mt-3" id="orderDetails" style="display: none;">
-									<div class="card-block" style="text-align:center;">
-										<div id="chart" class="row">
-											<div class="col-sm-12 col-lg-4">
-												<div class="card" style="height: 100px;">
-													<div class="card-body">
-														<h5 class="card-title" style="font-size:14px;">Total Staff</h5>
-														<p class="card-text" id="total"
-															style="font-size:large; font-weight: bold;">0</p>
-													</div>
-												</div>
-											</div>
-											<div class="col-sm-12 col-lg-4">
-												<div class="card" style="height: 100px;">
-													<div class="card-body">
-														<h5 class="card-title" style="font-size:14px;">Appointed</h5>
-														<p class="card-text" id="pending"
-															style="font-size: large;font-weight: bold;">0</p>
-													</div>
-												</div>
-											</div>
-											<div class="col-sm-12 col-lg-4">
-												<div class="card" style="height: 100px;">
-													<div class="card-body">
-														<h5 class="card-title" style="font-size:14px;">DropOut
-														</h5>
-														<p class="card-text" id="notappointed"
-															style="font-size: large;font-weight: bold;">0</p>
-													</div>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-
-								<br>
-								<div class="row" id="groupboxsection" style="display:none">
-									<div class="col-md-6 d-flex justify-content-between align-items-center">
-
-										<label
-											style="font-size: large; font-weight: 700; color: #414f69;">Self Help Group:</label>
-										<select id="grouplist" class="form-control"
-											style="font-size: large; width: 70%;">
-											<option value="">Select Group</option>
-										</select>
-									</div>
-								</div>
-
-								<!-- Appointment Date Section (Initially Hidden) -->
-								<div class="row mt-3" id="appointmentSection" style="display: none;">
-									<div class="col-md-6 d-flex align-items-center">
-										<label
-											style="font-size: large; font-weight: 700; color: #414f69; width: 30%;">DropOut
-											Date:</label>
-										<input type="date" id="appointmentDate" class="form-control"
-											style="font-size: large; width: 70%;">
-									</div>
-								</div>
-
-								<!-- Orders Table Section (Initially Hidden) -->
-								<div class="row mt-3" id="ordersTableSection" style="display: none;">
-									<div class="col-md-12">
-										<table class="table table-bordered">
-											<thead>
-												<tr>
-													<th style="width: 10%;">
-														<input type="checkbox" id="selectAll">
-													</th>
-													<th style="width: 30%;">Name</th>
-													<th style="width: 30%;">Phone Number</th>
-													<th style="width: 30%;">Address</th>
-													<th style="width: 30%;">Education Qualification</th>
-												</tr>
-											</thead>
-											<tbody id="ordersTableBody">
-												<!-- Table rows will be populated here -->
-											</tbody>
-										</table>
-									</div>
-								</div>
-								
-
-							</div>
-						</div>
-						<div class="d-flex justify-content-center">
-							<button class="btn"
-								style="background-color: #414f69; color: white; width: 200px;padding: 10px;margin-bottom: 10px;"
-								id="createorder">
-								Create DropOut
-							</button>
-						</div>
-
-					</div>
-
-
-
-
-				</div>
-
-
-
-			</div>
-
-
-	
-		<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-	</div>
-	</div>
-	<div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-	<script th:inline="javascript">
-$(document).ready(function() {
-    // Function to load order details
-    function loadOrderDetails() {
-        $.ajax({
-            url: '/gcc/api/nulm/getAllOrderDetails', // Updated Endpoint URL
-            method: 'GET',
-            dataType: 'json',
-            success: function(data) {
-                var $dropdown = $('#orderNumberDropdown');
-                $dropdown.empty();
-                $dropdown.append('<option value="">Select Order</option>');
-                $.each(data, function(index, order) {
-                    $dropdown.append('<option value="' + order.order_id + '">' + order.order_number + '</option>');
-                });
-            },
-            error: function(xhr, status, error) {
-                console.error('Error fetching order details:', error);
-            }
-        });
-    }
-
-    // Load order details when the document is ready
-    loadOrderDetails();
-
-    // Handle order number selection
-   $('#orderNumberDropdown').change(function() {
-        var orderId = $(this).val();
-        var $orderDetails = $('#orderDetails');
-        var $groupBoxSection = $('#groupboxsection');
-
-        if (orderId) {
-            // Display the order details and group section
-            $orderDetails.show();
-            $groupBoxSection.show();
-
-            // Fetch group names based on selected order ID
-            $.ajax({
-                url: '/gcc/api/nulm/getSchemeGroupNamesByOrderId',
-                method: 'GET',
-                data: { orderId: orderId },
-                dataType: 'json',
-                success: function(data) {
-                    console.log('Group names data:', data); // Log the response to check if it’s correct
-
-                    var $groupDropdown = $('#grouplist');  // Ensure you are updating the correct dropdown
-                    $groupDropdown.empty(); // Clear the dropdown before appending new options
-                    $groupDropdown.append('<option value="">Select Scheme Group</option>');
-
-                    // Check if data is an array and has the expected structure
-                    if (Array.isArray(data) && data.length > 0) {
-                        $.each(data, function(index, group) {
-                            $groupDropdown.append('<option value="' + group.group_id + '">' + group.group_name + '</option>');
-                        });
-                    } else {
-                        console.error('No group names available');
-                    }
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error fetching group names:', error);
-                }
-            });
-
-            // Fetch the enrollment counts based on the selected order ID
-            $.ajax({
-                url: '/gcc/api/nulm/dropOutCounts',
-                method: 'GET',
-                data: { orderId: orderId },
-                dataType: 'json',
-                success: function(counts) {
-                    // Update the values in the cards
-                    $('#total').text(counts.total_count || 0);
-                    $('#pending').text(counts.total_yes || 0);
-                    $('#notappointed').text(counts.total_drop || 0);
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error fetching enrollment counts:', error);
-                }
-            });
-        } else {
-            // Hide the order details and group section if no order is selected
-            $orderDetails.hide();
-            $groupBoxSection.hide();
-        }
-    });
-});
-$(document).ready(function() {
-    $('#createorder').click(function() {
-        var totalstaff = parseInt($('#total').text(), 10); // Convert total staff to an integer
-        var selectedEnrollments = [];
-        var orderId = parseInt($('#orderNumberDropdown').val(), 10); // Ensure orderId is an integer
-
-        $('.order-checkbox:checked').each(function() {
-            selectedEnrollments.push(parseInt($(this).val(), 10)); // Ensure enrollmentIds are integers
-        });
-
-        if (selectedEnrollments.length > totalstaff) {
-            // Show SweetAlert if the number of selected enrollments exceeds the total staff count
-            Swal.fire({
-                icon: 'warning',
-                title: 'Limit Exceeded',
-                text: `For this order, only ${totalstaff} staff members are allowed.`
-            });
-        } else {
-            // Proceed with the order creation logic
-            $.ajax({
-                url: '/gcc/api/nulm/assignDropout',
-                method: 'POST',
-                contentType: 'application/json', // Set the content type to JSON
-                data: JSON.stringify({
-                    enrollmentIds: selectedEnrollments,
-                    orderId: orderId
-                }), // Convert the data to JSON string
-                success: function(response) {
-                    // Show SweetAlert on success
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Order Dropped',
-                        text: 'The order has been dropped out.',
-                        confirmButtonText: 'OK'
-                    }).then((result) => {
-                        if (result.isConfirmed) {
-                            // Reload the page after SweetAlert is confirmed
-                            location.reload();
-                        }
-                    });
-                },
-                error: function(xhr, status, error) {
-                    // Show error message using SweetAlert
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'An error occurred while creating the order. Please try again later.'
-                    });
-                    console.error('Error creating order:', error);
-                }
-            });
-        }
-    });
-});
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/nulm-payment.html b/src/main/resources/templates/modules/nulm/nulm-payment.html
deleted file mode 100644
index b0e719fb..00000000
--- a/src/main/resources/templates/modules/nulm/nulm-payment.html
+++ /dev/null
@@ -1,241 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		label {
-			font-weight: 700;
-			color: #2d5263;
-		}
-
-
-
-		.checkbox-label {
-			display: block;
-			margin-bottom: 10px;
-			font-size: 16px;
-		}
-
-		
-		.custom-file-upload {
-			position: relative;
-			display: flex;
-			align-items: center;
-			border: 1px solid #d9dde4;
-			border-radius: 5px;
-			padding: 5px;
-			background-color: #f9fafb;
-			cursor: pointer;
-			margin-top: 5px;
-		}
-
-		.custom-file-upload input[type="file"] {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			opacity: 0;
-			cursor: pointer;
-		}
-
-		.custom-file-upload label {
-			display: flex;
-			justify-content: space-between;
-			width: 100%;
-			align-items: center;
-		}
-
-		.upload-icon i {
-			color: #a6adb5;
-			font-size: 18px;
-		}
-
-		.file-name {
-			margin-left: 10px;
-			color: #414f69;
-			font-size: 14px;
-		}
-
-		#upload-text {
-			color: #a7adb5;
-
-		}
-	</style>
-</head>
-
-<body>
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>NULM Payment</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">NULM Payment</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-					<div class="row align-items-center justify-content-center"
-						style="color: white;background-color:#414f69 ;padding: 10px;">
-						<h3 class="title resizable-content">NULM Payment</h3>
-					</div>
-					<!-- Add the resizable-content class to the card sections -->
-					<div class="card mb-3 mt-4 resizable-content">
-						<!--<div class="card-header text-white" style="background-color: #414f69;">Personal Information's
-                                </div>-->
-                                
-						<div class="card-body">								
-							
-							<div class="row">						
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-								    <label style="font-size: large;font-weight: 700;color: #414f69;">Name:</label>
-								    <div class="col-md-6" style="margin-right: 32%;">
-								    <input type="text" id="staff-name-input" class="form-control" placeholder="Enter Name..." style="font-size: large;margin-bottom: 15px;">
-								</div>
-								</div>
-						</div>						
-						
-							
-							<div class="row">		
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-								    <label style="font-size: large;font-weight: 700;color: #414f69;">Mobile Number:</label>
-								    <div class="col-md-6" style="margin-right: 32%;">
-								    <input type="text" id="mobile-number" class="form-control" placeholder="Enter Mobile Number..." style="font-size: large;margin-bottom: 15px;">
-								</div>
-								</div>
-							</div>
-							<div class="row">
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-								    <label style="font-size: large;font-weight: 700;color: #414f69;">Type of Fine Category:</label>
-								    <div class="col-md-6" style="margin-right: 32%;">
-								    <input type="text" id="category" class="form-control" placeholder="Enter Fine Category..." style="font-size: large;margin-bottom: 15px;">
-								</div>
-								</div>
-							</div>
-							<div class="row">
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-								    <label style="font-size: large;font-weight: 700;color: #414f69;">Category Fine Amount:</label>
-								    <div class="col-md-6" style="margin-right: 32%;">
-								    <input type="text" id="amount" class="form-control" placeholder="Enter the Category Fine Amount..." style="font-size: large;margin-bottom: 15px;" pattern="\d{10}" maxlength="10" minlength="10">
-								</div>	
-								</div>							
-							</div>
-
-								<!-- Update other input fields similarly -->
-				
-							</div>							
-	
-								
-								<div class="d-flex justify-content-center">
-							<button class="btn"
-								style="background-color: #414f69; color: white; width: 200px;padding: 10px;margin-bottom: 10px;"
-								id="staffenroll">
-								Payment
-							</button>
-						</div>						
-							
-
-						</div>
-						
-
-					</div>
-
-
-				</div>
-
-
-			
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-	<div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-<script th:inline="javascript">
-	
-	$(document).ready(function() {
-			$("#staffenroll").click(function() {
-				// Get input values
-				let name = $("#staff-name-input").val().trim();
-				let mobileNumber = $("#mobile-number").val().trim();
-				let category = $("#category").val().trim();
-				let amount = $("#amount").val().trim();
-
-				// Check if any of the required fields are empty
-				if (name === "" || mobileNumber === "" || category === "") {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Category fine amount is not entered!'
-					});
-				} else if (amount === "") {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Warning',
-						text: 'Please enter the Category Fine Amount.'
-					});
-				} else {
-					// Simulate AJAX success response
-					$.ajax({
-						type: "POST",
-						url: "#", // No actual API endpoint
-						data: {
-							name: name,
-							mobileNumber: mobileNumber,
-							category: category,
-							amount: amount
-						},
-						success: function() {
-							Swal.fire({
-								icon: 'success',
-								title: 'Success',
-								text: 'Category fine amount updated successfully!'
-							});
-						}
-					});
-				}
-			});
-		});
-  
-
-
-</script>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/salary-approve-park.html b/src/main/resources/templates/modules/nulm/salary-approve-park.html
deleted file mode 100644
index a6879b9d..00000000
--- a/src/main/resources/templates/modules/nulm/salary-approve-park.html
+++ /dev/null
@@ -1,394 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head th:replace="~{fragments/modules/base/head :: head}">
-    <!-- Include Bootstrap CSS for styling the modal -->
-    <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet">
-</head>
-
-<body>
-    <div class="wrapper">
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <div class="page-wrap">
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-6">
-                                <div class="page-header-title">
-                                    <i class="ik ik-thumbs-up bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Park STAFF</h5>
-                                        <span>Salary Approval</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-6">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item">
-                                            <a href="/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item active" aria-current="page">Park Salary Approval</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                    <hr>
-                    
-                    <div class="row">
-                        <div class="col-sm-3">
-                            <label for="month">Month:</label>
-                            <select id="month" class="form-control" required>
-                                <option value="">Select</option>
-                                <option value="January">January</option>
-                                <option value="February">February</option>
-                                <option value="March">March</option>
-                                <option value="April">April</option>
-                                <option value="May">May</option>
-                                <option value="June">June</option>
-                                <option value="July">July</option>
-                                <option value="August">August</option>
-                                <option value="September">September</option>
-                                <option value="October">October</option>
-                                <option value="November">November</option>
-                                <option value="December">December</option>
-                            </select>
-                        </div>
-
-                        <div class="col-sm-3">
-                            <label for="year">Year:</label>
-                            <input type="number" id="year" class="form-control" min="2000" max="2100" required>
-                        </div>
-
-                        <div class="col-sm-3">
-                            <label for="salaryStatus">Salary Status:</label>
-                            <select id="salaryStatus" class="form-control">
-                                <option value="">Select</option>
-                                <option value="Initiated">Initiated</option>
-                                <option value="Approved">Approved</option>
-                            </select>
-                        </div>
-
-                        <div class="col-sm-3">
-                            <button class="btn btn-primary mt-4" onclick="fetchSalaryReport()">Get Salary Info</button>
-                        </div>
-                    </div>
-                    
-					<div class="card-block mt-4">
-    <div>
-        <table id="salaryDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-            <thead class="thead-dark">
-                <tr role="row">
-                    <th>S.No</th>
-                    <th>Incharge Name</th>
-                    <th>Total Staff Count</th>
-                    <th>Salary Processed</th>
-                    <th>Total Salary Amount</th>
-                    <th>Salary Status</th>
-                    <th>Action</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr th:each="salaryInitiatedCounts, i : ${salaryInitiatedCounts}">
-                    <td th:text="${i.count}">0</td>
-                    <td th:text="${salaryInitiatedCounts.incharge_name}"></td>
-                    
-                    <!-- Make the Total Staff Count clickable -->
-                    <td>
-                        <a href="#" class="total-staff-count" 
-                           th:data-incharge-id="${salaryInitiatedCounts.incharge_id}" 
-                           th:data-month="${salaryInitiatedCounts.month}" 
-                           th:data-year="${salaryInitiatedCounts.year}"
-                           th:data-incharge-name="${salaryInitiatedCounts.incharge_name}"
-                           th:data-zone="${salaryInitiatedCounts.zone}"
-                           th:data-enrollment-ids="${salaryInitiatedCounts.enrollment_ids}"
-                           th:text="${salaryInitiatedCounts.total_staff_count}" 
-                           data-toggle="modal" data-target="#shgModal">
-                        </a>
-                    </td>
-                    
-                    <td th:text="${salaryInitiatedCounts.total_approved_count}"></td>
-                    <td th:text="${salaryInitiatedCounts.total_salary_amount}"></td>
-                    <td th:text="${salaryInitiatedCounts.salary_status}"></td>                   
-                        <td>
-							 <span th:if="${salaryInitiatedCounts.salary_status == 'Approved'}" class="badge badge-success">Approved</span>
-						    <button th:if="${salaryInitiatedCounts.salary_status == 'Initiated'}"
-						            class="btn btn-primary approve-btn"
-						            th:data-enrollment-ids="${salaryInitiatedCounts.enrollment_ids}"
-						            th:data-month="${salaryInitiatedCounts.month}"
-						            th:data-year="${salaryInitiatedCounts.year}">
-						        Approve
-						    </button>
-						</td>
-                </tr>
-            </tbody>
-            <tfoot class="thead-dark">
-                <tr>
-                    <th>S.No</th>
-                    <th>Incharge Name</th>
-                    <th>Total Staff Count</th>
-                    <th>Salary Processed</th>
-                    <th>Total Salary Amount</th>
-                    <th>Salary Status</th>
-                    <th>Action</th>
-                </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-
-<!-- Modal for displaying staff details -->
-<div class="modal fade" id="shgModal" tabindex="-1" role="dialog" aria-labelledby="shgModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-xl" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="shgModalLabel">Staff Details</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <!-- Table for displaying attendance details -->
-                <div id="attendanceDetailsContainer">
-                    <h5>Attendance Details</h5>
-                    <table class="table table-striped">
-                        <thead>
-                            <tr>
-                                <th>S.No</th>
-                                <th>Employee ID</th>
-                                <th>Name</th>
-                                <th>Year</th>
-                                <th>Month</th>
-                                <th>Total Days Present</th>
-                                <th>Total Days Absent</th>
-                                <th>Total Days OD</th>
-                                <th>Total Days Salary</th>
-                                <th>Total Salary</th>
-                                <th>Salary Status</th>
-                            </tr>
-                        </thead>
-                        <tbody id="attendanceDetailsTableBody">
-                            <!-- Dynamic content will be loaded here -->
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-                    
-                </div>
-                
-            </div>
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            <div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-		
-
-            <script th:replace="~{fragments/modules/base/script :: script}"></script>
-            <script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-            <script th:inline="javascript">
-				
-	function fetchSalaryReport() {
-        const month = document.getElementById('month').value;
-        const year = document.getElementById('year').value;
-        const salaryStatus = document.getElementById('salaryStatus').value;
-
-        if (month && year) {
-            window.location.href = `/gcc/nulm/salary-approve-park?month=${month}&year=${year}&salaryStatus=${salaryStatus}`;
-        } else {
-            alert("Please select both month and year.");
-        }
-    }
-				$(document).ready(function () {
-					
-	function clearUrlParams() {
-        const currentUrl = window.location.href;
-        const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-        window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-    }
-
-    // Call this on page load to reset the URL
-    clearUrlParams();
-    
-    // Initialize DataTable
-    var table = $('#salaryDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        fixedColumns: {
-            left: 1,
-            right: 1
-        },
-        buttons: [
-            {
-                extend: 'pageLength',
-                className: 'btn btn-warning'
-            },
-            {
-                title: 'Data export',
-                extend: 'copyHtml5',
-                text: 'Copy',
-                className: 'btn btn-secondary',
-                id: 'copyBtn',
-                columns: [0,1,2,3,4,5]
-            },
-            {
-                extend: 'pdfHtml5',
-                text: 'PDF',
-                className: 'btn btn-secondary',
-                id: 'pdfBtn',
-                exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5]
-                }
-            },
-            /*
-            {
-                extend: 'excelHtml5',
-                text: 'EXCEL',
-                className: 'btn btn-secondary',
-                id: 'excelBtn'
-            },
-            {
-                extend: 'csvHtml5',
-                text: 'CSV',
-                className: 'btn btn-secondary',
-                id: 'csvBtn'
-            }*/
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-    // Handle total-staff-count click event
-    $('.total-staff-count').on('click', function (event) {
-        event.preventDefault(); // Prevent default anchor click behavior
-
-        // Get inchargeName and month from the clicked element's data attributes
-       // var inchargeName = $(this).data('incharge-name');
-        var inchargeId = $(this).data('incharge-id')
-        var month = $(this).data('month')
-        var year = $(this).data('year')
-        var inchargeName = $(this).data('incharge-name')
-        var zone = $(this).data('zone');
-        var enrollmentIds = $(this).data('enrollment-ids');
-        console.log(zone);
-        console.log(inchargeName);
-        // Make the AJAX call to fetch attendance details
-        $.ajax({
-            url: '/gcc/api/nulm/staffInititeadList-park',
-            method: 'GET',
-            data: {
-                //inchargeName: inchargeName,
-                inchargeId: inchargeId,
-                month: month,
-                year: year,
-                inchargeName: inchargeName,
-                enrollmentIds: enrollmentIds.join(',')
-            },
-            success: function (data) {
-                // Populate the modal's table with the fetched data
-                var tbody = $('#attendanceDetailsTableBody');
-                tbody.empty(); // Clear any previous data
-
-                // Loop through the data and append rows to the table
-                $.each(data, function (index, item) {
-                    var row = `<tr>
-                                    <td>${index + 1}</td>
-                                    <td>${item.emp_id}</td>
-                                    <td>${item.name}</td>
-                                    <td>${item.year}</td>
-                                    <td>${item.month}</td>
-                                    <td>${item.total_days_present}</td>
-                                    <td>${item.total_days_absent}</td>
-                                    <td>${item.total_days_od}</td>
-                                    <td>${item.total_days_salary}</td>
-                                    <td>${item.total_salary}</td>
-                                    <td>${item.salary_status}</td>
-                                </tr>`;
-                    tbody.append(row);
-                });
-
-                // Show the modal after data is populated
-                $('#shgModal').modal('show');
-            },
-            error: function (xhr, status, error) {
-                console.error('Failed to fetch data:', error);
-                alert('Failed to load staff details. Please try again.');
-            }
-        });
-    });
-    
-   $(document).on('click', '.approve-btn', function () {
-    var enrollmentIds = $(this).data('enrollment-ids'); // Get the data attribute
-    var month = $(this).data('month');
-    var year = $(this).data('year');
-
-    // Confirm the action with SweetAlert
-    Swal.fire({
-        title: 'Are you sure?',
-        text: 'Do you want to approve the selected enrollments?',
-        icon: 'warning',
-        showCancelButton: true,
-        confirmButtonColor: '#3085d6',
-        cancelButtonColor: '#d33',
-        confirmButtonText: 'Yes, approve it!'
-    }).then((result) => {
-        if (result.isConfirmed) {
-            // Make the AJAX call
-            $.ajax({
-                url: '/gcc/api/nulm/update-salary-status-park',
-                method: 'POST',
-                contentType: 'application/x-www-form-urlencoded',
-                data: {
-                    // Pass the enrollment IDs as a comma-separated string
-                    enrollmentIds: enrollmentIds.join(','), // Convert array to a comma-separated string
-                    month: month,
-                    year: year
-                },
-                success: function (response) {
-                    Swal.fire(
-                        'Approved!',
-                        response,
-                        'success'
-                    );
-                    // Optionally refresh the table or update the UI
-                    location.reload();
-                },
-                error: function (xhr, status, error) {
-                    console.error('Failed to approve:', error);
-                    Swal.fire(
-                        'Error!',
-                        'Failed to approve the selected enrollments. Please try again.',
-                        'error'
-                    );
-                }
-            });
-        }
-    });
-});
-
-});
-
-            </script>
-        </div>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/salary-approve.html b/src/main/resources/templates/modules/nulm/salary-approve.html
deleted file mode 100644
index 10e3ac98..00000000
--- a/src/main/resources/templates/modules/nulm/salary-approve.html
+++ /dev/null
@@ -1,394 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head th:replace="~{fragments/modules/base/head :: head}">
-    <!-- Include Bootstrap CSS for styling the modal -->
-    <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet">
-</head>
-
-<body>
-    <div class="wrapper">
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <div class="page-wrap">
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-6">
-                                <div class="page-header-title">
-                                    <i class="ik ik-thumbs-up bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>NULM STAFF</h5>
-                                        <span>Salary Approval</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-6">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item">
-                                            <a href="/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item active" aria-current="page">Salary Approval</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                    <hr>
-                    
-                    <div class="row">
-                        <div class="col-sm-3">
-                            <label for="month">Month:</label>
-                            <select id="month" class="form-control" required>
-                                <option value="">Select</option>
-                                <option value="January">January</option>
-                                <option value="February">February</option>
-                                <option value="March">March</option>
-                                <option value="April">April</option>
-                                <option value="May">May</option>
-                                <option value="June">June</option>
-                                <option value="July">July</option>
-                                <option value="August">August</option>
-                                <option value="September">September</option>
-                                <option value="October">October</option>
-                                <option value="November">November</option>
-                                <option value="December">December</option>
-                            </select>
-                        </div>
-
-                        <div class="col-sm-3">
-                            <label for="year">Year:</label>
-                            <input type="number" id="year" class="form-control" min="2000" max="2100" required>
-                        </div>
-
-                        <div class="col-sm-3">
-                            <label for="salaryStatus">Salary Status:</label>
-                            <select id="salaryStatus" class="form-control">
-                                <option value="">Select</option>
-                                <option value="Initiated">Initiated</option>
-                                <option value="Approved">Approved</option>
-                            </select>
-                        </div>
-
-                        <div class="col-sm-3">
-                            <button class="btn btn-primary mt-4" onclick="fetchSalaryReport()">Get Salary Info</button>
-                        </div>
-                    </div>
-                    
-					<div class="card-block mt-4">
-    <div>
-        <table id="salaryDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-            <thead class="thead-dark">
-                <tr role="row">
-                    <th>S.No</th>
-                    <th>Incharge Name</th>
-                    <th>Total Staff Count</th>
-                    <th>Salary Processed</th>
-                    <th>Total Salary Amount</th>
-                    <th>Salary Status</th>
-                    <th>Action</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr th:each="salaryInitiatedCounts, i : ${salaryInitiatedCounts}">
-                    <td th:text="${i.count}">0</td>
-                    <td th:text="${salaryInitiatedCounts.incharge_name}"></td>
-                    
-                    <!-- Make the Total Staff Count clickable -->
-                    <td>
-                        <a href="#" class="total-staff-count" 
-                           th:data-incharge-id="${salaryInitiatedCounts.incharge_id}" 
-                           th:data-month="${salaryInitiatedCounts.month}" 
-                           th:data-year="${salaryInitiatedCounts.year}"
-                           th:data-incharge-name="${salaryInitiatedCounts.incharge_name}"
-                           th:data-zone="${salaryInitiatedCounts.zone}"
-                           th:data-enrollment-ids="${salaryInitiatedCounts.enrollment_ids}"
-                           th:text="${salaryInitiatedCounts.total_staff_count}" 
-                           data-toggle="modal" data-target="#shgModal">
-                        </a>
-                    </td>
-                    
-                    <td th:text="${salaryInitiatedCounts.total_approved_count}"></td>
-                    <td th:text="${salaryInitiatedCounts.total_salary_amount}"></td>
-                    <td th:text="${salaryInitiatedCounts.salary_status}"></td>                   
-                        <td>
-							 <span th:if="${salaryInitiatedCounts.salary_status == 'Approved'}" class="badge badge-success">Approved</span>
-						    <button th:if="${salaryInitiatedCounts.salary_status == 'Initiated'}"
-						            class="btn btn-primary approve-btn"
-						            th:data-enrollment-ids="${salaryInitiatedCounts.enrollment_ids}"
-						            th:data-month="${salaryInitiatedCounts.month}"
-						            th:data-year="${salaryInitiatedCounts.year}">
-						        Approve
-						    </button>
-						</td>
-                </tr>
-            </tbody>
-            <tfoot class="thead-dark">
-                <tr>
-                    <th>S.No</th>
-                    <th>Incharge Name</th>
-                    <th>Total Staff Count</th>
-                    <th>Salary Processed</th>
-                    <th>Total Salary Amount</th>
-                    <th>Salary Status</th>
-                    <th>Action</th>
-                </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-
-<!-- Modal for displaying staff details -->
-<div class="modal fade" id="shgModal" tabindex="-1" role="dialog" aria-labelledby="shgModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-xl" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="shgModalLabel">Staff Details</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <!-- Table for displaying attendance details -->
-                <div id="attendanceDetailsContainer">
-                    <h5>Attendance Details</h5>
-                    <table class="table table-striped">
-                        <thead>
-                            <tr>
-                                <th>S.No</th>
-                                <th>Employee ID</th>
-                                <th>Name</th>
-                                <th>Year</th>
-                                <th>Month</th>
-                                <th>Total Days Present</th>
-                                <th>Total Days Absent</th>
-                                <th>Total Days OD</th>
-                                <th>Total Days Salary</th>
-                                <th>Total Salary</th>
-                                <th>Salary Status</th>
-                            </tr>
-                        </thead>
-                        <tbody id="attendanceDetailsTableBody">
-                            <!-- Dynamic content will be loaded here -->
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-                    
-                </div>
-                
-            </div>
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            <div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-		
-
-            <script th:replace="~{fragments/modules/base/script :: script}"></script>
-            <script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-            <script th:inline="javascript">
-				
-	function fetchSalaryReport() {
-        const month = document.getElementById('month').value;
-        const year = document.getElementById('year').value;
-        const salaryStatus = document.getElementById('salaryStatus').value;
-
-        if (month && year) {
-            window.location.href = `/gcc/nulm/salary-approve?month=${month}&year=${year}&salaryStatus=${salaryStatus}`;
-        } else {
-            alert("Please select both month and year.");
-        }
-    }
-				$(document).ready(function () {
-					
-	function clearUrlParams() {
-        const currentUrl = window.location.href;
-        const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-        window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-    }
-
-    // Call this on page load to reset the URL
-    clearUrlParams();
-    
-    // Initialize DataTable
-    var table = $('#salaryDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        fixedColumns: {
-            left: 1,
-            right: 1
-        },
-        buttons: [
-            {
-                extend: 'pageLength',
-                className: 'btn btn-warning'
-            },
-            {
-                title: 'Data export',
-                extend: 'copyHtml5',
-                text: 'Copy',
-                className: 'btn btn-secondary',
-                id: 'copyBtn',
-                columns: [0,1,2,3,4,5]
-            },
-            {
-                extend: 'pdfHtml5',
-                text: 'PDF',
-                className: 'btn btn-secondary',
-                id: 'pdfBtn',
-                exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5]
-                }
-            },
-            /*
-            {
-                extend: 'excelHtml5',
-                text: 'EXCEL',
-                className: 'btn btn-secondary',
-                id: 'excelBtn'
-            },
-            {
-                extend: 'csvHtml5',
-                text: 'CSV',
-                className: 'btn btn-secondary',
-                id: 'csvBtn'
-            }*/
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-    // Handle total-staff-count click event
-    $('.total-staff-count').on('click', function (event) {
-        event.preventDefault(); // Prevent default anchor click behavior
-
-        // Get inchargeName and month from the clicked element's data attributes
-       // var inchargeName = $(this).data('incharge-name');
-        var inchargeId = $(this).data('incharge-id')
-        var month = $(this).data('month')
-        var year = $(this).data('year')
-        var inchargeName = $(this).data('incharge-name')
-        var zone = $(this).data('zone');
-        var enrollmentIds = $(this).data('enrollment-ids');
-        console.log(zone);
-        console.log(inchargeName);
-        // Make the AJAX call to fetch attendance details
-        $.ajax({
-            url: '/gcc/api/nulm/staffInititeadList',
-            method: 'GET',
-            data: {
-                //inchargeName: inchargeName,
-                inchargeId: inchargeId,
-                month: month,
-                year: year,
-                inchargeName: inchargeName,
-                enrollmentIds: enrollmentIds.join(',')
-            },
-            success: function (data) {
-                // Populate the modal's table with the fetched data
-                var tbody = $('#attendanceDetailsTableBody');
-                tbody.empty(); // Clear any previous data
-
-                // Loop through the data and append rows to the table
-                $.each(data, function (index, item) {
-                    var row = `<tr>
-                                    <td>${index + 1}</td>
-                                    <td>${item.emp_id}</td>
-                                    <td>${item.name}</td>
-                                    <td>${item.year}</td>
-                                    <td>${item.month}</td>
-                                    <td>${item.total_days_present}</td>
-                                    <td>${item.total_days_absent}</td>
-                                    <td>${item.total_days_od}</td>
-                                    <td>${item.total_days_salary}</td>
-                                    <td>${item.total_salary}</td>
-                                    <td>${item.salary_status}</td>
-                                </tr>`;
-                    tbody.append(row);
-                });
-
-                // Show the modal after data is populated
-                $('#shgModal').modal('show');
-            },
-            error: function (xhr, status, error) {
-                console.error('Failed to fetch data:', error);
-                alert('Failed to load staff details. Please try again.');
-            }
-        });
-    });
-    
-   $(document).on('click', '.approve-btn', function () {
-    var enrollmentIds = $(this).data('enrollment-ids'); // Get the data attribute
-    var month = $(this).data('month');
-    var year = $(this).data('year');
-
-    // Confirm the action with SweetAlert
-    Swal.fire({
-        title: 'Are you sure?',
-        text: 'Do you want to approve the selected enrollments?',
-        icon: 'warning',
-        showCancelButton: true,
-        confirmButtonColor: '#3085d6',
-        cancelButtonColor: '#d33',
-        confirmButtonText: 'Yes, approve it!'
-    }).then((result) => {
-        if (result.isConfirmed) {
-            // Make the AJAX call
-            $.ajax({
-                url: '/gcc/api/nulm/update-salary-status',
-                method: 'POST',
-                contentType: 'application/x-www-form-urlencoded',
-                data: {
-                    // Pass the enrollment IDs as a comma-separated string
-                    enrollmentIds: enrollmentIds.join(','), // Convert array to a comma-separated string
-                    month: month,
-                    year: year
-                },
-                success: function (response) {
-                    Swal.fire(
-                        'Approved!',
-                        response,
-                        'success'
-                    );
-                    // Optionally refresh the table or update the UI
-                    location.reload();
-                },
-                error: function (xhr, status, error) {
-                    console.error('Failed to approve:', error);
-                    Swal.fire(
-                        'Error!',
-                        'Failed to approve the selected enrollments. Please try again.',
-                        'error'
-                    );
-                }
-            });
-        }
-    });
-});
-
-});
-
-            </script>
-        </div>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/salary-details.html b/src/main/resources/templates/modules/nulm/salary-details.html
deleted file mode 100644
index 99d74d7c..00000000
--- a/src/main/resources/templates/modules/nulm/salary-details.html
+++ /dev/null
@@ -1,312 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-</head>
-
-<body>
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Salary Details</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Salary Details</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-					<div class="row">
-                        <div class="col-sm-3">
-                            <label for="month">Month:</label>
-                            <select id="month" class="form-control" required>
-                                <option value="">Select</option>
-                                <option value="January">January</option>
-                                <option value="February">February</option>
-                                <option value="March">March</option>
-                                <option value="April">April</option>
-                                <option value="May">May</option>
-                                <option value="June">June</option>
-                                <option value="July">July</option>
-                                <option value="August">August</option>
-                                <option value="September">September</option>
-                                <option value="October">October</option>
-                                <option value="November">November</option>
-                                <option value="December">December</option>
-                            </select>
-                        </div>
-
-                        <div class="col-sm-3">
-                            <label for="year">Year:</label>
-                            <input type="number" id="year" class="form-control" min="2000" max="2100" required>
-                        </div>
-
-                        <div class="col-sm-3">
-                            <button class="btn btn-primary mt-4" onclick="fetchSalaryDetails()">Get Salary Info</button>
-                        </div>
-                    </div>
-                    <div class="card-block mt-3">
-                        <div>
-                            <table id="salaryDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                <thead class="thead-dark">
-                                    <tr role="row">
-                                        <th>S.No</th>
-							            <th>Employee Name</th>
-							            <th>Total Number of days</th>
-							            <th>Number of days present</th>
-							            <th>Number of days Absent</th>
-							            <th>OD</th>
-							            <th>Total Days for the Salary</th>
-							            <th>Month</th>
-							            <th>Year</th>
-							            <th>Salary Amount</th>
-							            <th><input type="checkbox" id="selectAll"> Action</th>
-                                    </tr>
-                                    
-                                </thead>
-                                 <tbody>
-                                     <tr th:each="salaryCounts, i : ${salaryCounts}">
-                                      <td th:text="${i.count}">0</td>
-                                        <td th:text="${salaryCounts.name}"></td>
-                                        <td th:text="${salaryCounts.total_days}"></td>
-                                        <td th:text="${salaryCounts.total_days_present}"></td>
-                                        <td th:text="${salaryCounts.total_days_absent}"></td>
-                                        <td th:text="${salaryCounts.total_days_od}"></td>
-                                        <td th:text="${salaryCounts.total_days_salary}"></td>
-                                        <td th:text="${salaryCounts.month}"></td>
-                                        <td th:text="${salaryCounts.year}"></td>
-                                        <td th:text="${salaryCounts.total_salary}"></td>
-                                        <td>
-										    <!-- Show "Approved" badge if salary_status is 'Approved' -->
-										    <span th:if="${salaryCounts.salary_status == 'Approved'}" class="badge badge-primary">Approved</span>
-										
-										    <!-- Show "Initiated" badge if salary_status is 'Initiated' -->
-										    <span th:if="${salaryCounts.salary_status == 'Initiated'}" class="badge badge-success">Initiated</span>
-										
-										    <!-- Show checkbox if salary_status is neither 'Approved' nor 'Initiated' -->
-										    <input type="checkbox" th:unless="${salaryCounts.salary_status == 'Approved' || salaryCounts.salary_status == 'Initiated'}"
-										           class="initiate-checkbox"
-										           th:data-enrollment-id="${salaryCounts.enrollment_id}"
-										           th:data-total-days-present="${salaryCounts.total_days_present}"
-										           th:data-total-days-od="${salaryCounts.total_days_od}"
-										           th:data-total-days="${salaryCounts.total_days}"
-										           th:data-total-days-absent="${salaryCounts.total_days_absent}"
-										           th:data-month="${salaryCounts.month}"
-										           th:data-year="${salaryCounts.year}"
-										           th:data-salary-amount="${salaryCounts.total_salary}"
-										           th:data-salary-status="${salaryCounts.salary_status}"
-										           th:data-group-id="${salaryCounts.group_id}"
-										           th:data-wage-id="${salaryCounts.wage_id}">
-										</td>
-                                    </tr>
-                                </tbody>
-                                <tfoot class="thead-dark">
-                                    <tr role="row">
-                                        <th>S.No</th>
-							            <th>Employee Name</th>
-							            <th>Total Number of days</th>
-							            <th>Number of days present</th>
-							            <th>Number of days Absent</th>
-							            <th>OD</th>
-							            <th>Total Days for the Salary</th>
-							            <th>Month</th>
-							            <th>Year</th>
-							            <th>Salary Amount</th>
-							            <th>Action</th>
-                                    </tr>                                   
-                                </tfoot>
-                            </table>
-                            <button id="initiateButton" class="btn btn-success">Initiate</button>
-                        </div>
-                    </div>
-						
-
-					</div>
-
-
-				</div>
-
-
-			
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-	<div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-<script th:inline="javascript">
-	
-	function fetchSalaryDetails() {
-        const month = document.getElementById('month').value;
-        const year = document.getElementById('year').value;
-
-        if (month && year) {
-            window.location.href = `/gcc/nulm/salaryDetails?month=${month}&year=${year}`;
-        } else {
-            alert("Please select both month and year.");
-        }
-    }
-
-
-$(document).ready(function () {
-    // Initialize DataTable
-    var table = $('#salaryDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        fixedColumns: {
-            left: 1,
-            right: 1
-        },
-        buttons: [
-            {
-                extend: 'pageLength',
-                className: 'btn btn-warning'
-            },
-            {
-                title: 'Data export',
-                extend: 'copyHtml5',
-                text: 'Copy',
-                className: 'btn btn-secondary',
-                id: 'copyBtn'
-            },
-            {
-                extend: 'pdfHtml5',
-                text: 'PDF',
-                className: 'btn btn-secondary',
-                id: 'pdfBtn'
-            }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-    // Handle "Select All" checkbox change event
-    $("#selectAll").on('change', function () {
-        $(".initiate-checkbox").prop('checked', this.checked);
-    });
-
-    // Handle individual checkboxes change event to update the "Select All" checkbox
-    $(".initiate-checkbox").on('change', function () {
-        if ($('.initiate-checkbox:checked').length === $('.initiate-checkbox').length) {
-            $('#selectAll').prop('checked', true);
-        } else {
-            $('#selectAll').prop('checked', false);
-        }
-    });
-
-    // Approve button click event
-    $("#initiateButton").click(function (event){
-		event.preventDefault();
-        // Collect selected row data
-        let selectedRows = [];
-		$(".initiate-checkbox:checked").each(function () {
-		    const enrollmentId = $(this).data("enrollment-id");
-		    const totalDaysPresent = $(this).data("total-days-present");
-		    const totalDaysOd = $(this).data("total-days-od");
-		    const totalDays = $(this).data("total-days");
-		    const totalDaysAbsent = $(this).data("total-days-absent");
-		    const month = $(this).data("month");
-		    const year = $(this).data("year");
-		    const salaryAmount = $(this).data("salary-amount");
-		    const salaryStatus = $(this).data("salary-status");
-		    const groupId = $(this).data("group-id");
-		    const wageId = $(this).data("wage-id");
-		
-		    selectedRows.push({
-		        enrollment_id: parseInt(enrollmentId),
-		        total_days_present: parseInt(totalDaysPresent),
-		        total_days_od: parseInt(totalDaysOd),
-		        total_days: parseInt(totalDays),
-		        total_days_absent: parseInt(totalDaysAbsent),
-		        month: month,
-		        year: parseInt(year),
-		        salary_amount: parseInt(salaryAmount),
-		        salary_status: salaryStatus,
-		        group_id: parseInt(groupId),
-		        wage_id: parseInt(wageId)
-		    });
-		});
-
-        // If no rows are selected, show an alert
-        if (selectedRows.length === 0) {
-            alert("Please select at least one row to approve.");
-            return;
-        }
-
-        // Send AJAX POST request using jQuery
-       $.ajax({
-    url: "/gcc/api/nulm/salaryDetailUpdate",
-    type: "POST",
-    contentType: "application/json",
-    data: JSON.stringify(selectedRows), // Send array of objects
-    success: function (response) {
-        Swal.fire({
-            title: 'Success!',
-            text: 'Selected Staffs for Salary has been Initited successfully!',
-            icon: 'success',
-            confirmButtonText: 'OK'
-        }).then((result) => {
-            if (result.isConfirmed) {
-                // Optionally, you could refresh the page or update the UI to reflect the changes
-                location.reload(); // This will reload the page to fetch the latest data
-            }
-        });
-    },
-    error: function (xhr, status, error) {
-        console.error("Error:", error);
-        alert("An error occurred while approving salary details.");
-    }
-});
-    });
-})
-
-</script>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/salary-nonInitiatedreport-park.html b/src/main/resources/templates/modules/nulm/salary-nonInitiatedreport-park.html
deleted file mode 100644
index dabdefba..00000000
--- a/src/main/resources/templates/modules/nulm/salary-nonInitiatedreport-park.html
+++ /dev/null
@@ -1,358 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Park STAFF</h5>
-										<span>Park Salary Not Initiated Report</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Salary NotInitiated Report</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row">
-						
-						<!-- Year -->
-						<div class="col-md-3 form-group">
-							<label for="year">Year</label>
-							<select class="form-control" id="year" name="year" required>
-								<option value="">Select Year</option>
-								<option th:each="year : ${yearList}" th:value="${year.year}" th:text="${year.year}"
-									th:selected="${year.year == selectedYear}">
-								</option>
-							</select>
-						</div>
-						
-						<!-- Month -->
-						<div class="col-md-3 form-group">
-							<label for="month">Month</label>
-							<select id="month" class="form-control" name="month" required>
-								<option value="">Select Month</option>
-								<option th:each="month : ${monthList}" th:value="${month.month}" th:text="${month.month}"
-									th:selected="${month.month == selectedMonth}">
-								</option>
-							</select>
-						</div>
-
-						
-
-						<!--<div class="col-sm-3">
-							<label for="salaryStatus">Salary Status:</label>
-							<select id="salaryStatus" class="form-control">
-								<option value="">Select</option>
-								<option value="Initiated">Initiated</option>
-								<option value="Approved">Approved</option>
-								<option value="NonInitiated">Non Initiated</option>
-							</select>
-						</div>-->
-
-						<div class="col-sm-3" style="display: none;">
-							<label for="selfhelp">Self Help Group:</label>
-							<select id="selfhelp" class="form-control">
-								<option value="">Select</option>
-								<!-- Group names will be populated here -->
-							</select>
-						</div>
-
-
-
-						<div class="col-sm-3">
-
-							<button class="btn btn-primary mt-4" onclick="fetchSalaryReport()">Get List</button>
-						</div>
-					</div>
-
-					<!-- Salary Report Table -->
-					<div class="card-block mt-3">
-						<table id="salaryreporttable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Employee Designation</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Incharge Phone No</th>
-									<th>Self Help Group</th>
-									<!--<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>-->
-								</tr>
-							</thead>
-							<tbody>
-								<tr th:each="salary, i : ${salaryNonInitiatedReport}">
-									<td th:text="${i.count}">1</td>
-									<td th:text="${salary.emp_id}"></td>
-									<td th:text="${salary.name}"></td>
-									<td th:text="${salary.designation}"></td>
-									<td th:text="${salary.incharge_name}"></td>
-									<td th:text="${salary.incharge_designation}"></td>
-									<td th:text="${salary.incharge_phoneno}"></td>
-									<td th:text="${salary.group_name}"></td>
-									<!--<td th:text="${salary.total_days_present}"></td>
-									<td th:text="${salary.total_days_od}"></td>
-									<td th:text="${salary.total_days_salary}"></td>
-									<td th:text="${salary.total_days}"></td>
-									<td th:text="${salary.total_days_absent}"></td>
-									<td th:text="${salary.imonth}"></td>
-									<td th:text="${salary.iyear}"></td>
-									<td th:text="${salary.total_salary}"></td>
-									<td th:text="${salary.salary_status}"></td>-->
-								</tr>
-							</tbody>
-							<tfoot class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Employee Designation</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Incharge Phone No</th>
-									<th>Self Help Group</th>
-									<!--<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>-->
-								</tr>
-							</tfoot>
-						</table>
-					</div>
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-
-	<script th:inline="javascript">
-		
-		function loadYear(selectedYear) {
-			    $.ajax({
-			        url: '/gcc/api/nulm/getYear',
-			        type: 'GET',
-			        success: function (response) {
-			            const yearDropdown = $('#year');
-			            yearDropdown.empty(); // Clear existing options
-			            yearDropdown.append('<option value="">Select Year</option>');
-			
-			            response.forEach(function (year) {
-			                const yearName = year.year; // Correct the attribute name if necessary
-			                const isSelected = yearName === selectedYear ? 'selected' : '';
-			                yearDropdown.append(new Option(yearName, yearName, false, isSelected));
-			            });
-			
-			            // If no department selected, show "Select Zone"
-			            if (!selectedYear) {
-			                yearDropdown.val('');
-			            }
-			        },
-			        error: function (xhr, status, error) {
-			            console.error('Error fetching departments:', error);
-			        }
-			    });
-			}
-
-        
-        const selectedYear = /*[[${selectedYear}]]*/ ''; // Get this from Thymeleaf or other server-side context
-        loadYear(selectedYear);        
-             
-        function loadMonth(selectedMonth) {
-        const year = document.getElementById('year').value; // Get the selected year
-        if (!year) {
-            $('#month').empty().append('<option value="">Select Month</option>'); // Clear month dropdown if no year selected
-            return; // Exit if no year is selected
-        }
-        
-        $.ajax({
-            url: `/gcc/api/nulm/getMonth?year=${year}`, 
-            type: 'GET',
-            success: function (response) {
-                const monthDropdown = $('#month');
-                monthDropdown.empty(); // Clear existing options
-                monthDropdown.append('<option value="">Select Month</option>');
-
-                response.forEach(function (month) {
-                    const monthName = month.month; 
-                    monthDropdown.append(new Option(monthName, monthName));
-                });
-            },
-            error: function (xhr, status, error) {
-                console.error('Error fetching months:', error);
-            }
-        });
-    }
-
-    // Load months when the year changes
-    document.getElementById('year').addEventListener('change', function() {
-        loadMonth(); // Call loadMonth when the year is selected
-    });
-
-		function fetchSalaryReport() {
-			const month = document.getElementById('month').value;
-			const year = document.getElementById('year').value;
-			const groupName=encodeURIComponent(document.getElementById('selfhelp').value);
-
-			if (month && year) {
-				window.location.href = `/gcc/nulm/salary-nonInitiated-park?month=${month}&year=${year}&groupName=${groupName}`;
-			} else {
-				alert("Please select both month and year.");
-			}
-		}
-		$(document).ready(function () {
-
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-
-			// Call this on page load to reset the URL
-			clearUrlParams();
-
-			// Initialize DataTable
-			var table = $('#salaryreporttable').DataTable({
-				dom: 'Bftip',
-				columnDefs: [
-					{targets: 'no-sort', orderable: false}
-				],
-				lengthMenu: [
-					[50, 100, 200, 500, -1],
-					['50 rows', '100 rows', '200 rows', 'Show all']
-				],
-				scrollY: '50vh',
-				fixedColumns: {
-					left: 1,
-					right: 1
-				},
-				buttons: [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5, 6, 7]
-                },
-                orientation: 'potrait', // Change to landscape for more horizontal space
-						pageSize: 'A4', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							doc.content[1].table.widths = ['5%', '10%', '15%', '15%', '15%', '15%', '15%', '15%'];
-
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'EXCEL',
-						className: 'btn btn-secondary',
-						id: 'excelBtn'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn'
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-
-
-		});
-		$(document).ready(function () {
-			$.ajax({
-				url: '/gcc/api/nulm/selfHelpGroups', // Your API endpoint
-				type: 'GET',
-				success: function (data) {
-					// Clear existing options (if any)
-					$('#selfhelp').empty().append('<option value="">Select</option>');
-
-					// Check if data is an array and iterate through it
-					if (Array.isArray(data)) {
-						let options = '';
-						data.forEach(function (group) {
-							// Access the correct properties
-							options += `<option value="${group.groupName}">${group.groupName}</option>`;
-						});
-						$('#selfhelp').append(options);
-					} else {
-						console.error("Data is not an array:", data);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching self-help groups:", error);
-				}
-			});
-		});
-
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/salary-nonInitiatedreport.html b/src/main/resources/templates/modules/nulm/salary-nonInitiatedreport.html
deleted file mode 100644
index edac9b40..00000000
--- a/src/main/resources/templates/modules/nulm/salary-nonInitiatedreport.html
+++ /dev/null
@@ -1,358 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Salary Not Initiated Report</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Salary Not Initiated Report</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row">
-						
-						<!-- Year -->
-						<div class="col-md-3 form-group">
-							<label for="year">Year</label>
-							<select class="form-control" id="year" name="year" required>
-								<option value="">Select Year</option>
-								<option th:each="year : ${yearList}" th:value="${year.year}" th:text="${year.year}"
-									th:selected="${year.year == selectedYear}">
-								</option>
-							</select>
-						</div>
-						
-						<!-- Month -->
-						<div class="col-md-3 form-group">
-							<label for="month">Month</label>
-							<select id="month" class="form-control" name="month" required>
-								<option value="">Select Month</option>
-								<option th:each="month : ${monthList}" th:value="${month.month}" th:text="${month.month}"
-									th:selected="${month.month == selectedMonth}">
-								</option>
-							</select>
-						</div>
-
-						
-
-						<!--<div class="col-sm-3">
-							<label for="salaryStatus">Salary Status:</label>
-							<select id="salaryStatus" class="form-control">
-								<option value="">Select</option>
-								<option value="Initiated">Initiated</option>
-								<option value="Approved">Approved</option>
-								<option value="NonInitiated">Non Initiated</option>
-							</select>
-						</div>-->
-
-						<div class="col-sm-3">
-							<label for="selfhelp">Self Help Group:</label>
-							<select id="selfhelp" class="form-control">
-								<option value="">Select</option>
-								<!-- Group names will be populated here -->
-							</select>
-						</div>
-
-
-
-						<div class="col-sm-3">
-
-							<button class="btn btn-primary mt-4" onclick="fetchSalaryReport()">Get List</button>
-						</div>
-					</div>
-
-					<!-- Salary Report Table -->
-					<div class="card-block mt-3">
-						<table id="salaryreporttable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Employee Designation</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Incharge Phone No</th>
-									<th>Self Help Group</th>
-									<!--<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>-->
-								</tr>
-							</thead>
-							<tbody>
-								<tr th:each="salary, i : ${salaryNonInitiatedReport}">
-									<td th:text="${i.count}">1</td>
-									<td th:text="${salary.emp_id}"></td>
-									<td th:text="${salary.name}"></td>
-									<td th:text="${salary.designation}"></td>
-									<td th:text="${salary.incharge_name}"></td>
-									<td th:text="${salary.incharge_designation}"></td>
-									<td th:text="${salary.incharge_phoneno}"></td>
-									<td th:text="${salary.group_name}"></td>
-									<!--<td th:text="${salary.total_days_present}"></td>
-									<td th:text="${salary.total_days_od}"></td>
-									<td th:text="${salary.total_days_salary}"></td>
-									<td th:text="${salary.total_days}"></td>
-									<td th:text="${salary.total_days_absent}"></td>
-									<td th:text="${salary.imonth}"></td>
-									<td th:text="${salary.iyear}"></td>
-									<td th:text="${salary.total_salary}"></td>
-									<td th:text="${salary.salary_status}"></td>-->
-								</tr>
-							</tbody>
-							<tfoot class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Employee Designation</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Incharge Phone No</th>
-									<th>Self Help Group</th>
-									<!--<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>-->
-								</tr>
-							</tfoot>
-						</table>
-					</div>
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-
-	<script th:inline="javascript">
-		
-		function loadYear(selectedYear) {
-			    $.ajax({
-			        url: '/gcc/api/nulm/getYear',
-			        type: 'GET',
-			        success: function (response) {
-			            const yearDropdown = $('#year');
-			            yearDropdown.empty(); // Clear existing options
-			            yearDropdown.append('<option value="">Select Year</option>');
-			
-			            response.forEach(function (year) {
-			                const yearName = year.year; // Correct the attribute name if necessary
-			                const isSelected = yearName === selectedYear ? 'selected' : '';
-			                yearDropdown.append(new Option(yearName, yearName, false, isSelected));
-			            });
-			
-			            // If no department selected, show "Select Zone"
-			            if (!selectedYear) {
-			                yearDropdown.val('');
-			            }
-			        },
-			        error: function (xhr, status, error) {
-			            console.error('Error fetching departments:', error);
-			        }
-			    });
-			}
-
-        
-        const selectedYear = /*[[${selectedYear}]]*/ ''; // Get this from Thymeleaf or other server-side context
-        loadYear(selectedYear);        
-             
-        function loadMonth(selectedMonth) {
-        const year = document.getElementById('year').value; // Get the selected year
-        if (!year) {
-            $('#month').empty().append('<option value="">Select Month</option>'); // Clear month dropdown if no year selected
-            return; // Exit if no year is selected
-        }
-        
-        $.ajax({
-            url: `/gcc/api/nulm/getMonth?year=${year}`, 
-            type: 'GET',
-            success: function (response) {
-                const monthDropdown = $('#month');
-                monthDropdown.empty(); // Clear existing options
-                monthDropdown.append('<option value="">Select Month</option>');
-
-                response.forEach(function (month) {
-                    const monthName = month.month; 
-                    monthDropdown.append(new Option(monthName, monthName));
-                });
-            },
-            error: function (xhr, status, error) {
-                console.error('Error fetching months:', error);
-            }
-        });
-    }
-
-    // Load months when the year changes
-    document.getElementById('year').addEventListener('change', function() {
-        loadMonth(); // Call loadMonth when the year is selected
-    });
-
-		function fetchSalaryReport() {
-			const month = document.getElementById('month').value;
-			const year = document.getElementById('year').value;
-			const groupName=encodeURIComponent(document.getElementById('selfhelp').value);
-
-			if (month && year) {
-				window.location.href = `/gcc/nulm/salary-nonInitiated?month=${month}&year=${year}&groupName=${groupName}`;
-			} else {
-				alert("Please select both month and year.");
-			}
-		}
-		$(document).ready(function () {
-
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-
-			// Call this on page load to reset the URL
-			clearUrlParams();
-
-			// Initialize DataTable
-			var table = $('#salaryreporttable').DataTable({
-				dom: 'Bftip',
-				columnDefs: [
-					{targets: 'no-sort', orderable: false}
-				],
-				lengthMenu: [
-					[50, 100, 200, 500, -1],
-					['50 rows', '100 rows', '200 rows', 'Show all']
-				],
-				scrollY: '50vh',
-				fixedColumns: {
-					left: 1,
-					right: 1
-				},
-				buttons: [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5, 6, 7]
-                },
-                orientation: 'potrait', // Change to landscape for more horizontal space
-						pageSize: 'A4', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							doc.content[1].table.widths = ['5%', '10%', '15%', '15%', '15%', '15%', '15%', '15%'];
-
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'EXCEL',
-						className: 'btn btn-secondary',
-						id: 'excelBtn'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn'
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-
-
-		});
-		$(document).ready(function () {
-			$.ajax({
-				url: '/gcc/api/nulm/selfHelpGroups', // Your API endpoint
-				type: 'GET',
-				success: function (data) {
-					// Clear existing options (if any)
-					$('#selfhelp').empty().append('<option value="">Select</option>');
-
-					// Check if data is an array and iterate through it
-					if (Array.isArray(data)) {
-						let options = '';
-						data.forEach(function (group) {
-							// Access the correct properties
-							options += `<option value="${group.groupName}">${group.groupName}</option>`;
-						});
-						$('#selfhelp').append(options);
-					} else {
-						console.error("Data is not an array:", data);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching self-help groups:", error);
-				}
-			});
-		});
-
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/salary-report-park.html b/src/main/resources/templates/modules/nulm/salary-report-park.html
deleted file mode 100644
index b72c07c9..00000000
--- a/src/main/resources/templates/modules/nulm/salary-report-park.html
+++ /dev/null
@@ -1,274 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Park STAFF</h5>
-										<span>Salary Report</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Salary Report Park</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row">
-						<div class="col-sm-3">
-							<label for="month">Month:</label>
-							<select id="month" class="form-control" required>
-								<option value="">Select</option>
-								<option value="January">January</option>
-								<option value="February">February</option>
-								<option value="March">March</option>
-								<option value="April">April</option>
-								<option value="May">May</option>
-								<option value="June">June</option>
-								<option value="July">July</option>
-								<option value="August">August</option>
-								<option value="September">September</option>
-								<option value="October">October</option>
-								<option value="November">November</option>
-								<option value="December">December</option>
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="year">Year:</label>
-							<input type="number" id="year" class="form-control" min="2000" max="2100" required>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="salaryStatus">Salary Status:</label>
-							<select id="salaryStatus" class="form-control">
-								<option value="">Select</option>
-								<option value="Initiated">Initiated</option>
-								<option value="Approved">Approved</option>
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="selfhelp">Self Help Group:</label>
-							<select id="selfhelp" class="form-control">
-								<option value="">Select</option>
-								<!-- Group names will be populated here -->
-							</select>
-						</div>
-
-
-
-						<div class="col-sm-3">
-
-							<button class="btn btn-primary mt-4" onclick="fetchSalaryReport()">Get Salary Info</button>
-						</div>
-					</div>
-
-					<!-- Salary Report Table -->
-					<div class="card-block mt-3">
-						<table id="salaryreporttable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Employee Designation</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Self Help Group</th>
-									<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr th:each="salary, i : ${salaryReport}">
-									<td th:text="${i.count}">1</td>
-									<td th:text="${salary.emp_id}"></td>
-									<td th:text="${salary.name}"></td>
-									<td th:text="${salary.designation}"></td>
-									<td th:text="${salary.incharge_name}"></td>
-									<td th:text="${salary.incharge_designation}"></td>
-									<td th:text="${salary.group_name}"></td>
-									<td th:text="${salary.total_days_present}"></td>
-									<td th:text="${salary.total_days_od}"></td>
-									<td th:text="${salary.total_days_salary}"></td>
-									<td th:text="${salary.total_days}"></td>
-									<td th:text="${salary.total_days_absent}"></td>
-									<td th:text="${salary.imonth}"></td>
-									<td th:text="${salary.iyear}"></td>
-									<td th:text="${salary.total_salary}"></td>
-									<td th:text="${salary.salary_status}"></td>
-								</tr>
-							</tbody>
-							<tfoot class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Employee Designation</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Self Help Group</th>
-									<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>
-								</tr>
-							</tfoot>
-						</table>
-					</div>
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-
-	<script th:inline="javascript">
-
-		function fetchSalaryReport() {
-			const month = document.getElementById('month').value;
-			const year = document.getElementById('year').value;
-			const salaryStatus = document.getElementById('salaryStatus').value;
-			const groupName=document.getElementById('selfhelp').value;
-
-			if (month && year) {
-				window.location.href = `/gcc/nulm/salary-report-park?month=${month}&year=${year}&salaryStatus=${salaryStatus}&groupName=${groupName}`;
-			} else {
-				alert("Please select both month and year.");
-			}
-		}
-		$(document).ready(function () {
-
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-
-			// Call this on page load to reset the URL
-			clearUrlParams();
-
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-                },
-                orientation: 'landscape', // Change to landscape for more horizontal space
-    			pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-    			customize: function (doc) {
-        		// Custom column widths for better fit
-        		//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-        
-        		// Optional: Adjust font size if needed
-        		doc.styles.tableBodyEven.alignment = 'center';
-        		doc.styles.tableBodyOdd.alignment = 'center';
-    			}
-			}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-
-
-		});
-		$(document).ready(function () {
-			$.ajax({
-				url: '/gcc/api/nulm/selfHelpGroups', // Your API endpoint
-				type: 'GET',
-				success: function (data) {
-					// Clear existing options (if any)
-					$('#selfhelp').empty().append('<option value="">Select</option>');
-
-					// Check if data is an array and iterate through it
-					if (Array.isArray(data)) {
-						let options = '';
-						data.forEach(function (group) {
-							// Access the correct properties
-							options += `<option value="${group.groupName}">${group.groupName}</option>`;
-						});
-						$('#selfhelp').append(options);
-					} else {
-						console.error("Data is not an array:", data);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching self-help groups:", error);
-				}
-			});
-		});
-
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/salary-report.html b/src/main/resources/templates/modules/nulm/salary-report.html
deleted file mode 100644
index 47cd8f8d..00000000
--- a/src/main/resources/templates/modules/nulm/salary-report.html
+++ /dev/null
@@ -1,274 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Salary Report</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Salary Report</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row">
-						<div class="col-sm-3">
-							<label for="month">Month:</label>
-							<select id="month" class="form-control" required>
-								<option value="">Select</option>
-								<option value="January">January</option>
-								<option value="February">February</option>
-								<option value="March">March</option>
-								<option value="April">April</option>
-								<option value="May">May</option>
-								<option value="June">June</option>
-								<option value="July">July</option>
-								<option value="August">August</option>
-								<option value="September">September</option>
-								<option value="October">October</option>
-								<option value="November">November</option>
-								<option value="December">December</option>
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="year">Year:</label>
-							<input type="number" id="year" class="form-control" min="2000" max="2100" required>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="salaryStatus">Salary Status:</label>
-							<select id="salaryStatus" class="form-control">
-								<option value="">Select</option>
-								<option value="Initiated">Initiated</option>
-								<option value="Approved">Approved</option>
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="selfhelp">Self Help Group:</label>
-							<select id="selfhelp" class="form-control">
-								<option value="">Select</option>
-								<!-- Group names will be populated here -->
-							</select>
-						</div>
-
-
-
-						<div class="col-sm-3">
-
-							<button class="btn btn-primary mt-4" onclick="fetchSalaryReport()">Get Salary Info</button>
-						</div>
-					</div>
-
-					<!-- Salary Report Table -->
-					<div class="card-block mt-3">
-						<table id="salaryreporttable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Employee Designation</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Self Help Group</th>
-									<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr th:each="salary, i : ${salaryReport}">
-									<td th:text="${i.count}">1</td>
-									<td th:text="${salary.emp_id}"></td>
-									<td th:text="${salary.name}"></td>
-									<td th:text="${salary.designation}"></td>
-									<td th:text="${salary.incharge_name}"></td>
-									<td th:text="${salary.incharge_designation}"></td>
-									<td th:text="${salary.group_name}"></td>
-									<td th:text="${salary.total_days_present}"></td>
-									<td th:text="${salary.total_days_od}"></td>
-									<td th:text="${salary.total_days_salary}"></td>
-									<td th:text="${salary.total_days}"></td>
-									<td th:text="${salary.total_days_absent}"></td>
-									<td th:text="${salary.imonth}"></td>
-									<td th:text="${salary.iyear}"></td>
-									<td th:text="${salary.total_salary}"></td>
-									<td th:text="${salary.salary_status}"></td>
-								</tr>
-							</tbody>
-							<tfoot class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Employee Designation</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Self Help Group</th>
-									<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>
-								</tr>
-							</tfoot>
-						</table>
-					</div>
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-
-	<script th:inline="javascript">
-
-		function fetchSalaryReport() {
-			const month = document.getElementById('month').value;
-			const year = document.getElementById('year').value;
-			const salaryStatus = document.getElementById('salaryStatus').value;
-			const groupName=document.getElementById('selfhelp').value;
-
-			if (month && year) {
-				window.location.href = `/gcc/nulm/salary-report?month=${month}&year=${year}&salaryStatus=${salaryStatus}&groupName=${groupName}`;
-			} else {
-				alert("Please select both month and year.");
-			}
-		}
-		$(document).ready(function () {
-
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-
-			// Call this on page load to reset the URL
-			clearUrlParams();
-
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-                },
-                orientation: 'landscape', // Change to landscape for more horizontal space
-    			pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-    			customize: function (doc) {
-        		// Custom column widths for better fit
-        		//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-        
-        		// Optional: Adjust font size if needed
-        		doc.styles.tableBodyEven.alignment = 'center';
-        		doc.styles.tableBodyOdd.alignment = 'center';
-    			}
-			}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-
-
-		});
-		$(document).ready(function () {
-			$.ajax({
-				url: '/gcc/api/nulm/selfHelpGroups', // Your API endpoint
-				type: 'GET',
-				success: function (data) {
-					// Clear existing options (if any)
-					$('#selfhelp').empty().append('<option value="">Select</option>');
-
-					// Check if data is an array and iterate through it
-					if (Array.isArray(data)) {
-						let options = '';
-						data.forEach(function (group) {
-							// Access the correct properties
-							options += `<option value="${group.groupName}">${group.groupName}</option>`;
-						});
-						$('#selfhelp').append(options);
-					} else {
-						console.error("Data is not an array:", data);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching self-help groups:", error);
-				}
-			});
-		});
-
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/scheme-group.html b/src/main/resources/templates/modules/nulm/scheme-group.html
deleted file mode 100644
index 213b043e..00000000
--- a/src/main/resources/templates/modules/nulm/scheme-group.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-    
-</head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-thumbs-up bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>NULM STAFF</h5>
-                                            <span>Self Help Group</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item active" aria-current="page">Self Help Group</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row align-items-center justify-content-center"
-                        style="color: white;background-color:#414f69 ;padding: 10px;">
-                        <h3 class="title resizable-content">Self Help Group</h3>
-                    </div>
-                    
-                
-                        <div class="mt-1">
-                
-                        </div>
-                        <!-- Card Section -->
-                        <div class="card p-3 resizable-content" style="margin-bottom: 8px;color: #414f69;">
-                
-                
-                            <!-- Add the resizable-content class to the card sections -->
-                            <div class="card mb-3 resizable-content">
-                
-                                <div class="card-body">
-                                    <div class="row">
-                                        <div class="col-md-6 d-flex justify-content-between align-items-center">
-                                            <label style="font-size: large; font-weight: 700; color: #414f69;">Self Help Group:</label>
-                                            <input type="text" class="form-control" id="groupName" placeholder="Enter Scheme Group Name" style="font-size: large; width: 70%;margin-bottom: 15px;">
-                                        </div>
-                                     </div>
-								
-									<div class="row">
-
-                                        <div class="col-md-6 d-flex justify-content-between align-items-center">
-                                            <label style="font-size: large; font-weight: 700; color: #414f69;">Incharge Name:</label>
-                                            <input type="text" class="form-control" id="inchargeName" placeholder="Enter Incharge Name" style="font-size: large;  width: 70%;margin-bottom: 15px;">
-                                        </div>
-									</div>
-								
-									<div class="row">
-
-                                        <div class="col-md-6 d-flex justify-content-between align-items-center">
-                                            <label style="font-size: large; font-weight: 700; color: #414f69;">Incharge Phone Number:</label>
-                                            <input type="text" class="form-control" id="inchargePhoneNo" placeholder="Enter Incharge Phone Number" style="font-size: large; width: 70%;margin-bottom: 15px;">
-                                         </div>
-                                    </div>    
-                                    <div class="row">
-
-                                        <div class="col-md-6 d-flex justify-content-between align-items-center">
-                                            <label style="font-size: large; font-weight: 700; color: #414f69;">Bank Name:</label>
-                                            <input type="text" class="form-control" id="bankName" placeholder="Enter Incharge Phone Number" style="font-size: large; width: 70%;margin-bottom: 15px;">
-                                         </div>
-                                    </div>  
-                                    <div class="row">
-
-                                        <div class="col-md-6 d-flex justify-content-between align-items-center">
-                                            <label style="font-size: large; font-weight: 700; color: #414f69;">Bank Branch:</label>
-                                            <input type="text" class="form-control" id="bankBranch" placeholder="Enter Incharge Phone Number" style="font-size: large; width: 70%;margin-bottom: 15px;">
-                                         </div>
-                                    </div>  
-                                    <div class="row">
-
-                                        <div class="col-md-6 d-flex justify-content-between align-items-center">
-                                            <label style="font-size: large; font-weight: 700; color: #414f69;">IFSC Code:</label>
-                                            <input type="text" class="form-control" id="ifscCode" placeholder="Enter Incharge Phone Number" style="font-size: large; width: 70%;margin-bottom: 15px;">
-                                         </div>
-                                    </div>  
-                                    <div class="row">
-
-                                        <div class="col-md-6 d-flex justify-content-between align-items-center">
-                                            <label style="font-size: large; font-weight: 700; color: #414f69;">Bank Account Number:</label>
-                                            <input type="text" class="form-control" id="bankAccountno" placeholder="Enter Incharge Phone Number" style="font-size: large; width: 70%;margin-bottom: 15px;">
-                                         </div>
-                                    </div>                                  
-                                    
-                                </div>
-								<div class="d-flex justify-content-center">
-								    <button class="btn"
-								        style="background-color: #414f69; color: white; width: 200px;padding: 10px;margin-bottom: 10px;"
-								        onclick="saveSchemeGroup()">
-								        Submit
-								    </button>
-								    <button class="btn"
-								        style="background-color: #6c757d; color: white; width: 200px;padding: 10px;margin-bottom: 10px;margin-left: 10px;"
-								        onclick="viewDetails()">
-								        View Details
-								    </button>
-								</div>
-
-							</div>
-							<div id="detailsContainer" style="margin-top: 20px;"></div>
-
-                            </div>
-                           
-                
-                
-                
-                        </div>
-                
-                
-                
-                
-                    
-                
-                </div>
-
-                
-
-			
-
-        <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-		</div>
-	    <div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-        <script th:inline="javascript">
-			
-		function saveSchemeGroup() {
-        const schemeData = {
-            groupName: document.getElementById('groupName').value,
-            inchargeName: document.getElementById('inchargeName').value,
-            inchargePhoneNo: document.getElementById('inchargePhoneNo').value,
-            bankName: document.getElementById('bankName').value,
-            bankBranch: document.getElementById('bankBranch').value,
-            ifscCode: document.getElementById('ifscCode').value,
-            bankAccountno: document.getElementById('bankAccountno').value
-        };
-
-		$.ajax({
-		    type: "POST",
-		    url: "/gcc/api/nulm/saveGroup", // Ensure this matches the controller's mapping
-		    contentType: "application/json",
-		    data: JSON.stringify(schemeData),
-		    success: function(response) {
-		        Swal.fire({
-		            icon: 'success',
-		            title: 'Scheme Group Saved Successfully',
-		            text: response
-		        }).then((result) => {
-		            if (result.isConfirmed) {
-		                location.reload(); // Reload the page after the user confirms the alert
-		            }
-		        });
-		    },
-		    error: function(xhr) {
-		        Swal.fire({
-		            icon: 'error',
-		            title: 'Error',
-		            text: xhr.responseText
-		        });
-		    }
-		});
-
-    }
-
-	function viewDetails() {
-	    $.ajax({
-	        type: "GET",
-	        url: "/gcc/api/nulm/getAllSchemeGroups",
-	        success: function(data) {
-	            displayTable(data);
-	        },
-	        error: function(xhr) {
-	            Swal.fire({
-	                icon: 'error',
-	                title: 'Error',
-	                text: 'Could not retrieve details'
-	            });
-	        }
-	    });
-	}
-
-	function displayTable(data) {
-	    let tableHtml = `
-	        <table class="table table-bordered">
-	            <thead>
-	                <tr>
-	                    <th>Group Name</th>
-	                    <th>Incharge Name</th>
-	                    <th>Incharge Phone Number</th>
-	                    <th>Appointed</th>
-	                    <th>Available</th>
-	                    <th>Dropout</th>
-	                    <th>Created Date</th>
-	                </tr>
-	            </thead>
-	            <tbody>
-	    `;
-
-	    data.forEach(item => {
-	        tableHtml += `
-	            <tr>
-	                <td>${item.group_name}</td>
-	                <td>${item.incharge_name}</td>
-	                <td>${item.incharge_phoneno}</td>
-	                <td>${item.appointed_count}</td>
-	                <td>${item.available_count}</td>
-	                <td>${item.dropout_count}</td>
-	                <td>${item.created_date}</td>
-	            </tr>
-	        `;
-	    });
-
-	    tableHtml += `
-	            </tbody>
-	        </table>
-	    `;
-
-	    document.getElementById('detailsContainer').innerHTML = tableHtml;
-	}
-
-
-        		</script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/selfHelpGroup.html b/src/main/resources/templates/modules/nulm/selfHelpGroup.html
deleted file mode 100644
index 57f6e475..00000000
--- a/src/main/resources/templates/modules/nulm/selfHelpGroup.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-</head>
-
-<body>
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header">
-                    <div class="row align-items-end">
-                        <div class="col-lg-6">
-                            <div class="page-header-title">
-                                <i class="ik ik-thumbs-up bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>NULM STAFF</h5>
-                                    <span>Self Help Group Details</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-6">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item">
-                                        <a href="/index"><i class="ik ik-home"></i></a>
-                                    </li>
-                                    <li class="breadcrumb-item active" aria-current="page">Self Help Group Details</li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-
-                <!--<hr>
-                <div class="row">
-
-                    <div class="col-md-3 form-group">
-                        <label for="year">Year</label>
-                        <select class="form-control" id="year" name="year" required>
-                            <option value="">Select Year</option>
-                            <option th:each="year : ${yearList}" th:value="${year.year}" th:text="${year.year}"
-                                th:selected="${year.year == selectedYear}">
-                            </option>
-                        </select>
-                    </div>
-
-                    &lt;!&ndash; Month &ndash;&gt;
-                    <div class="col-md-3 form-group">
-                        <label for="month">Month</label>
-                        <select id="month" class="form-control" name="month" required>
-                            <option value="">Select Year</option>
-                            <option th:each="month : ${monthList}" th:value="${month.month}" th:text="${month.month}"
-                                th:selected="${month.month == selectedMonth}">
-                            </option>
-                        </select>
-                    </div>
-
-
-                    <div class="col-sm-3">
-                        <button class="btn btn-primary mt-4" onclick="fetchSalaryDetails()">Get Salary Info</button>
-                    </div>
-                </div>-->
-                <div class="card-block mt-3">
-                    <div>
-                        <table id="salaryDatatable" class="table table-striped table-bordered table-hover dataTable"
-                               role="grid" width="99.5%">
-                            <thead class="thead-dark">
-                            <tr role="row">
-                                <th>S.No</th>
-                                <th>Group Name</th>
-                                <th>Incharge Name</th>
-                                <th>Incharge Phone no</th>
-                                <th>Account Number</th>
-                                <th>Bank Name</th>
-                                <th>Branch Name</th>
-                                <th>IFSC Code</th>
-                            </tr>
-
-                            </thead>
-                            <tbody>
-                            <tr th:each="selfHelpGroup, i : ${selfHelpGroup}">
-                                <td th:text="${i.count}">0</td>
-                                <td th:text="${selfHelpGroup.group_name}"></td>
-                                <td th:text="${selfHelpGroup.incharge_name}"></td>
-                                <td th:text="${selfHelpGroup.incharge_phoneno}"></td>
-                                <td th:text="${selfHelpGroup.bank_accountno}"></td>
-                                <td th:text="${selfHelpGroup.ifsc_code}"></td>
-                                <td th:text="${selfHelpGroup.bank_name}"></td>
-                                <td th:text="${selfHelpGroup.bank_branch}"></td>
-                            </tr>
-                            <tfoot class="thead-dark">
-                            <tr role="row">
-                                <th>S.No</th>
-                                <th>Group Name</th>
-                                <th>Incharge Name</th>
-                                <th>Incharge Phone no</th>
-                                <th>Account Number</th>
-                                <th>IFSC Code</th>
-                                <th>Bank Name</th>
-                                <th>Branch Name</th>
-
-                            </tr>
-                            </tfoot>
-                        </table>
-                    </div>
-                </div>
-
-
-            </div>
-
-
-        </div>
-
-
-        <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-    </div>
-</div>
-<div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-<script th:replace="~{fragments/modules/base/script :: script}"></script>
-<script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-<script th:inline="javascript">
-
-    $(document).ready(function () {
-        // Initialize DataTable
-        var table = $('#salaryDatatable').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'
-                },
-                {
-                    extend: 'pdfHtml5',
-                    text: 'PDF',
-                    className: 'btn btn-secondary',
-                    id: 'pdfBtn',
-                    exportOptions: {
-                        columns: [0, 1, 2, 3, 4, 5, 6, 7]
-                    },
-                    orientation: 'landscape', // Change to landscape for more horizontal space
-                    pageSize: 'A4', // You can change to A4 or A3 depending on your needs
-                    customize: function (doc) {
-                        // Custom column widths for better fit
-                        doc.content[1].table.widths = ['5%', '20%', '12%', '10%', '12%', '15%', '15%', '10%'];
-
-                        // Optional: Adjust font size if needed
-                        doc.styles.tableBodyEven.alignment = 'center';
-                        doc.styles.tableBodyOdd.alignment = 'center';
-                    }
-                },
-                {
-                    extend: 'excelHtml5',
-                    text: 'EXCEL',
-                    className: 'btn btn-secondary',
-                    id: 'excelBtn'
-                }
-            ],
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false
-        });
-    })
-
-</script>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/staff-enrollment.html b/src/main/resources/templates/modules/nulm/staff-enrollment.html
deleted file mode 100644
index dcc16720..00000000
--- a/src/main/resources/templates/modules/nulm/staff-enrollment.html
+++ /dev/null
@@ -1,430 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		label {
-			font-weight: 700;
-			color: #2d5263;
-		}
-
-
-
-		.checkbox-label {
-			display: block;
-			margin-bottom: 10px;
-			font-size: 16px;
-		}
-
-		
-		.custom-file-upload {
-			position: relative;
-			display: flex;
-			align-items: center;
-			border: 1px solid #d9dde4;
-			border-radius: 5px;
-			padding: 5px;
-			background-color: #f9fafb;
-			cursor: pointer;
-			margin-top: 5px;
-		}
-
-		.custom-file-upload input[type="file"] {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			opacity: 0;
-			cursor: pointer;
-		}
-
-		.custom-file-upload label {
-			display: flex;
-			justify-content: space-between;
-			width: 100%;
-			align-items: center;
-		}
-
-		.upload-icon i {
-			color: #a6adb5;
-			font-size: 18px;
-		}
-
-		.file-name {
-			margin-left: 10px;
-			color: #414f69;
-			font-size: 14px;
-		}
-
-		#upload-text {
-			color: #a7adb5;
-
-		}
-	</style>
-</head>
-
-<body>
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Staff Enrollment</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Staff Enrollment</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-					<div class="row align-items-center justify-content-center"
-						style="color: white;background-color:#414f69 ;padding: 10px;">
-						<h3 class="title resizable-content">Staff Enrollment</h3>
-					</div>
-					<!-- Add the resizable-content class to the card sections -->
-					<div class="card mb-3 mt-4 resizable-content">
-						<!--<div class="card-header text-white" style="background-color: #414f69;">Personal Information's
-                                </div>-->
-                                
-						<div class="card-body">								
-							<div class="row">
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-									<label style="font-size: large; font-weight: 700; color: #414f69;">Self Help Group:</label>
-									<div class="col-md-6" style="margin-right: 32%;">
-										<select id="selfHelpGroupDropdown" class="form-control" style="font-size: large; margin-bottom: 15px;">
-											<option value="">Select Group</option>
-										</select>
-									</div>
-								</div>
-							</div>
-							<div class="row">						
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-								    <label style="font-size: large;font-weight: 700;color: #414f69;">Name:</label>
-								    <div class="col-md-6" style="margin-right: 32%;">
-								    <input type="text" id="staff-name-input" class="form-control" placeholder="Enter Name..." style="font-size: large;margin-bottom: 15px;">
-								</div>
-								</div>
-						</div>						
-						
-						<div class="row">
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-								    <label style="font-size: large;font-weight: 700;color: #414f69;">Gender:</label>
-								    <div class="col-md-6" style="margin-right: 32%;">
-								    <select id="gender-select" class="form-control" style="font-size: large;margin-bottom: 15px;">
-								        <option value="">Select Gender</option>
-								        <option value="1">Male</option>
-								        <option value="2">Female</option>
-								        <option value="3">Transgender</option>
-								    </select>
-								    </div>
-								</div>								
-							</div>
-							
-							<div class="row">		
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-								    <label style="font-size: large;font-weight: 700;color: #414f69;">Date Of Birth:</label>
-								    <div class="col-md-6" style="margin-right: 32%;">
-								    <input type="date" id="dob-input" class="form-control" style="font-size: large;margin-bottom: 15px;">
-								</div>
-								</div>
-							</div>
-							<div class="row">
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-								    <label style="font-size: large;font-weight: 700;color: #414f69;">Address:</label>
-								    <div class="col-md-6" style="margin-right: 32%;">
-								    <input type="text" id="address-input" class="form-control" placeholder="Enter Name..." style="font-size: large;margin-bottom: 15px;">
-								</div>
-								</div>
-							</div>
-							<div class="row">
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-								    <label style="font-size: large;font-weight: 700;color: #414f69;">Phone number:</label>
-								    <div class="col-md-6" style="margin-right: 32%;">
-								    <input type="text" id="phone-number-input" class="form-control" placeholder="Enter the Phone Number..." style="font-size: large;margin-bottom: 15px;" pattern="\d{10}" maxlength="10" minlength="10">
-								</div>	
-								</div>							
-							</div>
-
-								<!-- Update other input fields similarly -->
-							<div class="row">
-
-								<div class="col-md-12 d-flex justify-content-between align-items-center">
-									<label style="font-size: large; font-weight: 700; color: #414f69;">Education
-										Qualification:</label>
-										<div class="col-md-6" style="margin-right: 32%;">
-									<select id="educationQualification" class="form-control" style="font-size: large;margin-bottom: 15px;">
-										<option value="">Select Qualification</option>
-										<option value="8th">8th</option>
-										<option value="9th">9th</option>
-										<option value="10th">10th</option>
-										<option value="11th">11th</option>
-										<option value="12th">12th</option>
-										<option value="UG">UG</option>
-										<option value="PG">PG</option>
-									</select>
-									</div>
-								</div>	
-							</div>
-							
-							<div class="row">
-    <div class="col-md-12 d-flex justify-content-between align-items-center">
-        <label style="font-size: large;font-weight: 700;color: #414f69;">Additional Skills:</label>
-        <div class="col-md-6" style="margin-right: 32%;">
-        <select id="skills-select" class="form-control" style="font-size: large;margin-bottom: 15px;">
-            <option value="">Select Additional Skills</option>
-            <option value="typing">Typing</option>
-            <option value="shorthand">ShortHand</option>
-            <option value="dataentry">DataEntry</option>
-            <option value="others">Others</option>
-        </select>
-        </div>
-    </div>
-</div>
-		
-							</div>							
-								<div class="col-md-12">
-									<label style="font-size: large;font-weight: 700;color: #414f69;">Proof
-										Documents:</label>
-									<div class="row">
-
-
-										<!-- First File Upload -->
-										<div class="col-md-4">
-											<div class="custom-file-upload">
-												<input type="file" id="file-upload-1" class="form-control"
-													onchange="displayFileName('file-upload-1', 'file-name-1')">
-												<label for="file-upload-1" id="file-label-1">
-													<span class="upload-text" id="upload-text">Upload Aadhar Card</span>
-													<span class="upload-icon">
-														<i class="fas fa-file-upload"></i>
-													</span>
-												</label>
-												<span id="file-name-1" class="file-name"></span>
-											</div>
-										</div>
-
-										<!-- Second File Upload -->
-										<div class="col-md-4">
-											<div class="custom-file-upload">
-												<input type="file" id="file-upload-2" class="form-control"
-													onchange="displayFileName('file-upload-2', 'file-name-2')">
-												<label for="file-upload-2" id="file-label-2">
-													<span class="upload-text" id="upload-text">Upload Bank
-														Passbook</span>
-													<span class="upload-icon">
-														<i class="fas fa-file-upload"></i>
-													</span>
-												</label>
-												<span id="file-name-2" class="file-name"></span>
-											</div>
-										</div>
-
-										<!-- Third File Upload -->
-										<div class="col-md-4">
-											<div class="custom-file-upload">
-												<input type="file" id="file-upload-3" class="form-control"
-													onchange="displayFileName('file-upload-3', 'file-name-3')">
-												<label for="file-upload-3" id="file-label-3">
-													<span class="upload-text" id="upload-text">Upload Ration Card</span>
-													<span class="upload-icon">
-														<i class="fas fa-file-upload"></i>
-													</span>
-												</label>
-												<span id="file-name-3" class="file-name"></span>
-											</div>
-										</div>
-										
-										<!-- Fourth File Upload -->
-										<div class="col-md-4">
-											<div class="custom-file-upload">
-												<input type="file" id="file-upload-4" class="form-control"
-													onchange="displayFileName('file-upload-4', 'file-name-4')">
-												<label for="file-upload-4" id="file-label-4">
-													<span class="upload-text" id="upload-text">Upload Staff Photo</span>
-													<span class="upload-icon">
-														<i class="fas fa-file-upload"></i>
-													</span>
-												</label>
-												<span id="file-name-4" class="file-name"></span>
-											</div>
-										</div>
-									</div>
-								</div>	
-								
-								<div class="d-flex justify-content-center">
-							<button class="btn"
-								style="background-color: #414f69; color: white; width: 200px;padding: 10px;margin-bottom: 10px;"
-								id="staffenroll">
-								Enroll Staff
-							</button>
-						</div>						
-							
-
-						</div>
-						
-
-					</div>
-
-
-				</div>
-
-
-			
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-	<div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-<script th:inline="javascript">
-    function displayFileName(inputId, outputId) {
-        const fileInput = document.getElementById(inputId);
-        const fileNameSpan = document.getElementById(outputId);
-        const fileName = fileInput.files[0]?.name || 'No file chosen';
-        fileNameSpan.textContent = fileName;
-    }
-
-    function isValidAge(dob) {
-        const today = new Date();
-        const birthDate = new Date(dob);
-        let age = today.getFullYear() - birthDate.getFullYear();
-        const monthDifference = today.getMonth() - birthDate.getMonth();
-
-        // Adjust age if the birth date hasn't occurred yet this year
-        if (monthDifference < 0 || (monthDifference === 0 && today.getDate() < birthDate.getDate())) {
-            age--;
-        }
-
-        // Age should be at least 18
-        return age >= 18;
-    }
-
-$(document).ready(function () {
-    $('#staffenroll').click(function () {
-        const dob = document.getElementById('dob-input').value;
-        
-        if (!isValidAge(dob)) {
-            Swal.fire({
-                title: 'Invalid Date of Birth',
-                text: 'Age must be at least 18 years old.',
-                icon: 'error',
-                confirmButtonText: 'OK',
-                background: '#f5f5f5',
-                confirmButtonColor: '#414f69'
-            });
-            return false;
-        }
-
-        const staffData = {
-            name: document.getElementById('staff-name-input').value,
-            phoneNumber: document.getElementById('phone-number-input').value,
-            gender: document.getElementById('gender-select').value,
-            dateOfBirth: dob,
-            educationQualification: document.getElementById('educationQualification').value,
-            additionalSkills: document.getElementById('skills-select').value,
-            aadharCardUrl: document.getElementById('file-name-1').textContent,
-            rationCardUrl: document.getElementById('file-name-3').textContent,
-            bankPassbookUrl: document.getElementById('file-name-2').textContent,
-            staffPhotoUrl: document.getElementById('file-name-4').textContent,
-            address: document.getElementById('address-input').value, // Ensure this is included
-            groupId: document.getElementById('selfHelpGroupDropdown').value,
-        };
-
-        console.log(staffData); // Debug log
-
-        $.ajax({
-            url: '/gcc/api/nulm/saveStaff',
-            method: 'POST',
-            contentType: 'application/json',
-            data: JSON.stringify(staffData),
-            success: function (response) {
-                Swal.fire({
-                    icon: 'success',
-                    title: 'Success',
-                    text: response,
-                }).then(function () {
-                    location.reload();
-                });
-            },
-            error: function (xhr, status, error) {
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error',
-                    text: 'Error saving staff details: ' + xhr.responseText,
-                });
-            }
-        });
-    });
-
-
-	    document.getElementById('educationQualification').addEventListener('change', function () {
-	        var selectedValue = this.value;
-	        var courseNameField = document.getElementById('courseNameField');
-
-	        if (selectedValue === 'UG' || selectedValue === 'PG') {
-	            courseNameField.style.display = 'block';
-	        } else {
-	            courseNameField.style.display = 'none';
-	        }
-	    });
-
-	    function loadSchemeGroupNames() {
-	        $.ajax({
-	            url: '/gcc/api/nulm/getAllSchemeGroupNames',
-	            method: 'GET',
-	            dataType: 'json',
-	            success: function (data) {
-	                var $dropdown = $('#selfHelpGroupDropdown');
-	                $dropdown.empty();
-	                $dropdown.append('<option value="">Select Scheme Group</option>');
-	               $.each(data, function (index, group) {
-                    $dropdown.append('<option value="' + group.group_id + '">' + group.group_name + '</option>');
-                });
-	            },
-	            error: function (xhr, status, error) {
-	                console.error('Error fetching scheme group names:', error);
-	            }
-	        });
-	    }
-
-	    loadSchemeGroupNames();
-	});
-
-</script>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/staffupdate.html b/src/main/resources/templates/modules/nulm/staffupdate.html
deleted file mode 100644
index efd8adf6..00000000
--- a/src/main/resources/templates/modules/nulm/staffupdate.html
+++ /dev/null
@@ -1,1525 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Update Staff</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Update Staff</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row">
-						<div class="col-sm-3">
-							<label for="zone">Zone</label>
-							<select id="zone" class="form-control">
-								<option value="">Select</option>
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="division">Division</label>
-							<select id="division" class="form-control">
-								<option value="">Select</option>
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="park">Park</label>
-							<select id="park" class="form-control">
-								<option value="">Select</option>
-							</select>
-						</div>
-
-
-
-						<div class="col-sm-3">
-
-							<button class="btn btn-primary mt-4" onclick="fetchEmployeeReport()"> submit</button>
-							<button class="btn btn-secondary mt-4" onclick="resetFilters()">Reset</button>
-
-						</div>
-					</div>
-
-					<!-- Salary Report Table -->
-					<div class="card-block mt-3">
-						<table id="stafftable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Park Name</th>
-									<th>Employee Name</th>
-									<th>Mobile Number</th>
-									<th>Employee Designation</th>
-									<th>Incharge Name</th>
-
-									<th>Action</th>
-
-								</tr>
-							</thead>
-							<tbody>
-
-							</tbody>
-							<tfoot class="thead-dark">
-
-							</tfoot>
-						</table>
-					</div>
-
-				</div>
-			</div>
-			<div class="modal fade" id="editStaffModal" tabindex="-1">
-				<div class="modal-dialog modal-lg">
-					<div class="modal-content">
-
-						<div class="modal-header">
-							<h5 class="modal-title">Employee Details <span id="modalEnrollmentId"></span></h5>
-							<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-								<span aria-hidden="true">&times;</span>
-							</button>
-						</div>
-
-						<div class="modal-body">
-
-							<input type="hidden" id="enrollmentId">
-
-							<!-- Park & Incharge -->
-							<div class="row">
-
-								<div class="col-md-6">
-									<label>Park Name</label>
-									<input type="text" id="parkName" class="form-control" readonly>
-								</div>
-
-								<div class="col-md-6">
-									<label>Incharge Name</label>
-									<input type="text" id="inchargeName" class="form-control" readonly>
-								</div>
-
-							</div>
-
-							<hr>
-
-							<!-- Employee Details -->
-							<div class="row mt-2">
-
-								<div class="col-md-6">
-									<label>Employee Name</label>
-									<input type="text" id="empName" class="form-control" readonly>
-								</div>
-
-								<div class="col-md-6">
-									<label>Father / Husband Name</label>
-									<input type="text" id="fhName"
-										oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g,'').toUpperCase()"
-										class="form-control">
-								</div>
-
-								<div class="col-md-6 mt-2">
-									<label>Designation</label>
-									<select id="Designation" class="form-control">
-										<option value="">Select Designation</option>
-									</select>
-								</div>
-
-
-
-							</div>
-							<div class="row mt-2">
-
-								<div class="col-md-6 mt-2">
-									<label>Group Name</label>
-									<input type="text" id="groupName" class="form-control" readonly>
-								</div>
-
-								<div class="col-md-6 mt-2">
-									<label>Aadhar Number</label>
-									<input type="text" id="aadharNo" maxlength="12" class="form-control"
-										placeholder="Enter 12 digit Aadhar number">
-								</div>
-
-								<div class="col-md-6 mt-2">
-									<label>Bank Account Number</label>
-									<input type="text" id="bankAccNo" minlength="9" maxlength="18" class="form-control"
-										oninput="this.value = this.value.replace(/[^0-9]/g, '')">
-								</div>
-								<div class="col-md-6 mt-2">
-									<label>Bank Name</label>
-									<input type="text" id="bankName" class="form-control"
-										oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g,'').toUpperCase()">
-								</div>
-
-								<div class="col-md-6 mt-2">
-									<label>IFSC Code</label>
-									<input type="text" id="ifscCode" class="form-control">
-								</div>
-
-								<div class="col-md-6 mt-2">
-									<label>Branch</label>
-									<input type="text" id="branch" class="form-control "
-										oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g,'').toUpperCase()">
-								</div>
-
-								<div class="col-md-6 mt-2">
-									<label>Branch Address</label>
-									<input type="text" id="branchAddress" class="form-control">
-								</div>
-
-								<div class="col-md-6 mt-2">
-									<label>Mobile Number</label>
-									<input type="text" id="mobileNo"
-										oninput="this.value = this.value.replace(/[^0-9]/g, '').slice(0, 10)"
-										class="form-control">
-
-								</div>
-
-								<div class="col-md-12 mt-2">
-									<label>Address</label>
-									<textarea id="address" class="form-control"></textarea>
-								</div>
-
-							</div>
-							<div class="row mt-3">
-
-								<div class="col-md-6">
-									<label>Upload Form</label>
-									<input type="file" id="formFile" class="form-control" accept=".jpg,.jpeg">
-									<small>
-										<a id="formPreview" target="_blank"></a>
-									</small>
-								</div>
-
-								<div class="col-md-6">
-									<label>Upload Aadhar Card</label>
-									<input type="file" id="aadharFile" class="form-control" accept=".jpg,.jpeg">
-									<small>
-										<a id="aadharPreview" target="_blank"></a>
-									</small>
-								</div>
-
-								<div class="col-md-6 mt-3">
-									<label>Upload Bank Passbook</label>
-									<input type="file" id="bankPassbookFile" class="form-control" accept=".jpg,.jpeg">
-									<small>
-										<a id="bankPreview" target="_blank"></a>
-									</small>
-								</div>
-
-							</div>
-							<hr>
-
-							<div class="row mt-3">
-
-								<div class="col-md-3">
-									<label>
-										<input type="checkbox" id="notFoundChk"> Not Found
-									</label>
-								</div>
-
-								<div class="col-md-3">
-									<label>
-										<input type="checkbox" id="errorChk"> Error
-									</label>
-								</div>
-
-							</div>
-
-							<div class="row mt-2" id="remarksDiv" style="display:none;">
-								<div class="col-md-12">
-									<label>Remarks</label>
-									<textarea id="remarks" class="form-control"></textarea>
-								</div>
-							</div>
-
-						</div>
-
-						<div class="modal-footer">
-							<button class="btn btn-primary" onclick="updateStaff()">Update</button>
-							<button class="btn btn-secondary " data-bs-dismiss="modal">Close</button>
-						</div>
-
-					</div>
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-	<!-- DataTables -->
-	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
-	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
-
-	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
-	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
-	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
-
-	<!-- DataTable Buttons -->
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
-
-
-	<script th:inline="javascript">
-		//var createdBy = /*[[${LoginUserId}]]*/'';
-
-
-
-		/*$(document).ready(function () {
-
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-
-			// Call this on page load to reset the URL
-			clearUrlParams();
-
-			// Initialize DataTable
-			var table = $('#salaryreporttable').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'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
-						},
-						orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							//doc.content[1].table.widths = ['2%', '6%', '6%', '6%', '6%', '6%', '6%', '3%', '3%', '3%', '3%', '3%', '3%', '6%', '6%', '6%'];
-
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-
-
-		});*/
-		let staffTable;
-
-		$(document).ready(function () {
-
-			staffTable = $('#stafftable').DataTable({
-				dom: 'Bfrtip',
-
-				buttons: [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'Excel',
-						className: 'btn btn-secondary',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6]
-						}
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						orientation: 'landscape',
-						pageSize: 'A3',
-						exportOptions: {
-							columns: [0, 1, 2, 3, 4, 5, 6]
-						}
-					}
-				],
-
-				responsive: true,
-				searching: true,
-				paging: true,
-				ordering: true,
-				language: {
-					emptyTable: "No data available in table"
-				}
-
-			});
-
-		});
-		/*	function fetchEmployeeReport() {
-	
-				const parkId = $('#park').val();
-	
-				if (!parkId) {
-					alert("Please select park");
-					return;
-				}
-	
-				$.ajax({
-					url: "/gcc/api/nulm/staff",
-					method: "GET",
-					data: { parkId: parkId },
-	
-					success: function (data) {
-	
-						staffTable.clear();
-	
-						if (data && data.length > 0) {
-	
-							$.each(data, function (i, emp) {
-	
-								staffTable.row.add([
-									i + 1,
-									emp.emp_id,
-									emp.park_name,
-									emp.empname,
-									emp.phone_number,
-									emp.designation,
-									emp.incharge_name,
-									'<button class="btn btn-sm btn-primary">Edit</button>'
-								]);
-	
-							});
-	
-						}
-	
-						staffTable.draw();
-					}
-				});
-	
-			}*/
-
-		$("#aadharNo").on("input", function () {
-			this.value = this.value.replace(/[^0-9]/g, '');
-			if (this.value.length > 12) {
-				this.value = this.value.slice(0, 12);
-			}
-		});
-
-
-
-		function openEditModal(enrollmentId) {
-
-			$("#editStaffModal").modal("show");
-
-			$("#modalEnrollmentId").text("( Enrollment ID: " + enrollmentId + ")");
-			$("#enrollmentId").val(enrollmentId);
-
-			$.ajax({
-
-				url: "/gcc/api/nulm/staff-details",
-				type: "GET",
-				data: { enrollmentId: enrollmentId },
-
-				success: function (data) {
-
-					console.log(data);
-
-					$("#parkName").val(data.park_name);
-					$("#inchargeName").val(data.incharge_name);
-					$("#empName").val(data.name);
-					$("#fhName").val(data.f_h_name);
-					//$("#Designation").val(data.designation);
-					$("#Designation").val(data.designation_id);
-					$("#groupName").val(data.groupname);
-					$("#aadharNo").val(data.aadhar_no);
-					$("#bankAccNo").val(data.bankaccNo);
-					$("#mobileNo").val(data.phone_number);
-					$("#address").val(data.address);
-					$("#bankName").val(data.bank_name);
-					$("#ifscCode").val(data.ifsc_code);
-					$("#branch").val(data.branch);
-					$("#branchAddress").val(data.branch_address);
-					if (data.formUrl) {
-						$("#formPreview").attr("href", data.formUrl).text("View Form");
-					}
-
-					if (data.aadharUrl) {
-						$("#aadharPreview").attr("href", data.aadharUrl).text("View Aadhar");
-					}
-
-					if (data.bankpassbookUrl) {
-						$("#bankPreview").attr("href", data.bankpassbookUrl).text("View Passbook");
-					}
-					$("#notFoundChk").prop("checked", data.not_found == 1);
-					$("#errorChk").prop("checked", data.error == 1);
-					$("#remarks").val(data.remarks);
-
-					if (data.error == 1) {
-						$("#remarksDiv").show();
-					}
-
-				}
-
-			});
-
-		}
-		function fetchEmployeeReport() {
-
-			const parkId = $('#park').val();
-
-			if (!parkId) {
-				//	alert("Please select park");
-				Swal.fire({
-					icon: 'warning',
-					title: 'Warning',
-					text: 'Please select park and zone and division',
-					confirmButtonColor: '#3085d6'
-				});
-
-				return;
-			}
-
-			// Destroy existing DataTable
-			if ($.fn.DataTable.isDataTable('#stafftable')) {
-				$('#stafftable').DataTable().clear().destroy();
-			}
-
-			$("#stafftable tbody").empty();
-
-			$.ajax({
-				url: "/gcc/api/nulm/staff",
-				method: "GET",
-				data: { parkId: parkId },
-
-				success: function (data) {
-
-					let tableHtml = '';
-
-					if (data && data.length > 0) {
-
-						data.forEach((emp, i) => {
-
-							tableHtml += `
-                        <tr>
-                            <td>${i + 1}</td>
-                            <td>${emp.emp_id}</td>
-                            <td>${emp.park_name}</td>
-                            <td>${emp.empname}</td>
-                            <td>${emp.phone_number}</td>
-                            <td>${emp.designation}</td>
-                            <td>${emp.incharge_name}</td>
-                            <td>
-                                <button class="btn btn-sm btn-primary"
-                                    onclick="openEditModal('${emp.enrollment_id}')">
-                                    Edit
-                                </button>
-                            </td>
-                        </tr>
-                    `;
-						});
-
-					} else {
-
-						tableHtml = `
-					        <tr>
-					            <td></td>
-					            <td></td>
-					            <td></td>
-					            <td class="text-center text-danger">
-					                <i class="fas fa-check-circle"></i> 
-					                No staff records found
-					            </td>
-					            <td></td>
-					            <td></td>
-					            <td></td>
-					            <td></td>
-					        </tr>
-					    `;
-					}
-
-					// Insert rows
-					$("#stafftable tbody").html(tableHtml);
-
-					// Reinitialize DataTable
-					let table = $('#stafftable').DataTable({
-
-						dom: 'Bfrtip',
-
-						buttons: [
-							{
-								extend: 'pageLength',
-								className: 'btn btn-warning'
-							},
-							{
-								extend: 'excelHtml5',
-								text: 'Excel',
-								className: 'btn btn-secondary',
-								title: 'Park Staff Report'
-							},
-							{
-								extend: 'pdfHtml5',
-								text: 'PDF',
-								className: 'btn btn-secondary',
-								title: 'Park Staff Report',
-								orientation: 'landscape',
-								pageSize: 'A3'
-							}
-						],
-
-						responsive: true,
-						searching: true,
-						paging: true,
-						ordering: true
-					});
-
-					// Place buttons properly
-					table.buttons().container()
-						.appendTo('#stafftable_wrapper .col-md-6:eq(0)');
-				},
-
-				error: function () {
-					alert("Failed to load staff data");
-				}
-
-			});
-
-		}
-		/*	function fetchEmployeeReport() {
-	
-				const parkId = $('#park').val();
-	
-				if (!parkId) {
-					alert("Please select park");
-					return;
-				}
-	
-				// Destroy existing DataTable
-				if ($.fn.DataTable.isDataTable('#stafftable')) {
-					$('#stafftable').DataTable().clear().destroy();
-				}
-	
-				$.ajax({
-					url: "/gcc/api/nulm/staff",
-					method: "GET",
-					data: { parkId: parkId },
-	
-					success: function (data) {
-	
-						let tableHtml = '';
-	
-						if (data && data.length > 0) {
-	
-							data.forEach((emp, i) => {
-	
-								tableHtml += `
-							<tr>
-								<td>${i + 1}</td>
-								<td>${emp.emp_id}</td>
-								<td>${emp.park_name}</td>
-								<td>${emp.empname}</td>
-								<td>${emp.phone_number}</td>
-								<td>${emp.designation}</td>
-								<td>${emp.incharge_name}</td>
-								<td>
-									<button class="btn btn-sm btn-primary">Edit</button>
-								</td>
-							</tr>
-						`;
-							});
-	
-						} else {
-	
-							tableHtml = `
-						<tr>
-							<td colspan="8" class="text-center">
-								No data available
-							</td>
-						</tr>
-					`;
-						}
-	
-						$('#stafftable tbody').html(tableHtml);
-	
-						// Initialize DataTable AFTER rows inserted
-						$('#stafftable').DataTable({
-							dom: 'Bfrtip',
-							buttons: [
-								{
-									extend: 'pageLength',
-									className: 'btn btn-warning'
-								},
-								{
-									extend: 'excelHtml5',
-									text: 'Excel',
-									className: 'btn btn-success'
-								},
-								{
-									extend: 'pdfHtml5',
-									text: 'PDF',
-									className: 'btn btn-secondary',
-									orientation: 'landscape',
-									pageSize: 'A3'
-								}
-							],
-							responsive: true,
-							searching: true,
-							paging: true,
-							ordering: true
-						});
-	
-					},
-	
-					error: function () {
-						alert("Failed to load staff data");
-					}
-	
-				});
-	
-			}*/
-		function resetFilters() {
-
-			// Reset dropdowns
-			$('#zone').val('');
-			$('#division').val('');
-			$('#park').val('');
-
-
-			// Optional: clear table if needed later
-			// $('#salaryreporttable').DataTable().clear().draw();
-
-		}
-
-		/*$('#zone').change(function () {
-
-			const zone = $(this).val();
-
-			$('#division').empty().append('<option value="">Select</option>');
-			$('#park').empty().append('<option value="">Select</option>');
-
-			if (zone !== '') {
-
-				$.ajax({
-					url: '/gcc/api/nulm/divisions',
-					type: 'GET',
-					data: { zone: zone },
-
-					success: function (data) {
-
-						if (Array.isArray(data)) {
-							let options = '';
-
-							data.forEach(function (division) {
-								options += `<option value="${division}">${division}</option>`;
-							});
-
-							$('#division').append(options);
-						}
-					}
-				});
-
-			}
-
-		});*/
-		$('#zone').change(function () {
-
-			const zone = $(this).val();
-
-			$('#division').empty().append('<option value="">Select</option>');
-			$('#park').empty().append('<option value="">Select</option>');
-
-			if (zone !== '') {
-
-				// load divisions
-				$.get('/gcc/api/nulm/divisions', { zone: zone }, function (data) {
-					let options = '';
-					data.forEach(d => options += `<option value="${d}">${d}</option>`);
-					$('#division').append(options);
-				});
-
-				// load parks directly by zone
-				$.get('/gcc/api/nulm/list', { zone: zone }, function (data) {
-					let options = '';
-					data.forEach(p => options += `<option value="${p.park_id}">${p.park_name}</option>`);
-					$('#park').append(options);
-				});
-			}
-
-		});
-		$("#errorChk").change(function () {
-
-			if ($(this).is(":checked")) {
-				$("#remarksDiv").show();
-			} else {
-				$("#remarksDiv").hide();
-				$("#remarks").val("");
-			}
-
-		});
-		/*function updateStaff() {
-			let phone = $("#mobileNo").val();
-
-			let fhName = $("#fhName").val().trim();
-			let designation = $("#Designation").val();
-			let aadhar = $("#aadharNo").val().trim();
-			let bankAcc = $("#bankAccNo").val().trim();
-
-			let groupName = $("#groupName").val().trim();
-			let address = $("#address").val().trim();
-			if (!groupName) {
-				Swal.fire({
-					icon: 'warning',
-					title: 'Group Name Required',
-					text: 'Please enter group name',
-					confirmButtonColor: '#3085d6'
-				});
-				return;
-			}
-			if (!fhName) {
-				Swal.fire('Warning', 'Please enter Father/Husband Name', 'warning');
-				return;
-			}
-
-			if (!designation) {
-				Swal.fire('Warning', 'Please select designation', 'warning');
-				return;
-			}
-			if (!bankAcc) {
-				Swal.fire('Warning', 'Bank account number is required', 'warning');
-				return;
-			}
-
-			if (!address) {
-				Swal.fire('Warning', 'Please enter address', 'warning');
-				return;
-			}
-
-
-			// Phone validation (10 digits)
-			let phonePattern = /^[6-9]\d{9}$/;
-
-			// Aadhar validation (12 digits)
-			let aadharPattern = /^\d{12}$/;
-
-			if (phone && !phonePattern.test(phone)) {
-
-				Swal.fire({
-					icon: 'warning',
-					title: 'Invalid Mobile Number',
-					text: 'Please enter a valid 10 digit mobile number starting with 6-9',
-					confirmButtonColor: '#3085d6'
-				});
-
-				return;
-			}
-
-			if (aadhar && !aadharPattern.test(aadhar)) {
-
-				Swal.fire({
-					icon: 'warning',
-					title: 'Invalid Aadhar Number',
-					text: 'Please enter a valid 12 digit Aadhar number',
-					confirmButtonColor: '#3085d6'
-				});
-
-				return;
-			}
-			if (!phone) {
-				Swal.fire({
-					icon: 'warning',
-					title: 'Mobile Number Required',
-					text: 'Please enter your mobile number',
-					confirmButtonColor: '#3085d6'
-				});
-				return;
-			}
-
-			// 🔹 Check if phone format is invalid
-			if (!phonePattern.test(phone)) {
-				Swal.fire({
-					icon: 'warning',
-					title: 'Invalid Mobile Number',
-					text: 'Please enter a valid 10 digit mobile number starting with 6-9',
-					confirmButtonColor: '#3085d6'
-				});
-				return;
-			}
-			
-			console.log(createdBy);
-			var designationText = document.querySelector("#Designation option:checked").text;
-			console.log(designationText);
-			console.log($("#mobileNo").val());
-
-
-			let formData = new FormData();
-			formData.append("createdBy", createdBy);
-
-			formData.append("enrollmentId", $("#enrollmentId").val());
-			formData.append("fhName", $("#fhName").val());
-			formData.append("designation", designationText);
-			formData.append("designationId", $("#Designation").val());
-			//formData.append("designation", $("#Designation"));
-			formData.append("aadharNo", $("#aadharNo").val());
-			formData.append("bankAccNo", $("#bankAccNo").val());
-			formData.append("phoneNumber", $("#mobileNo").val());
-			formData.append("address", $("#address").val());
-
-			let formFile = $("#formFile")[0].files[0];
-			let aadharFile = $("#aadharFile")[0].files[0];
-			let bankFile = $("#bankPassbookFile")[0].files[0];
-
-			if (formFile) formData.append("uploadform", formFile);
-			if (aadharFile) formData.append("aadharcard", aadharFile);
-			if (bankFile) formData.append("bankpassbook", bankFile);
-			let notFound = $("#notFoundChk").is(":checked") ? 1 : 0;
-			let error = $("#errorChk").is(":checked") ? 1 : 0;
-			let remarks = $("#remarks").val();
-			if (error && !remarks) {
-				Swal.fire({
-					icon: 'warning',
-					title: 'Remarks required',
-					text: 'Please provide remarks when marking an error',
-					confirmButtonColor: '#3085d6'
-				});
-
-				return;
-			}
-
-
-			formData.append("notFound", notFound);
-			formData.append("error", error);
-			formData.append("remarks", remarks);
-			console.log(formData)
-
-			$.ajax({
-				url: "/gcc/api/nulm/update-staff",
-				type: "POST",
-				data: formData,
-				processData: false,
-				contentType: false,
-
-				success: function () {
-					//alert("Updated Successfully");
-					Swal.fire({
-						icon: 'success',
-						title: 'Success',
-						text: 'Updated Successfully',
-						confirmButtonColor: '#3085d6'
-					});
-					location.reload();
-				}
-
-			});
-
-		}*/
-
-
-		function updateStaff() {
-
-			let notFound = $("#notFoundChk").is(":checked") ? 1 : 0;
-			let error = $("#errorChk").is(":checked") ? 1 : 0;
-			let remarks = $("#remarks").val().trim();
-			let createdBy = /*[[${LoginUserId}]]*/'';
-
-			function showWarning(message) {
-				Swal.fire({
-					icon: 'warning',
-					title: 'Warning',
-					text: message,
-					confirmButtonColor: '#3085d6'
-				});
-			}
-
-			/* ===============================
-			   CASE 1: NOT FOUND OR ERROR
-			   Skip all validations
-			=============================== */
-
-			if (notFound || error) {
-
-				// Remarks required only when ERROR is checked
-				if (error && !remarks) {
-					showWarning("Please enter remarks when marking Error");
-					$("#remarks").focus();
-					return;
-				}
-
-				let formData = new FormData();
-				formData.append("createdBy", createdBy);
-				formData.append("enrollmentId", $("#enrollmentId").val());
-				formData.append("notFound", notFound);
-				formData.append("error", error);
-				formData.append("remarks", remarks);
-
-				$.ajax({
-					url: "/gcc/api/nulm/update-staff",
-					type: "POST",
-					data: formData,
-					processData: false,
-					contentType: false,
-
-					success: function () {
-
-						Swal.fire({
-							icon: 'success',
-							title: 'Success',
-							text: 'Status Updated Successfully',
-							confirmButtonColor: '#3085d6'
-						}).then(() => {
-							location.reload();
-						});
-
-					},
-
-					error: function () {
-						Swal.fire({
-							icon: 'error',
-							title: 'Error',
-							text: 'Failed to update staff',
-							confirmButtonColor: '#3085d6'
-						});
-					}
-
-				});
-
-				return; // stop normal validation
-			}
-
-			/* ===============================
-			   CASE 2: NORMAL UPDATE
-			   Run all validations
-			=============================== */
-
-			let phone = $("#mobileNo").val().trim();
-			let fhName = $("#fhName").val().trim();
-			let designation = $("#Designation").val();
-			let aadhar = $("#aadharNo").val().trim();
-			let bankAcc = $("#bankAccNo").val().trim();
-			let groupName = $("#groupName").val().trim();
-			let address = $("#address").val().trim();
-			let bankName = $("#bankName").val().trim();
-			let ifscCode = $("#ifscCode").val().trim();
-			let branch = $("#branch").val().trim();
-			let branchAddress = $("#branchAddress").val().trim();
-
-			let phonePattern = /^[6-9]\d{9}$/;
-			let aadharPattern = /^\d{12}$/;
-			let bankPattern = /^[0-9]{9,18}$/;
-			let ifscPattern = /^[A-Z]{4}0[A-Z0-9]{6}$/;
-
-			// Father / Husband Name
-			if (!fhName) {
-				showWarning("Please enter Father / Husband Name");
-				$("#fhName").focus();
-				return;
-			}
-
-			// Designation
-			if (!designation) {
-				showWarning("Please select designation");
-				$("#Designation").focus();
-				return;
-			}
-
-			// Group Name
-			if (!groupName) {
-				showWarning("Group name is missing");
-				$("#groupName").focus();
-				return;
-			}
-
-			// Aadhar
-			if (!aadhar) {
-				showWarning("Please enter Aadhar number");
-				$("#aadharNo").focus();
-				return;
-			}
-
-			if (!aadharPattern.test(aadhar)) {
-				showWarning("Aadhar number must be exactly 12 digits");
-				$("#aadharNo").focus();
-				return;
-			}
-
-			// Bank
-			if (!bankAcc) {
-				showWarning("Please enter bank account number");
-				$("#bankAccNo").focus();
-				return;
-			}
-
-			if (!bankPattern.test(bankAcc)) {
-				showWarning("Bank account number must be 9 to 18 digits");
-				$("#bankAccNo").focus();
-				return;
-			}
-			// Bank Name
-			if (!bankName) {
-				showWarning("Please enter bank name");
-				$("#bankName").focus();
-				return;
-			}
-
-			// IFSC Code
-			if (!ifscCode) {
-				showWarning("Please enter IFSC code");
-				$("#ifscCode").focus();
-				return;
-			}
-
-			if (!ifscPattern.test(ifscCode)) {
-				showWarning("Please enter valid IFSC code (Example: SBIN0001234)");
-				$("#ifscCode").focus();
-				return;
-			}
-
-			// Branch
-			if (!branch) {
-				showWarning("Please enter branch name");
-				$("#branch").focus();
-				return;
-			}
-
-			// Branch Address
-			if (!branchAddress) {
-				showWarning("Please enter branch address");
-				$("#branchAddress").focus();
-				return;
-			}
-
-			// Mobile
-			if (!phone) {
-				showWarning("Please enter mobile number");
-				$("#mobileNo").focus();
-				return;
-			}
-
-			if (!phonePattern.test(phone)) {
-				showWarning("Please enter valid 10 digit mobile number starting with 6-9");
-				$("#mobileNo").focus();
-				return;
-			}
-
-			// Address
-			if (!address) {
-				showWarning("Please enter address");
-				$("#address").focus();
-				return;
-			}
-
-			/* ===============================
-			   FILE VALIDATION
-			=============================== */
-
-			let formFile = $("#formFile")[0].files[0];
-			let aadharFile = $("#aadharFile")[0].files[0];
-			let bankFile = $("#bankPassbookFile")[0].files[0];
-
-			function validateFile(file) {
-				if (!file) return true;
-
-				let allowedTypes = ["image/jpeg", "image/jpg"];
-
-				if (!allowedTypes.includes(file.type)) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Invalid File',
-						text: 'Only JPG / JPEG files are allowed',
-						confirmButtonColor: '#3085d6'
-					});
-					return false;
-				}
-
-				return true;
-			}
-
-			if (!validateFile(formFile)) return;
-			if (!validateFile(aadharFile)) return;
-			if (!validateFile(bankFile)) return;
-
-			/* ===============================
-			   NORMAL FORM SUBMIT
-			=============================== */
-
-			let designationText = document.querySelector("#Designation option:checked").text;
-
-			let formData = new FormData();
-
-			formData.append("createdBy", createdBy);
-			formData.append("enrollmentId", $("#enrollmentId").val());
-			formData.append("fhName", fhName);
-			formData.append("groupName", groupName);
-			formData.append("designation", designationText);
-			formData.append("designationId", designation);
-			formData.append("aadharNo", aadhar);
-			formData.append("bankAccNo", bankAcc);
-			formData.append("phoneNumber", phone);
-			formData.append("address", address);
-			formData.append("bankName", bankName);
-			formData.append("ifscCode", ifscCode);
-			formData.append("branch", branch);
-			formData.append("branchAddress", branchAddress);
-
-			if (formFile) formData.append("uploadform", formFile);
-			if (aadharFile) formData.append("aadharcard", aadharFile);
-			if (bankFile) formData.append("bankpassbook", bankFile);
-
-			formData.append("notFound", notFound);
-			formData.append("error", error);
-			formData.append("remarks", remarks);
-
-			$.ajax({
-				url: "/gcc/api/nulm/update-staff",
-				type: "POST",
-				data: formData,
-				processData: false,
-				contentType: false,
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Success',
-						text: 'Updated Successfully',
-						confirmButtonColor: '#3085d6'
-					}).then(() => {
-						location.reload();
-					});
-
-				},
-
-				error: function () {
-					Swal.fire({
-						icon: 'error',
-						title: 'Error',
-						text: 'Failed to update staff',
-						confirmButtonColor: '#3085d6'
-					});
-				}
-
-			});
-
-		}
-
-
-		//09032026 last update method
-		/*function updateStaff() {
-
-			let phone = $("#mobileNo").val().trim();
-			let fhName = $("#fhName").val().trim();
-			let designation = $("#Designation").val();
-			let aadhar = $("#aadharNo").val().trim();
-			let bankAcc = $("#bankAccNo").val().trim();
-			let groupName = $("#groupName").val().trim();
-			let address = $("#address").val().trim();
-			let bankPattern = /^[0-9]{9,18}$/;
-
-
-
-			let phonePattern = /^[6-9]\d{9}$/;
-			let aadharPattern = /^\d{12}$/;
-
-			function showWarning(message) {
-				Swal.fire({
-					icon: 'warning',
-					title: 'Warning',
-					text: message,
-					confirmButtonColor: '#3085d6'
-				});
-			}
-
-			
-			if (!fhName) {
-				showWarning("Please enter Father / Husband Name");
-				$("#fhName").focus();
-				return;
-			}
-
-			// Designation
-			if (!designation) {
-				showWarning("Please select designation");
-				$("#Designation").focus();
-				return;
-			}
-
-			// Group Name
-			if (!groupName) {
-				showWarning("Group name is missing");
-				$("#groupName").focus();
-				return;
-			}
-
-			// Aadhar
-			// Aadhar Required
-			if (!aadhar) {
-				showWarning("Please enter Aadhar number");
-				$("#aadharNo").focus();
-				return;
-			}
-
-			// Aadhar Pattern Check
-			if (!aadharPattern.test(aadhar)) {
-				showWarning("Aadhar number must be exactly 12 digits");
-				$("#aadharNo").focus();
-				return;
-			}
-
-			// Bank Account
-			if (!bankAcc) {
-				showWarning("Please enter bank account number");
-				$("#bankAccNo").focus();
-				return;
-			}
-
-			if (!bankPattern.test(bankAcc)) {
-				showWarning("Bank account number must be 9 to 18 digits");
-				$("#bankAccNo").focus();
-				return;
-			}
-
-			// Mobile
-			if (!phone) {
-				showWarning("Please enter mobile number");
-				$("#mobileNo").focus();
-				return;
-			}
-
-			if (!phonePattern.test(phone)) {
-				showWarning("Please enter valid 10 digit mobile number starting with 6-9");
-				$("#mobileNo").focus();
-				return;
-			}
-
-			// Address
-			if (!address) {
-				showWarning("Please enter address");
-				$("#address").focus();
-				return;
-			}
-
-			
-
-			let formFile = $("#formFile")[0].files[0];
-			let aadharFile = $("#aadharFile")[0].files[0];
-			let bankFile = $("#bankPassbookFile")[0].files[0];
-
-			function validateFile(file) {
-				if (!file) return true;
-
-				let allowedTypes = ["image/jpeg", "image/jpg"];
-
-				if (!allowedTypes.includes(file.type)) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Invalid File',
-						text: 'Only JPG / JPEG files are allowed',
-						confirmButtonColor: '#3085d6'
-					});
-					return false;
-				}
-
-				return true;
-			}
-
-			if (!validateFile(formFile)) return;
-			if (!validateFile(aadharFile)) return;
-			if (!validateFile(bankFile)) return;
-
-			
-
-			
-
-			let designationText = document.querySelector("#Designation option:checked").text;
-
-			let formData = new FormData();
-
-			formData.append("createdBy", createdBy);
-			formData.append("enrollmentId", $("#enrollmentId").val());
-			formData.append("fhName", fhName);
-			formData.append("groupName", groupName);
-			formData.append("designation", designationText);
-			formData.append("designationId", designation);
-			formData.append("aadharNo", aadhar);
-			formData.append("bankAccNo", bankAcc);
-			formData.append("phoneNumber", phone);
-			formData.append("address", address);
-
-			if (formFile) formData.append("uploadform", formFile);
-			if (aadharFile) formData.append("aadharcard", aadharFile);
-			if (bankFile) formData.append("bankpassbook", bankFile);
-
-			let notFound = $("#notFoundChk").is(":checked") ? 1 : 0;
-			let error = $("#errorChk").is(":checked") ? 1 : 0;
-			let remarks = $("#remarks").val();
-
-			if (error && !remarks) {
-				showWarning("Please provide remarks when marking error");
-				return;
-			}
-
-			formData.append("notFound", notFound);
-			formData.append("error", error);
-			formData.append("remarks", remarks);
-
-			
-
-			$.ajax({
-				url: "/gcc/api/nulm/update-staff",
-				type: "POST",
-				data: formData,
-				processData: false,
-				contentType: false,
-
-				success: function () {
-
-					Swal.fire({
-						icon: 'success',
-						title: 'Success',
-						text: 'Updated Successfully',
-						confirmButtonColor: '#3085d6'
-					}).then(() => {
-						location.reload();
-					});
-
-				},
-
-				error: function () {
-					Swal.fire({
-						icon: 'error',
-						title: 'Error',
-						text: 'Failed to update staff',
-						confirmButtonColor: '#3085d6'
-					});
-				}
-
-			});
-
-		}*/
-		$('#division').change(function () {
-
-			const zone = $('#zone').val();
-			const division = $(this).val();
-
-			$('#park').empty().append('<option value="">Select</option>');
-
-			if (zone !== '' && division !== '') {
-
-				$.ajax({
-					url: '/gcc/api/nulm/list',
-					type: 'GET',
-					data: {
-						zone: zone,
-						division: division
-					},
-
-					success: function (data) {
-
-						if (Array.isArray(data)) {
-							let options = '';
-
-							data.forEach(function (park) {
-								options += `<option value="${park.park_id}">${park.park_name}</option>`;
-							});
-
-							$('#park').append(options);
-						}
-					}
-				});
-
-			}
-
-		});
-		$(document).ready(function () {
-			$.ajax({
-				url: '/gcc/api/nulm/zones',
-				type: 'GET',
-				success: function (data) {
-
-					$('#zone').empty().append('<option value="">Select</option>');
-
-					if (Array.isArray(data)) {
-						let options = '';
-						data.forEach(function (zone) {
-							options += `<option value="${zone}">${zone}</option>`;
-						});
-
-						$('#zone').append(options);
-					}
-				}
-			});
-			$.ajax({
-				url: "/gcc/api/nulm/designations",
-				type: "GET",
-				success: function (data) {
-
-					let options = '<option value="">Select Designation</option>';
-
-					data.forEach(function (item) {
-
-						options += `<option value="${item.designation_id}">
-                                ${item.designation}
-                            </option>`;
-					});
-
-					$("#Designation").html(options);
-				}
-			});
-		});
-
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/staffupdatenoacess.html b/src/main/resources/templates/modules/nulm/staffupdatenoacess.html
deleted file mode 100644
index c379f84a..00000000
--- a/src/main/resources/templates/modules/nulm/staffupdatenoacess.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-    <div class="wrapper">
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-        <div class="page-wrap">
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-6">
-                                <div class="page-header-title">
-                                    <i class="ik ik-thumbs-up bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>NULM STAFF</h5>
-                                        <span>Salary Report</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-6">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item">
-                                            <a href="/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item active" aria-current="page">Salary Report</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                    <hr>
-
-                    <div class="card-block mt-3">
-                        <div class="text-center text-danger" style="font-size:20px; font-weight:bold;">
-                            You Have No access for staff Update, Please contact admin...
-                        </div>
-                    </div>
-
-
-                </div>
-            </div>
-
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-    <div th:replace="~{fragments/modules/base/script :: script}"></div>
-
-
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/update.html b/src/main/resources/templates/modules/nulm/update.html
deleted file mode 100644
index 415d4c67..00000000
--- a/src/main/resources/templates/modules/nulm/update.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/updated-staff-park.html b/src/main/resources/templates/modules/nulm/updated-staff-park.html
deleted file mode 100644
index b3cd2084..00000000
--- a/src/main/resources/templates/modules/nulm/updated-staff-park.html
+++ /dev/null
@@ -1,380 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-</head>
-
-<body>
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Staff Details Updation Park</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Park StaffDetails Updation</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-                    <div class="card-block">
-						
-                        <div>
-							
-							<form id="departmentFilterForm" method="GET" action="/gcc/nulm/updateStaffPark">
-							    <div class="form-group">
-							        <label for="zone">Zone (Department)</label>
-							        <select class="form-control" id="zone" name="department" style="width: 300px;" onchange="this.form.submit()">
-							            <option value="">Select Zone</option>
-							            <option th:each="department : ${departments}"
-							                    th:value="${department.department}"
-							                    th:text="${department.department}"
-							                    th:selected="${department.department == selectedDepartment}">
-							            </option>
-							        </select>
-							    </div>
-							</form>
-                            <table id="salaryDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                <thead class="thead-dark">
-                                    <tr role="row">
-                                        <th>S.No</th>
-                                        <th>Employee ID</th>
-							            <th>Employee Name</th>
-							            <th>Designation</th>
-							            <th>Gender</th>
-							            <th>Date Of Birth</th>
-                                        <th>Action</th>
-                                    </tr>
-                                </thead>
-                                 <tbody>
-                                     <tr th:each="enrollments, i : ${enrollments}">
-                                      <td th:text="${i.count}">0</td>
-                                      <td th:text="${enrollments.emp_id}"></td>
-                                        <td th:text="${enrollments.name}"></td>
-                                        <td th:text="${enrollments.designation}"></td>
-                                        <td th:text="${enrollments.gender}"></td>
-                                        <td th:text="${enrollments.date_of_birth}"></td>
-                                        <td class="text-center">
-                                            <a href="#" th:onclick="return callEdit([[${enrollments.enrollment_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Edit" data-original-title="Edit"><i class="ik ik-edit f-16 mr-15 text-green"></i></a>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                                <tfoot class="thead-dark">
-                                    <tr role="row">
-                                        <th>S.No</th>
-                                        <th>Employee ID</th>
-							            <th>Employee Name</th>
-							            <th>Designation</th>
-							            <th>Gender</th>
-							            <th>Date Of Birth</th>
-                                        <th>Action</th>
-                                    </tr>
-                                </tfoot>
-                            </table>
-                        </div>
-                    </div>
-						
-
-					
-	
-	
-	<!-- Enrollment Edit Modal -->
-<div class="modal fade" id="editEnrollmentModal" tabindex="-1" role="dialog" aria-labelledby="editEnrollmentModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="editEnrollmentModalLabel">Edit Enrollment Details</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <!-- Form for Editing Enrollment -->
-                <form id="editEnrollmentForm">
-                    <input type="hidden" id="enrollmentId" name="enrollmentId">
-                    <div class="form-group">
-                        <label for="name">Name</label>
-                        <input type="text" class="form-control" id="name" name="name" disabled style="color: black;">
-                    </div>
-                    <div class="form-group">
-                        <label for="dateOfBirth">Date of Birth</label>
-                        <input type="date" class="form-control" id="dateOfBirth" name="dateOfBirth" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="gender">Gender</label>
-                        <input type="text" class="form-control" id="gender" name="gender" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="gender">Designation</label>
-                        <input type="text" class="form-control" id="designation" name="designation" disabled style="color: black;">
-                    </div>
-                    <div class="form-group">
-					      <label for="inchargeName">Incharge Name</label>
-					      <input type="text" class="form-control" id="inchargename" name="inchargename" disabled style="color: black;">
-					 </div>
-					 <div class="form-group">
-						 <label for="phoneNumber">Incharge Number</label>
-						 <input type="number" class="form-control" id="inchargeno" name="inchargeno" disabled style="color: black;">
-					 </div>
-					 <div class="form-group">
-					    <label for="shg">Self Help Group</label>
-					    <select class="form-control" id="shg" name="shg" required>
-					        <!-- Dropdown options will be populated dynamically via JavaScript -->
-					    </select>
-					</div>
-					
-					<div class="form-group">
-					    <label for="orderNumber">Order Number</label>
-					    <select class="form-control" id="orderNumber" name="orderNumber" required>
-					        <!-- Dropdown options will be populated dynamically via JavaScript -->
-					    </select>
-					</div>
-                    <!-- Add more fields as needed -->
-                    <button type="button" class="btn btn-primary" id="updateEnrollmentButton">Save Changes</button>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
-	
-	</div>
-
-
-				</div>
-
-
-			
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-	
-	<div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-<script th:inline="javascript">
-
- $(document).ready(function () {
-        // Initialize DataTable
-        const table = $('#salaryDatatable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [
-                { targets: 'no-sort', orderable: false }
-            ],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', 'Show all']
-            ],
-            scrollY: '50vh',
-            fixedColumns: {
-                left: 1,
-                right: 1
-            },
-            buttons: [
-                { extend: 'pageLength', className: 'btn btn-warning' },
-                { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary', id: 'copyBtn' },
-                { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary', id: 'excelBtn' },
-                { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary', id: 'csvBtn' },
-                { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary', id: 'pdfBtn' }
-            ],
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false       
-        });
-
-        // Function to open the edit modal and populate data
-        window.callEdit = function (enrollmentId) {
-            fetchEnrollmentDetails(enrollmentId);
-            return false; // Prevent default anchor click behavior
-        };
-        
-               function loadDepartments(selectedDepartment) {
-			    $.ajax({
-			        url: '/gcc/api/nulm/getDepartment',
-			        type: 'GET',
-			        success: function (response) {
-			            const departmentDropdown = $('#zone');
-			            departmentDropdown.empty(); // Clear existing options
-			            departmentDropdown.append('<option value="">Select Zone</option>');
-			
-			            response.forEach(function (department) {
-			                const departmentName = department.department; // Correct the attribute name if necessary
-			                const isSelected = departmentName === selectedDepartment ? 'selected' : '';
-			                departmentDropdown.append(new Option(departmentName, departmentName, false, isSelected));
-			            });
-			
-			            // If no department selected, show "Select Zone"
-			            if (!selectedDepartment) {
-			                departmentDropdown.val('');
-			            }
-			        },
-			        error: function (xhr, status, error) {
-			            console.error('Error fetching departments:', error);
-			        }
-			    });
-			}
-
-        // Load departments on page load
-        const selectedDepartment = /*[[${selectedDepartment}]]*/ ''; // Get this from Thymeleaf or other server-side context
-        loadDepartments(selectedDepartment);
-
-        function fetchEnrollmentDetails(enrollmentId) {
-            $.ajax({
-                url: `/gcc/api/nulm/getEnrollmentdeatilsByID/${enrollmentId}`,
-                type: 'GET',
-                success: function (response) {
-                    if (response && response.length > 0) {
-                        const enrollment = response[0];
-                        // Populate modal fields with data
-                        $('#enrollmentId').val(enrollment.enrollment_id);
-                        $('#name').val(enrollment.name);
-                        $('#dateOfBirth').val(enrollment.date_of_birth);
-                        $('#gender').val(enrollment.gender);
-                        $('#designation').val(enrollment.designation);
-                        $('#inchargename').val(enrollment.incharge_name);
-                        $('#inchargeno').val(enrollment.incharge_phoneno);
-                        
-                        // Call fetchDropdownData and pass the existing group and order values
-                        fetchDropdownData(enrollment.group_id, enrollment.order_id);
-                        
-                        // Open the modal
-                        $('#editEnrollmentModal').modal('show');
-                    } else {
-                        alert('Enrollment details not found.');
-                    }
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching enrollment details:', error);
-                    alert('An error occurred while fetching enrollment details.');
-                }
-            });
-        }
-
-        function fetchDropdownData(selectedGroupId, selectedOrderId) {
-            // Fetch Self Help Group dropdown
-            $.ajax({
-                url: '/gcc/api/nulm/selfHelpGroups',
-                type: 'GET',
-                success: function (response) {
-                    const selfHelpGroupDropdown = $('#shg');
-                    selfHelpGroupDropdown.empty(); // Clear existing options
-                    selfHelpGroupDropdown.append('<option value="">Select Self Help Group</option>');
-
-                    response.forEach(function (item) {
-                        const isSelected = item.groupId == selectedGroupId ? 'selected' : ''; // Check if this option should be selected
-                        selfHelpGroupDropdown.append(new Option(item.groupName, item.groupId, false, isSelected));
-                    });
-
-                    // If no group selected, show "Select Self Help Group"
-                    if (!selectedGroupId) {
-                        selfHelpGroupDropdown.val('');
-                    }
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching self-help groups:', error);
-                }
-            });
-
-            // Fetch Order Number dropdown
-            $.ajax({
-                url: '/gcc/api/nulm/orderNumbers',
-                type: 'GET',
-                success: function (response) {
-                    const orderNumberDropdown = $('#orderNumber');
-                    orderNumberDropdown.empty(); // Clear existing options
-                    orderNumberDropdown.append('<option value="">Select Order Number</option>');
-
-                    response.forEach(function (item) {
-                        const isSelected = item.orderId == selectedOrderId ? 'selected' : ''; // Check if this option should be selected
-                        orderNumberDropdown.append(new Option(item.orderNumber, item.orderId, false, isSelected));
-                    });
-
-                    // If no order selected, show "Select Order Number"
-                    if (!selectedOrderId) {
-                        orderNumberDropdown.val('');
-                    }
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching order numbers:', error);
-                }
-            });
-        }
-
-        $('#updateEnrollmentButton').on('click', function () {
-            const enrollmentId = $('#enrollmentId').val();
-            const updatedData = {
-                name: $('#name').val(),
-                dateOfBirth: $('#dateOfBirth').val(),
-                gender: $('#gender').val(),
-                groupId: $('#shg').val(),  // Get the selected group_id from dropdown
-                orderId: $('#orderNumber').val()  // Get the selected order_id from dropdown
-            };
-
-            $.ajax({
-                url: `/gcc/api/nulm/updateEnrollment/${enrollmentId}`,
-                type: 'POST',
-                data: updatedData,
-                success: function (response) {
-                    Swal.fire({
-                        title: 'Success!',
-                        text: 'Enrollment updated successfully!',
-                        icon: 'success',
-                        confirmButtonText: 'OK'
-                    }).then((result) => {
-                        if (result.isConfirmed) {
-                            $('#editEnrollmentModal').modal('hide'); // Hide the modal
-                            location.reload(); // Optionally reload the page to refresh the data
-                        }
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error updating enrollment details:', error);
-                    alert('An error occurred while updating enrollment details.');
-                }
-            });
-        });       
-
-
-    });
-
-</script>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/updated-staff.html b/src/main/resources/templates/modules/nulm/updated-staff.html
deleted file mode 100644
index a76d278a..00000000
--- a/src/main/resources/templates/modules/nulm/updated-staff.html
+++ /dev/null
@@ -1,380 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-</head>
-
-<body>
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Staff Details Updation</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Staff Details Updation</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-                    <div class="card-block">
-						
-                        <div>
-							
-							<form id="departmentFilterForm" method="GET" action="/gcc/nulm/updateStaff">
-							    <div class="form-group">
-							        <label for="zone">Zone (Department)</label>
-							        <select class="form-control" id="zone" name="department" style="width: 300px;" onchange="this.form.submit()">
-							            <option value="">Select Zone</option>
-							            <option th:each="department : ${departments}"
-							                    th:value="${department.department}"
-							                    th:text="${department.department}"
-							                    th:selected="${department.department == selectedDepartment}">
-							            </option>
-							        </select>
-							    </div>
-							</form>
-                            <table id="salaryDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                <thead class="thead-dark">
-                                    <tr role="row">
-                                        <th>S.No</th>
-                                        <th>Employee ID</th>
-							            <th>Employee Name</th>
-							            <th>Designation</th>
-							            <th>Gender</th>
-							            <th>Date Of Birth</th>
-                                        <th>Action</th>
-                                    </tr>
-                                </thead>
-                                 <tbody>
-                                     <tr th:each="enrollments, i : ${enrollments}">
-                                      <td th:text="${i.count}">0</td>
-                                      <td th:text="${enrollments.emp_id}"></td>
-                                        <td th:text="${enrollments.name}"></td>
-                                        <td th:text="${enrollments.designation}"></td>
-                                        <td th:text="${enrollments.gender}"></td>
-                                        <td th:text="${enrollments.date_of_birth}"></td>
-                                        <td class="text-center">
-                                            <a href="#" th:onclick="return callEdit([[${enrollments.enrollment_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Edit" data-original-title="Edit"><i class="ik ik-edit f-16 mr-15 text-green"></i></a>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                                <tfoot class="thead-dark">
-                                    <tr role="row">
-                                        <th>S.No</th>
-                                        <th>Employee ID</th>
-							            <th>Employee Name</th>
-							            <th>Designation</th>
-							            <th>Gender</th>
-							            <th>Date Of Birth</th>
-                                        <th>Action</th>
-                                    </tr>
-                                </tfoot>
-                            </table>
-                        </div>
-                    </div>
-						
-
-					
-	
-	
-	<!-- Enrollment Edit Modal -->
-<div class="modal fade" id="editEnrollmentModal" tabindex="-1" role="dialog" aria-labelledby="editEnrollmentModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="editEnrollmentModalLabel">Edit Enrollment Details</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <!-- Form for Editing Enrollment -->
-                <form id="editEnrollmentForm">
-                    <input type="hidden" id="enrollmentId" name="enrollmentId">
-                    <div class="form-group">
-                        <label for="name">Name</label>
-                        <input type="text" class="form-control" id="name" name="name" disabled style="color: black;">
-                    </div>
-                    <div class="form-group">
-                        <label for="dateOfBirth">Date of Birth</label>
-                        <input type="date" class="form-control" id="dateOfBirth" name="dateOfBirth" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="gender">Gender</label>
-                        <input type="text" class="form-control" id="gender" name="gender" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="gender">Designation</label>
-                        <input type="text" class="form-control" id="designation" name="designation" disabled style="color: black;">
-                    </div>
-                    <div class="form-group">
-					      <label for="inchargeName">Incharge Name</label>
-					      <input type="text" class="form-control" id="inchargename" name="inchargename" disabled style="color: black;">
-					 </div>
-					 <div class="form-group">
-						 <label for="phoneNumber">Incharge Number</label>
-						 <input type="number" class="form-control" id="inchargeno" name="inchargeno" disabled style="color: black;">
-					 </div>
-					 <div class="form-group">
-					    <label for="shg">Self Help Group</label>
-					    <select class="form-control" id="shg" name="shg" required>
-					        <!-- Dropdown options will be populated dynamically via JavaScript -->
-					    </select>
-					</div>
-					
-					<div class="form-group">
-					    <label for="orderNumber">Order Number</label>
-					    <select class="form-control" id="orderNumber" name="orderNumber" required>
-					        <!-- Dropdown options will be populated dynamically via JavaScript -->
-					    </select>
-					</div>
-                    <!-- Add more fields as needed -->
-                    <button type="button" class="btn btn-primary" id="updateEnrollmentButton">Save Changes</button>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
-	
-	</div>
-
-
-				</div>
-
-
-			
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-	
-	<div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-<script th:inline="javascript">
-
- $(document).ready(function () {
-        // Initialize DataTable
-        const table = $('#salaryDatatable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [
-                { targets: 'no-sort', orderable: false }
-            ],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', 'Show all']
-            ],
-            scrollY: '50vh',
-            fixedColumns: {
-                left: 1,
-                right: 1
-            },
-            buttons: [
-                { extend: 'pageLength', className: 'btn btn-warning' },
-                { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary', id: 'copyBtn' },
-                { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary', id: 'excelBtn' },
-                { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary', id: 'csvBtn' },
-                { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary', id: 'pdfBtn' }
-            ],
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false       
-        });
-
-        // Function to open the edit modal and populate data
-        window.callEdit = function (enrollmentId) {
-            fetchEnrollmentDetails(enrollmentId);
-            return false; // Prevent default anchor click behavior
-        };
-        
-               function loadDepartments(selectedDepartment) {
-			    $.ajax({
-			        url: '/gcc/api/nulm/getDepartment',
-			        type: 'GET',
-			        success: function (response) {
-			            const departmentDropdown = $('#zone');
-			            departmentDropdown.empty(); // Clear existing options
-			            departmentDropdown.append('<option value="">Select Zone</option>');
-			
-			            response.forEach(function (department) {
-			                const departmentName = department.department; // Correct the attribute name if necessary
-			                const isSelected = departmentName === selectedDepartment ? 'selected' : '';
-			                departmentDropdown.append(new Option(departmentName, departmentName, false, isSelected));
-			            });
-			
-			            // If no department selected, show "Select Zone"
-			            if (!selectedDepartment) {
-			                departmentDropdown.val('');
-			            }
-			        },
-			        error: function (xhr, status, error) {
-			            console.error('Error fetching departments:', error);
-			        }
-			    });
-			}
-
-        // Load departments on page load
-        const selectedDepartment = /*[[${selectedDepartment}]]*/ ''; // Get this from Thymeleaf or other server-side context
-        loadDepartments(selectedDepartment);
-
-        function fetchEnrollmentDetails(enrollmentId) {
-            $.ajax({
-                url: `/gcc/api/nulm/getEnrollmentdeatilsByID/${enrollmentId}`,
-                type: 'GET',
-                success: function (response) {
-                    if (response && response.length > 0) {
-                        const enrollment = response[0];
-                        // Populate modal fields with data
-                        $('#enrollmentId').val(enrollment.enrollment_id);
-                        $('#name').val(enrollment.name);
-                        $('#dateOfBirth').val(enrollment.date_of_birth);
-                        $('#gender').val(enrollment.gender);
-                        $('#designation').val(enrollment.designation);
-                        $('#inchargename').val(enrollment.incharge_name);
-                        $('#inchargeno').val(enrollment.incharge_phoneno);
-                        
-                        // Call fetchDropdownData and pass the existing group and order values
-                        fetchDropdownData(enrollment.group_id, enrollment.order_id);
-                        
-                        // Open the modal
-                        $('#editEnrollmentModal').modal('show');
-                    } else {
-                        alert('Enrollment details not found.');
-                    }
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching enrollment details:', error);
-                    alert('An error occurred while fetching enrollment details.');
-                }
-            });
-        }
-
-        function fetchDropdownData(selectedGroupId, selectedOrderId) {
-            // Fetch Self Help Group dropdown
-            $.ajax({
-                url: '/gcc/api/nulm/selfHelpGroups',
-                type: 'GET',
-                success: function (response) {
-                    const selfHelpGroupDropdown = $('#shg');
-                    selfHelpGroupDropdown.empty(); // Clear existing options
-                    selfHelpGroupDropdown.append('<option value="">Select Self Help Group</option>');
-
-                    response.forEach(function (item) {
-                        const isSelected = item.groupId == selectedGroupId ? 'selected' : ''; // Check if this option should be selected
-                        selfHelpGroupDropdown.append(new Option(item.groupName, item.groupId, false, isSelected));
-                    });
-
-                    // If no group selected, show "Select Self Help Group"
-                    if (!selectedGroupId) {
-                        selfHelpGroupDropdown.val('');
-                    }
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching self-help groups:', error);
-                }
-            });
-
-            // Fetch Order Number dropdown
-            $.ajax({
-                url: '/gcc/api/nulm/orderNumbers',
-                type: 'GET',
-                success: function (response) {
-                    const orderNumberDropdown = $('#orderNumber');
-                    orderNumberDropdown.empty(); // Clear existing options
-                    orderNumberDropdown.append('<option value="">Select Order Number</option>');
-
-                    response.forEach(function (item) {
-                        const isSelected = item.orderId == selectedOrderId ? 'selected' : ''; // Check if this option should be selected
-                        orderNumberDropdown.append(new Option(item.orderNumber, item.orderId, false, isSelected));
-                    });
-
-                    // If no order selected, show "Select Order Number"
-                    if (!selectedOrderId) {
-                        orderNumberDropdown.val('');
-                    }
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching order numbers:', error);
-                }
-            });
-        }
-
-        $('#updateEnrollmentButton').on('click', function () {
-            const enrollmentId = $('#enrollmentId').val();
-            const updatedData = {
-                name: $('#name').val(),
-                dateOfBirth: $('#dateOfBirth').val(),
-                gender: $('#gender').val(),
-                groupId: $('#shg').val(),  // Get the selected group_id from dropdown
-                orderId: $('#orderNumber').val()  // Get the selected order_id from dropdown
-            };
-
-            $.ajax({
-                url: `/gcc/api/nulm/updateEnrollment/${enrollmentId}`,
-                type: 'POST',
-                data: updatedData,
-                success: function (response) {
-                    Swal.fire({
-                        title: 'Success!',
-                        text: 'Enrollment updated successfully!',
-                        icon: 'success',
-                        confirmButtonText: 'OK'
-                    }).then((result) => {
-                        if (result.isConfirmed) {
-                            $('#editEnrollmentModal').modal('hide'); // Hide the modal
-                            location.reload(); // Optionally reload the page to refresh the data
-                        }
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error updating enrollment details:', error);
-                    alert('An error occurred while updating enrollment details.');
-                }
-            });
-        });       
-
-
-    });
-
-</script>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/zone-wise-report-park.html b/src/main/resources/templates/modules/nulm/zone-wise-report-park.html
deleted file mode 100644
index a9456a83..00000000
--- a/src/main/resources/templates/modules/nulm/zone-wise-report-park.html
+++ /dev/null
@@ -1,430 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>Park STAFF</h5>
-										<span>Park Zone wise Report</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Park Zonewise Report</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row">
-						
-						<div class="col-sm-3">
-							<label for="zone">Zone</label>
-							<select id="zone" class="form-control">
-								<option value="">Select</option>
-								<option value="1">Zone 01</option>
-								<option value="2">Zone 02</option>
-								<option value="3">Zone 03</option>
-								<option value="4">Zone 04</option>
-								<option value="5">Zone 05</option>
-								<option value="6">Zone 06</option>
-								<option value="7">Zone 07</option>
-								<option value="8">Zone 08</option>
-								<option value="9">Zone 09</option>
-								<option value="10">Zone 10</option>
-								<option value="11">Zone 11</option>
-								<option value="12">Zone 12</option>
-								<option value="13">Zone 13</option>
-								<option value="14">Zone 14</option>
-								<option value="15">Zone 15</option>
-							</select>
-						</div>
-						
-						<!-- Division -->
-						<div class="col-md-3 form-group">
-							<label for="division">Division</label>
-							<select class="form-control" id="division" name="division" required>
-								<option value="">Select Division</option>
-								<option th:each="division : ${divisionList}" th:value="${division.division}" th:text="${division.division}"
-									th:selected="${division.division == selectedDivision}">
-								</option>
-							</select>
-						</div>
-						
-						<!-- Year -->
-						<div class="col-md-3 form-group">
-							<label for="year">Year</label>
-							<select class="form-control" id="year" name="year" required>
-								<option value="">Select Year</option>
-								<option th:each="year : ${yearList}" th:value="${year.year}" th:text="${year.year}"
-									th:selected="${year.year == selectedYear}">
-								</option>
-							</select>
-						</div>
-						
-						<!-- Month -->
-						<div class="col-md-3 form-group">
-							<label for="month">Month</label>
-							<select id="month" class="form-control" name="month" required>
-								<option value="">Select Month</option>
-								<option th:each="month : ${monthList}" th:value="${month.month}" th:text="${month.month}"
-									th:selected="${month.month == selectedMonth}">
-								</option>
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="salaryStatus">Salary Status:</label>
-							<select id="salaryStatus" class="form-control">
-								<option value="">Select</option>
-								<option value="Initiated">Initiated</option>
-								<option value="Approved">Approved</option>
-							</select>
-						</div>
-
-						<div class="col-sm-3" style="display: none;">
-							<label for="selfhelp">Self Help Group:</label>
-							<select id="selfhelp" class="form-control">
-								<option value="">Select</option>
-								<!-- Group names will be populated here -->
-							</select>
-						</div>
-
-
-
-						<div class="col-sm-3">
-
-							<button class="btn btn-primary mt-4" onclick="fetchZoneReport()">Get Salary Info</button>
-						</div>
-					</div>
-
-					<!-- Salary Report Table -->
-					<div class="card-block mt-3">
-						<table id="salaryreporttable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Zone</th>
-									<th>Division</th>
-									<th>Self Help Group</th>
-									<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr th:each="zone, i : ${zonewiseReport}">
-									<td th:text="${i.count}">1</td>
-									<td th:text="${zone.emp_id}"></td>
-									<td th:text="${zone.name}"></td>
-									<td th:text="${zone.incharge_name}"></td>
-									<td th:text="${zone.incharge_designation}"></td>
-									<td th:text="${zone.zone}"></td>
-									<td th:text="${zone.division}"></td>
-									<td th:text="${zone.group_name}"></td>
-									<td th:text="${zone.total_days_present}"></td>
-									<td th:text="${zone.total_days_od}"></td>
-									<td th:text="${zone.total_days_salary}"></td>
-									<td th:text="${zone.total_days}"></td>
-									<td th:text="${zone.total_days_absent}"></td>
-									<td th:text="${zone.imonth}"></td>
-									<td th:text="${zone.iyear}"></td>
-									<td th:text="${zone.total_salary}"></td>
-									<td th:text="${zone.salary_status}"></td>
-								</tr>
-							</tbody>
-							<tfoot class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Zone</th>
-									<th>Division</th>
-									<th>Self Help Group</th>
-									<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>
-								</tr>
-							</tfoot>
-						</table>
-					</div>
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-
-	<script th:inline="javascript">
-		
-		function loadYear(selectedYear) {
-				$.ajax({
-					url: '/gcc/api/nulm/getYear',
-					type: 'GET',
-					success: function (response) {
-						const yearDropdown = $('#year');
-						yearDropdown.empty(); // Clear existing options
-						yearDropdown.append('<option value="">Select Year</option>');
-
-						response.forEach(function (year) {
-							const yearName = year.year; // Correct the attribute name if necessary
-							const isSelected = yearName === selectedYear ? 'selected' : '';
-							yearDropdown.append(new Option(yearName, yearName, false, isSelected));
-						});
-
-						// If no department selected, show "Select Zone"
-						if (!selectedYear) {
-							yearDropdown.val('');
-						}
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching departments:', error);
-					}
-				});
-			}
-
-
-			const selectedYear = /*[[${selectedYear}]]*/ ''; // Get this from Thymeleaf or other server-side context
-			loadYear(selectedYear);
-
-			function loadMonth(selectedMonth) {
-				const year = document.getElementById('year').value; // Get the selected year
-				if (!year) {
-					$('#month').empty().append('<option value="">Select Month</option>'); // Clear month dropdown if no year selected
-					return; // Exit if no year is selected
-				}
-
-				$.ajax({
-					url: `/gcc/api/nulm/getMonth?year=${year}`,
-					type: 'GET',
-					success: function (response) {
-						const monthDropdown = $('#month');
-						monthDropdown.empty(); // Clear existing options
-						monthDropdown.append('<option value="">Select Month</option>');
-
-						response.forEach(function (month) {
-							const monthName = month.month;
-							monthDropdown.append(new Option(monthName, monthName));
-						});
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching months:', error);
-					}
-				});
-			}
-
-			// Load months when the year changes
-			document.getElementById('year').addEventListener('change', function () {
-				loadMonth(); // Call loadMonth when the year is selected
-			});
-			
-			function loadDivision(selectedDivision) {
-				const zone=document.getElementById('zone').value;
-				console.log(zone);
-					$.ajax({
-						url: '/gcc/api/nulm/getDivisionList',
-						type: 'GET',
-						data: {
-							zone: zone
-						},
-						success: function (response) {
-							const divisionDropdown = $('#division');
-							divisionDropdown.empty(); // Clear existing options
-							divisionDropdown.append('<option value="">Select Division</option>');
-
-							response.forEach(function (division) {
-								const divisionName = division.division; // Correct the attribute name if necessary
-								const isSelected = divisionName === selectedDivision ? 'selected' : '';
-								divisionDropdown.append(new Option(divisionName, divisionName, false, isSelected));
-							});
-
-							// If no department selected, show "Select Zone"
-							if (!selectedDivision) {
-								divisionDropdown.val('');
-							}
-						},
-						error: function (xhr, status, error) {
-							console.error('Error fetching zone:', error);
-						}
-					});
-				}
-				
-				// Load division when zone selected
-			document.getElementById('zone').addEventListener('change', function () {
-			loadDivision(); // Call loadDivision when the zone is selected
-			});
-
-
-
-		function fetchZoneReport() {
-			const month = document.getElementById('month').value;
-			const year = document.getElementById('year').value;
-			const salaryStatus = document.getElementById('salaryStatus').value;
-			const groupName=document.getElementById('selfhelp').value;
-			const zone=document.getElementById('zone').value;
-			const division=document.getElementById('division').value;
-
-			if (month && year) {
-				window.location.href = `/gcc/nulm/salary-zonereport-park?month=${month}&year=${year}&salaryStatus=${salaryStatus}
-				&groupName=${groupName}&zone=${zone}&division=${division}`;
-			} else {
-				alert("Please select both month and year.");
-			}
-		}
-		$(document).ready(function () {
-
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-
-			// Call this on page load to reset the URL
-			clearUrlParams();
-
-			// Initialize DataTable
-			var table = $('#salaryreporttable').DataTable({
-				dom: 'Bftip',
-				columnDefs: [
-					{targets: 'no-sort', orderable: false}
-				],
-				lengthMenu: [
-					[50, 100, 200, 500, -1],
-					['50 rows', '100 rows', '200 rows', 'Show all']
-				],
-				scrollY: '50vh',
-				fixedColumns: {
-					left: 1,
-					right: 1
-				},
-				buttons: [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
-                },
-                orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							doc.content[1].table.widths = ['4%', '8%', '8%', '8%', '9%', '4%', '6%', '8%', '7%', '6%', '6%', '6%', '6%', '9%', '9%', '7%','6%'];
-
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'EXCEL',
-						className: 'btn btn-secondary',
-						id: 'excelBtn'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn'
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-
-
-		});
-		$(document).ready(function () {
-			$.ajax({
-				url: '/gcc/api/nulm/selfHelpGroups', 
-				type: 'GET',
-				success: function (data) {
-					// Clear existing options (if any)
-					$('#selfhelp').empty().append('<option value="">Select</option>');
-
-					// Check if data is an array and iterate through it
-					if (Array.isArray(data)) {
-						let options = '';
-						data.forEach(function (group) {
-							// Access the correct properties
-							options += `<option value="${group.groupName}">${group.groupName}</option>`;
-						});
-						$('#selfhelp').append(options);
-					} else {
-						console.error("Data is not an array:", data);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching self-help groups:", error);
-				}
-			});
-		});
-
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/nulm/zone-wise-report.html b/src/main/resources/templates/modules/nulm/zone-wise-report.html
deleted file mode 100644
index 7c159b51..00000000
--- a/src/main/resources/templates/modules/nulm/zone-wise-report.html
+++ /dev/null
@@ -1,430 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="ik ik-thumbs-up bg-blue"></i>
-									<div class="d-inline">
-										<h5>NULM STAFF</h5>
-										<span>Zone wise Report</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item active" aria-current="page">Zone wise Report</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-
-					<!-- Filters Section -->
-					<div class="row">
-						
-						<div class="col-sm-3">
-							<label for="zone">Zone</label>
-							<select id="zone" class="form-control">
-								<option value="">Select</option>
-								<option value="1">Zone 01</option>
-								<option value="2">Zone 02</option>
-								<option value="3">Zone 03</option>
-								<option value="4">Zone 04</option>
-								<option value="5">Zone 05</option>
-								<option value="6">Zone 06</option>
-								<option value="7">Zone 07</option>
-								<option value="8">Zone 08</option>
-								<option value="9">Zone 09</option>
-								<option value="10">Zone 10</option>
-								<option value="11">Zone 11</option>
-								<option value="12">Zone 12</option>
-								<option value="13">Zone 13</option>
-								<option value="14">Zone 14</option>
-								<option value="15">Zone 15</option>
-							</select>
-						</div>
-						
-						<!-- Division -->
-						<div class="col-md-3 form-group">
-							<label for="division">Division</label>
-							<select class="form-control" id="division" name="division" required>
-								<option value="">Select Division</option>
-								<option th:each="division : ${divisionList}" th:value="${division.division}" th:text="${division.division}"
-									th:selected="${division.division == selectedDivision}">
-								</option>
-							</select>
-						</div>
-						
-						<!-- Year -->
-						<div class="col-md-3 form-group">
-							<label for="year">Year</label>
-							<select class="form-control" id="year" name="year" required>
-								<option value="">Select Year</option>
-								<option th:each="year : ${yearList}" th:value="${year.year}" th:text="${year.year}"
-									th:selected="${year.year == selectedYear}">
-								</option>
-							</select>
-						</div>
-						
-						<!-- Month -->
-						<div class="col-md-3 form-group">
-							<label for="month">Month</label>
-							<select id="month" class="form-control" name="month" required>
-								<option value="">Select Month</option>
-								<option th:each="month : ${monthList}" th:value="${month.month}" th:text="${month.month}"
-									th:selected="${month.month == selectedMonth}">
-								</option>
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="salaryStatus">Salary Status:</label>
-							<select id="salaryStatus" class="form-control">
-								<option value="">Select</option>
-								<option value="Initiated">Initiated</option>
-								<option value="Approved">Approved</option>
-							</select>
-						</div>
-
-						<div class="col-sm-3">
-							<label for="selfhelp">Self Help Group:</label>
-							<select id="selfhelp" class="form-control">
-								<option value="">Select</option>
-								<!-- Group names will be populated here -->
-							</select>
-						</div>
-
-
-
-						<div class="col-sm-3">
-
-							<button class="btn btn-primary mt-4" onclick="fetchZoneReport()">Get Salary Info</button>
-						</div>
-					</div>
-
-					<!-- Salary Report Table -->
-					<div class="card-block mt-3">
-						<table id="salaryreporttable" class="table table-striped table-bordered">
-							<thead class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Zone</th>
-									<th>Division</th>
-									<th>Self Help Group</th>
-									<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr th:each="zone, i : ${zonewiseReport}">
-									<td th:text="${i.count}">1</td>
-									<td th:text="${zone.emp_id}"></td>
-									<td th:text="${zone.name}"></td>
-									<td th:text="${zone.incharge_name}"></td>
-									<td th:text="${zone.incharge_designation}"></td>
-									<td th:text="${zone.zone}"></td>
-									<td th:text="${zone.division}"></td>
-									<td th:text="${zone.group_name}"></td>
-									<td th:text="${zone.total_days_present}"></td>
-									<td th:text="${zone.total_days_od}"></td>
-									<td th:text="${zone.total_days_salary}"></td>
-									<td th:text="${zone.total_days}"></td>
-									<td th:text="${zone.total_days_absent}"></td>
-									<td th:text="${zone.imonth}"></td>
-									<td th:text="${zone.iyear}"></td>
-									<td th:text="${zone.total_salary}"></td>
-									<td th:text="${zone.salary_status}"></td>
-								</tr>
-							</tbody>
-							<tfoot class="thead-dark">
-								<tr>
-									<th>S.No</th>
-									<th>Employee Id</th>
-									<th>Employee Name</th>
-									<th>Incharge Name</th>
-									<th>Incharge Designation</th>
-									<th>Zone</th>
-									<th>Division</th>
-									<th>Self Help Group</th>
-									<th>Days Present</th>
-									<th>OD</th>
-									<th>Total Days for Salary</th>
-									<th>Total Days</th>
-									<th>Total Days Absent</th>
-									<th>Month</th>
-									<th>Year</th>
-									<th>Salary Amount</th>
-									<th>Salary Status</th>
-								</tr>
-							</tfoot>
-						</table>
-					</div>
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-	<div th:replace="~{fragments/modules/base/script :: script}"></div>
-
-	<script th:inline="javascript">
-		
-		function loadYear(selectedYear) {
-				$.ajax({
-					url: '/gcc/api/nulm/getYear',
-					type: 'GET',
-					success: function (response) {
-						const yearDropdown = $('#year');
-						yearDropdown.empty(); // Clear existing options
-						yearDropdown.append('<option value="">Select Year</option>');
-
-						response.forEach(function (year) {
-							const yearName = year.year; // Correct the attribute name if necessary
-							const isSelected = yearName === selectedYear ? 'selected' : '';
-							yearDropdown.append(new Option(yearName, yearName, false, isSelected));
-						});
-
-						// If no department selected, show "Select Zone"
-						if (!selectedYear) {
-							yearDropdown.val('');
-						}
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching departments:', error);
-					}
-				});
-			}
-
-
-			const selectedYear = /*[[${selectedYear}]]*/ ''; // Get this from Thymeleaf or other server-side context
-			loadYear(selectedYear);
-
-			function loadMonth(selectedMonth) {
-				const year = document.getElementById('year').value; // Get the selected year
-				if (!year) {
-					$('#month').empty().append('<option value="">Select Month</option>'); // Clear month dropdown if no year selected
-					return; // Exit if no year is selected
-				}
-
-				$.ajax({
-					url: `/gcc/api/nulm/getMonth?year=${year}`,
-					type: 'GET',
-					success: function (response) {
-						const monthDropdown = $('#month');
-						monthDropdown.empty(); // Clear existing options
-						monthDropdown.append('<option value="">Select Month</option>');
-
-						response.forEach(function (month) {
-							const monthName = month.month;
-							monthDropdown.append(new Option(monthName, monthName));
-						});
-					},
-					error: function (xhr, status, error) {
-						console.error('Error fetching months:', error);
-					}
-				});
-			}
-
-			// Load months when the year changes
-			document.getElementById('year').addEventListener('change', function () {
-				loadMonth(); // Call loadMonth when the year is selected
-			});
-			
-			function loadDivision(selectedDivision) {
-				const zone=document.getElementById('zone').value;
-				console.log(zone);
-					$.ajax({
-						url: '/gcc/api/nulm/getDivisionList',
-						type: 'GET',
-						data: {
-							zone: zone
-						},
-						success: function (response) {
-							const divisionDropdown = $('#division');
-							divisionDropdown.empty(); // Clear existing options
-							divisionDropdown.append('<option value="">Select Division</option>');
-
-							response.forEach(function (division) {
-								const divisionName = division.division; // Correct the attribute name if necessary
-								const isSelected = divisionName === selectedDivision ? 'selected' : '';
-								divisionDropdown.append(new Option(divisionName, divisionName, false, isSelected));
-							});
-
-							// If no department selected, show "Select Zone"
-							if (!selectedDivision) {
-								divisionDropdown.val('');
-							}
-						},
-						error: function (xhr, status, error) {
-							console.error('Error fetching zone:', error);
-						}
-					});
-				}
-				
-				// Load division when zone selected
-			document.getElementById('zone').addEventListener('change', function () {
-			loadDivision(); // Call loadDivision when the zone is selected
-			});
-
-
-
-		function fetchZoneReport() {
-			const month = document.getElementById('month').value;
-			const year = document.getElementById('year').value;
-			const salaryStatus = document.getElementById('salaryStatus').value;
-			const groupName=document.getElementById('selfhelp').value;
-			const zone=document.getElementById('zone').value;
-			const division=document.getElementById('division').value;
-
-			if (month && year) {
-				window.location.href = `/gcc/nulm/salary-zonereport?month=${month}&year=${year}&salaryStatus=${salaryStatus}
-				&groupName=${groupName}&zone=${zone}&division=${division}`;
-			} else {
-				alert("Please select both month and year.");
-			}
-		}
-		$(document).ready(function () {
-
-			function clearUrlParams() {
-				const currentUrl = window.location.href;
-				const urlWithoutParams = currentUrl.split('?')[0]; // Remove the query parameters
-				window.history.replaceState({}, document.title, urlWithoutParams); // Replace the current URL without params
-			}
-
-			// Call this on page load to reset the URL
-			clearUrlParams();
-
-			// Initialize DataTable
-			var table = $('#salaryreporttable').DataTable({
-				dom: 'Bftip',
-				columnDefs: [
-					{targets: 'no-sort', orderable: false}
-				],
-				lengthMenu: [
-					[50, 100, 200, 500, -1],
-					['50 rows', '100 rows', '200 rows', 'Show all']
-				],
-				scrollY: '50vh',
-				fixedColumns: {
-					left: 1,
-					right: 1
-				},
-				buttons: [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						exportOptions: {
-                    columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
-                },
-                orientation: 'landscape', // Change to landscape for more horizontal space
-						pageSize: 'A3', // You can change to A4 or A3 depending on your needs
-						customize: function (doc) {
-							// Custom column widths for better fit
-							doc.content[1].table.widths = ['4%', '8%', '8%', '8%', '9%', '4%', '6%', '8%', '7%', '6%', '6%', '6%', '6%', '9%', '9%', '7%','6%'];
-
-							// Optional: Adjust font size if needed
-							doc.styles.tableBodyEven.alignment = 'center';
-							doc.styles.tableBodyOdd.alignment = 'center';
-						}
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'EXCEL',
-						className: 'btn btn-secondary',
-						id: 'excelBtn'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn'
-					}
-				],
-				fixedHeader: true,
-				autoWidth: true,
-				responsive: true,
-				searching: true,
-				select: false,
-				processing: false
-			});
-
-
-		});
-		$(document).ready(function () {
-			$.ajax({
-				url: '/gcc/api/nulm/selfHelpGroups', 
-				type: 'GET',
-				success: function (data) {
-					// Clear existing options (if any)
-					$('#selfhelp').empty().append('<option value="">Select</option>');
-
-					// Check if data is an array and iterate through it
-					if (Array.isArray(data)) {
-						let options = '';
-						data.forEach(function (group) {
-							// Access the correct properties
-							options += `<option value="${group.groupName}">${group.groupName}</option>`;
-						});
-						$('#selfhelp').append(options);
-					} else {
-						console.error("Data is not an array:", data);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching self-help groups:", error);
-				}
-			});
-		});
-
-
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/.DS_Store b/src/main/resources/templates/modules/pensioner/.DS_Store
deleted file mode 100644
index d608b1fc5cb37252704a06d55a106c06a8581fd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHM&1(}u6o1oJyJ>BcwrTx9G!O(2R#UJ>C}NBeDIzUR(Uw-@Zg!e3-R#8OO=~TM
z9Q7`E^&b##;@OK=PaZr7BIw0~M{oM(BQ}j2@gP!k24;RQGw;2b`R%@)eH#EE`MNy;
za0mbltQ-^l*hCaQ&g)O5OZ5yR60`^KA%rSW@DO#;3}^;41DXNNfM#GXGJt0`FGh!R
zUykZlGoTsxFB#y^hZI(hIfV_0;?aSPNC6Oguv-+AF%J+nDTO(O4T-`Oeah^CC{v<R
z3?j{OJjK-!a|#<0r8y934n)mNRE9#t>}Zz~>OgW5b*mZB4E)Rh&)xgL#+<zdW^4X_
zb#69O4?-Wud*B*4nA6*xbf;Zbwp?c6I1j%|SWkZw1*H!Dt&O0jY@S;+*9pQ*<_+oU
z?%B7$*XT9+ja$W4wowetupZ=1e~JH^XUw&lvT5CL=te1#yv)4NbUf+{1IMPQvV7C=
zY_^eSb<YljZBY&wF(Xz=jBRa=XHKQYGux+9TiLTHp3hEhZ^w+$^qHx-(wbZK*aNY4
zAnJhw1M>He_F<=;IpuY=GxDgpvv<v%#rpaW3=GB-L-FDG$VhT@?BLkpQewn1%WD;%
zul6!?nV)y-bipYzujt&T3n9H1a-ozMZqu8i_U)an`OO;YBzHQ5ud6<#-crSP?3tC7
zfQAb#^5SxUv`&Y#I_<46^uLaj&eTGOdBF|p2Z*;^)1vN-muF$fs*9%Yn_h+HH%p1Q
zu*F5r`jp!Vzr~tacDzdZ;ulF&Iyc)CPD&vGX(`~FXR;|NB(ZtVtkPIIcTM#eZ~~^F
z0N25SyYK)W!4r52FX1)3h0pMn5Yk6R$S65Rj*|?TAm>O{T6Q(B+mYRKhyx+=j&~~)
z#WJhbg#OS`ekVujRav2+?p!1L^~3v5M_=(fzJsp)+q$*YmidP>d>N5G*NeXAGOvQ;
ze2+1VT>ix^z!+tS6#Ndc8==`2xzEsFYve{){1b5-u`eC9dp>F-uG+4c9eD9LIv!dh
zcJjjDM-{OV{;F&zUVp8*D_RE|IB`@Yw#6#f+B>CNF69u<|F3lZ{=at?tXHBL&<y->
z21rk#SjeN><||YC3_RCPVZDQu7p~WkC`_;s={TZD#}R-0VTf`HRk=-0VM8MJVEOAG
V0{DA-#FJm2|N8s~|NlAvzXJ%0etiG{

diff --git a/src/main/resources/templates/modules/pensioner/department/.DS_Store b/src/main/resources/templates/modules/pensioner/department/.DS_Store
deleted file mode 100644
index 78b4fad4c6bc8b9fa3982de0ae9d38f39010e4da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10244
zcmeHM&2Jk;6o2ES&ALfr(<DV80hS^VhpKfXAV@u6Tt`vVR*B-Mq-u*<+Y@Ki_0F=p
zjvJy#K2apD6-U&60C7Q_5keq7B)GtV1E(H2aO4F1W_I1|hn-42Ac|(BnfG?)y|?fE
z#`EkqCL&htwU>xWL}Z{#TAaZ!qRDmHGc6a*yadXiPZX@#qSdrTGb5`fGy)m{jetf#
zBcKuZZy<p0Y}t(Ikm^w*pb^jrJVZd|hZ4G^m52^Ps!|6ARRVxcVp=uur~{NvDWa8#
z4nnF_VKb~ASft9L5`%^6ST9L&&`LxHAq~}uh3dqjH?ychVe0MBD=Beem5}ODBcKt;
zA|Pw`6J%14+GHi_cX^QBL_hzxYDzUGX?K?DEzxz=JiBrgG`89mwOVu!AP?qug|EJr
zwh|KUM@YE4@i(X!6{tlv3G#`<-z)Igr-07WF2*j|vD*jf{io=0@AJ?WkaJ;!LjyLF
z8tl18Yb4^%JvfBM2)n8HzmMV{DVf0G7|8@46EZ-W1qvoG*rg^SGs(mA7&O=_lH#4%
zUKVKw_(>#&m|EmeXPmzJEPNc(Hz3WakM00VkM>tLH_AOf@Zi@ZU50H3-pH$?lw1;X
zwM)m^ZT5XP`Ye6cbZyHI%H>~JZesGp$th#Xm^N<JcSXM*m_g64n%)ihv?YYy9P(!K
zn#KE#;`}Ay1g7P1PbpY!4w0L0Sx#H@tD@($eWhCu7mU1-ht9!4`CO@dc&>D?{0g|&
zmtQ?R%o_`f7cOo#Zrfc)ye~Hb*hXJWbUJ)~INk-9!N6+mMKQ5^!<c>>#*{xbJ#%`t
zP<*OzrZ6`*zi{^Hv(Ge&b4{~#yW>eeF9}<CRlCQxt(I`=)_Z(A;CBMaG>T_Za+|#U
z_R-YVz6+W8qX}he)#Kc`(ebSI`p%BegY6i9{iY8<*8<*Mb9Mym?*YtpH?V}`U*nz+
zddoJO++KI8A_zqHy6JhQ)8W<qMzNrD;pB$LrJk}|cg>dNbQa(EBLr!&vN2>{4w)h?
zh76#aA94|8`7Oun^88}uax`Pmi*%7{bQP!IUHX9T(S7=azNDY%SNfg)WQ?6+b8LY<
z&t70<w!~gz%b{j&xM$BM-=TgqWcDm^@+Us}0Xi9(___b_ua&zG*f%oojgUJ!^~cF2
z&-@qC&5W(Ry64!!>0nL9Gll#nGeLk8Xr^<b%5d@1mXc1ym@~i4+KWes)nUF$+3AX-
z_{K{mqRY7uM0B3YNF3hpflFuT4<QrxKO>)vp!@SEn`2_g*cuZ>MlKo0eY}!pR2(j{
zvfK&(xU9-%V_Eg2(hKl??2(hrl;dR+akG`r;X}gKn3z*CBX=z!lZch6J(Kb3rV-Ex
zXaqC@8Uc;KlYziQ=w?aY|F4Yy|NqGdMti9d&<H#h0&KEYuT`NsEQixp<Xw9S{T+1K
zq}(8+N(F<ujt5oO@pzE8eyW(qTp7G-;46{=9fTAd+Q0s1fUf^haw_Okb$g<U)b;=9
KTa5oj{r?Z(tG~Jc

diff --git a/src/main/resources/templates/modules/pensioner/department/audit/familypension.html b/src/main/resources/templates/modules/pensioner/department/audit/familypension.html
deleted file mode 100644
index 95d61606..00000000
--- a/src/main/resources/templates/modules/pensioner/department/audit/familypension.html
+++ /dev/null
@@ -1,750 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#returnfamilypensiondetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-
-
-  .is-invalid {
-    border: 1px solid red;
-  }
-
-
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Family Pension</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Audit</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">Audit- Family Pension</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-												<th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  			
-					                  			
-					                  			<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']},data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                        
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  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-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Audit - Family Pension (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No  </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name  </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department  </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation  </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    
-			                    
-			                    <!-- pending duration-->
-			                    
-			                    
-                    				<div class="col-md-6">
-										    <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-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 -->
-			                    <div class="col-md-6">
-			                        <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">
-			                        <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 -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit  </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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" readonly></textarea>
-			                    </div>
-			                    
-			                    
-			                    <div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Mark As Returned From Audit</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile"  class="form-label fw-bold">Date File Received From Audit <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly>
-					               </div>
-					                    
-					            <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" ></textarea>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditbutton">Submit</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			        
-					           
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    
-    
-    
-    <script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}	
-	
-	document.getElementById("submitbutton").addEventListener("click", function () {
-	    // Clear the inputs in the receivedcard section
-	    //$('#datefile').val('');
-	    $('#remarks').val('');
-	    
-	    // Make the receivedcard section visible
-	    document.getElementById("receivedcard").style.display = "block";
-	
-	    // Scroll the receivedcard section into view
-	    document.getElementById("receivedcard").scrollIntoView({
-	        behavior: "smooth", // Smooth scrolling effect
-	        block: "center" // Aligns the element to the center of the viewport
-	    });
-	});
-	
-	
-	
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	console.log("employeecode:",tempId);
-	 	            	
-	 	                // Populate modal fields
-	 	                $('#employeenomodel').val(employeeDetails.emp_no);
-	 	                $('#employeename').val(employeeDetails.emp_name);
-	 	                $('#department').val(employeeDetails.dept_name);
-	 	                $('#designation').val(employeeDetails.designation);
-	 	                $('#servicedeath').val(employeeDetails.service_death);
-	 	               	$('#relationship').val(employeeDetails.relationship_deceased);
-	 	              	$('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
-	 	               	$('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               	
-	 	               	
-	 	               // 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);
-
-	 	                // Show the modal
-	 	                $('#returnfamilypensiondetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	                
-	 	                
-	 	               $('#auditbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-    	 
-    	 $(document).on('click', '.view-btn', function () {
-    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-    		 const tempId = $(this).data('temp-id');
-    		    console.log("empCode====="+empCode);
-    		    console.log("tempId====="+tempId);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    	        fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnfamilypensiondetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnfamilypensiondetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnfamilypensiondetailsModal').modal('hide');
-	    });
-	});
-	 
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-	 
-	 
-		function formatDateTime(dateString) {
-			 const options = {
-			     day: '2-digit',
-			     month: '2-digit',
-			     year: 'numeric',
-			 };
-			 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-			}
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);	 
-  	    let entryDetails = {
-  	        empNo: empNo,
-  	      	tempId: tempId,
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim()
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	  if (!entryDetails.remarks) {
-          Swal.fire({
-              icon: 'warning',
-              title: 'Validation Error!',
-              text: 'Remarks are required.',
-              confirmButtonText: 'OK'
-          });
-          return;
-      }
-
-  		// Disable the button to prevent multiple submissions
-  	     $('#auditbutton').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/department/audit/updateFamilyPensionDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditbutton').prop('disabled', false).text('Mark As Returned From Audit');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditbutton').prop('disabled', false).text('Mark As Returned From Audit');
-	                        	window.location.href = "/gcc/department/audit/familypension";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditbutton').prop('disabled', false).text('Mark As Returned From Audit');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-    
-
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/audit/pendency.html b/src/main/resources/templates/modules/pensioner/department/audit/pendency.html
deleted file mode 100644
index 92341c0b..00000000
--- a/src/main/resources/templates/modules/pensioner/department/audit/pendency.html
+++ /dev/null
@@ -1,736 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#returnpendencydetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Pendency</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Audit</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5><span th:text="${filecategory}" id="filecategory" style="display:none"></span>
-					         <h5 style="font-weight:bold;">Audit - 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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Category Type</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  			
-					                  					
-					                  			<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_category_name']}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']},data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                        
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  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-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Audit -Pendency(<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeeno" class="form-label fw-bold">Employee No  </label>
-			                        <input type="number" id="employeeno" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name  </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department  </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation  </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                   
-			                 
-			                    <!-- Class -->
-			                    <div class="col-md-6">
-			                        <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">
-			                        <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" id="retirementDetailsContainer" style="display: none; margin-top: 10px;">
-									    <label for="retirement" class="form-label fw-bold">Type Of Retirement </label>
-									    <input type="text" id="retirement" class="form-control" readonly>
-									</div>
-									
-								
-			                    <div class="col-md-6">
-								    <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="text" id="pendingDurationInputContainer" style="display: none; margin-top: 10px;">
-								        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control"  readonly>
-								    </div>
-								</div>
-			                    
-			                   
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit  </label>
-			                        <input type="date" id="datefile_modal" class="form-control" onclick="this.showPicker()" readonly>
-			                    </div>
-			
-			                    <!-- 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" readonly></textarea>
-			                    </div>
-			                    
-			                    
-			                    <!-- file history -->
-			                    <div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-			                    
-			                    
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Mark As Returned From Audit</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile "  class="form-label fw-bold">Date File Received From Audit <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly >
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditbutton">Submit</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			               
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	 <script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-
-        
-    });
-  
-  
-	function convertDateFormat(dateString) {
-	    if (!dateString) return '';
-	    let [day, month, year] = dateString.split('-');
-	    return `${year}-${month}-${day}`;
-	}
-	
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	console.log("employeecode:",tempId);
-	 	            	
-	 	                // Populate modal fields
-	 	                $('#employeeno').val(employeeDetails.emp_no);
-	 	                $('#employeename').val(employeeDetails.emp_name);
-	 	                $('#department').val(employeeDetails.dept_name);
-	 	                $('#designation').val(employeeDetails.designation);
-	 	               	$('#classes').val(employeeDetails.retirement_class);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
-	 	               	$('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               	$('#typeofcategory').val(employeeDetails.file_category_name);
-	 	               	
-	 	               // 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);
-	 	                }
-	 	               	
-	 	                
-	 	                let typeOfCategory=employeeDetails.file_category_name;
-	 	                let typeOfRetirement=employeeDetails.type_of_retirement;
-	 	                
-	 	               if (typeOfCategory === "Retirement") {
-	 	                    $('#retirementDetailsContainer').show(); // Show the text box
-	 	                    $('#retirement').val(typeOfRetirement); // Populate the input field
-	 	                } else {
-	 	                    $('#retirementDetailsContainer').hide(); // Hide the text box
-	 	                }
-
-	 	              	 	               
-	 	               
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#returnpendencydetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	          	       
-			 	            	// $('#datefile').val('');
-			 	         	    $('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	 	    // Scroll the receivedcard section into view
-	 	          	 	    document.getElementById("receivedcard").scrollIntoView({
-	 	          	 	        behavior: "smooth", // Smooth scrolling effect
-	 	          	 	        block: "center" // Aligns the element to the center of the viewport
-	 	          	 	    });
-	 	          	        
-	 	          	    });
-	 	                
-	 	               /*  document.getElementById('auditbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeeno').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	        		
-	 	              $('#auditbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-    	 
-    	 $(document).on('click', '.view-btn', function () {
-    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-    		 const tempId = $(this).data('temp-id');
-    		    console.log("empCode====="+empCode);
-    		    console.log("tempId====="+tempId);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    	        fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnfamilypensiondetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnpendencydetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnpendencydetailsModal').modal('hide');
-	    });
-	});
-	 
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-	 
-	 
-		function formatDateTime(dateString) {
-			 const options = {
-			     day: '2-digit',
-			     month: '2-digit',
-			     year: 'numeric',
-			 };
-			 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-			}
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);	 
-  	    let entryDetails = {
-  	    	 empNo: $('#employeeno').val(),
-  	      	tempId: tempId,
-  	        dateToAudit:convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim()
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	  if (!entryDetails.remarks) {
-          Swal.fire({
-              icon: 'warning',
-              title: 'Validation Error!',
-              text: 'Remarks are required.',
-              confirmButtonText: 'OK'
-          });
-          return;
-      }
-
-  		// Disable the button to prevent multiple submissions
-  	     $('#auditbutton').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/department/audit/updatePendencyDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditbutton').prop('disabled', false).text('Mark As Returned From Audit');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditbutton').prop('disabled', false).text('Mark As Returned From Audit');
-	                        	window.location.href = "/gcc/department/audit/pendency";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditbutton').prop('disabled', false).text('Mark As Returned From Audit');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-    
-    
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/audit/retirement.html b/src/main/resources/templates/modules/pensioner/department/audit/retirement.html
deleted file mode 100644
index 2190f549..00000000
--- a/src/main/resources/templates/modules/pensioner/department/audit/retirement.html
+++ /dev/null
@@ -1,646 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Retirement</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Audit</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5><span th:text="${filecategory}" id="filecategory" style="display:none"></span>
-					        <h5 style="font-weight:bold;">Audit- Retirement</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-                
-                <!--  page loader-->
-  
-  
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Audit - Retirement (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No  </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name  </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department  </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation  </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div class="col-md-6">
-			                        <label for="retirementdate" class="form-label fw-bold">Retirement Date  </label>
-			                        <input type="date" id="retirementdate" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Class -->
-			                    <div class="col-md-6">
-			                        <label for="classes" class="form-label fw-bold">Class  </label>
-			                        <input type="text" id="classes" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Type of Retirement -->
-			                    <div class="col-md-6">
-			                        <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>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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"  readonly></textarea>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-
-						</div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Mark As Returned From Audit</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile "  class="form-label fw-bold">Date File Received From Audit <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly>
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditsubmit">Submit</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			              
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: false,
-	    });
-	    
-	});
-	
-	
-	document.getElementById("submitbutton").addEventListener("click", function () {
-	    // Clear the inputs in the receivedcard section
-	    //$('#datefile').val('');
-	    //$('#remarks').val('');
-	    
-	    // Make the receivedcard section visible
-	    document.getElementById("receivedcard").style.display = "block";
-
-	    // Scroll the receivedcard section into view
-	    document.getElementById("receivedcard").scrollIntoView({
-	        behavior: "smooth", // Smooth scrolling effect
-	        block: "center" // Aligns the element to the center of the viewport
-	    });
-	});		  
-	
-	
-	
-	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;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	               $('#classes').val(employeeDetails.retirement_class);
-	 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                
-	 	               
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	          	       
-			 	            	// $('#datefile').val('');
-			 	         	    $('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditsubmit').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	                
-	 	               $('#auditsubmit').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	});
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
-	 const options = {
-	     day: '2-digit',
-	     month: '2-digit',
-	     year: 'numeric',
-	 };
-	 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-
-	 
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);	 
-  	    let entryDetails = {
-  	    	empNo:empNo,
-  	      	tempId: tempId, // Pass the stored tempId value		
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim()
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-
-   	  
-    	 if (!entryDetails.remarks) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error!',
-                text: 'Remarks are required.',
-                confirmButtonText: 'OK'
-            });
-            return;
-        }
-  	    
-  		// Disable the button to prevent multiple submissions
-  	      $('#auditsubmit').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/department/audit/updateEmployeeDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Submit');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditsubmit').prop('disabled', false).text('Submit');
-	                        	window.location.href = "/gcc/department/audit/retirement";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Submit');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-
-		
-		    
-		    
-		    
-		    
-		    		     
-		     
-
-
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/closedList.html b/src/main/resources/templates/modules/pensioner/department/closedList.html
deleted file mode 100644
index 0b581ad5..00000000
--- a/src/main/resources/templates/modules/pensioner/department/closedList.html
+++ /dev/null
@@ -1,1155 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"  xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-.card-block {
-    padding: 20px;
-}
-
-.form-label {
-    margin-bottom: 0.5rem;
-}
-
-input.form-control {
-    padding: 10px;
-}
-.form-select {
-    padding: 10px;
-    height: 40px;
-}
-
-#employeeCard label{
-padding-top: 2%;
-}
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-
-.form-check {
-    margin-right: 30px; /* Adjust space between Yes and No */
-}
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Closed List</h5>
-                                        <span>Retirement file Closed list Due to Service Death</span>
-                                     </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Retirement File Closing</li>
-                                        <li class="breadcrumb-item" aria-current="page">Closed List</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-                    <div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">File Closing List</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-												<th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                    </tbody>
-					                      
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-						
-					
-
-                    </div>
-                </div>
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-
-				<!-- model box -->
-				
-				
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    File Closing List- Employee (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                
-			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <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>
-			                    
-			                    <!-- Class -->
-			                    <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>
-			                    
-			                    <!-- Type of Retirement -->
-			                    <div class="col-md-4">
-			                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-			                        <input type="text" id="typeofretirement" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">File Updated Date</label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div class="col-md-4">
-					                        <label for="deathdate"  class="form-label fw-bold">Employee Death Date</label>
-					                        <input type="date" id="deathdate"  class="form-control" readonly>
-					               </div> 
-			
-			                    <!-- 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>
-			                    </div>
-			                    
-						</div>
-						<div id="zbcard">
-						<hr>
-						
-						<p style="font-weight: bold;font-size: medium;text-decoration: underline;">Zone Benefits</p>	
-							           
-			         <div class="row mt-2" id="sec2">	                		
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						
-						</div>
-						
-						<hr>
-						
-						
-						
-						<!-- <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" >
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		</div>
-	                   		
-	                   		<div class="row mt-2">
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    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)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    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)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    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> -->
-						
-						     <!-- file history -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-								
-								
-			            <hr>
-			               					           
-					             <div class="row mt-4">
-							                   <div class="col-12 d-flex justify-content-center">
-										       <button id="backbutton" class="btn btn-secondary mt-2" data-dismiss="modal">Back</button>
-										    </div>
-								 </div>
-			          </div> 
-			        </div>     
-			        </div>
-			    </div>
-			
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-	
-
-	$(document).ready(function () {
-	    
-	    // Initialize DataTable
-	    function initializeDataTable() {
-	        $('#AuditDatatable').DataTable({
-	            dom: 'Bftip',
-	            columnDefs: [{ targets: 'no-sort', orderable: false }],
-	            lengthMenu: [
-	                [50, 100, 200, 500, -1],
-	                ['50 rows', '100 rows', '200 rows', 'Show all']
-	            ],
-	            scrollY: '50vh',
-	            buttons: [
-	                { extend: 'pageLength', className: 'btn btn-warning' },
-	                { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	                { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	                { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	                { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	            ],
-	            fixedHeader: true,
-	            autoWidth: true,
-	            responsive: true,
-	            searching: true,
-	            paging: true,
-	            info: true,
-	            ordering: false
-	        });
-	    }
-
-	    // Call once on page load
-	    initializeDataTable();
-	
-	
-    // Handle Search button click
-    
-        //const empCode = $('#empCode').val();
-        const deptId=$('#deptId').text().trim();
-        
-        $('#pageLoader').show();
-        $('#audittable').show();
-
-        
-        $.ajax({
-            url: '/gcc/api/fileclosing/getcloseddetails',
-            type: 'GET',
-            data: {deptId:deptId },
-           
-            success: function (response) {
-            	
-            	 console.log("depatment",deptId);
-            	
-            	console.log("response==",response);
-            	
-            	let employeeDetails=response;
-                $('#pageLoader').hide();
-                if (employeeDetails && employeeDetails.length > 0) {
-                    populateDataTable(employeeDetails); // Function to populate DataTable
-                } else {
-                    Swal.fire({
-                        icon: "warning",
-                        title: "No Data Found",
-                        text: "No details found.",
-                        confirmButtonText: "OK",
-                        customClass: {
-                            confirmButton: "btn btn-primary"
-                        }
-                    });
-                }
-            },
-            error: function () {
-                $('#pageLoader').hide();
-                Swal.fire({
-                    icon: "error",
-                    title: "Error",
-                    text: "An error occurred while fetching data. Please try again.",
-                    confirmButtonText: "OK"
-                });
-            }
-        });
-   
-
-    function populateDataTable(data) {
-    	
-     let tbodyHtml = "";
-        $.each(data, function (index, audit) {
-            tbodyHtml += `
-                <tr>
-                    <td class="text-center">${index + 1}</td>
-                    <td class="text-center">${audit.emp_no || 'N/A'}</td>
-                    <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,'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
-                        </button>
-                    </td>
-                </tr>`;
-        });
-
-        // Destroy old DataTable before reinitializing
-        let table = $('#AuditDatatable').DataTable();
-        table.clear().destroy();
-        $('#AuditDatatable tbody').html(tbodyHtml);
-
-        // Reinitialize DataTable with updated data
-        initializeDataTable();
-    }
-
-   
- });
-
-	 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) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/fileclosing/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-					if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	//console.log("retirementdate",retirementdate);
-	 	                // 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);
-	 	                $('#classes').val(employeeDetails.retirement_class);
-	 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
-	 	               	$('#deathdate').val(employeeDetails.service_death);
-	 	                       
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             //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);
-		                     $('#gpf50').prop('disabled', true);
-		                     $('#gpfAmountDiv').show();
-		                     $('#gpfAmount').val(employeeDetails.gpf_amount).prop('readonly', true); // Make input readonly
-		                 } else if (employeeDetails.gpf === 'no') {
-		                     $('#gpfNo').prop('checked', true);
-		                     $('#gpfYes').prop('disabled', true);
-		                     $('#gpf50').prop('disabled', true);
-		                     $('#gpfAmountDiv').hide();
-		                 } else if (employeeDetails.gpf === '90') {
-		                     $('#gpf50').prop('checked', true);
-		                     $('#gpfYes').prop('disabled', true);
-		                     $('#gpfNo').prop('disabled', true);
-		                     $('#gpfAmountDiv').show();
-		                     $('#gpfAmount').val(employeeDetails.gpf_amount).prop('readonly', true);
-		                 }else  {
-		                     $('#gpf50').prop('disabled', true);
-		                     $('#gpfYes').prop('disabled', true);
-		                     $('#gpfNo').prop('disabled', true);
-		                     $('#gpfAmountDiv').hide();
-		                     
-		                 }
-						
-
-		                 // Populate Earned Leave & Leave on Private Affairs
-		                 if (employeeDetails.private_affairs === 'yes') {
-		                     $('#earnedleaveYes').prop('checked', true);
-		                     $('#earnedleaveNo').prop('disabled', true);
-		                     $('#earnedleaveAmountDiv').show();
-		                     $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount).prop('readonly', true);
-		                 } else if (employeeDetails.private_affairs === 'no') {
-		                     $('#earnedleaveNo').prop('checked', true);
-		                     $('#earnedleaveYes').prop('disabled', true);
-		                     $('#earnedleaveAmountDiv').hide();
-		                 } else  {
-		                     $('#earnedleaveNo').prop('disabled', true);
-		                     $('#earnedleaveYes').prop('disabled', true);
-		                     $('#earnedleaveAmountDiv').hide();
-		                 }
-
-		                 // Populate SPFGS
-		                 if (employeeDetails.spfgs === 'yes') {
-		                     $('#spfgsYes').prop('checked', true);
-		                     $('#spfgsNo').prop('disabled', true);
-		                     $('#spfgsAmountDiv').show();
-		                     $('#spfgsAmount').val(employeeDetails.spfgs_amount).prop('readonly', true);
-		                 } else if (employeeDetails.spfgs === 'no') {
-		                     $('#spfgsNo').prop('checked', true);
-		                     $('#spfgsYes').prop('disabled', true);
-		                     $('#spfgsAmountDiv').hide();
-		                 }else  {
-		                     $('#spfgsNo').prop('disabled', true);
-		                     $('#spfgsYes').prop('disabled', true);
-		                     $('#spfgsAmountDiv').hide();
-		                 }
-
-		                 // Populate Recovery From Employee
-		                 $('#recoveryemployeevalue')
-		                     .val(employeeDetails.recovery_emp)
-		                     .prop('readonly', true); // Make input readonly
-
-		                 // Populate DCRG
-		                 if (employeeDetails.dcrg === 'yes') {
-		                     $('#dcrgYes').prop('checked', true);
-		                     $('#dcrgNo').prop('disabled', true);
-		                   			                     
-		                 }else if (employeeDetails.dcrg === 'no') {
-		                     $('#dcrgNo').prop('checked', true);
-		                     $('#dcrgYes').prop('disabled', true);	  
-		                     
-		                 }else  {
-		                     $('#dcrgNo').prop('disabled', true);
-		                     $('#dcrgYes').prop('disabled', 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);
-                       if (employeeDetails.benefit_pension === "yes") {
-                           $('#PbAmountDiv').show();
-                           $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount).prop('readonly',true);
-                         //  bpYes bpNo PbAmountDiv benefit_pension_amount
-                           $('#bpYes').prop('checked', true);
-		                     $('#bpNo').prop('disabled', true);
-                       } else if(employeeDetails.benefit_pension === "no"){
-                           $('#PbAmountDiv').hide();
-                           $('#bpNo').prop('checked', true);
-		                     $('#bpYes').prop('disabled', true);
-                       }
-                       else{
-                       	$('#bpNo').prop('disabled', true);
-		                     $('#bpYes').prop('disabled', true);
-                       }
-                       
-                       $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-                       if (employeeDetails.benefit_dcrg === "yes") {
-                           $('#dcrgAmountDiv').show();
-                           $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount).prop('readonly',true);
-                           // DcrgYes DcrgNo dcrgAmountDiv benefit_dcrg_amount
-                           $('#DcrgYes').prop('checked', true);
-		                     $('#DcrgNo').prop('disabled', true);
-                       } else if(employeeDetails.benefit_dcrg === "no"){
-                           $('#dcrgAmountDiv').hide();
-                           $('#DcrgNo').prop('checked', true);
-		                     $('#DcrgYes').prop('disabled', true);
-                           
-                       }else {
-                           $('#dcrgAmountDiv').hide();
-                           $('#DcrgNo').prop('disabled', true);
-		                     $('#DcrgYes').prop('disabled', true);
-                           
-                       }
-                       
-                       $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-                       if (employeeDetails.benefit_commutation === "yes") {
-                           $('#CommutationAmountDiv').show();
-                           $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount).prop('readonly',true);
-                           // commutationYes commutationNo CommutationAmountDiv benefit_commutation_amount
-                           $('#commutationYes').prop('checked', true);
-		                     $('#commutationNo').prop('disabled', true);
-                       } else if (employeeDetails.benefit_commutation === "no"){
-                           $('#CommutationAmountDiv').hide();
-                           $('#commutationNo').prop('checked', true);
-		                     $('#commutationYes').prop('disabled', true);
-                       }else {
-                           $('#CommutationAmountDiv').hide();
-                           $('#commutationNo').prop('disabled', true);
-		                     $('#commutationYes').prop('disabled', true);
-                       } 
-	          	       
-		 	            	 //$('#datefile').val('');
-		 	         	    $('#remarks').val('');
-	          	        
-	                
-	                document.getElementById('closedbutton').addEventListener('click', function () {
-	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	                    // Trigger the save function and pass the value
-	                    saveEntryDetails(tempId,employeeNo);
-	        		}); */
-	                   
-	            } else {
-	                Swal.fire({
-	                    icon: 'info',
-	                    title: 'No Data',
-	                    text: 'No details found for the selected employee.',
-	                    confirmButtonText: 'OK',
-	                });
-	            }
-	        },
-	        error: function () {
-	            Swal.fire({
-	                icon: 'error',
-	                title: 'Error',
-	                text: 'Failed to fetch employee details. Please try again.',
-	                confirmButtonText: 'OK',
-	            });
-	        },
-	    }); 
-	    
-	}
-	    
-		
- 	$(document).ready(function () {
- 		
-   	 	$(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("tempId====="+tempId);
-   		    // Hide the receivedcard section before showing the modal
-   	        $("#receivedcard").hide();
-   		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-   		    loadFileHistory(tempId); // Load the file history for the selected employee
-   		
-
-   		});
-   	 	
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#backbutton').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	 // Listen for changes on the GPF radio buttons
-	    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-	            if (this.value === 'yes' || this.value === '90') {
-	                gpfAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	                gpfAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('gpfAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 
-	 
-	 // Listen for changes on the private affaires radio buttons
-	    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-	            if (this.value === 'yes') {
-	            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	 
-	 // Listen for changes on the spfgs radio buttons
-	    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-	            if (this.value === 'yes') {
-	            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 
-	 
-	 
-	    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const PbAmountDiv = document.getElementById('PbAmountDiv');
-	            if (this.value === 'yes') {
-	            	PbAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	PbAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	    
-	    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-	            if (this.value === 'yes') {
-	            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	    
-	    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-	            if (this.value === 'yes') {
-	            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	});
- 	
- 	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-	 
-	 // Function to format date and time
-		function formatDateTime(dateString) {
-	 const options = {
-	     day: '2-digit',
-	     month: '2-digit',
-	     year: 'numeric',
-	 };
-	 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-
-	 
-
-/* 		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("datefilereceived").value = formattedDateDisplay;
-	        document.getElementById("datefileyes").value = formattedDateDisplay;
-	        
-	    }); */
-	  
-	  
-/* 	function convertDateFormat(dateString) {
-	    if (!dateString) return '';
-	    let [day, month, year] = dateString.split('-');
-	    return `${year}-${month}-${day}`;
-	}
-	
-	
-	function saveEntryDetails(tempId,empNo) {
-	      
-  	    let entryDetails = {
-  	    	empNo:empNo,
-  	      	tempId: tempId, // Pass the stored tempId value		
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	      	serviceDeath:$('#deathdate').val(),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim(),
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	   $('#closedbutton').prop('disabled', true).text('Processing...');
- 	    
- 	    $.ajax({
- 	        url: '/gcc/api/fileclosing/updateDetails',
- 	        type: 'POST',
- 	        contentType: 'application/json',
- 	        data: JSON.stringify(entryDetails),
- 	        success: function (response) {
- 	        	$('#closedbutton').prop('disabled', false).text('Mark as Closed');	
- 	            Swal.fire({
- 	                icon: 'success',
- 	                title: 'Success',
- 	                text: response,
- 	               	allowOutsideClick: false,
- 	              	allowEscapeKey: false,
- 	              	allowEnterKey: false,
- 	                confirmButtonText: 'OK'
- 	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#closedbutton').prop('disabled', false).text('Mark as Closed');
-	                        	window.location.href = "/gcc/departmentfileclosing/fileclosing";
-	                            console.log("Continue clicked");
-	                        }
- 	            });
- 	        },
- 	        error: function (xhr, status, error) {
- 	        	$('#auditsubmit').prop('disabled', false).text('Mark as Closed');
- 	            Swal.fire({
- 	                icon: 'error',
- 	                title: 'Error',
- 	                text: 'Failed to save details. Please try again.',
- 	                confirmButtonText: 'OK'
- 	            });
- 	            console.error('Error:', xhr.responseText);
- 	        }
- 	    });  
- 	} */
-	
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/completed/contributorypensionscheme.html b/src/main/resources/templates/modules/pensioner/department/completed/contributorypensionscheme.html
deleted file mode 100644
index 8f200865..00000000
--- a/src/main/resources/templates/modules/pensioner/department/completed/contributorypensionscheme.html
+++ /dev/null
@@ -1,691 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#completedDetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-#completedDetailsModal label{
-	padding-top: 3%;
-}
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Contributory Pension Scheme</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Contributory Pension Scheme</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-					    <div class="col-md-12">
-					        <div class="card">
-					            <div class="card-block">
-					            <h5 style="font-weight:bold;"><span th:text="${deptname}" id="deptname"></span>&nbsp;Department</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">
-					                    <table id="CompletedCPSDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                        <thead class="thead-dark">
-					                            <tr role="row">
-					                                <th class="text-center">S.No</th>
-					                                <th class="text-center">Employee Code</th>
-					                                <th class="text-center">Name</th>
-					                                <th class="text-center">Department</th>
-					                                <th class="text-center">Designation</th>
-					                                <th class="text-center">File Created Date</th>					                            
-					                     		    <th class="text-center">File Type</th> 
-					                                <th class="text-center">View</th>
-					                            </tr>
-					                        </thead>
-					                        <tbody style="text-align:center;">
-					                            <!-- Thymeleaf loop to populate data -->
-					                            <tr th:each="cps, iterStat : ${completedCPSList}">
-					                                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-					                                <td th:text="${cps['emp_no']}" class="text-center"></td>
-					                                <td th:text="${cps['emp_name']}" class="text-center"></td>
-					                                <td th:text="${cps['dept_name']}" class="text-center"></td>
-					                                <td th:text="${cps['designation']}" class="text-center"></td>
-					                                <td th:text="${cps['created_date'] != null ? #dates.format(cps['created_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                    <td th:text="${cps['file_entry_type']}" class="text-center"></td> 
-					                                <td class="text-center">
-					                                    <button class="btn btn-primary btn-sm view-btn" 
-					                                            th:attr="data-id=${cps['emp_no']}, data-temp-id=${cps['temp_id']}">
-					                                        View
-					                                    </button>
-					                                </td>
-					                            </tr>
-					                        </tbody>
-					                    </table>
-					                </div>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-
-                   </div>
-
-                    </div>
-                    
-                      <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-                </div>
-
-        </div>
-
-    
-<!-- Modal Box for CompletedDetails -->
-<!-- Modal Box for CompletedDetails -->
-<div class="modal fade" id="completedDetailsModal" tabindex="-1" role="dialog" aria-labelledby="completedDetailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="completedDetailsModalLabel">
-                   Contributory pension Scheme Completed Details - (<span id="completedModalEmployeeCode"></span>)
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <div class="col-md-6">
-                        <label for="completedEmployeeNo" class="form-label fw-bold">Employee No </label>
-                        <input type="text" id="completedEmployeeNo" class="form-control" readonly>
-                    </div>
-                    <div class="col-md-6">
-                        <label for="completedEmployeeName" class="form-label fw-bold">Employee Name </label>
-                        <input type="text" id="completedEmployeeName" class="form-control" readonly>
-                    </div>
-                    <div class="col-md-6">
-                        <label for="completedDepartment" class="form-label fw-bold">Department </label>
-                        <input type="text" id="completedDepartment" class="form-control" readonly>
-                    </div>
-                    <div class="col-md-6">
-                        <label for="completedDesignation" class="form-label fw-bold">Designation </label>
-                        <input type="text" id="completedDesignation" class="form-control" readonly>
-                    </div>
-
-                    <div class="col-md-6">
-                        <label for="completedClass" class="form-label fw-bold">Class </label>
-                        <input type="text" id="completedClass" class="form-control" readonly>
-                    </div>
-                    <div class="col-sm-6">
-                        <label for="completedretirementdate" class="form-label fw-bold">Retirement Date </label>
-                        <input type="date" id="completedretirementdate" class="form-control" readonly>
-                    </div>
-                    <div class="col-md-6">
-                        <label for="completedType" class="form-label fw-bold">Type of Retirement </label>
-                        <input type="text" id="completedType" class="form-control" readonly>
-                    </div>
-					<!-- UAC Section -->
-					    <div class="col-md-6">
-					        <label class="form-label fw-bold" for="uac">Whether File Sent UAC Date </label>
-					        <div class="d-flex">
-					            <div class="form-check" style="padding-right:10px;">
-					                <input type="radio" id="uacYes" name="uac" class="form-check-input" value="Yes" >
-					                <label for="uacYes" class="form-check-label">Yes</label>
-					            </div>
-					            <div class="form-check">
-					                <input type="radio" id="uacNo" name="uac" class="form-check-input" value="No" >
-					                <label for="uacNo" class="form-check-label">No</label>
-					            </div>
-					        </div>
-					        <div class="mt-3" id="uacInputDiv" style="display: none;">
-					            <input type="date" id="uacDate" class="form-control" readonly>
-					        </div>
-					    </div>
-                    
-						
-						
-					 <!-- Pending Duration -->
-							<div class="col-md-6">
-							    <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="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled>
-							            <label for="yespen" class="form-check-label">Yes</label>
-							        </div>
-							        <div class="form-check">
-							            <input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" disabled>
-							            <label for="nopen" class="form-check-label">No</label>
-							        </div>
-							    </div>
-							    <div id="clickyesdiv" style="display: none; margin-top: 10px;">
-							        <label for="clickyes" class="form-label">Please specify:</label>
-							        <input type="text" id="Clickyes" class="form-control">
-							    </div>
-							</div> 
-                    
-				    <!-- CPS Section -->
-				    <div class="col-md-6">
-				        <label class="form-label fw-bold">Whether CPS Amount Settled</label>
-				        <div class="d-flex">
-				            <div class="form-check" style="padding-right:10px;">
-				                <input type="radio" id="cpsYes" name="cps" class="form-check-input" value="Yes" >
-				                <label for="cpsYes" class="form-check-label">Yes</label>
-				            </div>
-				            <div class="form-check">
-				                <input type="radio" id="cpsNo" name="cps" class="form-check-input" value="No">
-				                <label for="cpsNo" class="form-check-label">No</label>
-				            </div>
-				        </div>
-				        <div class="mt-3" id="cpsInputDiv" style="display: none;">
-				            <input type="text" id="cpsAmount" class="form-control" readonly>
-				        </div>
-				    </div>
-				
-				    <!-- EL/LPA Section -->
-				    <div class="col-md-6">
-				        <label class="form-label fw-bold">Whether EL/LPA Amount Settled </label>
-				        <div class="d-flex">
-				            <div class="form-check" style="padding-right:10px;">
-				                <input type="radio" id="elLpaYes" name="el_or_lpa" class="form-check-input" value="yes" >
-				                <label for="elLpaYes" class="form-check-label">Yes</label>
-				            </div>
-				            <div class="form-check">
-				                <input type="radio" id="elLpaNo" name="el_or_lpa" class="form-check-input" value="no" >
-				                <label for="elLpaNo" class="form-check-label">No</label>
-				            </div>
-				        </div>
-				        <div class="mt-3" id="elLpaInputDiv" style="display: none;">
-				            <input type="text" id="elLpaAmount" class="form-control" readonly>
-				        </div>
-				    </div>
-				
-				    <!-- SPFGS Section -->
-				    <div class="col-md-6">
-				        <label class="form-label fw-bold">Whether SPFGS Amount Settled </label>
-				        <div class="d-flex">
-				            <div class="form-check" style="padding-right:10px;">
-				                <input type="radio" id="spfgsYes" name="spfgs" class="form-check-input" value="yes" >
-				                <label for="spfgsYes" class="form-check-label">Yes</label>
-				            </div>
-				            <div class="form-check">
-				                <input type="radio" id="spfgsNo" name="spfgs" class="form-check-input" value="no" >
-				                <label for="spfgsNo" class="form-check-label">No</label>
-				            </div>
-				        </div>
-				        <div class="mt-3" id="spfgsInputDiv" style="display: none;">
-				            <input type="text" id="spfgsAmount" class="form-control" readonly>
-				        </div>
-				    </div>				
-										
-                    <div class="col-md-12">
-                        <label for="completedRemarks" class="form-label fw-bold">Comments/Remarks  </label>
-                        <textarea id="completedRemarks" class="form-control" rows="4" placeholder="Enter remarks" readonly></textarea>
-                    </div>
-                    
-                    	<div class="col-md-12 mt-4">
-								<h5>File History</h5>
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-								</div>
-							</div> 
-                </div>
-                <div class="row mb-2 mt-2">
-                    <div class="col-md-12 d-flex justify-content-center">
-                         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="completedBackButton">Back</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    
-    
-
-	<script>
-	
-	 const table = $('#CompletedCPSDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        select: false,
-	        processing: false
-	    });
-	
-	 
-	 
-	 
-	 
-	$(document).ready(function () {
-
-	    // Handle view button click to fetch completed details
-	    $(document).on('click', '.view-btn', function () {
-	    	  const empCode = $(this).data('id');
-	          const tempId = $(this).data('temp-id');
-
-	          if (!tempId) {
-	              console.error("tempId is missing!");
-	              return;
-	          }
-
-	          console.log("empCode:", empCode || "Not Provided");
-	          console.log("tempId:", tempId);
-
-	          fetchCPSDetails(tempId);
-	          loadFileHistory(tempId);
-	    });
-
-	    // Initialize modal
-	    $('#completedDetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false
-	    });
-
-	    // Handle Close and Back button click
-	    $('.close, #back').click(function () {
-	        $('#completedDetailsModal').modal('hide');
-	        //clearFields();
-	    });
-
-
-	    function fetchCPSDetails(tempId) {
-	        $.ajax({
-	            url: '/gcc/api/department/audit/getemployeedetailscps',
-	            type: 'GET',
-	            data: { tempId: tempId },
-	            success: function (response) {
-	                if (response && response.length > 0) {
-	                    let cpsDetails = response[0]; // Access the first object in the array
-	                    console.log("response:", response);
-
-	                    // Populate modal fields with CPS details
-	                    $('#completedModalEmployeeCode').text(cpsDetails.emp_no);
-	                    $('#completedEmployeeNo').val(cpsDetails.emp_no);
-	                    $('#completedEmployeeName').val(cpsDetails.emp_name);
-	                    $('#completedDepartment').val(cpsDetails.dept_name);
-	                    $('#completedDesignation').val(cpsDetails.designation);
-	                    $('#completedClass').val(cpsDetails.retirement_class);
-	                    $('#completedType').val(cpsDetails.type_of_retirement);
-	                    $('#completedRemarks').val(cpsDetails.remarks);
-	                    $('#completedretirementdate').val(cpsDetails.retirement_date)
-
-	                    // Populate UAC Section
-	                    if (cpsDetails.uac === "yes") {
-	                        $('#uacYes').prop('checked', true); // Check Yes radio button
-	                        $('#uacNo').prop('disabled', true); // Disable No radio button
-	                        $('#uacInputDiv').show(); // Show date input field
-	                        $('#uacDate').val(cpsDetails.uac_date || '').prop('readonly', true); // Set UAC date and make readonly
-	                    } else if (cpsDetails.uac === "no") {
-	                        $('#uacNo').prop('checked', true); // Check No radio button
-	                        $('#uacYes').prop('disabled', true); // Disable Yes radio button
-	                        $('#uacInputDiv').hide(); // Hide date input field
-	                    }
-	                    
-	                    
-	                    
-	 	                
-			 	        // Populate Pending Duration and Reason fields
-			                if (cpsDetails.pending_duration === "Yes") {
-			                    $('#yespen').prop('checked', true); // Check the Yes radio button
-			                    $('#clickyesdiv').show(); // Show the reason input
-			                    $('#Clickyes').val(cpsDetails.reason_for_pending || '').prop('readonly' ,true); // Set reason and make readonly
-			                } else if (cpsDetails.pending_duration === "No") {
-			                    $('#nopen').prop('checked', true); // Check the No radio button
-			                    $('#clickyesdiv').hide(); // Hide the reason input
-			                }
-	                    
-/* 	                 // Populate Pending Duration and Reason for Pending pendingDurationYes pendingDurationNo pendingDurationInputContainer pendingDurationInput
-	                    if (cpsDetails.pending_duration === "yes") {
-	                        $('#pendingDurationYes').prop('checked', true);
-	                        $('#pendingDurationNo').prop('disabled', true); // Disable the other option
-	                        $('#pendingDurationInputContainer').show(); // Hide reason input
-	                        $('#pendingDurationInput').val(cpsDetails.reason_for_pending || '').prop('readonly', true);
-	                    } else if (cpsDetails.pending_duration === "no") {
-	                    	 $('#pendingDurationYes').prop('disabled', true);
-		                     $('#pendingDurationNo').prop('checked', true);
-	                         $('#pendingDurationInputContainer').hide(); // Show reason input field
-	                        
-	                    } */
-
-	                    // Populate CPS Section based on response or data
-	                    if (cpsDetails.cps === "yes") {
-	                        $('#cpsYes').prop('checked', true); // Check Yes radio button
-	                        $('#cpsNo').prop('disabled', true); // Disable No radio button
-	                        $('#cpsInputDiv').show(); // Show CPS amount input field
-	                        $('#cpsAmount').val(cpsDetails.cps_amount || '').prop('readonly', true); // Set CPS amount and make readonly
-	                    } else if (cpsDetails.cps === "no") {
-	                        $('#cpsNo').prop('checked', true); // Check No radio button
-	                        $('#cpsYes').prop('disabled', true); // Disable Yes radio button
-	                        $('#cpsInputDiv').hide(); // Hide CPS amount input field
-	                    }
-
-	                    // Populate EL or LPA Section based on response or data
-	                    if (cpsDetails.el_or_lpa === "yes") {
-	                        $('#elLpaYes').prop('checked', true); // Check Yes radio button
-	                        $('#elLpaNo').prop('disabled', true); // Disable No radio button
-	                        $('#elLpaInputDiv').show(); // Show input field for EL or LPA Amount
-	                        $('#elLpaAmount').val(cpsDetails.el_or_lpa_amount || '').prop('readonly', true); // Set the amount and make readonly
-	                    } else if (cpsDetails.el_or_lpa === "no") {
-	                        $('#elLpaNo').prop('checked', true); // Check No radio button
-	                        $('#elLpaYes').prop('disabled', true); // Disable Yes radio button
-	                        $('#elLpaInputDiv').hide(); // Hide input field for EL or LPA Amount
-	                    }
-
-	                    // Populate SPFGS Section based on response or data
-	                    if (cpsDetails.spfgs === "yes") {
-	                        $('#spfgsYes').prop('checked', true); // Check Yes radio button
-	                        $('#spfgsNo').prop('disabled', true); // Disable No radio button
-	                        $('#spfgsInputDiv').show(); // Show SPFGS amount input field
-	                        $('#spfgsAmount').val(cpsDetails.spfgs_amount || '').prop('readonly', true); // Set SPFGS amount and make readonly
-	                    } else if (cpsDetails.spfgs === "no") {
-	                        $('#spfgsNo').prop('checked', true); // Check No radio button
-	                        $('#spfgsYes').prop('disabled', true); // Disable Yes radio button
-	                        $('#spfgsInputDiv').hide(); // Hide SPFGS amount input field
-	                    }
-
-	                    // Handle SPFGS changes
-	                    $('#spfgsYes').change(function () {
-	                        if ($(this).is(':checked')) {
-	                            $('#spfgsNo').prop('disabled', true); // Disable No radio button
-	                            $('#spfgsInputDiv').show(); // Show SPFGS amount input field
-	                        }
-	                    });
-
-	                    $('#spfgsNo').change(function () {
-	                        if ($(this).is(':checked')) {
-	                            $('#spfgsYes').prop('disabled', true); // Disable Yes radio button
-	                            $('#spfgsInputDiv').hide(); // Hide SPFGS amount input field
-	                        }
-	                    });
-
-	                    // Show the modal after fetching details
-	                     $('#completedDetailsModal').modal('show');
-	                } else {
-	                    Swal.fire({
-	                        icon: 'info',
-	                        title: 'No Data',
-	                        text: 'No details found for the selected CPS record.',
-	                        confirmButtonText: 'OK',
-	                    });
-	                }
-	            },
-	            error: function () {
-	                Swal.fire({
-	                    icon: 'error',
-	                    title: 'Error',
-	                    text: 'Failed to fetch CPS details. Please try again.',
-	                    confirmButtonText: 'OK',
-	                });
-	            },
-	        });
-	    }
-	    
-	   });
-
-
-	$('#completedBackButton').on('click', function () {
-	    $('#completedDetailsModal').modal('hide'); // Replace 'yourModalId' with the actual modal ID
-	});
-
-
-
-	  
-	 ///history function to show in modal
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
-	 const options = {
-	     day: '2-digit',
-	     month: '2-digit',
-	     year: 'numeric',
-	 };
-	 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-	 
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/completed/familypension.html b/src/main/resources/templates/modules/pensioner/department/completed/familypension.html
deleted file mode 100644
index 5877df2a..00000000
--- a/src/main/resources/templates/modules/pensioner/department/completed/familypension.html
+++ /dev/null
@@ -1,834 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #returnretrieddetailsModal .modal-body {
-        max-height: 80vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#receivedprovisionalModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
- #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5> Family Pension</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <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;"><span th:text="${deptId}" id="deptId" style="display:none"></span>Completed - Family Pension</h5>
-					        <span th:text="${userId}" id="userId" style="display:none"></span>
-					            <div  id="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="provisional, iterStat : ${provisionallist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${provisional['emp_no']}" class="text-center"></td>
-								                <td th:text="${provisional['emp_name']}" class="text-center"></td>
-								                <td th:text="${provisional['dept_name']}" class="text-center"></td>
-								                <td th:text="${provisional['designation']}" class="text-center"></td>
-								                <td th:text="${provisional['file_moved_date'] != null ? #dates.format(provisional['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${provisional['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${provisional['emp_no']}, data-temp-id=${provisional['temp_id']}">
-												        View
-												    </button>
-												</td> 
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-         <!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Completed - Family Pension (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                        <!-- pending duration-->
-			                    
-			                    
-                    				<div class="col-md-4">
-										    <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" placeholder="Enter details for pending duration" 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="date" id="servicedeath" class="form-control" readonly>
-			                    </div>
-			                    
-			                     <!-- Relationship of Deceased -->
-			                    <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-4">
-			                        <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 -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Completed </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-						
-								</div>
-						<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</span>		
-						</div>
-								<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled>
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no" disabled>
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90" disabled>
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly>
-						    </div>
-						</div>
-						
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes" disabled>
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no" disabled>
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly>
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes" disabled>
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no" disabled>
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly>
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" readonly>
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no" disabled>
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-							
-							<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>		
-						</div>
-							
-							<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" readonly>
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
-	                   		</div>
-	                   		
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes" disabled>
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no" disabled>
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no" disabled>
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes" disabled>
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no" disabled>
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-	                   		
-								
-							</div>
-							
-							<div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					               
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-						</div>
-					           
-			        </div>
-			    </div>
-			</div>  
-	
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	// Initialize DataTable
-    const table = $('#AuditDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-	
-	
-    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({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	                $('#servicedeath').val(employeeDetails.service_death);
-	 	                $('#relationship').val(employeeDetails.relationship_deceased);
-	 	                $('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
-	 	                $('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-	 	               //$('#classes').val(employeeDetails.retirement_class);
-	 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               //$('#retirementdate').val(employeeDetails.retirement_date);
-	 	               
-	 	               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);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	
-	 	            	   
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-	                        } else {
-	                            $('#gpfAmountDiv').hide();
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                        }
-
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        
-	                        $('#pensionNumber').val(employeeDetails.pension_number);
-	                        $('#ledgerNumber').val(employeeDetails.ledger_number);
-	                        
-	                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount);
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount);
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount);
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                        }
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-  
-  
-$(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-
-	});
-	
-function loadFileHistory(tempId) {
-    $.ajax({
-        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-        type: 'GET',
-        data: { tempId: tempId }, // Pass empCode as a parameter
-        success: function (response) {
-            if (response.length > 0) {
-                let historyHtml = '';
-                response.forEach(item => {
-                    historyHtml += `
-                        <div class="file-history-item">
-                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-                            <div class="file-history-content">
-                                <div class="file-history-status">${item.fileStatusHistory}</div>
-                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-                            </div>
-                        </div>
-                    `;
-                });
-
-
-
-                $('#fileHistoryContainer').html(historyHtml);
-            } else {
-                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-            }
-        },
-        error: function () {
-            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-        }
-    });
-}
-
-	// Function to format date and time
-	function formatDateTime(dateString) {
-		const options = {
-		day: '2-digit',
-		month: '2-digit',
-		year: 'numeric',
-		};
-		return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-	 
-	 
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/completed/gis.html b/src/main/resources/templates/modules/pensioner/department/completed/gis.html
deleted file mode 100644
index 5c93f945..00000000
--- a/src/main/resources/templates/modules/pensioner/department/completed/gis.html
+++ /dev/null
@@ -1,560 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>GIS</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">GIS</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">Completed-GIS</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="audittable">
-					                <table id="GISDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    GIS - Completed (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No</label>
-			                        <input type="text" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div class="col-md-6">
-			                        <label for="retirementdate" class="form-label fw-bold">While in service Death </label>
-			                        <input type="date" id="retirementdate" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Class -->
-			                    <div class="col-md-6">
-			                        <label for="classes" class="form-label fw-bold">Relationship of Deceased </label>
-			                        <input type="text" id="classes" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div  class="row col-md-12" id="gisentrycontainer" style="display: none;padding-left: 0px;padding-right: 0px;margin-left: 3px;">			                    
-			                    <div class="col-md-6">
-								    <label for="gisentry" class="form-label fw-bold">GIS Entry Type</label>
-							        <input type="text" id="gisentry" class="form-control" readonly>
-
-								</div>
-			                    
-			                    <div class="col-md-6">
-								    <label for="gisamount" class="form-label fw-bold">
-								       Sanctioned GIS Advance 
-
-								    </label>
-								    <div class="d-flex align-items-center">
-								        <div class="form-check" style="padding-right:10px;">
-								            <input type="radio" id="gisyes" name="gisamount" class="form-check-input" value="Yes" disabled>
-								            <label for="gisyes" class="form-check-label">Yes</label>
-								        </div>
-								        <div class="form-check">
-								            <input type="radio" id="gisno" name="gisamount" class="form-check-input" value="No" disabled>
-								            <label for="gisno" class="form-check-label">No</label>
-								        </div>
-								    </div>
-								    <div class="dropdown" id="gisAmountInputContainer" style="display: none; margin-top: 10px;">
-									    <input type="text" id="gisAmountInput"  class="form-control" readonly>
-									          
-									</div>
-								</div> 
-								
-								</div>
-								
-
-			                    
-			                    <div class="col-md-6">
-				                        <label for="sanctionalGISDate "  class="form-label fw-bold">Sanctional GIS Date</label>
-				                        <input type="date" id="sanctionalGISDate"  class="form-control" readonly>
-				               </div>
-				                <div class="col-md-6">
-				                       <label for="sanctionalGisAmount "  class="form-label fw-bold">Sanctional GIS Amount </label>
-				                        <input type="number" id="sanctionalGisAmount"  class="form-control" readonly>
-				               </div>
-				               <div class="col-md-6">
-				                       <label for="licDate "  class="form-label fw-bold">File Forward To LIC On</label>
-				                        <input type="date" id="licDate"  class="form-control" readonly>
-				               </div>
-		                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">File Completed Date </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">
-									<h5>File History</h5>
-										<div id="fileHistoryContainer" class="file-history-list">
-											<!-- File History will be dynamically loaded here -->
-									</div>
-								</div> 
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					           </div>
-										           
-			            </div>
-					           
-					    </div> 
-			            
-			          </div>
-			               
-			        </div>
-			    </div>
-		
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-		
-		    // Initialize DataTable
-		    const table = $('#GISDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-		 
-		  //model function
-			 function fetchEmployeeDetails(tempId) {
-			 	    $.ajax({
-			 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-			 	        type: 'GET',
-			 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-			 	        success: function (response) {
-			 	            if (response && response.length > 0) {
-			 	            	
-			 	            	let employeeDetails = response[0]; // Access the first object in the array
-			 	            	console.log("response:",response);
-			 	            	
-			 	            	
-			 	                // Populate modal fields
-			 	                $('#employeenomodel').val(employeeDetails.emp_no);
-			 	                $('#employeename').val(employeeDetails.emp_name);
-			 	                $('#department').val(employeeDetails.dept_name);
-			 	                $('#designation').val(employeeDetails.designation);
-			 	                
-			 	             
-			 	                $('#classes').val(employeeDetails.relationship_deceased);
-			 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-			 	               	$('#remarks_modal').val(employeeDetails.remarks);
-				 	            $('#retirementdate').val(employeeDetails.service_death);
-				 	             
-				 	            $('#sanctionalGISDate').val(employeeDetails.sanctional_gis_date);
-				 	            $('#sanctionalGisAmount').val(employeeDetails.sanctional_gis_amount);
-				 	            $('#licDate').val(employeeDetails.lic_date);
-				 	         
-				 	          /*  gisyes
-								gisno
-			                    gisAmountInputContainer
-			                    gisAmountInput */
-			 	               
-			                    
-			                    // Populate gis advance Section based on response or data
-				 	           if(employeeDetails.gis_entry!=null && employeeDetails.gis_advance!=null){
-				 	            	 
-				 	            	 $('#gisentrycontainer').show();
-				 	            	 
-				 	            	$('#gisentry').val(employeeDetails.gis_entry);
-					 	            // Populate gis advance  Section based on response or data
-					                    if (employeeDetails.gis_advance === "yes") {
-					                        $('#gisyes').prop('checked', true); // Check Yes radio button
-					                        $('#gisno').prop('disabled', true); // Disable No radio button
-					                        $('#gisAmountInputContainer').show(); // Show CPS amount input field
-					                        $('#gisAmountInput').val(employeeDetails.gis_advance_amount || '').prop('readonly', true); // Set CPS amount and make readonly
-					                    } else if (employeeDetails.gis_advance === "no") {
-					                        $('#gisno').prop('checked', true); // Check No radio button
-					                        $('#gisyes').prop('disabled', true); // Disable Yes radio button
-					                        $('#gisAmountInputContainer').hide(); // Hide CPS amount input field
-					                    }
-				 	             }
-				 	             else{
-				 	            	$('#gisentrycontainer').hide();
-				 	             }
-			 	                // Update the modal title with the employee code
-			 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-			 	                // Show the modal
-			 	                $('#returnretrieddetailsModal').modal('show');
-			 	                
-			 	             	//additional card display function
-			 	               document.getElementById("submitbutton").addEventListener("click", function() {
-			 	          	       
-					 	            	// $('#datefile').val('');
-					 	         	    $('#remarks').val('');
-			 	          	            document.getElementById("receivedcard").style.display = "block";
-			 	          	        
-			 	          	    });
-			 	                
-			 	               /*  document.getElementById('auditsubmit').addEventListener('click', function () {
-			 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-			 	                    // Trigger the save function and pass the value
-			 	                    saveEntryDetails(tempId,employeeNo);
-			 	        		}); */
-			 	                
-			 	             	
-			 	                
-			 	            } else {
-			 	                Swal.fire({
-			 	                    icon: 'info',
-			 	                    title: 'No Data',
-			 	                    text: 'No details found for the selected employee.',
-			 	                    confirmButtonText: 'OK',
-			 	                });
-			 	            }
-			 	        },
-			 	        error: function () {
-			 	            Swal.fire({
-			 	                icon: 'error',
-			 	                title: 'Error',
-			 	                text: 'Failed to fetch employee details. Please try again.',
-			 	                confirmButtonText: 'OK',
-			 	            });
-			 	        },
-			 	    });
-			 	}
-		  
-			 $(document).ready(function () {
-		    	 
-		    	 $(document).on('click', '.view-btn', function () {
-		    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-		    		    console.log("empCode====="+empCode);
-		    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-		    		    // Hide the receivedcard section before showing the modal
-		    	        $("#receivedcard").hide();
-		    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-		    		    loadFileHistory(tempId); // Load the file history for the selected employee
-		    		});
-
-
-			    // Initialize the modal with static backdrop and disabled keyboard closing
-			    $('#returnretrieddetailsModal').modal({
-			        backdrop: 'static',
-			        keyboard: false,
-			        show: false // Ensure it doesn't auto-show on page load
-			    });
-
-			   
-			    // Handle close button click
-			    $('#back').click(function () {
-			        $('#returnretrieddetailsModal').modal('hide');
-			    });
-			    
-			    $('.close').click(function () {
-			        $('#returnretrieddetailsModal').modal('hide');
-			    });
-			});
-			 
-			 
-			 function loadFileHistory(tempId) {
-				    $.ajax({
-				        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-				        type: 'GET',
-				        data: { tempId: tempId }, // Pass empCode as a parameter
-				        success: function (response) {
-				            if (response.length > 0) {
-				                let historyHtml = '';
-				                response.forEach(item => {
-				                    historyHtml += `
-				                        <div class="file-history-item">
-				                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-				                            <div class="file-history-content">
-				                                <div class="file-history-status">${item.fileStatusHistory}</div>
-				                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-				                            </div>
-				                        </div>
-				                    `;
-				                });
-
-
-
-				                $('#fileHistoryContainer').html(historyHtml);
-				            } else {
-				                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-				            }
-				        },
-				        error: function () {
-				            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-				        }
-				    });
-				}
-
-			 // Function to format date and time
-			function formatDateTime(dateString) {
-		 const options = {
-		     day: '2-digit',
-		     month: '2-digit',
-		     year: 'numeric',
-		 };
-		 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-		}
-			
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/completed/pendency.html b/src/main/resources/templates/modules/pensioner/department/completed/pendency.html
deleted file mode 100644
index d72a6ae4..00000000
--- a/src/main/resources/templates/modules/pensioner/department/completed/pendency.html
+++ /dev/null
@@ -1,822 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #returnretrieddetailsModal .modal-body {
-        max-height: 80vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#receivedprovisionalModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
- #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5> Pendency</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <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;"><span th:text="${deptId}" id="deptId" style="display:none"></span>Completed - Pendency</h5>
-					        <span th:text="${userId}" id="userId" style="display:none"></span>
-					            <div  id="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="provisional, iterStat : ${provisionallist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${provisional['emp_no']}" class="text-center"></td>
-								                <td th:text="${provisional['emp_name']}" class="text-center"></td>
-								                <td th:text="${provisional['dept_name']}" class="text-center"></td>
-								                <td th:text="${provisional['designation']}" class="text-center"></td>
-								                <td th:text="${provisional['file_moved_date'] != null ? #dates.format(provisional['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${provisional['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${provisional['emp_no']}, data-temp-id=${provisional['temp_id']}">
-												        View
-												    </button>
-												</td> 
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-		
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-         <!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Completed - Pendency (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <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-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-4">
-										    <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="text" id="pendingDurationInputContainer" style="display: none; margin-top: 10px;">
-										        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control" placeholder="Enter details for pending duration" readonly>
-										    </div>
-										</div>
-			                  
-			                    <!-- Type of Retirement -->
-			                    <div class="col-md-4">
-			                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-			                        <input type="text" id="typeofretirement" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Completed </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-						
-								</div>
-						<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</span>		
-						</div>
-								<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled>
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no" disabled>
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90" disabled>
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly>
-						    </div>
-						</div>
-						
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes" disabled>
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no" disabled>
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly>
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes" disabled>
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no" disabled>
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly>
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" readonly>
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no" disabled>
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-							
-							<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>		
-						</div>
-							
-							<!-- <div class="col-md-6 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" readonly>
-	                   		</div>
-	                   		
-	                   		<div class="col-md-6 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
-	                   		</div> -->
-	                   		
-	                   		<div class="col-md-4 mb-2">
-	                   			<label for="pensionNumber" class="form-label">Pension Number</label>
-						        <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly>
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
-	                   		</div>
-	                   		
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes" disabled>
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no" disabled>
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no" disabled>
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes" disabled>
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no" disabled>
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-	                   		
-								
-							</div>
-							
-							<div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					               
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-						</div>
-					           
-			        </div>
-			    </div>
-			</div>  
-	
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	// Initialize DataTable
-    const table = $('#AuditDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-  //model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	               $('#classes').val(employeeDetails.retirement_class);
-	 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	              $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                
-	 	               
-	 	              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);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	
-	 	            	   
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-	                        } else {
-	                            $('#gpfAmountDiv').hide();
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                        }
-
-	                        //recover emp
- 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        
-	                        $('#pensionNumber').val(employeeDetails.pension_number);
-	                        $('#ledgerNumber').val(employeeDetails.ledger_number);
-	                        
-	                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount);
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount);
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount);
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                        }
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-  
-  
-$(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-
-	});
-	
-function loadFileHistory(tempId) {
-    $.ajax({
-        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-        type: 'GET',
-        data: { tempId: tempId }, // Pass empCode as a parameter
-        success: function (response) {
-            if (response.length > 0) {
-                let historyHtml = '';
-                response.forEach(item => {
-                    historyHtml += `
-                        <div class="file-history-item">
-                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-                            <div class="file-history-content">
-                                <div class="file-history-status">${item.fileStatusHistory}</div>
-                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-                            </div>
-                        </div>
-                    `;
-                });
-
-
-
-                $('#fileHistoryContainer').html(historyHtml);
-            } else {
-                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-            }
-        },
-        error: function () {
-            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-        }
-    });
-}
-
-// Function to format date and time
-function formatDateTime(dateString) {
-const options = {
-day: '2-digit',
-month: '2-digit',
-year: 'numeric',
-};
-return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-	 
-	 
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/completed/provisionalretirement.html b/src/main/resources/templates/modules/pensioner/department/completed/provisionalretirement.html
deleted file mode 100644
index 557bb979..00000000
--- a/src/main/resources/templates/modules/pensioner/department/completed/provisionalretirement.html
+++ /dev/null
@@ -1,701 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#receivedprovisionalModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Provisional Retirement</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Provisional Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <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;"><span th:text="${deptId}" id="deptId" style="display:none"></span>Completed - Provisional Retirement</h5>
-					        <span th:text="${userId}" id="userId" style="display:none"></span>
-					            <div  id="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		<th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="provisional, iterStat : ${provisionallist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${provisional['emp_no']}" class="text-center"></td>
-								                <td th:text="${provisional['emp_name']}" class="text-center"></td>
-								                <td th:text="${provisional['dept_name']}" class="text-center"></td>
-								                <td th:text="${provisional['designation']}" class="text-center"></td>
-								                <td th:text="${provisional['file_moved_date'] != null ? #dates.format(provisional['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${provisional['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-											    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${provisional['emp_no']}, data-temp-id=${provisional['temp_id']}">
-											        View
-											    </button>
-												</td> 
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-       <!--  Modal Box -->    
-		<div class="modal fade" id="receivedprovisionalModal" 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-content">
-		            <div class="modal-header">
-		                <h5 class="modal-title" id="detailsModalLabel">
-		                    Received From Department - Provisional Retirement (<span id="modalEmployeeCode"></span>)
-		                </h5>
-		                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-		            </div>
-		            <div class="modal-body">
-		                <div class="row">
-		                    <!-- Employee No -->
-		                    <div class="col-md-6">
-		                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-		                        <input type="number" id="employeenomodel" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Employee Name -->
-		                    <div class="col-md-6">
-		                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-		                        <input type="text" id="employeename" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Department -->
-		                    <div class="col-md-6">
-		                        <label for="department" class="form-label fw-bold">Department </label>
-		                        <input type="text" id="department" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Designation -->
-		                    <div class="col-md-6">
-		                        <label for="designation" class="form-label fw-bold">Designation </label>
-		                        <input type="text" id="designation" class="form-control" readonly>
-		                    </div>
-		                    
-		                    <!-- Class -->
-		                    <div class="col-md-6">
-							    <label for="classes" class="form-label fw-bold">Class</label>
-							     <input type="text" id="classes" class="form-control" readonly>
-							</div>
-							
-							<!-- Type Of Retirement -->
-							<div class="col-md-6">
-							    <label for="typeofretirement" class="form-label fw-bold">Type Of Retirement</label>
-							    <input type="text" id="typeofretirement" class="form-control" readonly>
-							</div>
-
-		                    <div class="col-md-6">
-		                        <label for="retirementdate" class="form-label fw-bold">Retirement Date </label>
-		                        <input type="date" id="retirementdate" class="form-control" readonly>
-		                    </div>
-							<!-- Reason For Provisional Pension is given -->
-<!-- 							provisionalreason
-							otherReason -->
-							<div class="col-md-6">
-							    <label for="provisionalreason" class="form-label fw-bold">Reason For Provisional Pension is given </label>
-		                        <input type="text" id="provisionalreason" class="form-control" readonly>
-								 <div  id="otherReasonDiv" style="display: none; margin-top: 10px;">								
-							        <label for="otherReason" class="form-label">Please specify:</label>
-							        <input type="text" id="otherReason" class="form-control" placeholder="Enter reason" readonly>							    	
-						      </div>		
-		                        
-							</div>		
-							
-							
-		                    
-		                    <!-- Date File Sent to Pension Section -->
-		                    <div class="col-md-6">
-		                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Pension Section </label>
-		                        <input type="date" id="datefile_modal" class="form-control" readonly onclick="this.showPicker()">
-		                    </div>
-		                    
-		                    <!-- Pending Duration -->
-							<div class="col-md-6">
-							    <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="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled>
-							            <label for="yespen" class="form-check-label">yes</label>
-							        </div>
-							        <div class="form-check">
-							            <input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" disabled>
-							            <label for="nopen" class="form-check-label">no</label>
-							        </div>
-							    </div>
-							    <div id="clickyesdiv" style="display: none; margin-top: 10px;">
-							        <label for="clickyes" class="form-label">Please specify:</label>
-							        <input type="text" id="Clickyes" class="form-control" placeholder="Enter reason">
-							    </div>
-							</div> 
-								
-							<!-- dp -->	
-							<div class="col-md-6">
-							    <label for="DP" class="form-label fw-bold">DP</label>
-							    <div class="d-flex align-items-center">
-							        <div class="form-check  " style="padding-right:10px;">
-							            <input type="radio" id="yes" name="DP" value="yes" class="form-check-input" disabled>
-							            <label for="yes" class="form-check-label">yes</label>
-							        </div>
-							        <br>
-							        <div class="form-check" >
-							            <input type="radio" id="no" name="DP" value="no" class="form-check-input" disabled>
-							            <label for="no" class="form-check-label" >no</label>
-							        </div>
-							    </div>
-							</div>
-							
-				    	<!-- Retirement Amount -->
-							<div class="col-md-6">
-							    <label for="RetirementAmount" class="form-label fw-bold">
-							        Provisional Retirement Amount 
-							    </label>
-							    <div class="d-flex align-items-center">
-							        <div class="form-check" style="padding-right:10px;">
-							            <input type="radio" id="fifty" name="RetirementAmount" value="50" class="form-check-input" disabled>
-							            <label for="fifty" class="form-check-label">50%</label>
-							        </div>
-							        <div class="form-check" style="padding-right:10px;">
-							            <input type="radio" id="seventyfive" name="RetiremesntAmount" value="75" class="form-check-input" disabled>
-							            <label for="seventyfive" class="form-check-label">75%</label>
-							        </div>
-							        <div class="form-check" style="padding-right:10px;">
-							            <input type="radio" id="hundred" name="RetirementAmount" value="100" class="form-check-input" disabled>
-							            <label for="hundred" class="form-check-label">100%</label>
-							        </div>
-							    </div>
-							
-							    <!-- Additional Input Field -->
-							    <div class="mt-3" id="additionalInputDiv" style="display: none;">
-							        <input type="number" id="additionalInput" class="form-control" placeholder="Enter Amount" readonly>
-							    </div>
-							</div>
-
-	
-		                    <!-- 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>
-		                    </div>
-		                    
-		                    <!-- new -->
-		                    <div class="col-md-12 mt-4">
-								<h5>File History</h5>
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-								</div>
-							</div>  
-							
-		                </div>
-		                
-		          <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		               
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div> 
-
-		                
-		     </div>
-
-        </div>
-    </div>
-</div>
-
- 
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	// Initialize DataTable
-    const table = $('#AuditDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-	
-	
-	
-    $(document).ready(function () {
-		  
-		  $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		});
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#receivedprovisionalModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-
-
-
-		 // Handle Close button click
-		    $('.close').click(function () {
-		        $('#receivedprovisionalModal').modal('hide'); // Hide the modal
-		        clearFields(); // Clear input fields
-		    });
-
-		    // Handle Back button click
-		    $('#back').click(function () {
-		        $('#receivedprovisionalModal').modal('hide'); // Hide the modal
-		        clearFields(); // Clear input fields
-		    });
-
-		    // Function to clear input fields
-/* 		    function clearFields() {
-		        $('#datefile').val(''); // Clear date input
-		        $('#remarks').val(''); // Clear textarea
-		    } */
-
-		});
-	
-    
-        
-    
-    
-  //model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                $('#classes').val(employeeDetails.retirement_class);
-	 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-		 	            $('#provisionalreason').val(employeeDetails.reason_for_provisional_pension);
-		 	            
-		 	        // Ensure employeeDetails exists
-		 	           if (employeeDetails) {
-		 	               let prPercentage = employeeDetails.pr_percentage;
-		 	               let prAmount = employeeDetails.pr_amount || '';
-
-		 	               // Convert pr_percentage to string to avoid type mismatches
-		 	               prPercentage = prPercentage ? prPercentage.toString() : '';
-
-		 	               // Reset any previously selected radio buttons (in case of multiple calls)
-		 	               $('#fifty').prop('checked', false).prop('disabled', false);
-		 	               $('#seventyfive').prop('checked', false).prop('disabled', false);
-		 	               $('#hundred').prop('checked', false).prop('disabled', false);
-
-		 	               // Hide the additional input field initially
-		 	               $('#additionalInputDiv').hide();
-
-		 	               // Check if pr_percentage is a valid percentage
-		 	               if (prPercentage === "50") {
-		 	                   // Select 50% radio button and disable all
-		 	                   $('#fifty').prop('checked', true).prop('disabled', true);
-		 	                   $('#seventyfive').prop('disabled', true);
-		 	                   $('#hundred').prop('disabled', true);
-		 	                   
-		 	                  $('#additionalInputDiv').show();
-		 	                  $('#additionalInput').val(prAmount).prop('readonly', true);
-		 	               } else if (prPercentage === "75" || prPercentage === "75.00") {
-		 	                   // Select 75% radio button and disable all
-		 	                   $('#seventyfive').prop('checked', true).prop('disabled', true);
-		 	                   $('#fifty').prop('disabled', true);
-		 	                   $('#hundred').prop('disabled', true);
-
-		 	                   // If pr_amount exists, set it in the additional input
-		 	                   $('#additionalInputDiv').show();
-		 	                   $('#additionalInput').val(prAmount).prop('readonly', true);
-		 	               } else if (prPercentage === "100") {
-		 	                   // Select 100% radio button and disable all
-		 	                   $('#hundred').prop('checked', true).prop('disabled', true);
-		 	                   $('#fifty').prop('disabled', true);
-		 	                   $('#seventyfive').prop('disabled', true);
-		 	                   
-		 	                  $('#additionalInputDiv').show();
-		 	                  $('#additionalInput').val(prAmount).prop('readonly', true);
-		 	               } else {
-		 	                   // If pr_percentage is NOT 50, 75, or 100, show the additional input field
-		 	                   $('#additionalInputDiv').show();
-		 	                   $('#additionalInput').val(prAmount).prop('readonly', true);
-		 	               }
-		 	           }
-
-
-	 	                
-		 	        // Populate Pending Duration and Reason fields
-		                if (employeeDetails.pending_duration === "Yes") {
-		                    $('#yespen').prop('checked', true); // Check the Yes radio button
-		                    $('#clickyesdiv').show(); // Show the reason input
-		                    $('#Clickyes').val(employeeDetails.reason_for_pending || '').prop('readonly' ,true); // Set reason and make readonly
-		                } else if (employeeDetails.pending_duration === "No") {
-		                    $('#nopen').prop('checked', true); // Check the No radio button
-		                    $('#clickyesdiv').hide(); // Hide the reason input
-		                }
-		 	        //populate reason for provisional pension
-		                if (employeeDetails.reason_for_provisional_pension === "Others") {
-		                    $('#otherReasonDiv').show(); // Show the input field for 'Others'
-		                    $('#otherReason')
-		                        .val(employeeDetails.others_provisional_pension || '')
-		                        .prop('readonly' ,true); // Populate and make readonly
-		                } else {
-		                    $('#otherReasonDiv').hide(); // Hide the input field if reason is not 'Others'
-		                }
-	 	               
-		             // Handle DP value
-		                if (employeeDetails.dp === "yes") {
-		                    $('#yes').prop('checked', true); // Select 'yes' radio button
-		                } else if (employeeDetails.dp === "no") {
-		                    $('#no').prop('checked', true); // Select 'no' radio button
-		                }
-		 	        
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#receivedprovisionalModal').modal('show');
-	 	                
-
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-  
-  
-  
-  
-  
-	 ///history function to show in modal
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
-		 const options = {
-		     day: '2-digit',
-		     month: '2-digit',
-		     year: 'numeric',
-		 };
-		 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-	 
-	 
-	 
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/completed/retirement.html b/src/main/resources/templates/modules/pensioner/department/completed/retirement.html
deleted file mode 100644
index 02169fbd..00000000
--- a/src/main/resources/templates/modules/pensioner/department/completed/retirement.html
+++ /dev/null
@@ -1,769 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #returnretrieddetailsModal .modal-body {
-        max-height: 80vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
- #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5> Retirement</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <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;"><span th:text="${deptId}" id="deptId" style="display:none"></span>Completed - Retirement</h5>
-					        <span th:text="${userId}" id="userId" style="display:none"></span>
-					            <div  id="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="provisional, iterStat : ${provisionallist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${provisional['emp_no']}" class="text-center"></td>
-								                <td th:text="${provisional['emp_name']}" class="text-center"></td>
-								                <td th:text="${provisional['dept_name']}" class="text-center"></td>
-								                <td th:text="${provisional['designation']}" class="text-center"></td>
-								                <td th:text="${provisional['file_moved_date'] != null ? #dates.format(provisional['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${provisional['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${provisional['emp_no']}, data-temp-id=${provisional['temp_id']}">
-												        View
-												    </button>
-												</td> 
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-         <!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Completed - Retirement (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <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>
-			                    
-			                    <!-- Class -->
-			                    <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>
-			                    
-			                    <!-- Type of Retirement -->
-			                    <div class="col-md-4">
-			                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-			                        <input type="text" id="typeofretirement" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Completed </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-						
-								</div>
-						<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</span>		
-						</div>
-								<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled>
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no" disabled>
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90" disabled>
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly>
-						    </div>
-						</div>
-						
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes" disabled>
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no" disabled>
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly>
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes" disabled>
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no" disabled>
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly>
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control"  readonly>
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no" disabled>
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-							
-							<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>		
-						</div>
-							
-							<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" readonly>
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
-	                   		</div>
-	                   		
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes" disabled>
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no" disabled>
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no" disabled>
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes" disabled>
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no" disabled>
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-	                   		
-								
-							</div>
-							
-							<div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					               
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-						</div>
-					           
-			        </div>
-			    </div>
-			</div>  
-	
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	// Initialize DataTable
-    const table = $('#AuditDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-  //model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	               $('#classes').val(employeeDetails.retirement_class);
-	 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                
-	 	               
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	
-	 	            	   
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-	                        } else {
-	                            $('#gpfAmountDiv').hide();
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                        }
-	                        //recover emp
- 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        
-	                        $('#pensionNumber').val(employeeDetails.pension_number);
-	                        $('#ledgerNumber').val(employeeDetails.ledger_number);
-	                        
-	                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount);
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount);
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount);
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                        }
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-  
-  
-$(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-
-	});
-	
-function loadFileHistory(tempId) {
-    $.ajax({
-        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-        type: 'GET',
-        data: { tempId: tempId }, // Pass empCode as a parameter
-        success: function (response) {
-            if (response.length > 0) {
-                let historyHtml = '';
-                response.forEach(item => {
-                    historyHtml += `
-                        <div class="file-history-item">
-                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-                            <div class="file-history-content">
-                                <div class="file-history-status">${item.fileStatusHistory}</div>
-                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-                            </div>
-                        </div>
-                    `;
-                });
-
-
-
-                $('#fileHistoryContainer').html(historyHtml);
-            } else {
-                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-            }
-        },
-        error: function () {
-            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-        }
-    });
-}
-
-// Function to format date and time
-function formatDateTime(dateString) {
-const options = {
-day: '2-digit',
-month: '2-digit',
-year: 'numeric',
-};
-return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-	 
-	 
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/dashboard.html b/src/main/resources/templates/modules/pensioner/department/dashboard.html
deleted file mode 100644
index 48600ede..00000000
--- a/src/main/resources/templates/modules/pensioner/department/dashboard.html
+++ /dev/null
@@ -1,968 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    /* Base Layout and Styling */
-
-/* Base Layout and Styling */
-body {
-    font-family: 'Arial', sans-serif;
-    background-color: #f8f9fa;
-}
-
-/* Card Styling */
-.card-box {
-    border-radius: 12px;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-    background-color: #ffffff;
-    padding: 20px;
-    transition: transform 0.3s ease-in-out;
-}
-
-.card-box:hover {
-    transform: translateY(-5px);
-}
-
-/* Title Styling */
-h3 {
-    font-size: 1.2rem;
-    color: #444;
-}
-
-/* Styling for Overall Pendency and Stage Wise Sections */
-.charts {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 30px; /* Increased gap between charts */
-    margin-top: 30px; /* Increased margin-top */
-}
-
-.chart {
-    flex: 1;
-    background: #ffffff; /* White background */
-    padding: 20px;
-    border-radius: 8px;
-    border: 2px solid #1e90ff; /* Add a colored border */
-    width: 100%;
-    box-sizing: border-box;
-    text-align: center;
-    transition: all 0.3s ease-in-out;
-}
-
-.chart:hover {
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
-}
-
-.chart h3 {
-    font-size: 1.2rem;
-    color: #333;
-    margin-bottom: 15px;
-}
-
-.chart canvas {
-    display: block;
-    max-width: 100%;
-    height: auto;
-}
-
-/* Stats Cards */
-.stats {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    gap: 30px; /* Increased gap between stats cards */
-    margin-top: 30px; /* Increased margin-top */
-}
-
-.stat-card {
-    background: #ffffff;
-    border: 2px solid #1e90ff;
-    padding: 20px;
-    border-radius: 8px;
-    text-align: center;
-    flex: 1;
-    margin: 10px; /* Reduced margin for cleaner look */
-}
-
-.stat-card:hover {
-    transform: scale(1.05);
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
-}
-
-.stat-card h2 {
-    margin: 0;
-    font-size: 36px;
-    color: #007bff; 
-}
-
-.stat-card p {
-    margin: 5px 0 0;
-    font-size: 13px;
-    color: #555;
-    font-weight:bold;
-}
-
-/* Buttons */
-.btn-primary:hover {
-    background-color: #0056b3;
-}
-
-.btn-warning:hover {
-    background-color: #e0a800;
-}
-
-/* Container Styling */
-.container {
-    max-width: 1200px;
-    margin: 20px auto;
-    padding: 20px;
-    background: #fff;
-    border-radius: 8px;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-
-/* Date Input Row */
-.row.mt-3.ml-2 {
-    margin-top: 20px; /* Increased margin-top */
-}
-
-/* Responsive Design */
-@media (min-width: 768px) {
-    .charts {
-        flex-direction: row;
-    }
-
-    .charts .chart {
-        width: calc(50% - 15px); /* Increased gap between charts */
-    }
-
-    .stats {
-        flex-direction: row;
-    }
-}
-
-@media (max-width: 576px) {
-    .charts,
-    .stats {
-        flex-direction: column;
-    }
-
-    .stat-card {
-        margin: 15px 0; /* Increased margin for better spacing */
-    }
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}   
-
-#EmpcodeDetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-
-</style>
-
-<body>
-    <div class="wrapper">
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <div class="page-wrap">
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Dashboard</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item">Department Entries</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mt-4">
-                        <div class="col-md-12">
-                           
-                            <div class="card">
-					        <div class="card-block">
-                                        
-                                <h5 style="font-weight:bold;"><span th:text="${deptId}" id="deptId" style="display:none"></span></h5>
-                                  <h5 style="font-weight:bold;"><span th:text="${deptname}" id="deptname"></span> Department</h5>
-	                                      <div class="d-flex justify-content-end align-items-center">
-											    <label for="EmpCode" style="font-weight: bold; margin-right: 10px;" class="mb-0">EmpCode:</label>
-											    <input type="text" id="EmpCode" name="EmpCode" class="form-control" style="width: auto; min-width: 150px; margin-right: 10px;">
-											    <button id="searchEmpButton" class="btn btn-primary">Search</button>
-											</div>
-
-												<div class="row mt-3 ml-2 ">
-												    <div class="col-md-3">
-												        <label for="startDate" class="form-label">From Date:</label>
-												        <input type="date" id="startDate" class="form-control" onclick="this.showPicker()">
-												    </div>
-												    <div class="col-md-3">
-												        <label for="endDate" class="form-label">To Date:</label>
-												        <input type="date" id="endDate" class="form-control" onclick="this.showPicker()">
-												    </div>
-												   <div class="col-12 d-flex justify-content-center mt-3">
-												        <button id="searchButton" class="btn btn-primary mx-2">Search</button>
-												        <input type="reset" class="btn btn-warning mx-2" value="Reset">
-												    </div>
-												</div>
-												
-												
-												<div id="stats" class="stats"></div>
-
-                                            <div class="charts">
-                                                <div class="chart">
-                                                    <h3>File Category - Overall</h3>
-                                                    <div id="overallPieChart" style="width: 100%; height: 400px;"></div>
-                                                    
-                                                </div>
-                                                <div class="chart">
-                                                    <h3>File Category  Stages Wise</h3>
-                                                    <div id="stagesBarChart" style="width: 100%; height: 400px;"></div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                   
-                                </div>
-                           
-                        </div>
-                    </div>
-                </div>
-                
-            </div>
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    <!-- Modal -->
-	<div class="modal fade" id="zoneDetailsModal" tabindex="-1"
-		role="dialog" aria-labelledby="zoneDetailsModalLabel"
-		aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div id="zone-details-content"></div>
-			</div>
-		</div>
-	</div>
-	
-	
-	<div class="modal fade" id="EmpcodeDetailsModal" tabindex="-1"
-		role="dialog" aria-labelledby="zoneDetailsModalLabel"
-		aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-xl" role="document">
-			<div class="modal-content">
-				<div id="emp-details-content">
-				<div class="col-md-12 mt-4">
-					<h5>File History</h5>
-							<div id="fileHistoryContainer" class="file-history-list">
-								File History will be dynamically loaded here
-						</div>
-					</div> 
-				</div>
-			</div>
-		</div>
-	</div>
-	
-  <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-      <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-    <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-	<script src="node_modules/amcharts3/amcharts/serial.js"></script>
-	
-	<script src="node_modules/amcharts3/amcharts/pie.js"></script>
-	<script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-	
-    <script>
-    document.addEventListener('DOMContentLoaded', function () {
-        // Function to fetch data from /dashboard endpoint
-        
-    	   $('#searchEmpButton').on('click', function () {
-               const Empcode = document.getElementById('EmpCode').value.trim();
-               if (!Empcode) {
-                   Swal.fire({
-                       icon: "warning",
-                       title: "Enter Employee Code",
-                       text: "Please enter an Employee Code before searching.",
-                       confirmButtonText: "OK",
-                   });
-                   return;
-               }
-
-               // First API call to fetch employee details
-               $.ajax({
-                   url: `/gcc/api/pensionerdashboard/fetchEmpDetails?Empcode=${Empcode}`,
-                   type: 'GET',
-                   success: function (response) {
-                       if (!response || response.length === 0) {
-                           Swal.fire({
-                               icon: "warning",
-                               title: "No Data Found",
-                               text: "No records found for the entered Employee Code.",
-                               confirmButtonText: "OK",
-                           });
-                           return;
-                       }
-
-                       const isGISEmployee = response.some(emp => emp.file_name === "GIS");
-
-                       // Second API call to check department validity (only if not GIS)
-                       $.ajax({
-                           url: '/gcc/api/department/newentry/employeedetails',
-                           type: 'GET',
-                           data: { empCode: Empcode },
-                           success: function (deptResponse) {
-                               if (deptResponse.list && deptResponse.list.length > 0) {
-                                   let employeeDetails = deptResponse.list[0];
-                                   const loggedInDeptId = $('#deptId').text().trim();
-
-                                   if (employeeDetails.ID_DEPT !== loggedInDeptId) {
-                                       Swal.fire({
-                                           icon: "error",
-                                           title: "Access Denied",
-                                           text: "This employee does not belong to your department.",
-                                           confirmButtonText: "OK",
-                                       });
-                                   } else {
-                                       renderEmpDetailsModal(response);
-                                   }
-                               } else {
-                                   if (isGISEmployee) {
-                                       renderEmpDetailsModal(response);
-                                   } else {
-                                       Swal.fire({
-                                           icon: "warning",
-                                           title: "No Data Found",
-                                           text: "No details found for this employee number.",
-                                           confirmButtonText: "OK",
-                                       });
-                                   }
-                               }
-                           },
-                           error: function () {
-                               Swal.fire({
-                                   icon: "error",
-                                   title: "Error",
-                                   text: "An error occurred while fetching department details.",
-                                   confirmButtonText: "OK",
-                               });
-                           }
-                       });
-                   },
-                   error: function (xhr) {
-                       console.error("Error fetching employee details:", xhr.status, xhr.responseText);
-                   }
-               });
-           });
-    	   function renderEmpDetailsModal(data) {
-   		    const Empcode = document.getElementById('EmpCode').value.trim();
-
-   		 
-   		    let modalContent = `
-   		        <div class="modal-header">
-   		            <h5 class="modal-title">Employee Details for ${Empcode}</h5>
-   		            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-   		                <span aria-hidden="true">&times;</span>
-   		            </button>
-   		        </div>
-   		        <div class="modal-body">
-   		            <div class="table-responsive">
-   		                <table id="DashboardDatatable" class="table table-striped table-bordered table-hover dataTable">
-   		                    <thead class="thead-dark">
-   		                        <tr>
-   		                            <th class="text-center">S.NO</th>
-   		                            <th class="text-center">Department Name</th>
-   		                            <th class="text-center">File Name</th>
-   		                            <th class="text-center">File Status</th>
-   		                            <th class="text-center">History</th>
-   		                        </tr>
-   		                    </thead>
-   		                    <tbody>
-   		                        ${data.map((item, index) => `
-   		                            <tr data-temp-id="${item.temp_id}">
-   		                                <td>${index + 1}</td>
-   		                                <td>${item.dept_name}</td>
-   		                                <td>${item.file_name}</td>
-   		                                <td>${item.file_status}</td>
-   		                                <td class="file-history-column" id="history-${item.temp_id}">Loading...</td>
-   		                            </tr>
-   		                        `).join('')}
-   		                    </tbody>
-   		                </table>
-   		            </div>
-   		        </div>
-   		    `;
-
-   		    document.getElementById('emp-details-content').innerHTML = modalContent;
-
-   		   
-   		    let fetchPromises = data.map(item => fetchDetailsByTempId(item.temp_id));
-
-   		    Promise.all(fetchPromises).then(() => {
-   		        $('#EmpcodeDetailsModal').modal({
-   		            backdrop: 'static',
-   		            keyboard: false
-   		        });
-
-   		        // **Initialize DataTable AFTER Data is Loaded**
-   		        setTimeout(() => {
-   		            let table = $('#DashboardDatatable').DataTable({
-   		                dom: 'Bftip',
-   		                columnDefs: [{ targets: 'no-sort', orderable: false }],
-   		                lengthMenu: [
-   		                    [50, 100, 200, 500, -1],
-   		                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-   		                ],
-   		                scrollY: '50vh',
-   		                
-   		             buttons: [
-   		              { extend: 'pageLength', className: 'btn btn-warning' },
-   		              { 
-   		                  extend: 'copyHtml5', 
-   		                  text: 'Copy', 
-   		                  className: 'btn btn-secondary',
-   		                  exportOptions: { columns: ':visible', modifier: { page: 'all' } }
-   		              },
-   		              { 
-   		                  extend: 'excelHtml5', 
-   		                  text: 'Excel', 
-   		                  className: 'btn btn-secondary',
-   		                  customize: function (xlsx) {
-   		                      let sheet = xlsx.xl.worksheets['sheet1.xml'];
-   		                      $('row c[r]', sheet).attr('s', '55'); // Apply word-wrap formatting
-   		                  }
-   		              },
-   		              { 
-   		                  extend: 'csvHtml5', 
-   		                  text: 'CSV', 
-   		                  className: 'btn btn-secondary',
-   		                  exportOptions: { columns: ':visible' }
-   		              },
-   		              { 
-   		                  extend: 'pdfHtml5', 
-   		                  text: 'PDF', 
-   		                  className: 'btn btn-secondary',
-   		                  orientation: 'landscape',
-   		                  pageSize: 'A4',
-   		                  customize: function (doc) {
-   		                      doc.styles.tableBodyEven.alignment = 'left';
-   		                      doc.styles.tableBodyOdd.alignment = 'left';
-   		                      doc.styles.tableHeader.alignment = 'center';
-   		                      doc.defaultStyle.fontSize = 9;
-   		                      doc.styles.tableHeader.fontSize = 10;
-   		                      doc.content[1].table.widths = Array(doc.content[1].table.body[0].length + 1).join('*').split('');
-   		                  }
-   		              }
-   		          ],
-   		                responsive: false,
-   		                processing: false
-   		            });
-
-   		            // ✅ Adjust column width after table is fully initialized
-   		           
-   		        }, 200);
-   		    });
-   		}
-
-   		// **Ensure Header Aligns Properly When Modal is Opened**
-   	
-
-   		// **Fetch History & Update Table**
-   		function fetchDetailsByTempId(tempId) {
-   		    return new Promise((resolve, reject) => {
-   		        $.ajax({
-   		            url: `/gcc/api/pensionerdashboard/fetchTempDetails?tempId=${tempId}`,
-   		            type: 'GET',
-   		            success: function (response) {
-   		                let historyContainer = $(`#history-${tempId}`);
-   		                if (response.length > 0) {
-   		                    let historyHtml = response.map(item => `
-   		                        <div class="file-history-item">
-   		                            <div class="file-history-date">${formatDateTime(item.file_moved_date)}</div>
-   		                            <div class="file-history-content">
-   		                                <div class="file-history-status">${item.file_status}</div>
-   		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarks || 'N/A'}</div>
-   		                            </div>
-   		                        </div>
-   		                    `).join('');
-   		                    historyContainer.html(historyHtml);
-   		                    $('#EmpcodeDetailsModal').modal({
-   		                        backdrop: 'static',
-   		                        keyboard: false
-   		                    });
-   		                    $('#EmpcodeDetailsModal').modal('show');
-   		                    $('.close').click(function () {
-   		                        $('#EmpcodeDetailsModal').modal('hide');
-   		                    });
-   		                } else {
-   		                    historyContainer.html('<p>No file history available.</p>');
-   		                    $('#EmpcodeDetailsModal').modal({
-   		                        backdrop: 'static',
-   		                        keyboard: false
-   		                    });
-   		                    $('#EmpcodeDetailsModal').modal('show');
-   		                    $('.close').click(function () {
-   		                        $('#EmpcodeDetailsModal').modal('hide');
-   		                    });
-   		                }
-   		                resolve();
-   		            },
-   		            error: function () {
-   		                $(`#history-${tempId}`).html('<p>Failed to load file history.</p>');
-   		                $('#EmpcodeDetailsModal').modal({
-		                        backdrop: 'static',
-		                        keyboard: false
-		                    });
-		                    $('#EmpcodeDetailsModal').modal('show');
-		                    $('.close').click(function () {
-		                        $('#EmpcodeDetailsModal').modal('hide');
-		                    });
-   		                resolve();
-   		            }
-   		        });
-   		    });
-   		}
-
-   		// **Helper Function to Format Date**
-   		function formatDateTime(dateString) {
-   		    const options = { day: '2-digit', month: '2-digit', year: 'numeric' };
-   		    return new Date(dateString).toLocaleDateString('en-GB', options);
-   		}
-
-
-
-        
-    	function loadDashboardData() {
-    	    const deptId = $('#deptId').text().trim();
-    	    console.log(deptId);
-
-    	    $.ajax({
-    	        url: `/gcc/api/pensionerdashboard/departmentdashboard?deptId=${encodeURIComponent(deptId)}`,
-    	        type: 'GET',
-    	        contentType: 'application/json',
-    	        success: function (data) {
-    	            const statsDiv = document.getElementById('stats');
-    	            statsDiv.innerHTML = ''; // Clear previous stats
-
-    	            data.forEach(item => {
-    	                const statCard = document.createElement('div');
-    	                statCard.className = 'stat-card';
-    	                statCard.innerHTML = `
-    	                    <h2>${item.category_count}</h2>
-    	                    <p>${item.file_name}</p>
-    	                `;
-    	                statsDiv.appendChild(statCard);
-    	            });
-
-    	            // Call renderCharts after data is loaded
-    	            renderCharts();
-    	        },
-    	        error: function (xhr) {
-    	            console.error('Error fetching dashboard data:', xhr.status, xhr.responseText);
-    	        }
-    	    });
-    	}
-
-    	// Function to handle search button click
-    	document.getElementById('searchButton').addEventListener('click', function () {
-    	    const startDate = document.getElementById('startDate').value;
-    	    const endDate = document.getElementById('endDate').value;
-    	    const deptId = $('#deptId').text().trim();
-
-    	    if (!startDate || !endDate) {
-    	        Swal.fire({
-    	            icon: "warning",
-    	            title: "Incomplete Search",
-    	            text: "Please select the Date Before searching",
-    	            confirmButtonText: "OK",
-    	        });
-    	    } else {
-    	        $.ajax({
-    	            url: `/gcc/api/pensionerdashboard/dashboardsearch?startdate=${startDate}&enddate=${endDate}&deptId=${encodeURIComponent(deptId)}`,
-    	            type: 'GET',
-    	            success: function (data) {
-    	                const statsDiv = document.getElementById('stats');
-    	                statsDiv.innerHTML = data.map(item => `
-    	                    <div class='stat-card'>
-    	                        <h2>${item.category_count}</h2>
-    	                        <p>${item.file_name}</p>
-    	                    </div>
-    	                `).join('');
-
-    	                // Re-render charts after search results load
-    	                renderCharts(startDate, endDate);
-    	            },
-    	            error: function (xhr) {
-    	                console.error('Error fetching search data:', xhr.status, xhr.responseText);
-    	            }
-    	        });
-    	    }
-    	});
-
-    	
-    	function renderCharts(startDate = null, endDate = null) {
-    	    const deptId = $('#deptId').text().trim();
-
-    	    // Dispose existing amCharts instances
-    	    disposeExistingCharts();
-
-    	    function disposeExistingCharts() {
-    	        if (window.chart1) {
-    	            window.chart1.clear();
-    	            window.chart1 = null;
-    	        }
-    	        if (window.chart2) {
-    	            window.chart2.clear();
-    	            window.chart2 = null;
-    	        }
-    	    }
-
-    	    // Render pie chart
-    	  const fixedColors = {
-    "Retirement": "#6A0572", // Deep Purple
-    "Family Pension": "#2C3E50", // Dark Blue-Gray
-    "Pendency": "#A569BD", // Soft Lavender
-    "GIS": "#17A589", // Teal Green
-    "Provisional Retirement": "#D35400", // Warm Orange
-    "Contributory Pension Scheme": "#5D6D7E"  // Muted Gray-Blue
-};
-
-$.ajax({
-    url: `/gcc/api/pensionerdashboard/categoryCounts`,
-    type: 'GET',
-    data: { deptId, startDate, endDate },
-    dataType: 'json',
-    success: function (data) {
-        const chartData = data.map((item, index) => ({
-            category: item.file_name,
-            value: item.category_count,
-            color: fixedColors[item.file_name], // Assign colors cyclically
-            id: item.id
-        }));
-
-        window.chart1 = AmCharts.makeChart("overallPieChart", {
-            type: "pie",
-            theme: "dark",
-            dataProvider: chartData,
-            valueField: "value",
-            titleField: "category",
-            colorField: "color",
-            radius: "40%", 
-            innerRadius: "50%", 
-            labelText: "[[[[title]]]] - [[[[value]]]]",
-            fontSize: 14,
-            
-            labelsEnabled: true,
-            pullOutRadius: 0,
-           
-            gradientRatio: [-0.4, -0.4, -0.4, -0.4, -0.4, -0.4, 0, 0.1, 0.2, 0.1, 0, -0.2, -0.5], 
-            export: {
-                enabled: true,
-            },
-            responsive: {
-                enabled: true,
-            },
-            
-            legend: {
-                position: "bottom",
-                markerType: "circle",
-                valueText: "[[[[value]]]]",
-                switchable: false,
-                markerSize: 12,
-                fontSize: 12
-                
-                
-            },
-            balloon: {
-                fixedPosition: true
-            },
-            listeners: [
-                {
-                    event: "clickSlice",
-                    method: function (event) {
-                        const FileId = event.dataItem.dataContext.id;
-                        const FileNumber = event.dataItem.dataContext.category;
-                        fetchempno(FileId, FileNumber);
-                    }
-                }
-            ]
-        });
-    },
-    error: function (xhr, status, error) {
-        console.error("AJAX Request Failed:", status, error);
-        console.error("Response Text:", xhr.responseText); 
-    }
-});
-
-    	    function fetchempno(FileId, FileNumber) {
-    	        $.ajax({
-    	            url: `/gcc/api/pensionerdashboard/getEmpNoByFileName?file_id=${FileId}`,
-    	            type: 'GET',
-    	            success: function (response) {
-    	                renderEmpNoModal(FileNumber, response);
-    	            },
-    	            error: function (xhr) {
-    	                console.error("Error fetching region details:", xhr.status, xhr.responseText);
-    	            }
-    	        });
-    	    }
-
-    	    function renderEmpNoModal(FileNumber, empNos) {
-    	        console.log(empNos);
-    	        const modalContent = `
-    	            <div class="modal-header">
-    	                <h5 class="modal-title">Employee Numbers for ${FileNumber}</h5>
-    	                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-    	                    <span aria-hidden="true">&times;</span>
-    	                </button>
-    	            </div>
-    	            <div class="modal-body">
-    	                <table class="table table-bordered">
-    	                    <thead>
-    	                        <tr><th>Employee Number</th></tr>
-    	                    </thead>
-    	                    <tbody>
-    	                        ${empNos.map(empNo => `<tr><td>${empNo.emp_no}</td></tr>`).join('')}
-    	                    </tbody>
-    	                </table>
-    	            </div>
-    	        `;
-
-    	        document.getElementById('zone-details-content').innerHTML = modalContent;
-    	       // $('#zoneDetailsModal').modal('show');
-    	        $('.close').click(function () {
-    	            $('#zoneDetailsModal').modal('hide');
-    	        });
-    	    }
-    	    
-    	   
-
-    	    function getRandomColor() {
-    	        const letters = '0123456789ABCDEF';
-    	        let color = '#';
-    	        for (let i = 0; i < 6; i++) {
-    	            color += letters[Math.floor(Math.random() * 16)];
-    	        }
-    	        return color;
-    	    }
-
-    	    // Render bar chart
-    	    $.ajax({
-    	        url: `/gcc/api/pensionerdashboard/stageWiseCounts`,
-    	        type: 'GET',
-    	        data: { deptId, startDate, endDate },
-    	        dataType: 'json',
-    	        success: function (data) {
-    	            const colorMapping = {
-	    	                "Audit Pending": "#FF5733",
-	    	                "Department Pending": "#FFC300",
-	    	                "Pension Pending": "#28B463",
-	    	                "Completed": "#3498DB"
-    	            };
-
-    	            const chartData = data.map(item => ({
-    	                category: item.category,
-    	                value: item.category_count,
-    	                color: colorMapping[item.category] || '#D3D3D3'
-    	            }));
-
-    	            window.chart2 = AmCharts.makeChart("stagesBarChart", {
-    	                 type: "serial",
-    	                 theme: "light",
-    	                 dataProvider: chartData,
-    	                 depth3D: 2,
-    	                 angle: 10,
-    	                 valueAxes: [{
-    	                     axisAlpha: 0,
-    	                     gridAlpha: 0,
-    	                     labelsEnabled: false,
-    	                     dashLength: 0
-    	                 }],
-    	                 startDuration: 1,
-    	                 startEffect: "easeInSine",
-    	                 graphs: [{
-    	                     balloonText: "[[[[category]]]]: [[[[value]]]]",
-    	                     fillAlphas: 0.8,
-    	                     lineAlpha: 0.3,
-    	                     topRadius: 1,
-    	                     type: "column",
-    	                     valueField: "value",
-    	                     fillColorsField: "color",
-    	                     columnWidth: 0.5,
-    	                     labelText: "[[[[value]]]]",
-    	                     labelPosition: "right",
-    	                     fontSize: 14,
-    	                     color: "#000000"
-    	                     
-    	                 }],
-    	                 categoryField: "category",
-    	                 categoryAxis: {
-    	                     gridPosition: "start",
-    	                     gridAlpha: 0,
-    	                     autoWrap: false,
-    	                     axisAlpha: 0,
-    	                     fontSize: 14,  // Increases the category label size
-    	                       // Makes category labels bold
-    	                     labelRotation: 0 
-    	                
-    	                 },
-    	                 rotate: true,
-    	                 export: {
-    	                     enabled: true,
-    	                     position: "bottom-right"
-    	                 }
-    	             });
-
-    	             console.log("Stages Bar Chart Data:", chartData);
-    	         },
-    	         error: function (xhr, status, error) {
-    	             console.error("AJAX Request Failed:", status, error);
-    	         }
-    	     });
-    	 }
-
-    	// Initial data load
-    	loadDashboardData();
-    	 document.querySelector("input[type='reset']").addEventListener('click', function () {
-             window.location.href = "/gcc/department/dashboard";
-         });
-
-    })
-    
-    
-     
-        $('#startDate').on('change', function () {
-	        const fromDate = $(this).val();
-	        $('#endDate').attr('min', fromDate); // Update min attribute for To Date
-
-	        // If To Date is earlier than the new From Date, adjust it
-	        const toDate = $('#endDate').val();
-	        if (new Date(toDate) < new Date(fromDate)) {
-	            $('#endDate').val(fromDate);
-	        }
-	    });
-
-	    // Update From Date's max attribute when To Date changes
-	    $('#endDate').on('change', function () {
-	        const toDate = $(this).val();
-	        $('#startDate').attr('max', toDate); // Update max attribute for From Date
-
-	        // If From Date is later than the new To Date, adjust it
-	        const fromDate = $('#startDate').val();
-	        if (new Date(fromDate) > new Date(toDate)) {
-	            $('#startDate').val(toDate);
-	        }
-	    });
-        
-        
-         	//disable future dates
-	document.addEventListener("DOMContentLoaded", function () {
-        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
-        let startdateInput = document.getElementById("startDate");
-        let enddateInput = document.getElementById("endDate");
-
-        // Set max attribute to disable future dates
-        startdateInput.setAttribute("max", today);
-        enddateInput.setAttribute("max", today);
-        
-
-        // Prevent manual future date entry
-        startdateInput.addEventListener("change", function () {
-            if (this.value > today) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Invalid Date',
-                    text: 'Future dates are not allowed.',
-                    confirmButtonText: 'OK'
-                });
-                this.value = ""; // Clear the invalid input
-            }
-        });
-    });
-    
-
-
-    </script>
-</body>
-
-</html>
diff --git a/src/main/resources/templates/modules/pensioner/department/fileclosing.html b/src/main/resources/templates/modules/pensioner/department/fileclosing.html
deleted file mode 100644
index b63dec61..00000000
--- a/src/main/resources/templates/modules/pensioner/department/fileclosing.html
+++ /dev/null
@@ -1,1308 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"  xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-.card-block {
-    padding: 20px;
-}
-
-.form-label {
-    margin-bottom: 0.5rem;
-}
-
-input.form-control {
-    padding: 10px;
-}
-.form-select {
-    padding: 10px;
-    height: 40px;
-}
-
-#employeeCard label{
-padding-top: 2%;
-}
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-
-.form-check {
-    margin-right: 30px; /* Adjust space between Yes and No */
-}
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>File Closing</h5>
-                                        <span>Search Employee Number</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Retirement File Closing</li>
-                                        <li class="breadcrumb-item" aria-current="page">File Closing</li>
-                                        <!-- <li class="breadcrumb-item active" aria-current="page">Family Pension</li> -->
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4" >
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					       <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</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> Retirement File Closing</h5>
-                              <span th:text="${userId}" id="userId" style="display:none"></span>
-								<div class="row mb-4">
-								
-								    <!-- Input Fields for Year Selection -->
-								  
-									  <!-- Start Year Dropdown as Button Dropdown -->
-										<!-- Start Year Dropdown as Button Dropdown -->
-										<div class="col-md-4" >
-										  <label for="empCode" class="form-label fw-bold">Search by Employee No <span class="text-danger">*</span></label>
-										
-										    <div class="dropdown">
-										  <input type="number" id="empCode" class="form-control" pattern="^[A-Za-z0-9]+$" placeholder="Enter Employee No" required>
-										  <small id="employeenoHelp" class="form-text text-muted">Only numeric characters (numbers) are allowed.</small>
-										</div>
-										</div>
-
-                                     <div class="col-md-4 mt-20" >
-								        <button id="searchButton" class="btn btn-primary mt-2" Style="height:38px;">Search</button>
-								        <!-- <button id="resetButton" class="btn btn-secondary mt-2">Reset</button> -->
-								    </div>
-								</div>
-							 </div>
-					    </div>
-					 
-					</div>   
-                    </div>
-                    <div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Retirement File Closing</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-												<th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                    </tbody>
-					                      
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-						
-					
-
-                    </div>
-                </div>
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-
-				<!-- model box -->
-				
-				
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Retirement File Closing - Employee (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                
-			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <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>
-			                    
-			                    <!-- Class -->
-			                    <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>
-			                    
-			                    <!-- Type of Retirement -->
-			                    <div class="col-md-4">
-			                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-			                        <input type="text" id="typeofretirement" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">File Updated Date</label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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>
-			                    </div>
-			                    
-						</div>
-						
-						<div id="showZoneBenefit">
-						<hr>
-						
-						<p style="font-weight: bold;font-size: medium;text-decoration: underline;">Zone Benefits</p>	
-							           
-			         <div class="row mt-2" id="sec2">	                		
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						
-						</div>
-						
-						
-						
-						<!-- <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" >
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		</div> -->
-	                   		
-	                   		<!-- <div class="row mt-2">
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    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)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    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)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    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> -->
-						
-						     <!-- file history -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-								
-								
-			            <hr>
-			                <div class="row">
-			            
-					            <div class="col-md-3">
-					                        <label for="datefile"  class="form-label fw-bold">Date File Completed <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly="readonly">
-					               </div>
-					               
-					                
-					               <div class="col-md-3">
-					                        <label for="deathdate"  class="form-label fw-bold">Employee Death Date<span class="text-danger">*</span></label>
-					                        <input type="date" id="deathdate"  class="form-control" onclick="this.showPicker()">
-					               </div> 
-					                    
-					            <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>
-					               </div> 
-					              
-					                 
-					           </div>
-					           
-					                  <div class="row mt-4">
-							                   <div class="col-12 d-flex justify-content-center">
-										        <button id="closedbutton" class="btn btn-warning mt-2 mx-2">Mark as Closed</button>
-										        <button id="backbutton" class="btn btn-secondary mt-2" data-dismiss="modal">Back</button>
-										    </div>
-										    </div>
-					        
-			          </div> 
-			            </div>     
-			        </div>
-			    </div>
-			
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-	
-
-	$(document).ready(function () {
-	    
-	    // Initialize DataTable
-	    function initializeDataTable() {
-	        $('#AuditDatatable').DataTable({
-	            dom: 'Bftip',
-	            columnDefs: [{ targets: 'no-sort', orderable: false }],
-	            lengthMenu: [
-	                [50, 100, 200, 500, -1],
-	                ['50 rows', '100 rows', '200 rows', 'Show all']
-	            ],
-	            scrollY: '50vh',
-	            buttons: [
-	                { extend: 'pageLength', className: 'btn btn-warning' },
-	                { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	                { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	                { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	                { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	            ],
-	            fixedHeader: true,
-	            autoWidth: true,
-	            responsive: true,
-	            searching: true,
-	            paging: true,
-	            info: true,
-	            ordering: false
-	        });
-	    }
-
-	    // Call once on page load
-	    initializeDataTable();
-	    
-	    
-	 // Trigger search on pressing Enter key
-	    $('#empCode').on('keydown', function (event) {
-	        if (event.key === 'Enter') {
-	            event.preventDefault(); // Prevent default form submission or page reload
-
-	            const empCode = $('#empCode').val(); // Get the value of empCode
-	            if (!empCode) {
-	                // Show Swal alert if the employee number is missing
-	                Swal.fire({
-	                    icon: "warning", // Display a warning icon
-	                    title: "Missing Employee Number",
-	                    text: "Please enter an employee number to proceed.",
-	                    confirmButtonText: "OK",
-	                    customClass: {
-	                        confirmButton: "btn btn-primary" // Optional styling for the button
-	                    }
-	                });
-	                return; // Stop further execution
-	            }
-	            
-	            $('#searchButton').click(); // Trigger the click event of the search button
-	        }
-	    });
-	
-	
-    // Handle Search button click
-    $('#searchButton').on('click', function () {
-    	
-    	
-    	
-        const empCode = $('#empCode').val();
-        const deptId=$('#deptId').text().trim();
-        
-        if (empCode) {
-        	$('#pageLoader').show();
-        	document.getElementById("audittable").style.display = "block";
-        }else{
-        	Swal.fire({
-                icon: "warning", // Display a warning icon
-                title: "Missing Employee Number",
-                text: "Please enter an employee number to proceed.",
-                confirmButtonText: "OK",
-                customClass: {
-                    confirmButton: "btn btn-primary" // Optional styling for the button
-                }
-            });
-        	return;
-        }
-
-        $('#pageLoader').show();
-        $('#audittable').show();
-
-        
-        $.ajax({
-            url: '/gcc/api/fileclosing/getdetails',
-            type: 'GET',
-            data: { empCode: empCode,deptId:deptId },
-            success: function (response) {
-            	
-            	console.log("response==",response);
-            	
-            	let employeeDetails=response;
-                $('#pageLoader').hide();
-                if (employeeDetails && employeeDetails.length > 0) {
-                    populateDataTable(employeeDetails); // Function to populate DataTable
-                } else {
-                    Swal.fire({
-                        icon: "warning",
-                        title: "No Data Found",
-                        text: "No details found for this employee number.",
-                        confirmButtonText: "OK",
-                        customClass: {
-                            confirmButton: "btn btn-primary"
-                        }
-                    });
-                }
-            },
-            error: function () {
-                $('#pageLoader').hide();
-                Swal.fire({
-                    icon: "error",
-                    title: "Error",
-                    text: "An error occurred while fetching data. Please try again.",
-                    confirmButtonText: "OK"
-                });
-            }
-        });
-    });
-
-    function populateDataTable(data) {
-    	
-     let tbodyHtml = "";
-        $.each(data, function (index, audit) {
-            tbodyHtml += `
-                <tr>
-                    <td class="text-center">${index + 1}</td>
-                    <td class="text-center">${audit.emp_no || 'N/A'}</td>
-                    <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, 'dd-MM-yyyy') : 'N/A'}</td>                
-                    <td class="text-center">${audit.file_entry_type || 'N/A'}</td>
-                    <td class="text-center">
-                        <button class="btn btn-primary btn-sm view-btn" data-id="${audit.emp_no}" data-temp-id="${audit.temp_id}">
-                            View
-                        </button>
-                    </td>
-                </tr>`;
-        });
-
-        // Destroy old DataTable before reinitializing
-        let table = $('#AuditDatatable').DataTable();
-        table.clear().destroy();
-        $('#AuditDatatable tbody').html(tbodyHtml);
-
-        // Reinitialize DataTable with updated data
-        initializeDataTable();
-    }
-
-    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) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/fileclosing/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-					if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	//console.log("retirementdate",retirementdate);
-	 	                // 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);
-	 	                $('#classes').val(employeeDetails.retirement_class);
-	 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                
-	 	               console.log("retirementdate",retirementdate);
-	 	               
-	 	              let status=employeeDetails.file_status;
-	 	                console.log("status=:"+status);
-	 	                
-	 	               
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	                
-							//zone benefits fields
-	 	                if (status >= 6 && status <= 8) {
-	 	                	
-	 	                	
-	 	                	$('#showZoneBenefit').show();
-	 	               
-			                 if (employeeDetails.gpf === 'yes') {
-			                     $('#gpfYes').prop('checked', true); // Disable radio
-			                     $('#gpfNo').prop('disabled', true);
-			                     $('#gpf50').prop('disabled', true);
-			                     $('#gpfAmountDiv').show();
-			                     $('#gpfAmount').val(employeeDetails.gpf_amount).prop('readonly', true); // Make input readonly
-			                 } else if (employeeDetails.gpf === 'no') {
-			                     $('#gpfNo').prop('checked', true);
-			                     $('#gpfYes').prop('disabled', true);
-			                     $('#gpf50').prop('disabled', true);
-			                     $('#gpfAmountDiv').hide();
-			                 } else if (employeeDetails.gpf === '90') {
-			                     $('#gpf50').prop('checked', true);
-			                     $('#gpfYes').prop('disabled', true);
-			                     $('#gpfNo').prop('disabled', true);
-			                     $('#gpfAmountDiv').show();
-			                     $('#gpfAmount').val(employeeDetails.gpf_amount).prop('readonly', true);
-			                 }else  {
-			                     $('#gpf50').prop('disabled', true);
-			                     $('#gpfYes').prop('disabled', true);
-			                     $('#gpfNo').prop('disabled', true);
-			                     $('#gpfAmountDiv').hide();
-			                     
-			                 }
-							
-
-			                 // Populate Earned Leave & Leave on Private Affairs
-			                 if (employeeDetails.private_affairs === 'yes') {
-			                     $('#earnedleaveYes').prop('checked', true);
-			                     $('#earnedleaveNo').prop('disabled', true);
-			                     $('#earnedleaveAmountDiv').show();
-			                     $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount).prop('readonly', true);
-			                 } else if (employeeDetails.private_affairs === 'no') {
-			                     $('#earnedleaveNo').prop('checked', true);
-			                     $('#earnedleaveYes').prop('disabled', true);
-			                     $('#earnedleaveAmountDiv').hide();
-			                 } else  {
-			                     $('#earnedleaveNo').prop('disabled', true);
-			                     $('#earnedleaveYes').prop('disabled', true);
-			                     $('#earnedleaveAmountDiv').hide();
-			                 }
-
-			                 // Populate SPFGS
-			                 if (employeeDetails.spfgs === 'yes') {
-			                     $('#spfgsYes').prop('checked', true);
-			                     $('#spfgsNo').prop('disabled', true);
-			                     $('#spfgsAmountDiv').show();
-			                     $('#spfgsAmount').val(employeeDetails.spfgs_amount).prop('readonly', true);
-			                 } else if (employeeDetails.spfgs === 'no') {
-			                     $('#spfgsNo').prop('checked', true);
-			                     $('#spfgsYes').prop('disabled', true);
-			                     $('#spfgsAmountDiv').hide();
-			                 }else  {
-			                     $('#spfgsNo').prop('disabled', true);
-			                     $('#spfgsYes').prop('disabled', true);
-			                     $('#spfgsAmountDiv').hide();
-			                 }
-
-			                 // Populate Recovery From Employee
-			                 $('#recoveryemployeevalue')
-			                     .val(employeeDetails.recovery_emp)
-			                     .prop('readonly', true); // Make input readonly
-
-			                 // Populate DCRG
-			                 if (employeeDetails.dcrg === 'yes') {
-			                     $('#dcrgYes').prop('checked', true);
-			                     $('#dcrgNo').prop('disabled', true);
-			                   			                     
-			                 }else if (employeeDetails.dcrg === 'no') {
-			                     $('#dcrgNo').prop('checked', true);
-			                     $('#dcrgYes').prop('disabled', true);	  
-			                     
-			                 }else  {
-			                     $('#dcrgNo').prop('disabled', true);
-			                     $('#dcrgYes').prop('disabled', 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);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount).prop('readonly',true);
-	                          //  bpYes bpNo PbAmountDiv benefit_pension_amount
-	                            $('#bpYes').prop('checked', true);
-			                     $('#bpNo').prop('disabled', true);
-	                        } else if(employeeDetails.benefit_pension === "no"){
-	                            $('#PbAmountDiv').hide();
-	                            $('#bpNo').prop('checked', true);
-			                     $('#bpYes').prop('disabled', true);
-	                        }
-	                        else{
-	                        	$('#bpNo').prop('disabled', true);
-			                     $('#bpYes').prop('disabled', true);
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount).prop('readonly',true);
-	                            // DcrgYes DcrgNo dcrgAmountDiv benefit_dcrg_amount
-	                            $('#DcrgYes').prop('checked', true);
-			                     $('#DcrgNo').prop('disabled', true);
-	                        } else if(employeeDetails.benefit_dcrg === "no"){
-	                            $('#dcrgAmountDiv').hide();
-	                            $('#DcrgNo').prop('checked', true);
-			                     $('#DcrgYes').prop('disabled', true);
-	                            
-	                        }else {
-	                            $('#dcrgAmountDiv').hide();
-	                            $('#DcrgNo').prop('disabled', true);
-			                     $('#DcrgYes').prop('disabled', true);
-	                            
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount).prop('readonly',true);
-	                            // commutationYes commutationNo CommutationAmountDiv benefit_commutation_amount
-	                            $('#commutationYes').prop('checked', true);
-			                     $('#commutationNo').prop('disabled', true);
-	                        } else if (employeeDetails.benefit_commutation === "no"){
-	                            $('#CommutationAmountDiv').hide();
-	                            $('#commutationNo').prop('checked', true);
-			                     $('#commutationYes').prop('disabled', true);
-	                        }else {
-	                            $('#CommutationAmountDiv').hide();
-	                            $('#commutationNo').prop('disabled', true);
-			                     $('#commutationYes').prop('disabled', true);
-	                        } */
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
-	 	          	        
-	 	                
-	 	                /* document.getElementById('closedbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	                   
-	 	               $('#closedbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    }); 
-	 	    
-	 	}
-	    
-		
- 	$(document).ready(function () {
- 		
-   	 	$(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("tempId====="+tempId);
-   		    // Hide the receivedcard section before showing the modal
-   	        $("#receivedcard").hide();
-   		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-   		    loadFileHistory(tempId); // Load the file history for the selected employee
-   		    
-
-   		});
-   	 	
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#backbutton').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	 // Listen for changes on the GPF radio buttons
-	    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-	            if (this.value === 'yes' || this.value === '90') {
-	                gpfAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	                gpfAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('gpfAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 
-	 
-	 // Listen for changes on the private affaires radio buttons
-	    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-	            if (this.value === 'yes') {
-	            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	 
-	 // Listen for changes on the spfgs radio buttons
-	    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-	            if (this.value === 'yes') {
-	            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 
-	 
-	 
-	    /* document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const PbAmountDiv = document.getElementById('PbAmountDiv');
-	            if (this.value === 'yes') {
-	            	PbAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	PbAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	    
-	    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-	            if (this.value === 'yes') {
-	            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	    
-	    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-	            if (this.value === 'yes') {
-	            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    }); */
-	});
- 	
- 	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-	 
-	 // Function to format date and time
-		function formatDateTime(dateString) {
-			 const options = {
-			     day: '2-digit',
-			     month: '2-digit',
-			     year: 'numeric',
-			 };
-			 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-			}
-
-	 
-
-		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("datefilereceived").value = formattedDateDisplay;
-	        //document.getElementById("datefileyes").value = formattedDateDisplay;
-	        
-	    });
-	  
-	  
-	function convertDateFormat(dateString) {
-	    if (!dateString) return '';
-	    let [day, month, year] = dateString.split('-');
-	    return `${year}-${month}-${day}`;
-	}
-	
-	
-	function saveEntryDetails(tempId,empNo) {
-	      
-  	    let entryDetails = {
-  	    	empNo:empNo,
-  	      	tempId: tempId, // Pass the stored tempId value		
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	      	serviceDeath:$('#deathdate').val(),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim(),
-  	    };
-  	    
-  	  	if (!entryDetails.serviceDeath) {
-  	        Swal.fire({
-  	            icon: 'warning',
-  	            title: 'Validation Error!',
-  	            text: 'Employee Death Date is required.',
-  	            confirmButtonText: 'OK'
-  	        });
-  	        return;
-  	    }
-  	    
-  	  if (!entryDetails.remarks) {
-          Swal.fire({
-              icon: 'warning',
-              title: 'Validation Error!',
-              text: 'Remarks are required.',
-              confirmButtonText: 'OK'
-          });
-          return;
-      }
-  	   
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	   $('#closedbutton').prop('disabled', true).text('Processing...');
- 	    
- 	    $.ajax({
- 	        url: '/gcc/api/fileclosing/updateDetails',
- 	        type: 'POST',
- 	        contentType: 'application/json',
- 	        data: JSON.stringify(entryDetails),
- 	        success: function (response) {
- 	        	$('#closedbutton').prop('disabled', false).text('Mark as Closed');	
- 	            Swal.fire({
- 	                icon: 'success',
- 	                title: 'Success',
- 	                text: response,
- 	               	allowOutsideClick: false,
- 	              	allowEscapeKey: false,
- 	              	allowEnterKey: false,
- 	                confirmButtonText: 'OK'
- 	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#closedbutton').prop('disabled', false).text('Mark as Closed');
-	                        	window.location.href = "/gcc/departmentfileclosing/fileclosing";
-	                            console.log("Continue clicked");
-	                        }
- 	            });
- 	        },
- 	        error: function (xhr, status, error) {
- 	        	$('#auditsubmit').prop('disabled', false).text('Mark as Closed');
- 	            Swal.fire({
- 	                icon: 'error',
- 	                title: 'Error',
- 	                text: 'Failed to save details. Please try again.',
- 	                confirmButtonText: 'OK'
- 	            });
- 	            console.error('Error:', xhr.responseText);
- 	        }
- 	    });  
- 	}
-	
-	
-	
-	
-	//disable future dates
-	document.addEventListener("DOMContentLoaded", function () {
-        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
-        let deathdate = document.getElementById("deathdate");
-
-
-        // Set max attribute to disable future dates
-        deathdate.setAttribute("max", today);
-       
-        
-
-        // Prevent manual future date entry
-        deathdate.addEventListener("change", function () {
-            if (this.value > today) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Invalid Date',
-                    text: 'Future dates are not allowed.',
-                    confirmButtonText: 'OK'
-                });
-                this.value = ""; // Clear the invalid input
-            }
-        });
-    });
-	
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/newentry/.DS_Store b/src/main/resources/templates/modules/pensioner/department/newentry/.DS_Store
deleted file mode 100644
index 098520aec737a84be5d58f4f8c7360c0aac1f06c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5T2<;A|e(~;z9BR1>Yc+dJvDkfKBU9AzDdW!CUTLd;(v=N7QeAC~0F3
zf{4fr%zm5M`Puz8WV1xXgXQFes7FKzRIsyy<_nQ=(S~%~vJGU-QPPxhTGE1M4ev1g
zMFwQ=j%kejdcdyL_phX9dZcUE=h#&lpTqACmV0O)y#;#3c`+O3#Vki2d5KP;{SOuN
zhz{t6M(~?b(a6`9<9#DXLbr&Yx7Fkeyne5>ntML)iOznEx-FIXWuwv&B1^3GN$c6F
zN0@nuObgfqW%a^UOHO6rtu~weZ$-=6>(O`&2?m0JVBp6Yz?m(Q>>5TJ3<Lwgz={F+
zKBQ2=%&{`mPX`*k0sy-(tDrBxffAECW{#C1Mj&jVKnrERVz7n7p1NP=SQ%P4v0pye
zE3@BFSgRv{s_w*@VYI<OFtE<RmOb|5{6A~I|E~wdQ!o$={3`~yJG>kYup~cQ8;g^(
tHice6MZ~W%T!o;cM=^ZmC_aR$z@AD6m^oI4ut4HRKxv3382D8NJ^{EQcGCa=

diff --git a/src/main/resources/templates/modules/pensioner/department/newentry/contributorypensionscheme.html b/src/main/resources/templates/modules/pensioner/department/newentry/contributorypensionscheme.html
deleted file mode 100644
index 936c9f9a..00000000
--- a/src/main/resources/templates/modules/pensioner/department/newentry/contributorypensionscheme.html
+++ /dev/null
@@ -1,1022 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-.card-block {
-    padding: 20px;
-}
-
-.form-label {
-    margin-bottom: 0.5rem;
-}
-
-input.form-control {
-    padding: 10px;
-}
-.form-select {
-    padding: 10px;
-    height: 40px;
-}
-
-#employeeCard label{
-padding-top: 2%;
-}
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Department Entries</h5>
-                                        <span>Contributory Pension Scheme</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">NewEntry</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Contributory Pension Scheme</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4" >
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${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">
-								
-								    <!-- Input Fields for Year Selection -->
-										<!-- Start Year Dropdown as Button Dropdown -->
-										<div class="col-md-4" >
-										  <label for="empCode" class="form-label fw-bold">Search by Employee No <span class="text-danger">*</span></label>
-										
-										    <div class="dropdown">
-										  <input type="number" id="empCode" class="form-control" pattern="^[A-Za-z0-9]+$" placeholder="Enter Employee No" required>
-										  <small id="employeenoHelp" class="form-text text-muted">Only numeric characters (numbers) are allowed.</small>
-										</div>
-										</div>
-
-                                     <div class="col-md-4 mt-20">
-								        <button id="searchButton" class="btn btn-primary mt-2" Style="height:38px;">Search</button>
-								        <!-- <button id="resetButton" class="btn btn-secondary mt-2">Reset</button> -->
-								    </div>
-								</div>
-							 </div>
-					    </div>
-					 
-					</div>
-                    </div>
-                    <div class="row mb-4" id="employeeCard" style="display: none;">
-						    <div class="col-md-12">
-						        <div class="card">
-						            <div class="card-block">
-						                <h5 style="font-weight:bold;">New Entry - Contributory Pension - <span id="EmployeeCode"></span></h5>
-						                <hr>
-						                <div class="row">
-						                    <!-- Employee No -->
-						                    <div class="col-md-6">
-						                        <label for="employeeno" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="number" id="employeeno" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <!-- Employee Name -->
-						                    <div class="col-md-6">
-						                        <label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="employeename" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                     <div class="col-md-6">
-						                        <label for="Department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="department" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                     <div class="col-md-6">
-						                        <label for="Designation" class="form-label fw-bold">Designation<span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="designation" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <div class="col-md-6">
-											    <label for="classes" class="form-label fw-bold">Class<span class="text-danger">*</span></label>
-											    <div class="dropdown" >
-											       <input type="text" id="classes" class="form-control" readonly>
-											    </div>
-											</div>
-											
-											<div class="col-sm-6">
-						                        <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>
-						                    </div>
-											
-																	                   <div class="col-md-6">
-											    <label for="pendingDuration" class="form-label fw-bold">Pending Duration <span class="text-danger">*</span></label>
-											    <div class="d-flex align-items-center">
-											        <div class="form-check" style="padding-right:10px;">
-											            <input type="radio" id="yespen" name="pendingDuration" value="Yes" class="form-check-input" onclick="toggleInputField(this)">
-											            <label for="yespen" class="form-check-label">Yes</label>
-											        </div>
-											        <div class="form-check">
-											            <input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" onclick="toggleInputField(this)">
-											            <label for="nopen" class="form-check-label">No</label>
-											        </div>
-											    </div>
-											    <div id="clickyesdiv" style="display: none; margin-top: 10px;">
-											        <label for="clickyes" class="form-label">Please specify:<span class="text-danger">*</span></label>
-											        <input type="text" id="Clickyes" class="form-control" placeholder="Enter Pending Duration">
-											    </div>
-											</div> 
-											
-											 <div class="col-md-6">
-											    <label for="retirement" class="form-label fw-bold">Type Of Retirement<span class="text-danger">*</span></label>
-											    <div class="dropdown" >
-											        <select id="retirement" class="form-select"  style="width: 100%;" required>
-											           
-											        </select>
-											    </div>
-											</div>
-								
-						                    
-						                    <div class="col-md-6">
-											    <label for="filesentuac" class="form-label fw-bold">
-											        Whether file sent to UAC (if yes, Date)
-											        <span class="text-danger">*</span>
-											    </label>
-											    <div class="d-flex align-items-center">
-											        <div class="form-check" style="padding-right:10px;">
-											            <input type="radio" id="yes" name="filesentuac" class="form-check-input" value="yes">
-											            <label for="yes" class="form-check-label">Yes</label>
-											        </div>
-											        <br>
-											        <div class="form-check">
-											            <input type="radio" id="no" name="filesentuac" class="form-check-input" value="no">
-											            <label for="no" class="form-check-label">No</label>
-											        </div>
-											    </div>
-											    
-											 <div class="dropdown" id="dateInputContainer" style="display: none; margin-top: 10px;">											 
-												    <input type="date" id="dateInput" name="filesentuac_date" class="form-control" onclick="this.showPicker()" >											  
-												</div>
-											</div>
-											
-											
-<!-- 											<div class="col-md-6">
-											    <label for="pendingDuration" class="form-label fw-bold">
-											        Pending Duration
-											        <span class="text-danger">*</span>
-											    </label>
-											    <div class="d-flex align-items-center">
-											        <div class="form-check" style="padding-right:10px;">
-											            <input type="radio" id="pendingDurationYes" name="pendingDuration" value="yes" class="form-check-input">
-											            <label for="pendingDurationYes" class="form-check-label">Yes</label>
-											        </div>
-											        <div class="form-check">
-											            <input type="radio" id="pendingDurationNo" name="pendingDuration" value="no" class="form-check-input">
-											            <label for="pendingDurationNo" 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" placeholder="Enter details for pending duration">
-											    </div>
-											</div> -->
-											
-											<div class="col-md-6">
-											    <label for="cpsamount" class="form-label fw-bold">
-											        Whether CPS Amount Settled
-											        <span class="text-danger">*</span>
-											    </label>
-											    <div class="d-flex align-items-center">
-											        <div class="form-check" style="padding-right:10px;">
-											            <input type="radio" id="yes1" name="cpsamount" class="form-check-input" value="yes">
-											            <label for="yes1" class="form-check-label">Yes</label>
-											        </div>
-											        <div class="form-check">
-											            <input type="radio" id="no1" name="cpsamount" class="form-check-input" value="no">
-											            <label for="no1" class="form-check-label">No</label>
-											        </div>
-											    </div>
-											    <div class="dropdown" id="cpsAmountInputContainer" style="display: none; margin-top: 10px;">
-												    <input type="number" id="cpsAmountInput" name="cpsamount_value" class="form-control"
-												           placeholder="Enter CPS Amount" min="1" oninput="validatePositiveNumber(this)">
-												</div>
-											</div>
-											
-											<div class="col-md-6">
-											    <label for="elamount" class="form-label fw-bold">
-											        Whether EL/LPA Amount Settled
-											        <span class="text-danger">*</span>
-											    </label>
-											    <div class="d-flex align-items-center">
-											        <div class="form-check" style="padding-right:10px;">
-											            <input type="radio" id="yes2" name="elamount" class="form-check-input" value="yes">
-											            <label for="yes2" class="form-check-label">Yes</label>
-											        </div>
-											        <div class="form-check">
-											            <input type="radio" id="no2" name="elamount" class="form-check-input" value="no">
-											            <label for="no2" class="form-check-label">No</label>
-											        </div>
-											    </div>
-											   <div class="dropdown" id="elAmountInputContainer" style="display: none; margin-top: 10px;">
-													    <input type="number" id="elAmountInput" name="elamount_value" class="form-control"
-													           placeholder="Enter EL/LPA Amount" min="1" oninput="validatePositiveNumber(this)">
-													</div>
-											</div>
-											
-											<div class="col-md-6">
-											    <label for="spfgsamount" class="form-label fw-bold">
-											        Whether SPFGS Amount Settled
-											        <span class="text-danger">*</span>
-											    </label>
-											    <div class="d-flex align-items-center">
-											        <div class="form-check" style="padding-right:10px;">
-											            <input type="radio" id="yes3" name="spfgsamount" class="form-check-input" value="yes">
-											            <label for="yes3" class="form-check-label">Yes</label>
-											        </div>
-											        <div class="form-check">
-											            <input type="radio" id="no3" name="spfgsamount" class="form-check-input" value="no">
-											            <label for="no3" class="form-check-label">No</label>
-											        </div>
-											    </div>
-											    <div class="dropdown" id="spfgsAmountInputContainer" style="display: none; margin-top: 10px;">
-													<input type="number" id="spfgsAmountInput" name="spfgsamount_value" class="form-control" 
-		      												 placeholder="Enter SPFGS Amount" min="1" oninput="validatePositiveNumber(this)">
-												</div>
-											</div>
-																					
-						                    
-						                    <div class="col-md-12">
-						                        <label for="Remarks" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                             <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here" required></textarea>
-						                        </div>
-						                    </div>
-						                    
-						                    </div>
-						                    
-
-						                   <div class="row mt-4">
-							                   <div class="col-12 d-flex justify-content-center">
-										        <button id="lfauditButton" class="btn btn-primary mt-2 mx-2">Submit</button>
-										        <button id="cancelButton" class="btn btn-secondary mt-2">Cancel</button>
-										    </div>
-										    </div>
-
-						                    
-						                
-						            </div>
-						        </div>
-						    </div>
-						</div>
-
-					
-						
-                    </div>
-                </div>
-  
-  
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-    
-    $(document).ready(function (){
-       	
-       	// Handle Search button click
-           $('#searchButton').on('click', function () {
-               const empCode = $('#empCode').val();
-                      
-               console.log("empCode",empCode);
-
-               if (empCode) {
-               	$('#pageLoader').show();
-               	document.getElementById("employeeCard").style.display = "block";
-               }else{              	
-               	
-               	Swal.fire({
-                       icon: "warning", // Display a warning icon
-                       title: "Missing Employee Number",
-                       text: "Please enter an employee number to proceed.",
-                       confirmButtonText: "OK",
-                       customClass: {
-                           confirmButton: "btn btn-primary" // Optional styling for the button
-                       }
-                   });
-               	//document.getElementById("newemployeeCard").style.display = "block";
-               	 return; // Stop further execution if empCode is not provided
-               }
-
-               // Format dates to dd-MM-yyyy
-               
-               $('#pageLoader').show();
-               $('#employeeCard').hide();
-               $('#newemployeeCard').hide();
-               
-               $('#retirement').val('');
-               $('#dateInput').val('');
-               $('#remarks').val('');
-               $('#pendingDurationInput').val('');
-               $('#cpsAmountInput').val('');
-               $('#elAmountInput').val('');
-               $('#spfgsAmountInput').val('');
-               $('input[name="filesentuac"]').prop('checked', false);
-               $('input[name="pendingDuration"]').prop('checked', false);
-               $('input[name="cpsamount"]').prop('checked', false);
-               $('input[name="elamount"]').prop('checked', false);
-               $('input[name="spfgsamount"]').prop('checked', false);
-               // Call the API
-              $('#pageLoader').show();
-               
-              $.ajax({
-  	            url: '/gcc/api/department/newentry/cpsexists', // Endpoint to check existence
-  	            type: 'GET',
-  	            data: { empCode: empCode },
-  	            success: function (existsResponse) {
-  	                console.log("Exists API Response:", existsResponse);
-  	                $('#pageLoader').hide(); // Hide loader after the first API response
-
-  	                if (existsResponse && existsResponse.exists) {
-  	                    console.log(`Employee Code ${empCode} exists in the database.`);
-  	                    Swal.fire({
-  	                        icon: "warning",
-  	                        title: "Already Exists",
-  	                        text: "This employee number already exists.",
-  	                        confirmButtonText: "OK",
-  	                        customClass: {
-  	                            confirmButton: "btn btn-primary"
-  	                        }
-  	                    });
-  	                    return; // Exit if employee already exists
-  	                }
-               
-               	
-    	                $('#pageLoader').show();
-		               $.ajax({
-		                   url: '/gcc/api/department/newentry/employeedetails', // Correct API URL
-		                   type: 'GET',
-		                   data: { empCode: empCode },
-		                   success: function (response) {
-		                   	$('#pageLoader').hide();
-		                       console.log("response:", response.list);
-		                       if (response.list && response.list.length > 0) {
-		                           // Clear existing data
-		                           let employeeDetails = response.list[0];
-		           	            	console.log("employeedetails",response);
-		           	            	
-		           	            	const loggedInDeptId = $('#deptId').text().trim(); // Get logged-in deptId dynamically
-		
-		                            // Validate department ID
-		                            if (employeeDetails.ID_DEPT !== loggedInDeptId) {
-		                                Swal.fire({
-		                                    icon: "error",
-		                                    title: "Access Denied",
-		                                    text: "This employee does not belong to your department. Please try again with a valid employee code.",
-		                                    confirmButtonText: "OK",
-		                                    customClass: {
-		                                        confirmButton: "btn btn-danger"
-		                                    }
-		                                });
-		                                return; // Exit if the department does not match
-		                            }
-		           	            	
-		           	            	
-		           	            	
-		           	            	
-		                            // Function to handle radio button state based on retirement date
-    	                            function handlePendingDurationState() {
-    	                                const currentDate = new Date().toISOString().split('T')[0]; // Get today's date in YYYY-MM-DD format
-    	                                const retirementDate = employeeDetails.RETIREMENT_DATE; // Assuming this comes in YYYY-MM-DD format
-
-    	                                const yesRadio = document.getElementById("yespen");
-    	                                const noRadio = document.getElementById("nopen");
-
-    	                                const inputFieldDiv = document.getElementById('clickyesdiv');
-    	                                if (retirementDate <= currentDate) {
-    	                                    // If retirement date is less than or equal to current date, disable 'Yes' option
-    	                                     
-    	                                    yesRadio.checked = true;
-    	                                    inputFieldDiv.style.display = 'block';
-    	                                    noRadio.disabled = true; // Default to 'No'
-    	                                } else {
-    	                                    // If retirement date is greater than current date, disable 'No' option
-    	                                    noRadio.checked = true;
-    	                                    yesRadio.disabled = true; // Default to 'Yes'
-    	                                }
-    	                            }
-
-    	                            // Call the function after fetching `employeeDetails`
-    	                            handlePendingDurationState();
-
-		           	            	
-           	            	
-                       	    $('#employeeno').val(employeeDetails.EMPLOYEE_CODE);
-        	                $('#employeename').val(employeeDetails.EMPLOYEE_NAME);
-        	                $('#department').val(employeeDetails.DEPARTMENT);
-        	                $('#designation').val(employeeDetails.DESIGNATION);
-        	                $('#classes').val(employeeDetails.GROUP_TYPE);
-        	                $('#retirementdate').val(employeeDetails.RETIREMENT_DATE);
-                           
-        	               $('#EmployeeCode').text(empCode);
-        	                //show the modal
-        	                $('#employeeCard').show();
-          	               
-                           
-                       } else {
-                       	//$('#pageLoader').hide();
-                       	//document.getElementById("newemployeeCard").style.display = "block";
-                       	 Swal.fire({
-                                icon: "warning", // Display a warning icon
-                                title: "No Data Found",
-                                text: "No details found for this employee number.",
-                                confirmButtonText: "OK",
-                                customClass: {
-                                    confirmButton: "btn btn-primary" // Optional styling for the button
-                                
-                                }
-                            });
-                           
-                          //document.getElementById("newemployeeCard").style.display = "block"; // Show the new employee card
-                       }                     
-                  
-                    },
-	                    error: function () {
-	                        $('#pageLoader').hide(); // Hide loader on error
-	                        Swal.fire({
-	                            icon: "error",
-	                            title: "Error",
-	                            text: "An error occurred while fetching data. Please try again.",
-	                            confirmButtonText: "OK",
-		                        });
-		                    }
-		                });
-		            },
-                   error: function () {
-                   	$('#pageLoader').hide();
-                       Swal.fire({
-                           icon: "error",
-                           title: "Error",
-                           text: "An error occurred while fetching data. Please try again.",
-                           confirmButtonText: "OK",
-                       });
-                   }
-              
-	        });
-		               
-    	          
-           }); 
-        
-       })
-    
-       
-       
-       			function toggleInputField(radio) {
-			    const inputFieldDiv = document.getElementById('clickyesdiv');
-			    if (radio.value === "Yes") {
-			        inputFieldDiv.style.display = 'block';
-			    } else {
-			        inputFieldDiv.style.display = 'none';
-			        document.getElementById('Clickyes').value = ''; // Clear the input field
-			    }
-			}
-       
-     
-       $(document).ready(function () {
-       	    function loadRetirementTypes() {
-       	        $.ajax({
-       	            url: "/gcc/api/getRetrimentTypes",
-       	            type: "GET",
-       	            success: function (data) {
-       	                var dropdown = $("#retirement");
-       	                dropdown.empty();
-       	                dropdown.append('<option value="" selected>-- Select Option --</option>');
-
-       	                $.each(data, function (key, entry) {
-       	                    if (entry.retriment_type !== "Provisional") {  // Exclude "Provisional"
-       	                        dropdown.append($('<option></option>').attr('value', entry.retriment_type).text(entry.retriment_type));
-       	                    }
-       	                });
-       	            },
-       	            error: function () {
-       	                console.log("Error loading dropdown data.");
-       	            }
-       	        });
-       	    }
-
-       	    // Call function on page load
-       	    loadRetirementTypes();
-       	});
-
-       
-       // Trigger search on pressing Enter key
-        $('#empCode').on('keydown', function (event) {
-            if (event.key === 'Enter') {
-                event.preventDefault(); // Prevent default form submission or page reload
-
-                const empCode = $('#empCode').val(); // Get the value of empCode
-                if (!empCode) {
-                    // Show Swal alert if the employee number is missing
-                    Swal.fire({
-                        icon: "warning", // Display a warning icon
-                        title: "Missing Employee Number",
-                        text: "Please enter an employee number to proceed.",
-                        confirmButtonText: "OK",
-                        customClass: {
-                            confirmButton: "btn btn-primary" // Optional styling for the button
-                        }
-                    });
-                    return; // Stop further execution
-                }
-                
-                $('#searchButton').click(); // Trigger the click event of the search button
-            }
-        });
-		
-		// Handle close button click
-		$('#cancelButton').click(function () {
-		    // Clear the input field value
-		    $('#empCode').val('');
-		    document.getElementById('dateInputContainer').style.display = 'none';
-		    document.getElementById('pendingDurationInputContainer').style.display = 'none';
-		    document.getElementById('cpsAmountInputContainer').style.display = 'none';
-		    document.getElementById('elAmountInputContainer').style.display = 'none';
-		    document.getElementById('spfgsAmountInputContainer').style.display = 'none';
-		    // Hide the card
-		    $('#employeeCard').hide();
-		});
-
-		// Handle close button click
-		$('#cancelButtonnew').click(function () {
-		    // Clear the input field value
-		    $('#empCode').val('');
-
-		    $('#newemployeeCard').hide();
-		});    
-		
-		// Set the max attribute to today's date to disable future dates
-		document.addEventListener("DOMContentLoaded", function () {
-		    let today = new Date().toISOString().split("T")[0]; 
-		    document.getElementById("dateInput").setAttribute("max", today);
-		});
-
-		document.querySelectorAll('input[name="filesentuac"]').forEach(radio => {
-		    radio.addEventListener('change', function () {
-		        const dateInputContainer = document.getElementById('dateInputContainer');
-		        if (this.value === 'yes') {
-		            dateInputContainer.style.display = 'block'; // Show the input field
-		        } else {
-		            dateInputContainer.style.display = 'none'; // Hide the input field
-		            document.getElementById('dateInput').value = ''; // Clear the input field
-		        }
-		    });
-		});
-		
-
-
-	    document.querySelectorAll('input[name="cpsamount"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const cpsAmountInputContainer = document.getElementById('cpsAmountInputContainer');
-	            if (this.value === 'yes') {
-	                cpsAmountInputContainer.style.display = 'block'; // Show the input field
-	            } else {
-	                cpsAmountInputContainer.style.display = 'none'; // Hide the input field
-	                document.getElementById('cpsAmountInput').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-
-	    document.querySelectorAll('input[name="elamount"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const elAmountInputContainer = document.getElementById('elAmountInputContainer');
-	            if (this.value === 'yes') {
-	                elAmountInputContainer.style.display = 'block'; // Show the input field
-	            } else {
-	                elAmountInputContainer.style.display = 'none'; // Hide the input field
-	                document.getElementById('elAmountInput').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-		
-		document.querySelectorAll('input[name="spfgsamount"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const spfgsAmountInputContainer = document.getElementById('spfgsAmountInputContainer');
-	            if (this.value === 'yes') {
-	            	spfgsAmountInputContainer.style.display = 'block'; // Show the input field
-	            } else {
-	            	spfgsAmountInputContainer.style.display = 'none'; // Hide the input field
-	                document.getElementById('spfgsAmountInput').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-		  
-	    
-		function validatePositiveNumber(input) {
-		    if (input.value < 1) {
-		        input.value = "";
-		    }
-		}
-	    
-	    function saveNewEntryDetailsPensionScheme() {
-
-	    	let selecteduacValue = $('input[name="filesentuac"]:checked').val();
-	    	let uacDate = null;
-     	    let selectedPendingDurationValue = $('input[name="pendingDuration"]:checked').val();
-     	    let selectedReasonValue = $('#Clickyes').val();  
-
-     	    
-     	    
-     	    
-	    	if (selecteduacValue === 'yes') {
-	    	    uacDate = $('#dateInput').val();
-	    	    if (!uacDate) {
-	    	        Swal.fire({
-	    	            icon: 'warning',
-	    	            title: 'Validation Error',
-	    	            text: 'Please Enter UAC Date',
-	    	            confirmButtonText: 'OK'
-	    	        });
-	    	        return; // Stop further execution if validation fails
-	    	    }
-	    	}
-	        
-	        let pendingDuration= $('input[name="pendingDuration"]:checked').val();
-	        let pendingDurationReason=null;
-	        if (pendingDuration === 'yes' ) {
-	        	pendingDurationReason = $('#pendingDurationInput').val(); // Retrieve the amount if available, else null
-	        	if (!pendingDurationReason) {
-		            Swal.fire({
-		                icon: 'warning',
-		                title: 'Validation Error',
-		                text: 'Please Enter Pending Reason',
-		                confirmButtonText: 'OK'
-		            });
-		            return; // Stop further execution if validation fails
-		        }
-	        }
-	     
-
-	        let selcpsamount = $('input[name="cpsamount"]:checked').val();
-	        let selcpsamountval = null;
-
-	        if (selcpsamount === 'yes') {
-	            selcpsamountval = $('#cpsAmountInput').val();
-	            if (!selcpsamountval || selcpsamountval <= 0) {
-	                Swal.fire({
-	                    icon: 'warning',
-	                    title: 'Validation Error',
-	                    text: 'Please enter a valid CPS Amount greater than zero',
-	                    confirmButtonText: 'OK'
-	                });
-	                return ; // Stop further execution
-	            }
-	        }
-
-	        let selelamount = $('input[name="elamount"]:checked').val();
-	        let selelamountval = null;
-
-	        if (selelamount === 'yes') {
-	            selelamountval = $('#elAmountInput').val();
-	            if (!selelamountval || selelamountval <= 0) {
-	                Swal.fire({
-	                    icon: 'warning',
-	                    title: 'Validation Error',
-	                    text: 'Please enter a valid EL/LPA Amount greater than zero',
-	                    confirmButtonText: 'OK'
-	                });
-	                return ; // Stop further execution
-	            }
-	        }
-	        
-	        
-	        let selspfgsamount = $('input[name="spfgsamount"]:checked').val();
-	        let selspfgsamountval = null;
-
-	        if (selspfgsamount === 'yes') {
-	            selspfgsamountval = $('#spfgsAmountInput').val().trim(); // Trim input to remove spaces
-
-	            if (!selspfgsamountval || selspfgsamountval <= 0) {
-	                Swal.fire({
-	                    icon: 'warning',
-	                    title: 'Validation Error',
-	                    text: 'Please enter a valid SPFGS Amount greater than zero',
-	                    confirmButtonText: 'OK'
-	                });
-	                return; // Stop further execution if validation fails
-	            }
-	        }
-	        
-	        
-	 	    // Check for "Yes" in Pending Duration
-	 	    if (selectedPendingDurationValue === 'Yes') {
-	 	        selectedReasonPending = $('#Clickyes').val()?.trim() || null;
-	 	        if (!selectedReasonPending) {
-	 	            Swal.fire({
-	 	                icon: 'warning',
-	 	                title: 'Validation Error',
-	 	                text: 'Please specify the reason for selecting "Yes" for Pending Duration.',
-	 	                confirmButtonText: 'OK'
-	 	            });
-	 	            return;
-	 	        }
-	 	    }
-			
-	        
-	        // Collecting input values
-	        let entryDetails = {
-	            empNo: $('#employeeno').val(),
-	            empName: $('#employeename').val(),
-	            deptName: $('#department').val(),
-	            designation: $('#designation').val(),
-	            classes: $('#classes').val(),
-	            retirementdate: $('#retirementdate').val()?.trim(),
-	            fileMovedBy: $('#userId').text().trim(),
-	            remarks: $('#remarks').val(),
-	            retirementType: $('#retirement').val(),
-	            uac: selecteduacValue,
-	            uacDate: uacDate,
-	            
-	            pendingDuration: selectedPendingDurationValue,            
-	            reasonPending: selectedReasonValue || null,
-	            cps: selcpsamount,
-	            cpsAmount: selcpsamountval,
-	            elOrLpa: selelamount,
-	            elOrLpaAmount:selelamountval,
-	            spfgs: selspfgsamount,
-	            spfgsAmount: selspfgsamountval,
-	            deptId: $('#deptId').text().trim(),
-	            filecategory:$('#filecategory').text().trim()
-	        };
-	            
-	        
-	        if(!entryDetails.retirementType){
- 		    	Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error!',
-                    text: 'Type of Retirement is required.',
-                    confirmButtonText: 'OK'
-                });
-                return;
- 		    }
-	        
-	        if(!entryDetails.uac){
-		    	Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error!',
-                  text: 'uac is required.',
-                  confirmButtonText: 'OK'
-              });
-              return;
-		    }
-	        
-	        if(!entryDetails.pendingDuration){
-		    	Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error!',
-                  text: 'Pending Duration is required!.',
-                  confirmButtonText: 'OK'
-              });
-              return;
-		    }
-	        
-	        
-	        
-	        
-	        if(!entryDetails.cps){
-		    	Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error!',
-                  text: 'CPS is required.',
-                  confirmButtonText: 'OK'
-              });
-              return;
-		    }
-	        
-	        if(!entryDetails.elOrLpa){
-		    	Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error!',
-                  text: 'EL/LPA  is required.',
-                  confirmButtonText: 'OK'
-              });
-              return;
-		    }
-	        
-	        
-	        
-	        if(!entryDetails.spfgs){
-		    	Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error!',
-                  text: 'SPFGS is required.',
-                  confirmButtonText: 'OK'
-              });
-              return;
-		    }
-	        
-	        if(!entryDetails.remarks){
-		    	Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error!',
-                  text: 'Remarks is required.',
-                  confirmButtonText: 'OK'
-              });
-              return;
-		    }
-	        
-	                
-	        console.log("entrydetails:>>", entryDetails);
-			
-	         $('#lfauditButton').prop('disabled', true).text('Processing...');
-	        
-	        // AJAX call to save data
-	        $.ajax({
-	            url: '/gcc/api/department/newentry/saveEmployeeDetailsPensionScheme',
-	            type: 'POST',
-	            contentType: 'application/json',
-	            data: JSON.stringify(entryDetails),
-	            success: function (response) {
-	            	$('#lfauditButton').prop('disabled', false).text('Submit');
-	            	console.log("saveddetails:",entryDetails);
-	                Swal.fire({
-	                	icon: 'success',
-     	                title: 'Success',
-     	                text: response,
-     	               	allowOutsideClick: false,
-     	              	allowEscapeKey: false,
-     	              	allowEnterKey: false,
-     	                confirmButtonText: 'OK'
-	                }).then((result) => {
-	                    if (result.isConfirmed) {
-	                    	$('#lfauditButton').prop('disabled', false).text('Submit');
-	                        window.location.href = '/gcc/department/newentry/contributorypensionscheme';
-	                        console.log('Continue clicked');
-	                    }
-	                });
-	            },
-	            error: function (xhr, status, error) {
-	            	$('#lfauditButton').prop('disabled', false).text('Submit');
-	                Swal.fire({
-	                    icon: 'error',
-	                    title: 'Error',
-	                    text: 'Failed to save details. Please try again.',
-	                    confirmButtonText: 'OK'
-	                });
-	                console.error('Error:', xhr.responseText);
-	            }
-	        }); 
-	    }
-	    
-	  		
-  		$('#lfauditButton').off('click').on('click', saveNewEntryDetailsPensionScheme);
-	    
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/newentry/familypension.html b/src/main/resources/templates/modules/pensioner/department/newentry/familypension.html
deleted file mode 100644
index 8dfbfe19..00000000
--- a/src/main/resources/templates/modules/pensioner/department/newentry/familypension.html
+++ /dev/null
@@ -1,884 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"  xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-.card-block {
-    padding: 20px;
-}
-
-.form-label {
-    margin-bottom: 0.5rem;
-}
-
-input.form-control {
-    padding: 10px;
-}
-.form-select {
-    padding: 10px;
-    height: 40px;
-}
-
-#employeeCard label{
-padding-top: 2%;
-}
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Department Entries</h5>
-                                        <span>Family Pension</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">NewEntry</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4" >
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					       <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</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> New Entry - Family Pension</h5>
-                              <span th:text="${userId}" id="userId" style="display:none"></span>
-								<div class="row mb-4">
-								
-								    <!-- Input Fields for Year Selection -->
-								  
-									  <!-- Start Year Dropdown as Button Dropdown -->
-										<!-- Start Year Dropdown as Button Dropdown -->
-										<div class="col-md-4" >
-										  <label for="empCode" class="form-label fw-bold">Search by Employee No <span class="text-danger">*</span></label>
-										
-										    <div class="dropdown">
-										  <input type="number" id="empCode" class="form-control" pattern="^[A-Za-z0-9]+$" placeholder="Enter Employee No" required>
-										  <small id="employeenoHelp" class="form-text text-muted">Only numeric characters (numbers) are allowed.</small>
-										</div>
-										</div>
-
-                                     <div class="col-md-4 mt-20" >
-								        <button id="searchButton" class="btn btn-primary mt-2" Style="height:38px;">Search</button>
-								        <!-- <button id="resetButton" class="btn btn-secondary mt-2">Reset</button> -->
-								    </div>
-								</div>
-							 </div>
-					    </div>
-					 
-					</div>   
-                    </div>
-                    <div class="row mb-4" id="employeeCard" style="display: none;">
-						    <div class="col-md-12">
-						        <div class="card">
-						            <div class="card-block">
-						                <h5 style="font-weight:bold;">New Entry - Family Pension - <span id="EmployeeCode"></span></h5>
-						                <hr>
-						                <div class="row">
-						                    <!-- Employee No -->
-						                    <div class="col-md-6">
-						                        <label for="employeeno" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="number" id="employeeno" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <!-- Employee Name -->
-						                    <div class="col-md-6">
-						                        <label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="employeename" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                     <div class="col-md-6">
-						                        <label for="Department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="department" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                     <div class="col-md-6">
-						                        <label for="Designation" class="form-label fw-bold">Designation<span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="designation" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    
-						                    <!--  pending duration-->
-
-										<div class="col-md-6">
-										    <label for="pendingDuration" class="form-label fw-bold">
-										        Pending Duration
-										        <span class="text-danger">*</span>
-										    </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">
-										            <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">
-										            <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" placeholder="Enter details for pending duration">
-										    </div>
-										</div>
-						                 
-											
-											
-						                   <div class="col-md-6">
-											    <label for="servicedeath" class="form-label fw-bold">While In Service Death <span class="text-danger">*</span></label>
-											    <div class="dropdown">
-						                            <input type="date" id="servicedeath" class="form-control"  onclick="this.showPicker()" >
-						                        </div>
-											</div>
-											
-											 <div class="col-md-6">
-											    <label for="deceased" class="form-label fw-bold">Relationship of Deceased<span class="text-danger">*</span></label>
-											    <div class="dropdown">
-						                            <input type="text" id="deceased" class="form-control" >
-						                        </div>
-											</div>
-											
-											<div class="col-md-6">
-						                        <label for="sanctionedgis" class="form-label fw-bold">Sanctioned GIS<span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="number" id="sanctionedgis" class="form-control"  min="1" oninput="validatePositiveNumber(this)">
-						                        </div>
-						                    </div>
-						                    
-						                    <div class="col-md-6">
-						                        <label for="Audit File" class="form-label fw-bold">Date file sent to Audit<span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="filesentdate" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    
-						                    <div class="col-md-12">
-						                        <label for="Remarks" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                             <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here" required></textarea>
-						                        </div>
-						                    </div>
-						                  </div>  
-
-						                   <div class="row mt-4">
-							                   <div class="col-12 d-flex justify-content-center">
-											        <button id="lfauditButton" class="btn btn-primary mt-2 mx-2">Mark as sent audit</button>
-											        <button id="cancelButton" class="btn btn-secondary mt-2">Cancel</button>
-											    </div>
-										    </div>
-						            </div>
-						        </div>
-						    </div>
-						</div>
-						
-						
-						
-						
-						
-
-                    </div>
-                </div>
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-    $(document).ready(function (){
-    	
-    	// Handle Search button click
-        /* $('#searchButton').on('click', function () {
-            const empCode = $('#empCode').val();
-                
-            console.log("empCode",empCode);                    
-            
-            if (empCode) {
-            	$('#pageLoader').show();
-            	document.getElementById("employeeCard").style.display = "block";
-            }else{
-            	Swal.fire({
-                    icon: "warning", // Display a warning icon
-                    title: "Missing Employee Number",
-                    text: "Please enter an employee number to proceed.",
-                    confirmButtonText: "OK",
-                    customClass: {
-                        confirmButton: "btn btn-primary" // Optional styling for the button
-                    }
-                });
-            	return;
-            }
-
-            // Format dates to dd-MM-yyyy
-            
-            //$('#pageLoader').show();
-            $('#pageLoader').show();
-            $('#employeeCard').hide();
-            $('#newemployeeCard').hide();
-            
-            $('#servicedeath').val('');
-   	      	$('#sanctionedgis').val('');
-   	       	$('#deceased').val('');
-   	        //$('#filesentdate').val('');
-   	        $('#remarks').val('');
-            // Call the API
-            $.ajax({
-                url: '/gcc/api/department/newentry/employeedetails', // Correct API URL
-                type: 'GET',
-                data: { empCode: empCode },
-                success: function (response) {
-                	$('#pageLoader').hide();
-                    console.log("response:", response.list);
-                    if (response.list && response.list.length > 0) {
-                        // Clear existing data
-                        let employeeDetails = response.list[0];
-        	            	console.log("employeedetails",response);
-        	            	 // Check if the employee code is null or not found
-        	                const loggedInDeptId = $('#deptId').text().trim(); // Get logged-in deptId dynamically
-
-  	                            // Validate department ID
-  	                            if (employeeDetails.ID_DEPT !== loggedInDeptId) {
-  	                                Swal.fire({
-  	                                    icon: "error",
-  	                                    title: "Access Denied",
-  	                                    text: "This employee does not belong to your department. Please try again with a valid employee code.",
-  	                                    confirmButtonText: "OK",
-  	                                    customClass: {
-  	                                        confirmButton: "btn btn-danger"
-  	                                    }
-  	                                });
-  	                                return; // Exit if the department does not match
-  	                            }
-                       
-                    	$('#employeeno').val(employeeDetails.EMPLOYEE_CODE);
-     	                $('#employeename').val(employeeDetails.EMPLOYEE_NAME);
-     	                $('#department').val(employeeDetails.DEPARTMENT);
-     	                $('#designation').val(employeeDetails.DESIGNATION);
-     	                $('#classes').val(employeeDetails.GROUP_TYPE);
-     	                $('#retrirementdate').val(employeeDetails.RETIREMENT_DATE);
-                        
-     	               $('#EmployeeCode').text(empCode);
-     	                //show the modal
-     	                $('#employeeCard').show();
-     	                
-     	               
-     	              
-                    } else {
-                    	$('#pageLoader').hide();
-                        
-                    	Swal.fire({
-                            icon: "warning", // Display a warning icon
-                            title: "No Data Found",
-                            text: "No details found for this employee number. Please create a new one to proceed.",
-                            confirmButtonText: "OK",
-                            customClass: {
-                                confirmButton: "btn btn-primary" // Optional styling for the button
-                            }
-                        });
-                       
-                      //document.getElementById("newemployeeCard").style.display = "block"; // Show the new employee card
-                    }
-                },
-                error: function () {
-                	$('#pageLoader').hide();
-                    Swal.fire({
-                        icon: "error",
-                        title: "Error",
-                        text: "An error occurred while fetching data. Please try again.",
-                        confirmButtonText: "OK",
-                    });
-                }
-            });
-        }); */
-    	
-        /* document.getElementById('lfauditButton').addEventListener('click', function () {
-  		    // Trigger the save function when the button is clicked
-  		    saveFamilyPensionDetails();
-  		}); */
-  		
-  		
-  		
-  		
-  		
-  		$('#searchButton').on('click', function () {
-  		    const empCode = $('#empCode').val().trim();
-  		    console.log("empCode:", empCode);
-
-  		    if (!empCode) {
-  		        Swal.fire({
-  		            icon: "warning",
-  		            title: "Missing Employee Number",
-  		            text: "Please enter an employee number to proceed.",
-  		            confirmButtonText: "OK",
-  		            customClass: {
-  		                confirmButton: "btn btn-primary"
-  		            }
-  		        });
-  		        console.log("No Employee Code provided. Aborting search.");
-  		        return;
-  		    }
-
-  		    // Show loader and hide any existing employee cards
-  		    $('#pageLoader').show();
-  		    $('#employeeCard').hide();
-  		    $('#newemployeeCard').hide();
-
-  		    // Clear any form fields that need resetting
-  		    $('#servicedeath').val('');
-  		    $('#sanctionedgis').val('');
-  		    $('#deceased').val('');
-  		    //$('#filesentdate').val('');
-  		    $('#remarks').val('');
-
-  		    // STEP 1: Check if the employee already exists in the database
-  		    $.ajax({
-  		        url: '/gcc/api/department/newentry/familypensionexists', // Endpoint to check existence
-  		        type: 'GET',
-  		        data: { empCode: empCode },
-  		        success: function (existsResponse) {
-  		            console.log("Exists API Response:", existsResponse);
-  		            $('#pageLoader').hide(); // Hide loader after the first API response
-
-  		            if (existsResponse && existsResponse.exists) {
-  		                console.log(`Employee Code ${empCode} exists in the database.`);
-  		                Swal.fire({
-  		                    icon: "warning",
-  		                    title: "Already Exists",
-  		                    text: "This employee number already exists.",
-  		                    confirmButtonText: "OK",
-  		                    customClass: {
-  		                        confirmButton: "btn btn-primary"
-  		                    }
-  		                });
-  		                return; // Exit if employee already exists
-  		            }
-
-  		            // STEP 2: Since the employee does not exist, fetch employee details
-  		            $('#pageLoader').show(); // Show loader for the second API call
-  		            $.ajax({
-  		                url: '/gcc/api/department/newentry/employeedetails', // Correct API URL
-  		                type: 'GET',
-  		                data: { empCode: empCode },
-  		                success: function (response) {
-  		                    $('#pageLoader').hide();
-  		                    console.log("Employee Details API Response:", response.list);
-  		                    if (response.list && response.list.length > 0) {
-  		                        // Extract employee details
-  		                        let employeeDetails = response.list[0];
-  		                        console.log("Employee Details:", employeeDetails);
-
-  		                        
-  		                        // Validate department ID
-  		                        const loggedInDeptId = $('#deptId').text().trim(); // Get logged-in deptId dynamically
-  		                        if (employeeDetails.ID_DEPT !== loggedInDeptId) {
-  		                            Swal.fire({
-  		                                icon: "error",
-  		                                title: "Access Denied",
-  		                                text: "This employee does not belong to your department. Please try again with a valid employee code.",
-  		                                confirmButtonText: "OK",
-  		                                customClass: {
-  		                                    confirmButton: "btn btn-danger"
-  		                                }
-  		                            });
-  		                            return; // Exit if the department does not match
-  		                        }
-  		                        
-  		                        
-  		                      const currentDate = $('#filesentdate').val().trim();
-                              
-                             /*  if(employeeDetails.RETIREMENT_DATE <= currentDate){
-                              	
-                              	 Swal.fire({
-                                       icon: "warning",
-                                       title: "Not Applicable",
-                                       text: "This employee not applicable for this familypension.",
-                                       confirmButtonText: "OK",
-                                       customClass: {
-                                           confirmButton: "btn btn-primary"
-                                       }
-                                   });
-                                   return;
-                              } */
-
-  		                        // Populate the form fields with the employee details
-  		                        $('#employeeno').val(employeeDetails.EMPLOYEE_CODE);
-  		                        $('#employeename').val(employeeDetails.EMPLOYEE_NAME);
-  		                        $('#department').val(employeeDetails.DEPARTMENT);
-  		                        $('#designation').val(employeeDetails.DESIGNATION);
-  		                        $('#classes').val(employeeDetails.GROUP_TYPE);
-  		                        $('#retrirementdate').val(employeeDetails.RETIREMENT_DATE);
-  		                        $('#EmployeeCode').text(empCode);
-
-  		                        // Show the employee details card/modal
-  		                        $('#employeeCard').show();
-  		                    } else {
-  		                        $('#pageLoader').hide();
-  		                        Swal.fire({
-  		                            icon: "warning",
-  		                            title: "No Data Found",
-  		                            text: "No details found for this employee number.",
-  		                            confirmButtonText: "OK",
-  		                            customClass: {
-  		                                confirmButton: "btn btn-primary"
-  		                            }
-  		                        });
-  		                        // Optionally, show the new employee card:
-  		                        // document.getElementById("newemployeeCard").style.display = "block";
-  		                    }
-  		                },
-  		                error: function () {
-  		                    $('#pageLoader').hide();
-  		                    Swal.fire({
-  		                        icon: "error",
-  		                        title: "Error",
-  		                        text: "An error occurred while fetching data. Please try again.",
-  		                        confirmButtonText: "OK",
-  		                    });
-  		                }
-  		            });
-  		        },
-  		        error: function () {
-  		            $('#pageLoader').hide();
-  		            Swal.fire({
-  		                icon: "error",
-  		                title: "Error",
-  		                text: "An error occurred while checking the employee. Please try again.",
-  		                confirmButtonText: "OK",
-  		            });
-  		        }
-  		    });
-  		});
-
-  		
-        
-        //$('#lfauditButton').one('click', saveFamilyPensionDetails);
-  		
-        $('#lfauditButton').off('click').on('click', saveFamilyPensionDetails);
-    	
-    })
-    
-    
-    function validatePositiveNumber(input) {
-		    if (input.value < 1) {
-		        input.value = "";
-		    }
-		}
-    
-    
-    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("filesentdate").value = formattedDateDisplay;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-		
-// Trigger search on pressing Enter key
-        $('#empCode').on('keydown', function (event) {
-            if (event.key === 'Enter') {
-                event.preventDefault(); // Prevent default form submission or page reload
-
-                const empCode = $('#empCode').val(); // Get the value of empCode
-                if (!empCode) {
-                    // Show Swal alert if the employee number is missing
-                    Swal.fire({
-                        icon: "warning", // Display a warning icon
-                        title: "Missing Employee Number",
-                        text: "Please enter an employee number to proceed.",
-                        confirmButtonText: "OK",
-                        customClass: {
-                            confirmButton: "btn btn-primary" // Optional styling for the button
-                        }
-                    });
-                    return; // Stop further execution
-                }
-                
-                $('#searchButton').click(); // Trigger the click event of the search button
-            }
-        });
-		
-		// Handle close button click
-		$('#cancelButton').click(function () {
-		    // Clear the input field value
-		    $('#empCode').val('');
-		    
-		    // Hide the card
-		    $('#employeeCard').hide();
-		});
-		
-		// Handle close button click
-		$('#cancelButtonnew').click(function () {
-		    // Clear the input field value
-		    $('#empCode').val('');
-
-		    $('#newemployeeCard').hide();
-		});
-
-		  
-            
-            
-      function saveFamilyPensionDetails() {
-            	
-            	
-        let pendingDuration= $('input[name="pendingDuration"]:checked').val();
-  	        let pendingDurationReason=null;
-  	        if (pendingDuration === 'yes' ) {
-  	        	pendingDurationReason = $('#pendingDurationInput').val(); // Retrieve the amount if available, else null
-  	        	if (!pendingDurationReason) {
-  		            Swal.fire({
-  		                icon: 'warning',
-  		                title: 'Validation Error',
-  		                text: 'Please Enter Pending Duration',
-  		                confirmButtonText: 'OK'
-  		            });
-  		            return; // Stop further execution if validation fails
-  		        }
-  	        }
-        	
-        	
-     	    let entryDetails = {
-     	        empNo: $('#employeeno').val(),
-     	        empName: $('#employeename').val(),
-     	        deptName: $('#department').val(),
-     	        designation: $('#designation').val(),
-     	       	serviceDeath: $('#servicedeath').val(),
-     	      	sanctionedgis: $('#sanctionedgis').val(),
-     	        deceased: $('#deceased').val(),
-     	       	dateToAudit:  convertDateFormat($('#filesentdate').val()?.trim()),
-     	       	remarks: $('#remarks').val(),
-     	      	pendingDuration: pendingDuration,            
-	            reasonPending: pendingDurationReason,
-     	        deptId:$('#deptId').text().trim(),
-     	        filemovedby:$('#userId').text().trim(),
-     	        filecategory:$('#filecategory').text().trim()
-     	      
-     	       
-     	    };
-     	    
-     	    
-     	    console.log("entrydetails..",entryDetails);
-	        
-	       if(!entryDetails.pendingDuration) {
-	    	   Swal.fire({
-                   icon: 'warning',
-                   title: 'Validation Error!',
-                   text: 'Pending Duration is required.',
-                   confirmButtonText: 'OK'
-               });
-               return;   
-	       }
-     	    
-      	   if (!entryDetails.serviceDeath) {
-               Swal.fire({
-                   icon: 'warning',
-                   title: 'Validation Error!',
-                   text: 'Service Death is required.',
-                   confirmButtonText: 'OK'
-               });
-               return;
-           }
-     	    
-     	   if (!entryDetails.sanctionedgis) {
-               Swal.fire({
-                   icon: 'warning',
-                   title: 'Validation Error!',
-                   text: 'Sanctioned GIS is required.',
-                   confirmButtonText: 'OK'
-               });
-               return;
-           }
-     	    
-
-     	   
-     	  if (!entryDetails.deceased) {
-              Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error!',
-                  text: 'Deceased is required.',
-                  confirmButtonText: 'OK'
-              });
-              return;
-          }
-     	  
-     	 
-     	if (!entryDetails.remarks) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error!',
-                text: 'Remarks are required.',
-                confirmButtonText: 'OK'
-            });
-            return;
-        }
-     	
-
-     	// Collect missing fields
-     	/*    let missingFields = [];
-     	   if (!entryDetails.sanctionedgis) missingFields.push("Sanctioned GIS");
-     	   if (!entryDetails.serviceDeath) missingFields.push("Service Death");
-     	   if (!entryDetails.deceased) missingFields.push("Deceased");
-     	   if (!entryDetails.remarks) missingFields.push("Remarks");
-     	   if (!entryDetails.dateToAudit) missingFields.push("Date to Audit");
-
-     	   // Show warning if any fields are missing
-     	   if (missingFields.length > 0) {
-     	       Swal.fire({
-     	           icon: 'warning',
-     	           title: 'Validation Error!',
-     	           html: `<strong style="display:block; text-align:center; font-size:18px;">Please fill the following mandatory fields:</strong>
-     	                  <ul style="color:red;  text-align:center; list-style:none; padding:0;">
-     	                      ${missingFields.map(field => `<li>${field}</li>`).join('')}
-     	                  </ul>`,
-     	           confirmButtonText: 'OK'
-     	       });
-     	       return;
-     	   } */
-
-
-     	    
-     	   $('#lfauditButton').prop('disabled', true).text('Processing...'); 
-     	    
-     	    $.ajax({
-     	        url: '/gcc/api/department/newentry/saveFamilyPensionDetails',
-     	        type: 'POST',
-     	        contentType: 'application/json',
-     	        data: JSON.stringify(entryDetails),
-     	        success: function (response) {
-     	        	$('#lfauditButton').prop('disabled', false).text('Mark as sent audit');	
-     	        	Swal.fire({
-     	        		icon: 'success',
-     	                title: 'Success',
-     	                text: response,
-     	               	allowOutsideClick: false,
-     	              	allowEscapeKey: false,
-     	              	allowEnterKey: false,
-     	                confirmButtonText: 'OK'
-                    }).then((result) => {
-                        if (result.isConfirmed) {
-                        	$('#lfauditButton').prop('disabled', false).text('Mark as sent audit');	
-                        	window.location.href = "/gcc/department/newentry/familypension";
-                            console.log("Continue clicked");
-                        }
-                    });
-     	        },
-     	        error: function (xhr, status, error) {
-     	        	$('#lfauditButton').prop('disabled', false).text('Mark as sent audit');	
-     	            Swal.fire({
-     	                icon: 'error',
-     	                title: 'Error',
-     	                text: 'Failed to save details. Please try again.',
-     	                confirmButtonText: 'OK'
-     	            });
-     	            console.error('Error:', xhr.responseText);
-     	        }
-     	    });
-     	
-            
-            }
-            
-         
-    		document.querySelectorAll('input[name="pendingDuration"]').forEach(radio => {
-    	        radio.addEventListener('change', function () {
-    	            const pendingDurationInputContainer = document.getElementById('pendingDurationInputContainer');
-    	            if (this.value === 'yes') {
-    	            	pendingDurationInputContainer.style.display = 'block'; // Show the input field
-    	            } else {
-    	            	pendingDurationInputContainer.style.display = 'none'; // Hide the input field
-    	                document.getElementById('pendingDurationInput').value = ''; // Clear the input field
-    	            }
-    	        });
-    	    });
-    		
-    		
-    		//service death date field
-    		
-    		document.addEventListener("DOMContentLoaded", function () {
-    	        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
-    	        let servicedeathInput = document.getElementById("servicedeath");
-
-    	        // Set max attribute to disable future dates
-    	        servicedeathInput.setAttribute("max", today);
-
-    	        // Prevent manual future date entry
-    	        servicedeathInput.addEventListener("change", function () {
-    	            if (this.value > today) {
-    	                Swal.fire({
-    	                    icon: 'warning',
-    	                    title: 'Invalid Date',
-    	                    text: 'Future dates are not allowed.',
-    	                    confirmButtonText: 'OK'
-    	                });
-    	                this.value = ""; // Clear the invalid input
-    	            }
-    	        });
-    	    });
-            
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/newentry/gis.html b/src/main/resources/templates/modules/pensioner/department/newentry/gis.html
deleted file mode 100644
index 6470e554..00000000
--- a/src/main/resources/templates/modules/pensioner/department/newentry/gis.html
+++ /dev/null
@@ -1,1071 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-.card-block {
-    padding: 20px;
-}
-
-.form-label {
-    margin-bottom: 0.5rem;
-}
-
-input.form-control {
-    padding: 10px;
-}
-.form-select {
-    padding: 10px;
-    height: 40px;
-}
-
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Department Entries</h5>
-                                        <span>GIS</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">NewEntry</li>
-                                        <li class="breadcrumb-item active" aria-current="page">GIS</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4" >
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5><span th:text="${filecategory}" id="filecategory" style="display:none"></span>
-									<div id="headingContainer">
-										<h5 style="font-weight: bold;">
-											<span th:text="${deptId}" id="deptId" style="display: none"></span>
-											New Entry - GIS
-										</h5>
-									</div>
-									<span th:text="${userId}" id="userId" style="display:none"></span>
-								<div class="row mb-4">
-								
-								    <!-- Input Fields for Year Selection -->
-								  
-									  <!-- Start Year Dropdown as Button Dropdown -->
-										<!-- Start Year Dropdown as Button Dropdown -->
-										<div class="col-md-4" >
-										  <label for="empCode" class="form-label fw-bold">Search by Employee No <span class="text-danger">*</span></label>
-										
-										    <div class="dropdown">
-										  <input type="number" id="empCode" class="form-control" pattern="^[A-Za-z0-9]+$" placeholder="Enter Employee No" required>
-										  <small id="employeenoHelp" class="form-text text-muted">Only numeric characters (numbers) are allowed.</small>
-										</div>
-										</div>
-										
-
-                                     <div class="col-md-4 mt-20">
-								        <button id="searchButton" class="btn btn-primary mt-2" Style="height:38px;">Search</button>
-								         
-								        <!-- <button id="resetButton" class="btn btn-secondary mt-2">Reset</button> -->
-								    </div>
-								    
-								   
-								</div>
-									<div>
-									   
-										<button id="addNewbutton" class="btn btn-success mt-2"
-											Style="height: 38px;">Create New</button>
-									</div>
-									
-									<div id="staffTypeContainer"
-										style="display: none; margin-top: 10px;">
-										<label style="font-weight: bold; margin-bottom: 5px;">Select
-											Staff Type:</label>
-									<div style="display: flex; align-items: center; gap: 40px;">
-										    <div>
-										        <input type="radio" id="temporaryStaff" name="staffType" value="temporary">
-										        <label for="temporaryStaff">Temporary Staff</label>
-										    </div>
-										    <div>
-										        <input type="radio" id="permanentStaff" name="staffType" value="permanent">
-										        <label for="permanentStaff">Permanent Staff</label>
-										    </div>
-										</div>
-									</div>
-								</div>
-							 
-					    </div>
-					   
-					 
-					</div>
-                    </div>
-                    <div class="row mb-4" id="employeeCard" style="display: none;">
-                    
-						    <div class="col-md-12">
-						        <div class="card">
-						       
-						            <div class="card-block">
-						                <h5 style="font-weight:bold;">New Entry - GIS </h5>
-						                
-						                <hr>
-						                <div class="row">
-						                    <!-- Employee No -->
-						                    <div class="col-md-6">
-						                        <label for="employeeno" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="employeeno" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <!-- Employee Name -->
-						                    <div class="col-md-6">
-						                        <label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="employeename" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                     <div class="col-md-6">
-						                        <label for="Department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="department" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                     <div class="col-md-6">
-						                        <label for="Designation" class="form-label fw-bold">Designation<span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="designation" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <div class="col-md-6">
-											    <label for="servicedeath" class="form-label fw-bold">
-											        While In Service Death <span class="text-danger">*</span>
-											    </label>
-											    <div class="dropdown">
-											        <input type="date" id="servicedeath" class="form-control" onclick="this.showPicker()" max="">
-											    </div>
-											</div>  
-											
-											 <div class="col-md-6">
-											    <label for="deceased" class="form-label fw-bold">Relationship of Deceased<span class="text-danger">*</span></label>
-											    <div class="dropdown">
-						                            <input type="text" id="deceased" class="form-control" >
-						                        </div>
-											</div>
-											
-											
-											<div class="row col-md-12" id="tempcontainer" style="display: none;">
-											<div class="col-md-6">
-											    <label for="gisentry" class="form-label fw-bold">GIS Entry Type<span class="text-danger">*</span></label>
-										        <select id="gisentry" class="form-select"  style="width: 100%;" required>	
-										          									           
-										        </select>
-											</div>
-											
-											<!-- div class="col-md-6">
-						                        <label for="funeraladvance" class="form-label fw-bold">Sanctioned GIS Advance <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="number" id="funeraladvance" class="form-control" >
-						                        </div>
-						                    </div> -->
-						                    
-						                    <div class="col-md-6">
-											    <label for="gisamount" class="form-label fw-bold">
-											       Sanctioned GIS Advance 
-											        <span class="text-danger">*</span>
-											    </label>
-											    <div class="d-flex align-items-center">
-											        <div class="form-check" style="padding-right:10px;">
-											            <input type="radio" id="yes1" name="gisamount" class="form-check-input" value="yes">
-											            <label for="yes1" class="form-check-label">Yes</label>
-											        </div>
-											        <div class="form-check">
-											            <input type="radio" id="no1" name="gisamount" class="form-check-input" value="no">
-											            <label for="no1" class="form-check-label">No</label>
-											        </div>
-											    </div>
-											    <div class="dropdown" id="gisAmountInputContainer" style="display: none; margin-top: 10px;">
-												    <input type="number" id="gisAmountInput" name="gisamount_value" class="form-control"
-												           placeholder="Enter Sanctioned Gis Amount" min="1" oninput="validatePositiveNumber(this)">
-												</div>
-											</div>
-											
-											</div>
-
-											
-						                    
-						                    <div class="col-md-6">
-						                        <label for="filesentdate" class="form-label fw-bold"> File Sent to GD Pension Section On<span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="filesentdate" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <div class="col-md-12">
-						                        <label for="remarks" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                             <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here" required></textarea>
-						                        </div>
-						                    </div>
-						                    
-						                    
-						                </div>
-						                
-						                <div class="row mt-4 mt-20">
-											<div class="col-12 d-flex justify-content-center">
-												<button id="submitButton" class="btn btn-primary mt-2 mx-2">Mark as Forward to Pension</button>
-										        <button id="cancelButton" class="btn btn-secondary mt-2">Cancel</button>
-											</div>
-										</div>
-						                
-						            </div>
-						        
-						        </div>
-						    </div>
-						</div>
-						
-                    </div>
-                </div>
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	
-	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("filesentdate").value = formattedDateDisplay;
-
-        
-    });
-  
-  
-	function convertDateFormat(dateString) {
-	    if (!dateString) return '';
-	    let [day, month, year] = dateString.split('-');
-	    return `${year}-${month}-${day}`;
-	}
-    
-    
-    
-document.addEventListener("DOMContentLoaded", function () {
-    let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
-    let servicedeathInput = document.getElementById("servicedeath");
-
-    // Set max attribute to disable future dates
-    servicedeathInput.setAttribute("max", today);
-
-    // Prevent manual future date entry
-    servicedeathInput.addEventListener("change", function () {
-        if (this.value > today) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Invalid Date',
-                text: 'Future dates are not allowed.',
-                confirmButtonText: 'OK'
-            });
-            this.value = ""; // Clear the invalid input
-        }
-    });
-});
-    
-    console.log("before ajaxx....")
-    $(document).ready(function () {
-    	
-    	$(document).ready(function () {
-    	    $('#addNewbutton').on('click', function () {
-    	    	
-    	    	$('#empCode').val('');
-    	        // Show the staff type container
-    	        $('#staffTypeContainer').show();
-    	        $('#employeeCard').hide(); 
-    	        $('input[name="staffType"]').prop('checked', false);
-    	        // Add change event listener to the radio buttons
-    	        $('input[name="staffType"]').off('change').on('change', function () {
-    	            const selectedType = $('input[name="staffType"]:checked').val();
-    	            console.log(selectedType);
-    	            
-    	            $('#staffTypeContainer').hide();
-
-    	            if (selectedType === 'temporary') {
-    	                // Show the employee card
-    	                $('#employeeCard').show();
-    	                
-    	                $('#tempcontainer').hide();
-
-    	                // Pre-fill "GIS" in Employee No and enforce rules
-    	                $('#employeeno')
-    	                    .val('GIS') // Pre-fill with "GIS"
-    	                    .prop('readonly', false) // Allow editing, but only after "GIS"
-    	                    .off('input keydown') // Remove existing event listeners
-    	                    .on('input', function () {
-    	                        const value = $(this).val();
-    	                        if (!value.startsWith('GIS')) {
-    	                            $(this).val('GIS');
-    	                        } else {
-    	                            const numericPart = value.slice(3).replace(/\D/g, ''); // Allow only digits after "GIS"
-    	                            $(this).val('GIS' + numericPart);
-    	                        }
-    	                    })
-    	                    .on('keydown', function (e) {
-    	                        const cursorPosition = this.selectionStart;
-    	                        if ((e.key === 'Backspace' || e.key === 'Delete') && cursorPosition <= 3) {
-    	                            e.preventDefault(); // Prevent removing "GIS"
-    	                        }
-    	                    });
-
-    	                // Pre-fill and enable fields
-    	                $('#employeename').val('').prop('readonly', false);
-    	                $('#department').val($('#deptname').text().trim()).prop('readonly', true);
-    	                $('#designation').val('').prop('readonly', false);
-    	                $('#servicedeath').val('').prop('readonly', false);
-    	                $('#deceased').val('').prop('readonly', false);
-    	                //$('#funeraladvance').val('').prop('readonly', false);
-    	                $('#filesentdate').prop('readonly', true);
-    	                $('#remarks').val('').prop('readonly', false);
-    	            } else if (selectedType === 'permanent') {
-    	                // Hide the employee card and show a SweetAlert
-    	                $('#employeeCard').hide();
-    	                Swal.fire({
-    	                    icon: 'warning',
-    	                    title: 'ERP Required',
-    	                    text: 'Please create a number in ERP for permanent staff.',
-    	                    confirmButtonText: 'OK',
-    	                    customClass: {
-    	                        confirmButton: 'btn btn-primary'
-    	                    }
-    	                });
-    	            }
-    	        });
-    	    });
-    	    /* $('#submitButton').off('click').on('click', function () {
-    	    	   	    	    	
-    	        const gisPattern = /^GIS\d+$/;
-    	        const employeeNo = $('#employeeno').val().trim();
-				
-    	        console.log("=====");
-    	        // Validate Employee No
-    	        if (!gisPattern.test(employeeNo)) {
-    	            Swal.fire({
-    	                icon: 'warning',
-    	                title: 'Validation Error',
-    	                text: 'Employee No must start with "GIS" and be followed by one or more numbers.',
-    	                confirmButtonText: 'OK'
-    	            });
-    	            console.warn('Validation failed: Employee No is invalid.');
-    	            $('#submitButton').prop('disabled', false).text('Mark as Forwarded to Pension'); // Re-enable button
-    	            return; // Stop execution if validation fails
-    	        }
-
-    	        // Log and call save function
-    	        console.log("Save button clicked. Triggering saveEntryDetails function.");
-    	        saveEntryDetailsnew();
-    	    }); */
-
-    	});
-
-
-    	
-        // Handle Search button click
-        $('#searchButton').on('click', function () {
-            const empCode = $('#empCode').val().trim(); // Trim input to avoid accidental spaces
-            $('input[name="staffType"]').prop('checked', false);
-            console.log("empCode...",empCode);
-
-            if (!empCode) {
-                Swal.fire({
-                    icon: "warning",
-                    title: "Missing Employee Number",
-                    text: "Please enter an employee number to proceed.",
-                    confirmButtonText: "OK",
-                    customClass: {
-                        confirmButton: "btn btn-primary"
-                    }
-                });
-                console.log("No Employee Code provided. Aborting search.");
-                return; // Stop further execution if empCode is not provided
-            }
-
-            // Show loader and hide other elements
-            $('#pageLoader').show();
-            $('#employeeCard').hide();
-            $('#newemployeeCard').hide();
-            $('#gisAmountInput').val('');
-            $('#tempcontainer').show();
-            
-            $('input[name="gisamount"]').prop('checked', false);
-
-            console.log("Checking if employee exists: ${empCode}");
-
-            // Step 1: Check if employee exists in the database
-            $.ajax({
-                url: '/gcc/api/department/newentry/exists', // Endpoint to check existence
-                type: 'GET',
-                data: { empCode: empCode },
-                success: function (existsResponse) {
-                    console.log("Exists API Response:", existsResponse);
-                    $('#pageLoader').hide();
-                    
-                
-
-                    if (existsResponse && existsResponse.exists) {
-                        console.log("Employee Code ${empCode} exists in the database.");
-                        Swal.fire({
-                            icon: "warning",
-                            title: "Already Exists",
-                            text: "This employee number already exists.",
-                            confirmButtonText: "OK",
-                            customClass: {
-                                confirmButton: "btn btn-primary"
-                            }
-                        });
-                        return; // Exit the function if the employee exists
-                    }
-
-                    console.log(`Employee Code ${empCode} does not exist. Fetching details from the external API.`);
-                    
-                    
-                    // If employee does not exist, fetch details from the external API
-                    fetchEmployeeDetails(empCode);
-                },
-                error: function (xhr) {
-                    $('#pageLoader').hide();
-                    console.error("Error during existence check:", xhr.responseText);
-                    Swal.fire({
-                        icon: "error",
-                        title: "Error",
-                        text: "An error occurred while checking employee existence. Please try again.",
-                        confirmButtonText: "OK"
-                    });
-                }
-            });
-        });
-
-        // Function to fetch employee details from external API
-        
-        console.log("fetchEmployeeDetails.....")
-        function fetchEmployeeDetails(empCode) {
-            console.log("Fetching details for employee:");
-            $('#pageLoader').show();
-
-            $.ajax({
-                url: '/gcc/api/department/newentry/employeedetails', // External API endpoint
-                type: 'GET',
-                data: { empCode: empCode },
-                success: function (response) {
-                    console.log("Employee Details API Response:", response);
-                    $('#pageLoader').hide();
-
-                    if (response.list && response.list.length > 0) {
-                        const employeeDetails = response.list[0];
-                        console.log("Employee Details Retrieved:", employeeDetails);
-
-                        // Check if the employee code is null or not found
-       	                const loggedInDeptId = $('#deptId').text().trim(); // Get deptId dynamically
-
-                        // Validate department ID
-                        if (employeeDetails.ID_DEPT !== loggedInDeptId) {
-                            Swal.fire({
-                                icon: "error",
-                                title: "Access Denied",
-                                text: "This employee does not belong to your department. Please try again with a valid employeecode.",
-                                confirmButtonText: "OK",
-                                customClass: {
-                                    confirmButton: "btn btn-danger"
-                                }
-                            });
-                            return;
-                        }
-
-                        // Populate the employee details
-                        console.log("Populating employee details in the UI.");
-                        $('#employeeno').val(employeeDetails.EMPLOYEE_CODE).prop('readonly', true);;
-                        $('#employeename').val(employeeDetails.EMPLOYEE_NAME).prop('readonly', true);
-                        $('#department').val(employeeDetails.DEPARTMENT).prop('readonly', true);
-                        $('#designation').val(employeeDetails.DESIGNATION).prop('readonly', true);
-                        $('#classes').val(employeeDetails.GROUP_TYPE);
-                        $('#retrirementdate').val(employeeDetails.RETIREMENT_DATE);
-                        
-                        
-                        $('#servicedeath').val('');
-                        $('#deceased').val('');
-                        $('#remarks').val(''); 
-                        $('#gisentry').val('');
-                                                 
-
-                        $('#EmployeeCode').text(empCode);
-                        $('#employeeCard').show();
-
-                        // Attach event handler for saving details 
-                       
-                    } else {
-                        console.warn("No employee data found in the external API response.");
-                        Swal.fire({
-                            icon: "warning",
-                            title: "No Data Found",
-                            text: "No details found for this employee number.",
-                            confirmButtonText: "OK",
-                            customClass: {
-                                confirmButton: "btn btn-primary"
-                            }
-                        });
-                        $('#newemployeeCard').show();
-                    }
-                },
-                error: function (xhr) {
-                    $('#pageLoader').hide();
-                    console.error("Error in Employee Details API:", xhr.responseText);
-                    Swal.fire({
-                        icon: "error",
-                        title: "Error",
-                        text: "An error occurred while fetching data. Please try again.",
-                        confirmButtonText: "OK"
-                    });
-                }
-            });
-        }
-
-        
-        
-	    document.querySelectorAll('input[name="gisamount"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const gisAmountInputContainer = document.getElementById('gisAmountInputContainer');
-	            if (this.value === 'yes') {
-	            	gisAmountInputContainer.style.display = 'block'; // Show the input field
-	            } else {
-	            	gisAmountInputContainer.style.display = 'none'; // Hide the input field
-	                document.getElementById('gisAmountInput').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	    
-	    
-	    //dropdown for gisentry type:
-	    	
-	    $(document).ready(function () { 
-            function loadEntryTypes() {
-                $.ajax({
-                    url: "/gcc/api/getGisEntryTypes",
-                    type: "GET",
-                    success: function (data) {
-                        var dropdown = $("#gisentry");
-                        dropdown.empty(); // Clear existing options
-                        dropdown.append('<option value="" selected>-- Select Option --</option>');
-
-                        // Loop through the API response and add options
-                        $.each(data, function (key, entry) {
-		                    dropdown.append($('<option></option>').attr('value', entry.gis_entry).text(entry.gis_entry));
-                        	//dropdown.append('<option value="' + item.id + '">' + item.gis_entry + '</option>');
-                        });
-                    },
-                    error: function () {
-                        console.log("Error loading dropdown data.");
-                    }
-                });
-            }
-
-            // Call function on page load
-            loadEntryTypes();
-        });
-
-	    $('#submitButton').off('click').on('click', function () {
-            console.log("Save button clicked. Triggering saveEntryDetails function.");
-            saveEntryDetailsnew();
-        });
-	    
-        function saveEntryDetailsnew() {
-        	
-        	const selectedstaffType1 = $('input[name="staffType"]:checked').val();
-        	console.log("selectedstaffType====="+selectedstaffType1);
-        	
-        	if(selectedstaffType1 ==='temporary'){
-        		const gisPattern1 = /^GIS\d+$/;
-    	        const employeeNo1 = $('#employeeno').val().trim();
-				
-    	        console.log("==New===");
-    	        // Validate Employee No
-    	        if (!gisPattern1.test(employeeNo1)) {
-    	            Swal.fire({
-    	                icon: 'warning',
-    	                title: 'Validation Error',
-    	                text: 'Employee No must start with "GIS" and be followed by one or more numbers.',
-    	                confirmButtonText: 'OK'
-    	            });
-    	            console.log('New Validation failed: Employee No is invalid.');
-    	            $('#submitButton').prop('disabled', false).text('Mark as Forwarded to Pension'); // Re-enable button
-    	            return; // Stop execution if validation fails
-    	        }
-        	}
-        	
-        	   let selgisamount = $('input[name="gisamount"]:checked').val();
-               let selgismamountval = null;
-
-               if (selgisamount === 'yes') {
-               	selgismamountval = $('#gisAmountInput').val();
-                   if (!selgismamountval || selgismamountval <= 0) {
-                       Swal.fire({
-                           icon: 'warning',
-                           title: 'Validation Error',
-                           text: 'Please enter a valid Sanctioned Gis Amount',
-                           confirmButtonText: 'OK'
-                       });
-                       return ; // Stop further execution
-                   }
-               }
-               
-               
-               
-               let employeeName = $('#employeename').val().trim();
-		        if (!/^[A-Za-z.\s]+$/.test(employeeName)) {
-		            Swal.fire({
-		                icon: 'warning',
-		                title: 'Validation Error',
-		                text: 'Employee Name must contain only alphabets.',
-		                confirmButtonText: 'OK'
-		            });
-		            return;
-		        }
-               
-        	
-        	
-            let entryDetails = {
-                empNo: $('#employeeno').val(),
-                empName: employeeName,
-                deptName: $('#department').val(),
-                designation: $('#designation').val(),
-                serviceDeath: $('#servicedeath').val(),
-                dateToPension: convertDateFormat($('#filesentdate').val()?.trim()),
-                deceased: $('#deceased').val(),
-                gisentry: $('#gisentry').val() || null,              
-                gisAdvanceamount : selgismamountval || null,
-                gisAdvance : selgisamount || null,
-                remarks: $('#remarks').val(),
-                deptId: $('#deptId').text().trim(),
-                filemovedby: $('#userId').text().trim(),
-                filecategory: $('#filecategory').text().trim()
-            };
-
-            console.log("Saving employee details:", entryDetails);
-
-          
-            
-            if (!entryDetails.empName) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error!',
-                    text: 'Employee Name is required.',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            if (!entryDetails.designation) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error!',
-                    text: 'Designation is required.',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            if (!entryDetails.dateToPension) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error!',
-                    text: 'Date to Pension is required.',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            if (!entryDetails.serviceDeath) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error!',
-                    text: 'Service Death Date is required.',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            if (!entryDetails.deceased) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error!',
-                    text: 'Relationship of Deceased is required.',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            if (selectedstaffType1 !== 'temporary'){
-            
-            if (!entryDetails.gisentry || entryDetails.gisentry.trim() === '') {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error!',
-                    text: 'Gis Entry Type is required.',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            if (!entryDetails.gisAdvance || entryDetails.gisAdvance.trim() === '') {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error!',
-                    text: 'Sanctional Gis Advance is required.',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-            
-            }
-
-            if (!entryDetails.remarks) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error!',
-                    text: 'Remarks are required.',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            
-            const employeeNo = entryDetails.empNo.trim();
-
-            // Validate Employee No format
-        /*     const gisPattern = /^GIS\d+$/;
-            
-            if (!gisPattern.test(employeeNo)) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error',
-                    text: 'Employee No must start with "GIS" and be followed by one or more numbers.',
-                    confirmButtonText: 'OK'
-                });
-                console.warn('Validation failed: Employee No is invalid.');
-                $('#submitButton').prop('disabled', false).text('Mark as sent audit'); // Re-enable button
-                return; // Stop further execution
-            } */
-
-            // Step 1: Check if the employee exists in the database
-            $('#submitButton').prop('disabled', true).text('Checking...');
-             $.ajax({
-                url: '/gcc/api/department/newentry/exists',
-                type: 'GET',
-                data: { empCode: employeeNo },
-                success: function (existsResponse) {
-                    console.log("Exists API Response:", existsResponse);
-                    $('#pageLoader').hide();
-
-                    if (existsResponse && existsResponse.exists) {
-                        console.log(`Employee Code ${employeeNo} already exists in the database.`);
-                        Swal.fire({
-                            icon: "warning",
-                            title: "Already Exists",
-                            text: "This employee number already exists in our database.",
-                            confirmButtonText: "OK",
-                            customClass: {
-                                confirmButton: "btn btn-primary"
-                            }
-                        });
-                        $('#submitButton').prop('disabled', false).text('Mark as Forwarded to pension'); // Re-enable button
-                        return; // Exit the function if the employee exists
-                    }
-
-                    // If employee does not exist, proceed to save details
-                    console.log(`Employee Code ${employeeNo} does not exist. Proceeding to save details.`);
-                    $('#submitButton').prop('disabled', true).text('Processing...');
-                    $.ajax({
-                        url: '/gcc/api/department/newentry/saveEmployeeDetailsGis',
-                        type: 'POST',
-                        contentType: 'application/json',
-                        data: JSON.stringify(entryDetails),
-                        success: function (response) {
-                            console.log("Save API Response:", response);
-                            Swal.fire({
-                            	icon: 'success',
-             	                title: 'Success',
-             	                text: response,
-             	               	allowOutsideClick: false,
-             	              	allowEscapeKey: false,
-             	              	allowEnterKey: false,
-             	                confirmButtonText: 'OK'
-                            }).then((result) => {
-                                if (result.isConfirmed) {
-                                    console.log("Save confirmed. Redirecting to GIS page.");
-                                    $('#submitButton').prop('disabled', false).text('Mark as Forwarded to Pension');
-                                    window.location.href = "/gcc/department/newentry/gis";
-                                }
-                            });
-                        },
-                        error: function (xhr) {
-                            console.error("Error in Save API:", xhr.responseText);
-                            Swal.fire({
-                                icon: 'error',
-                                title: 'Error',
-                                text: 'Failed to save details. Please try again.',
-                                confirmButtonText: 'OK'
-                            });
-                            $('#submitButton').prop('disabled', false).text('Mark as Forwarded to pension'); // Re-enable button
-                        }
-                    });
-                },
-                error: function (xhr) {
-                    console.error("Error during existence check:", xhr.responseText);
-                    Swal.fire({
-                        icon: "error",
-                        title: "Error",
-                        text: "An error occurred while checking employee existence. Please try again.",
-                        confirmButtonText: "OK"
-                    });
-                    $('#submitButton').prop('disabled', false).text('Mark as Forwarded to pension'); // Re-enable button
-                }
-            }); 
-        }
-
-    });
-    
-    
-    
-    
- // Trigger search on pressing Enter key
-    $('#empCode').on('keydown', function (event) {
-        if (event.key === 'Enter') {
-            event.preventDefault(); // Prevent default form submission or page reload
-
-            const empCode = $('#empCode').val(); // Get the value of empCode
-            if (!empCode) {
-                // Show Swal alert if the employee number is missing
-                Swal.fire({
-                    icon: "warning", // Display a warning icon
-                    title: "Missing Employee Number",
-                    text: "Please enter an employee number to proceed.",
-                    confirmButtonText: "OK",
-                    customClass: {
-                        confirmButton: "btn btn-primary" // Optional styling for the button
-                    }
-                });
-                return; // Stop further execution
-            }
-            
-            $('#searchButton').click(); // Trigger the click event of the search button
-        }
-    });
-
-		
-		// Handle close button click
-		$('#cancelButton').click(function () {
-		    // Clear the input field value
-		    $('#empCode').val('');
-		    
-		    // Hide the card
-		    $('#employeeCard').hide();
-		    $('#staffTypeContainer').hide();
-
-		});
-
-		// Handle close button click
-		$('#cancelButtonnew').click(function () {
-		    // Clear the input field value
-		    $('#empCode').val('');
-
-		    $('#newemployeeCard').hide();
-		});
-		  
-		
-		function validatePositiveNumber(input) {
-		    if (input.value < 1) {
-		        input.value = "";
-		    }
-		}
-
-		$(document).ready(function () {
-		    // Restrict Employee Name to only alphabets
-		    $('#employeename').on('input', function () {
-		        let value = $(this).val();
-		        $(this).val(value.replace(/[^A-Za-z\s]/g, '')); // Allow only letters and spaces
-		    });
-
-		   /*  $('#submitButton').on('click', function () {
-		        const employeeName = $('#employeename').val().trim();
-
-
-		        if (!/^[A-Za-z\s]+$/.test(employeeName)) {
-		            Swal.fire({
-		                icon: 'warning',
-		                title: 'Validation Error',
-		                text: 'Employee Name must contain only alphabets.',
-		                confirmButtonText: 'OK'
-		            });
-		            return;
-		        }
-		    }); */
-		});
-
-           
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/newentry/pendency.html b/src/main/resources/templates/modules/pensioner/department/newentry/pendency.html
deleted file mode 100644
index a69cb7bc..00000000
--- a/src/main/resources/templates/modules/pensioner/department/newentry/pendency.html
+++ /dev/null
@@ -1,808 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-.card-block {
-    padding: 20px;
-}
-
-.form-label {
-    margin-bottom: 0.5rem;
-}
-
-input.form-control {
-    padding: 10px;
-}
-.form-select {
-    padding: 10px;
-    height: 40px;
-}
-
-#employeeCard label{
-padding-top: 2%;
-}
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Department Entries</h5>
-                                        <span>Pendency</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">NewEntry</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4" >
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        
-					        <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</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> New Entry - Pendency</h5>
-                              <span th:text="${userId}" id="userId" style="display:none"></span>
-								<div class="row mb-4">
-
-										<div class="col-md-4" >
-										  <label for="empCode" class="form-label fw-bold">Search by Employee No <span class="text-danger">*</span></label>
-										
-										    <div class="dropdown">
-										  <input type="number" id="empCode" class="form-control" pattern="^[A-Za-z0-9]+$" placeholder="Enter Employee No" required>
-										  <small id="employeenoHelp" class="form-text text-muted">Only numeric characters (numbers) are allowed.</small>
-										</div>
-										</div>
-
-                                     <div class="col-md-4 mt-20">
-								        <button id="searchButton" class="btn btn-primary mt-2" Style="height:38px;">Search</button>
-								        <!-- <button id="resetButton" class="btn btn-secondary mt-2">Reset</button> -->
-								    </div>
-								</div>
-							 </div>
-					    </div>
-					 
-					</div>
-                    </div>
-                    <div class="row mb-4" id="employeeCard" style="display: none;">
-						    <div class="col-md-12">
-						        <div class="card">
-						            <div class="card-block">
-						                <h5 style="font-weight:bold;">New Entry - Pendency - <span id="EmployeeCode"></span></h5>
-						                <hr>
-						                <div class="row">
-						                    <!-- Employee No -->
-						                    <div class="col-md-6">
-						                        <label for="employeeno" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="number" id="employeeno" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <!-- Employee Name -->
-						                    <div class="col-md-6">
-						                        <label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="employeename" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                     <div class="col-md-6">
-						                        <label for="Department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="department" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                     <div class="col-md-6">
-						                        <label for="Designation" class="form-label fw-bold">Designation<span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="designation" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <div class="col-md-6">
-											    <label for="classes" class="form-label fw-bold">Class<span class="text-danger">*</span></label>
-											    <div class="dropdown" >
-											    <input type="text" id="classes" class="form-control" readonly>
-											       
-											    </div>
-											</div>
-											
-											<div class="col-sm-6">
-						                        <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>
-						                    </div>
-											
-											
-												
-												<div class="col-md-6">
-								    <label for="retirement" class="form-label fw-bold">Type Of Retirement<span class="text-danger">*</span></label>								    
-							        <select id="retirement" class="form-select"  style="width: 100%;height: 40px;" required>
-							          
-							        </select>
-								    
-								</div>
-										
-											
-											<!--  pending duration-->
-										<div class="col-md-6">
-											    <label for="pendingDuration" class="form-label fw-bold">
-											        Pending Duration
-											        <span class="text-danger">*</span>
-											    </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">
-											            <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">
-											            <label for="no" class="form-check-label">No</label>
-											        </div>
-											    </div>
-											    <div id="clickyesdiv" style="display: none; margin-top: 10px;">
-											        <label for="clickyes" class="form-label">Please specify:<span class="text-danger">*</span></label>
-											        <input type="text" id="Clickyes" class="form-control" placeholder="Enter reason">
-											    </div>
-											</div>
-										</div> 	
-			
-							        
-									       <div class="row">
-									        <div class="col-md-6">
-						                        <label for="Audit File" class="form-label fw-bold">Date file sent to Audit<span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                           <input type="text" id="filesentdate" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <div class="col-md-12">
-						                        <label for="remarks" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                             <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here" required></textarea>
-						                        </div>
-						                    </div>
-						                    </div>
-						                    
-
-						                   <div class="row mt-4">
-							                   <div class="col-12 d-flex justify-content-center">
-										        <button id="lfauditButton" class="btn btn-primary mt-2 mx-2">Mark as sent Audit</button>
-										        <button id="cancelButton" class="btn btn-secondary mt-2">Cancel</button>
-										    </div>
-										    </div>
-   									 
-										
-						                    
-						                </div>
-						            </div>
-						        </div>
-						    </div>
-
-                    </div>
-                </div>
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-		
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-  
-    
-$(document).ready(function (){
-    	    
-        $('#searchButton').on('click', function () {
-            const empCode = $('#empCode').val().trim();  // Trim any extra spaces
-            console.log("empCode:", empCode);
-            
-            // If empCode is missing, show a warning and abort.
-            if (!empCode) {
-                Swal.fire({
-                    icon: "warning",
-                    title: "Missing Employee Number",
-                    text: "Please enter an employee number to proceed.",
-                    confirmButtonText: "OK",
-                    customClass: {
-                        confirmButton: "btn btn-primary"
-                    }
-                });
-                console.log("No Employee Code provided. Aborting search.");
-                return;
-            }
-
-            // Show loader and hide any previously displayed cards
-            $('#pageLoader').show();
-            $('#employeeCard').hide();
-            $('#newemployeeCard').hide();
-
-            // Clear/reset form fields
-            $('#typeofcategory').val('');
-            $('#retirement').val('');
-            $('#pendingDurationInput').val('');
-            $('#remarks').val('');
-            $('input[name="pendingDuration"]').prop('checked', false);
-
-
-            // STEP 1: Check if the employee already exists in the database.
-            $.ajax({
-                url: '/gcc/api/department/newentry/prexists',  // Endpoint to check existence
-                type: 'GET',
-                data: { empCode: empCode },
-                success: function (existsResponse) {
-                    console.log("Exists API Response:", existsResponse);
-                    $('#pageLoader').hide();
-
-                    // If the employee exists, show a warning and stop processing.
-                    if (existsResponse && existsResponse.exists) {
-                        Swal.fire({
-                            icon: "warning",
-                            title: "Already Exists",
-                            text: "This employee number already exists.",
-                            confirmButtonText: "OK",
-                            customClass: {
-                                confirmButton: "btn btn-primary"
-                            }
-                        });
-                        return;
-                    }
-
-                    // STEP 2: If the employee does not exist, fetch employee details.
-                    $('#pageLoader').show(); // Show loader for the second API call
-                    $.ajax({
-                        url: '/gcc/api/department/newentry/employeedetails',  // Correct API URL for employee details
-                        type: 'GET',
-                        data: { empCode: empCode },
-                        success: function (response) {
-                            $('#pageLoader').hide();
-                            console.log("Employee Details API Response:", response.list);
-
-                            if (response.list && response.list.length > 0) {
-                                // Retrieve the first (and presumably only) employee details record.
-                                let employeeDetails = response.list[0];
-                                console.log("Employee Details:", employeeDetails);
-                             // Optional: Validate department ID if needed.
-                                const loggedInDeptId = $('#deptId').text().trim();
-                                const currentDate = $('#filesentdate').val().trim();
-                                const retirementDateStr = employeeDetails.RETIREMENT_DATE.trim();
-
-                                // Convert input date from "dd-MM-yyyy" to "yyyy-MM-dd"
-                                function parseInputDate(dateStr) {
-                                    let parts = dateStr.split('-'); // Assuming input is "dd-MM-yyyy"
-                                    if (parts.length === 3) {
-                                        return new Date(parts[2], parts[1] - 1, parts[0]); // Convert to "YYYY, MM-1, DD"
-                                    }
-                                    return null;
-                                }
-
-                                // Convert RETIREMENT_DATE from "YYYY-MM-DD" to Date object
-                                const retirementDate = new Date(retirementDateStr);
-                                const currentDateObj = parseInputDate(currentDate);
-
-                                if (!retirementDate || !currentDateObj) {
-                                    console.error("Invalid date format", retirementDate, currentDateObj);
-                                    return;
-                                }
-
-                                // Compare retirement date with current date
-                                if (retirementDate >= currentDateObj) {
-                                    Swal.fire({
-                                        icon: "warning",
-                                        title: "Not Applicable",
-                                        text: "This employee is not applicable for this pendency.",
-                                        confirmButtonText: "OK",
-                                        customClass: {
-                                            confirmButton: "btn btn-primary"
-                                        }
-                                    });
-                                    return;
-                                }
-
-
-
-                                // If the returned data is invalid, show a warning.
-                                if (!employeeDetails || !employeeDetails.EMPLOYEE_CODE) {
-                                    Swal.fire({
-                                        icon: "warning",
-                                        title: "No Data Found",
-                                        text: "No details found for this employee number.",
-                                        confirmButtonText: "OK",
-                                        customClass: {
-                                            confirmButton: "btn btn-primary"
-                                        }
-                                    });
-                                    return;
-                                }
-
-                                
-                                if (employeeDetails.ID_DEPT !== loggedInDeptId) {
-                                    Swal.fire({
-                                        icon: "error",
-                                        title: "Access Denied",
-                                        text: "This employee does not belong to your department. Please try again with a valid employee code.",
-                                        confirmButtonText: "OK",
-                                        customClass: {
-                                            confirmButton: "btn btn-danger"
-                                        }
-                                    });
-                                    return;
-                                }
-                                
-                                
-                                
-                                
-                                // Function to handle radio button state based on retirement date
-	                            function handlePendingDurationState() {
-	                                const currentDate = new Date().toISOString().split('T')[0]; // Get today's date in YYYY-MM-DD format
-	                                const retirementDate = employeeDetails.RETIREMENT_DATE; // Assuming this comes in YYYY-MM-DD format
-
-	                                const yesRadio = document.getElementById("yes");
-	                                const noRadio = document.getElementById("no");
-
-	                                const inputFieldDiv = document.getElementById('clickyesdiv');
-	                                if (retirementDate <= currentDate) {
-	                                    // If retirement date is less than or equal to current date, disable 'Yes' option
-	                                     
-	                                    yesRadio.checked = true;
-	                                    inputFieldDiv.style.display = 'block';
-	                                    noRadio.disabled = true; // Default to 'No'
-	                                } else {
-	                                    // If retirement date is greater than current date, disable 'No' option
-	                                    noRadio.checked = true;
-	                                    yesRadio.disabled = true; // Default to 'Yes'
-	                                }
-	                            }
-
-	                            // Call the function after fetching `employeeDetails`
-	                            handlePendingDurationState();
-
-                                // Populate the form fields with the fetched employee details.
-                                $('#employeeno').val(employeeDetails.EMPLOYEE_CODE);
-                                $('#employeename').val(employeeDetails.EMPLOYEE_NAME);
-                                $('#department').val(employeeDetails.DEPARTMENT);
-                                $('#designation').val(employeeDetails.DESIGNATION);
-                                $('#classes').val(employeeDetails.GROUP_TYPE);
-                                $('#retirementdate').val(employeeDetails.RETIREMENT_DATE);
-                                $('#EmployeeCode').text(empCode);
-
-                                // Finally, display the employee card/modal.
-                                $('#employeeCard').show();
-                            } else {
-                                $('#pageLoader').hide();
-                                Swal.fire({
-                                    icon: "warning",
-                                    title: "No Data Found",
-                                    text: "No details found for this employee number.",
-                                    confirmButtonText: "OK",
-                                    customClass: {
-                                        confirmButton: "btn btn-primary"
-                                    }
-                                });
-                            }
-                        },
-                        error: function () {
-                            $('#pageLoader').hide();
-                            Swal.fire({
-                                icon: "error",
-                                title: "Error",
-                                text: "An error occurred while fetching data. Please try again.",
-                                confirmButtonText: "OK"
-                            });
-                        }
-                    });
-                },
-                error: function () {
-                    $('#pageLoader').hide();
-                    Swal.fire({
-                        icon: "error",
-                        title: "Error",
-                        text: "An error occurred while checking the employee. Please try again.",
-                        confirmButtonText: "OK"
-                    });
-                }
-            });
-        });
-
-        
-        
-    	
-        /* document.getElementById('lfauditButton').addEventListener('click', function () {
-   		    // Trigger the save function when the button is clicked
-   		    saveEntryDetails();
-   		}); */
-   		
-        //$('#lfauditButton').one('click', saveEntryDetails);
-    	
-        $('#lfauditButton').off('click').on('click', saveEntryDetails);
-    })
-    
-
-		// Handle close button click
-		$('#cancelButton').click(function () {
-		    // Clear the input field value
-		    $('#empCode').val('');
-		    
-		    // Hide the card
-		    $('#employeeCard').hide();
-		});
-
-		
-		// Handle close button click
-		$('#cancelButtonnew').click(function () {
-		    // Clear the input field value
-		    $('#empCode').val('');
-		    
-		    // Hide the card
-		    $('#newemployeeCard').hide();
-		});
-		
-		
-		// Trigger search on pressing Enter key
-        $('#empCode').on('keydown', function (event) {
-            if (event.key === 'Enter') {
-                event.preventDefault(); // Prevent default form submission or page reload
-
-                const empCode = $('#empCode').val(); // Get the value of empCode
-                if (!empCode) {
-                    // Show Swal alert if the employee number is missing
-                    Swal.fire({
-                        icon: "warning", // Display a warning icon
-                        title: "Missing Employee Number",
-                        text: "Please enter an employee number to proceed.",
-                        confirmButtonText: "OK",
-                        customClass: {
-                            confirmButton: "btn btn-primary" // Optional styling for the button
-                        }
-                    });
-                    return; // Stop further execution
-                }
-                
-                $('#searchButton').click(); // Trigger the click event of the search button
-            }
-        });	
-		
-		
-		
-		
-        $(document).ready(function () {
-    	    function loadRetirementTypes() {
-    	        $.ajax({
-    	            url: "/gcc/api/getRetrimentTypes",
-    	            type: "GET",
-    	            success: function (data) {
-    	                var dropdown = $("#retirement");
-    	                dropdown.empty();
-    	                dropdown.append('<option value="" selected>-- Select Option --</option>');
-
-    	                $.each(data, function (key, entry) {
-    	                    if (entry.retriment_type !== "Provisional") {  // Exclude "Provisional"
-    	                        dropdown.append($('<option></option>').attr('value', entry.retriment_type).text(entry.retriment_type));
-    	                    }
-    	                });
-    	            },
-    	            error: function () {
-    	                console.log("Error loading dropdown data.");
-    	            }
-    	        });
-    	    }
-
-    	    // Call function on page load
-    	    loadRetirementTypes();
-    	});
-		
-		
-		
-        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("filesentdate").value = formattedDateDisplay;
-
-            
-        });
-      
-      
-    function convertDateFormat(dateString) {
-        if (!dateString) return '';
-        let [day, month, year] = dateString.split('-');
-        return `${year}-${month}-${day}`;
-    }
-		
-		
-		function saveEntryDetails() {
-			 let selectedPendingDurationValue = $('input[name="pendingDuration"]:checked').val();
-	     	 let selectedReasonValue = $('#reason').val(); 
-			 // Check for "Yes" in Pending Duration
-     	    if (selectedPendingDurationValue === 'yes') {
-     	        selectedReasonPending = $('#Clickyes').val()?.trim() || null;
-     	        if (!selectedReasonPending) {
-     	            Swal.fire({
-     	                icon: 'warning',
-     	                title: 'Validation Error',
-     	                text: 'Please specify the reason for selecting "Yes" for Pending Duration.',
-     	                confirmButtonText: 'OK'
-     	            });
-     	            return;
-     	        }
-     	    }
-        	
-	        //pendencyCategory:$('#typeofcategory').val(),
-			
-     	    let entryDetails = {
-    	    		
-     	        empNo: $('#employeeno').val(),
-     	        empName: $('#employeename').val(),
-     	        deptName: $('#department').val(),
-     	        designation: $('#designation').val(),
-     	       	retirementclass: $('#classes').val(),
-     	      	typeOfRetirement: $('#retirement').val(),
-     	      	retirementDate:$('#retirementdate').val(),      	
-     	       	pendingDuration: selectedPendingDurationValue,            
-	            reasonPending: selectedReasonPending || null,
-	            dateToAudit: convertDateFormat($('#filesentdate').val()?.trim()),
-     	       	remarks: $('#remarks').val(),
-     	       	deptId:$('#deptId').text().trim(),
-     	      	filemovedby:$('#userId').text().trim(),
-     	      	filecategory:$('#filecategory').text().trim()
-     	    };
-     	    
-     	    console.log("entrydetails..",entryDetails);
-     	     
-     	    
-     	    
-     	   if (!entryDetails.pendingDuration) {
-               Swal.fire({
-                   icon: 'warning',
-                   title: 'Validation Error!',
-                   text: 'Pending Duration.',
-                   confirmButtonText: 'OK'
-               });
-               return;
-           }
-     	    
-     	    
-     	   if (!entryDetails.typeOfRetirement) {
-               Swal.fire({
-                   icon: 'warning',
-                   title: 'Validation Error!',
-                   text: 'Type of Retirement.',
-                   confirmButtonText: 'OK'
-               });
-               return;
-           }
-     	    
-     	   
-     	 
-     	  
-     	 if (!entryDetails.remarks) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error!',
-                 text: 'Remarks are required.',
-                 confirmButtonText: 'OK'
-             });
-             return;
-         }
-     	   
-
-     	   $('#lfauditButton').prop('disabled', true).text('Processing...');
-
-     	    $.ajax({
-     	        url: '/gcc/api/department/newentry/savePendecnyDetails',
-     	        type: 'POST',
-     	        contentType: 'application/json',
-     	        data: JSON.stringify(entryDetails),
-     	        success: function (response) {
-     	        	$('#lfauditButton').prop('disabled', false).text('Mark as sent Audit');
-     	        	Swal.fire({
-     	        		icon: 'success',
-     	                title: 'Success',
-     	                text: response,
-     	               	allowOutsideClick: false,
-     	              	allowEscapeKey: false,
-     	              	allowEnterKey: false,
-     	                confirmButtonText: 'OK'
-                    }).then((result) => {
-                        if (result.isConfirmed) {
-                        	$('#lfauditButton').prop('disabled', false).text('Mark as sent Audit');
-                        	window.location.href = "/gcc/department/newentry/pendency";
-                            console.log("Continue clicked");
-                        }
-                    });
-     	        },
-     	        error: function (xhr, status, error) {
-     	        	$('#lfauditButton').prop('disabled', false).text('Mark as sent Audit');
-     	            Swal.fire({
-     	                icon: 'error',
-     	                title: 'Error',
-     	                text: 'Failed to save details. Please try again.',
-     	                confirmButtonText: 'OK'
-     	            });
-     	            console.error('Error:', xhr.responseText);
-     	        }
-     	    });
-     	
-            
-            }
-		  
-		
-		function handleCategoryChange() {
-	        const categoryDropdown = document.getElementById('typeofcategory');
-	        const retirementDetailsContainer = document.getElementById('retirementDetailsContainer');
-
-	        // Show or hide the retirement details dropdown based on the selection
-	        if (categoryDropdown.value === 'Retirement') {
-	            retirementDetailsContainer.style.display = 'block'; // Show retirement dropdown
-	        } else {
-	            retirementDetailsContainer.style.display = 'none'; // Hide retirement dropdown
-	        }
-	    }
-
-			 
-			document.querySelectorAll('input[name="pendingDuration"]').forEach(radio => {
-    	        radio.addEventListener('change', function () {
-    	            const pendingDurationInputContainer = document.getElementById('pendingDurationInputContainer');
-    	            if (this.value === 'yes') {
-    	            	pendingDurationInputContainer.style.display = 'block'; // Show the input field
-    	            } else {
-    	            	pendingDurationInputContainer.style.display = 'none'; // Hide the input field
-    	                document.getElementById('pendingDurationInput').value = ''; // Clear the input field
-    	            }
-    	        });
-    	    });  
-           
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/newentry/provisionalretirement.html b/src/main/resources/templates/modules/pensioner/department/newentry/provisionalretirement.html
deleted file mode 100644
index 2107c945..00000000
--- a/src/main/resources/templates/modules/pensioner/department/newentry/provisionalretirement.html
+++ /dev/null
@@ -1,884 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-.card-block {
-    padding: 20px;
-}
-
-.form-label {
-    margin-bottom: 0.5rem;
-}
-
-input.form-control {
-    padding: 10px;
-}
-.form-select {
-    padding: 10px;
-    height: 40px;
-}
-#employeeCard label{
-padding-top: 2%;
-}
-
-
-
-  .is-invalid {
-    border: 1px solid red;
-  }
-
-
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Department Entries</h5>
-                                        <span>Provisional Pension</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">NewEntry</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Provisional Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4" >
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</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> New Entry -  Provisional Pension</h5>
-                              <span th:text="${userId}" id="userId" style="display:none"></span>
-								<div class="row mb-4">
-								
-										<div class="col-md-4" >
-										  <label for="empCode" class="form-label fw-bold">Search by Employee No <span class="text-danger">*</span></label>
-										
-										    <div class="dropdown">
-										  <input type="number" id="empCode" class="form-control" pattern="^[A-Za-z0-9]+$" placeholder="Enter Employee No" required>
-										  <small id="employeenoHelp" class="form-text text-muted">Only numeric characters (numbers) are allowed.</small>
-										</div>
-										</div>
-
-                                     <div class="col-md-4 mt-20">
-								        <button id="searchButton" class="btn btn-primary mt-2" Style="height:38px;">Search</button>
-								        <!-- <button id="resetButton" class="btn btn-secondary mt-2">Reset</button> -->
-								    </div>
-								</div>
-							 </div>
-					    </div>
-					 
-					</div>
-                    </div>
-                    <div class="row mb-4" id="employeeCard" style="display: none;">
-						    <div class="col-md-12">
-						        <div class="card">
-						            <div class="card-block">
-						                <h5 style="font-weight:bold;">New Entry -  Provisional Pension - <span id="EmployeeCode"></span></h5>
-						                <hr>
-						                <div class="row">
-						                    <!-- Employee No -->
-						                    <div class="col-md-6">
-						                        <label for="employeeno" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="number" id="employeeno" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <!-- Employee Name -->
-						                    <div class="col-md-6">
-						                        <label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="employeename" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                     <div class="col-md-6">
-						                        <label for="Department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="department" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                     <div class="col-md-6">
-						                        <label for="Designation" class="form-label fw-bold">Designation<span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                            <input type="text" id="designation" class="form-control" readonly>
-						                        </div>
-						                    </div>
-						                    
-						                    <div class="col-md-6">
-											    <label for="classes" class="form-label fw-bold">Class<span class="text-danger">*</span></label>
-											    <div class="dropdown" >
-											    <input type="text" id="classes" class="form-control" readonly>
-
-											    </div>
-											</div>
-											<div class="col-sm-6">
-						                        <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>
-						                    </div>
-											
-
-											
-											<div class="col-sm-6">
-												<label for="retirement" class="form-label fw-bold">Type Of Retirement<span class="text-danger">*</span></label>								    
-												<select id="retirement" class="form-select"  style="width: 100%;" required>
-													<option value=""  selected>-- Select Option --</option>
-												</select>								    
-											</div>
-											
-											
-											<div class="col-sm-6">
-													<label for="reason" class="form-label fw-bold">Reason For Provisional Pension Given<span class="text-danger">*</span></label>								    
-													<select id="reason" class="form-select"  style="width: 100%;" required>
-														<option value=""  selected>-- Select Option --</option>
-													</select>	
-											<div id="otherReasonDiv" style="display: none; margin-top: 10px;">
-													<label for="otherReason" class="form-label">Please specify for selecting others reason:</label>
-													<input type="text" id="otherReason" class="form-control" placeholder="Enter reason">
-											</div>										    
-											</div>
-
-						                    
-						                    
-						                  <div class="col-md-6">
-										    <label for="Audit File" class="form-label fw-bold">
-										        Date file sent to Pension Section <span class="text-danger">*</span>
-										    </label>
-										    <div class="dropdown">
-										        <input type="text" id="filesentdate" class="form-control" readonly>
-										    </div>
-										</div>
-						                                 
-						                   <div class="col-md-6">
-											    <label for="pendingDuration" class="form-label fw-bold">Pending Duration <span class="text-danger">*</span></label>
-											    <div class="d-flex align-items-center">
-											        <div class="form-check" style="padding-right:10px;">
-											            <input type="radio" id="yespen" name="pendingDuration" value="Yes" class="form-check-input" onclick="toggleInputField(this)">
-											            <label for="yespen" class="form-check-label">Yes</label>
-											        </div>
-											        <div class="form-check">
-											            <input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" onclick="toggleInputField(this)">
-											            <label for="nopen" class="form-check-label">No</label>
-											        </div>
-											    </div>
-											    <div id="clickyesdiv" style="display: none; margin-top: 10px;">
-											        <label for="clickyes" class="form-label">Please specify:<span class="text-danger">*</span></label>
-											        <input type="text" id="Clickyes" class="form-control" placeholder="Enter reason">
-											    </div>
-											</div> 
-											
-											<div class="col-md-6">
-											    <label for="DP" class="form-label fw-bold">DP<span class="text-danger">*</span></label>
-											    <div class="d-flex align-items-center">
-											        <div class="form-check  " style="padding-right:10px;">
-											            <input type="radio" id="yes" name="DP" value="yes" class="form-check-input">
-											            <label for="yes" class="form-check-label">yes</label>
-											        </div>
-											        <br>
-											        <div class="form-check" >
-											            <input type="radio" id="No" name="DP" value="no" class="form-check-input">
-											            <label for="No" class="form-check-label">no</label>
-											        </div>
-											    </div>
-											</div>
-						                    
-						                    <div class="col-md-12">
-						                        <label for="Remarks" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
-						                        <div class="dropdown">
-						                             <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here" required></textarea>
-						                        </div>
-						                    </div>
-						                   </div> 
-
-						                  <div class="row mt-4">
-							                   <div class="col-12 d-flex justify-content-center">
-										        <button id="submitButton" class="btn btn-primary mt-2 mx-2">Mark as Forward to Pension</button>
-										        <button id="cancelButton" class="btn btn-secondary mt-2">Cancel</button>
-										    </div>
-										</div>
-						                    
-						                
-						            </div>
-						        </div>
-						    </div>
-						</div>
-						
-						
-						
-
-                    </div>
-                </div>
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	
-$(document).ready(function (){
-	
-	
-       	// Handle Search button click
-           $('#searchButton').on('click', function () {
-               const empCode = $('#empCode').val();
-               
-               console.log("empCode",empCode);
-              
-               if (empCode) {
-               	$('#pageLoader').show();
-               	document.getElementById("employeeCard").style.display = "block";
-               }else{
-               	
-               	
-               	Swal.fire({
-                       icon: "warning", // Display a warning icon
-                       title: "Missing Employee Number",
-                       text: "Please enter an employee number to proceed.",
-                       confirmButtonText: "OK",
-                       customClass: {
-                           confirmButton: "btn btn-primary" // Optional styling for the button
-                       }
-                   });
-               	//document.getElementById("newemployeeCard").style.display = "block";
-               	 return; 
-               }
-
-               // Format dates to dd-MM-yyyy
-               
-               $('#pageLoader').show();
-               $('#employeeCard').hide();
-               $('#newemployeeCard').hide();
-               
-                $('#retirement').val('');
-    	        $('#reason').val('');
-    	        $('#otherReason').val('');
-    	       // $('#filesentdate').val(''); 
-    	        $('#remarks').val('');
-    	        $('input[name="pendingDuration"]').prop('checked', false); // Clear "pendingDuration" radio buttons
-    	        $('input[name="DP"]').prop('checked', false); // Clear "DP" radio buttons    	        
-    	       	        
-
-    	        // Step 1: Check if employee exists in the database and fetch employee details if not
-    	        $('#pageLoader').show(); // Show loader before starting AJAX requests
-    	        $.ajax({
-    	            url: '/gcc/api/department/newentry/prexists', // Endpoint to check existence
-    	            type: 'GET',
-    	            data: { empCode: empCode },
-    	            success: function (existsResponse) {
-    	                console.log("Exists API Response:", existsResponse);
-    	                $('#pageLoader').hide(); // Hide loader after the first API response
-
-    	                if (existsResponse && existsResponse.exists) {
-    	                    console.log(`Employee Code ${empCode} exists in the database.`);
-    	                    Swal.fire({
-    	                        icon: "warning",
-    	                        title: "Already Exists",
-    	                        text: "This employee number already exists.",
-    	                        confirmButtonText: "OK",
-    	                        customClass: {
-    	                            confirmButton: "btn btn-primary"
-    	                        }
-    	                    });
-    	                    return; // Exit if employee already exists
-    	                }
-
-    	                // If employee does not exist, proceed to fetch details
-    	                $('#pageLoader').show(); // Show loader for the second API call
-    	                $.ajax({
-    	                    url: '/gcc/api/department/newentry/employeedetails', // Correct API URL
-    	                    type: 'GET',
-    	                    data: { empCode: empCode },
-    	                    success: function (response) {
-    	                        $('#pageLoader').hide(); // Hide loader after the second API response
-    	                        console.log("Employee Details API Response:", response.list);
-
-    	                        if (response.list && response.list.length > 0) {
-    	                            // Extract employee details
-    	                            let employeeDetails = response.list[0];
-    	                            console.log("Employee Details:", employeeDetails);
-
-    	                            const loggedInDeptId = $('#deptId').text().trim(); // Get logged-in deptId dynamically
-
-    	                            // Validate department ID
-    	                            if (employeeDetails.ID_DEPT !== loggedInDeptId) {
-    	                                Swal.fire({
-    	                                    icon: "error",
-    	                                    title: "Access Denied",
-    	                                    text: "This employee does not belong to your department. Please try again with a valid employee code.",
-    	                                    confirmButtonText: "OK",
-    	                                    customClass: {
-    	                                        confirmButton: "btn btn-danger"
-    	                                    }
-    	                                });
-    	                                return; // Exit if the department does not match
-    	                            }
-
-    	                            
-    	                            // Function to handle radio button state based on retirement date
-    	                            function handlePendingDurationState() {
-    	                                const currentDate = new Date().toISOString().split('T')[0]; // Get today's date in YYYY-MM-DD format
-    	                                const retirementDate = employeeDetails.RETIREMENT_DATE; // Assuming this comes in YYYY-MM-DD format
-
-    	                                const yesRadio = document.getElementById("yespen");
-    	                                const noRadio = document.getElementById("nopen");
-
-    	                                const inputFieldDiv = document.getElementById('clickyesdiv');
-    	                                if (retirementDate <= currentDate) {
-    	                                    // If retirement date is less than or equal to current date, disable 'Yes' option
-    	                                     
-    	                                    yesRadio.checked = true;
-    	                                    inputFieldDiv.style.display = 'block';
-    	                                    noRadio.disabled = true; // Default to 'No'
-    	                                } else {
-    	                                    // If retirement date is greater than current date, disable 'No' option
-    	                                    noRadio.checked = true;
-    	                                    yesRadio.disabled = true; // Default to 'Yes'
-    	                                }
-    	                            }
-
-    	                            // Call the function after fetching `employeeDetails`
-    	                            handlePendingDurationState();
-
-    	                            
-    	                            
-    	                            // Populate employee details in the form
-    	                            $('#employeeno').val(employeeDetails.EMPLOYEE_CODE);
-    	                            $('#employeename').val(employeeDetails.EMPLOYEE_NAME);
-    	                            $('#department').val(employeeDetails.DEPARTMENT);
-    	                            $('#designation').val(employeeDetails.DESIGNATION);
-    	                            $('#classes').val(employeeDetails.GROUP_TYPE);
-    	                            $('#retirementdate').val(employeeDetails.RETIREMENT_DATE);
-
-    	                            $('#EmployeeCode').text(empCode);
-
-    	                            // Show the employee card
-    	                            $('#employeeCard').show();
-
-    	                            
-    	                        } else {
-    	                            // No details found for the employee
-    	                            Swal.fire({
-    	                                icon: "warning",
-    	                                title: "No Data Found",
-    	                                text: "No details found for this employee number.",
-    	                                confirmButtonText: "OK",
-    	                                customClass: {
-    	                                    confirmButton: "btn btn-primary"
-    	                                }
-    	                            });
-
-    	                            document.getElementById("newemployeeCard").style.display = "block"; // Show the new employee card
-    	                        }
-    	                    },
-    	                    error: function () {
-    	                        $('#pageLoader').hide(); // Hide loader on error
-    	                        Swal.fire({
-    	                            icon: "error",
-    	                            title: "Error",
-    	                            text: "An error occurred while fetching data. Please try again.",
-    	                            confirmButtonText: "OK",
-    	                        });
-    	                    }
-    	                });
-    	            },
-    	            
-    	            error: function () {
-    	                $('#pageLoader').hide(); // Hide loader on error
-    	                Swal.fire({
-    	                    icon: "error",
-    	                    title: "Error",
-    	                    text: "An error occurred while checking the employee. Please try again.",
-    	                    confirmButtonText: "OK",
-    	                });
-    	            }
-    	        });
-           });
-       	
-       	
-       	
-       })
-       
-       // Attach event listener to the submit button
-            /* document.getElementById('submitButton').addEventListener('click', function () {
-                saveEntryDetails(); // Trigger save function when clicked
-            }); */
-            
-		//$('#submitButton').one('click', saveEntryDetails);
-            
-            $('#submitButton').off('click').on('click', saveEntryDetails);
-            
-            
-            
-      
-       
-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("filesentdate").value = formattedDateDisplay;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-
-  
-     // Dropdown for Type of Retriment
-		$(document).ready(function () {
-		    function loadRetirementTypes() {
-		        $.ajax({
-		            url: "/gcc/api/getRetrimentTypes",
-		            type: "GET",
-		            success: function (data) {
-		                var dropdown = $("#retirement");
-		                dropdown.empty();
-		                dropdown.append('<option value="" selected>-- Select Option --</option>');
-
-		                $.each(data, function (key, entry) {
-		                    dropdown.append($('<option></option>').attr('value', entry.retriment_type).text(entry.retriment_type));
-		                });
-		            },
-		            error: function () {
-		                console.log("Error loading dropdown data.");
-		            }
-		        });
-		    }
-
-		    // Call function on page load
-		    loadRetirementTypes();
-		    });
-
-
-
-
-		//Dropdown for Reason of Provisional
-		$(document).ready(function () {
-		function loadRetirementReasonTypes() {
-		    $.ajax({
-		        url: "/gcc/api/getProvisionalReasonTypes",
-		        type: "GET",
-		        success: function (data) {
-		            var dropdown = $("#reason");
-		            dropdown.empty();
-		            dropdown.append('<option value="" selected>-- Select Option --</option>');
-		
-		            $.each(data, function (key, entry) {
-		                dropdown.append($('<option></option>').attr('value', entry.provisional_reason).text(entry.provisional_reason));
-		            });
-		        },
-		        error: function () {
-		            console.log("Error loading dropdown data.");
-		        }
-		    });
-		}
-		
-		// Call function on page load
-		loadRetirementReasonTypes();
-		});
-       
-    
-    document.getElementById('reason').addEventListener('change', function () {
-        const otherReasonDiv = document.getElementById('otherReasonDiv'); // Get the div to show/hide
-        if (this.value === 'Others') {
-            otherReasonDiv.style.display = 'block'; // Show the input field if "Others" is selected
-        } else {
-            otherReasonDiv.style.display = 'none'; // Hide the input field otherwise
-            document.getElementById('otherReason').value = ''; // Clear the input field
-        }
-    });
-    
-    
-    
-    
-
-
-    
-    
-			function toggleInputField(radio) {
-			    const inputFieldDiv = document.getElementById('clickyesdiv');
-			    if (radio.value === "Yes") {
-			        inputFieldDiv.style.display = 'block';
-			    } else {
-			        inputFieldDiv.style.display = 'none';
-			        document.getElementById('Clickyes').value = ''; // Clear the input field
-			    }
-			}
-			
-			
-			
-			// Trigger search on pressing Enter key
-	        $('#empCode').on('keydown', function (event) {
-	            if (event.key === 'Enter') {
-	                event.preventDefault(); // Prevent default form submission or page reload
-
-	                const empCode = $('#empCode').val(); // Get the value of empCode
-	                if (!empCode) {
-	                    // Show Swal alert if the employee number is missing
-	                    Swal.fire({
-	                        icon: "warning", // Display a warning icon
-	                        title: "Missing Employee Number",
-	                        text: "Please enter an employee number to proceed.",
-	                        confirmButtonText: "OK",
-	                        customClass: {
-	                            confirmButton: "btn btn-primary" // Optional styling for the button
-	                        }
-	                    });
-	                    return; // Stop further execution
-	                }
-	                
-	                $('#searchButton').click(); // Trigger the click event of the search button
-	            }
-	        });	
-			
-
-		// Handle close button click
-		$('#cancelButton').click(function () {
-		    // Clear the input field value
-		    $('#empCode').val('');
-		    document.getElementById('otherReasonDiv').style.display = 'none';
-		    // Hide the card
-		    $('#employeeCard').hide();
-		});
-
-		// Handle close button click
-		$('#cancelButtonnew').click(function () {
-		    // Clear the input field value
-		    $('#empCode').val('');
-
-		    $('#newemployeeCard').hide();
-		});
-		  
-
-		
-
-     	
-      function saveEntryDetails() {
-     	    let selectedDPValue = $('input[name="DP"]:checked').val();
-     	    let selectedPendingDurationValue = $('input[name="pendingDuration"]:checked').val();
-     	    let selectedReasonValue = $('#reason').val();  
-     	    let selectedOtherReason = null;
-     	    let selectedReasonPending = null;
-
-     	    // Check for "Others" in Reason of Pension
-     	    if (selectedReasonValue === 'Others') {
-     	        selectedOtherReason = $('#otherReason').val()?.trim() || null;
-     	        if (!selectedOtherReason) {
-     	            Swal.fire({
-     	                icon: 'warning',
-     	                title: 'Validation Error',
-     	                text: 'Please specify the reason for selecting "Others".',
-     	                confirmButtonText: 'OK'
-     	            });
-     	            return;
-     	        }
-     	    }
-
-     	    // Check for "Yes" in Pending Duration
-     	    if (selectedPendingDurationValue === 'Yes') {
-     	        selectedReasonPending = $('#Clickyes').val()?.trim() || null;
-     	        if (!selectedReasonPending) {
-     	            Swal.fire({
-     	                icon: 'warning',
-     	                title: 'Validation Error',
-     	                text: 'Please specify the reason for selecting "Yes" for Pending Duration.',
-     	                confirmButtonText: 'OK'
-     	            });
-     	            return;
-     	        }
-     	    }
-
-     	    // Create the entryDetails object
-     	    let entryDetails = {
-     	        empNo: $('#employeeno').val()?.trim(),
-     	        empName: $('#employeename').val()?.trim(),
-     	        deptName: $('#department').val()?.trim(),
-     	        designation: $('#designation').val()?.trim(),
-     	        retirementClass: $('#classes').val()?.trim(),
-     	        retirementDate: $('#retirementdate').val()?.trim(),
-     	        typeOfRetirement: $('#retirement').val()?.trim(),
-     	        ReasonofPension: selectedReasonValue || null,
-     	       // Convert DD-MM-YYYY to YYYY-MM-DD
-     	       dateToAudit: convertDateFormat($('#filesentdate').val()?.trim()),
-     	        //dateToAudit: $('#filesentdate').val()?.trim(),
-     	        pendingDuration: selectedPendingDurationValue,
-     	        reasonofPending: selectedReasonPending || null,
-     	        dp: selectedDPValue,
-     	        otherReason: selectedOtherReason,
-     	        remarks: $('#remarks').val()?.trim(),
-     	        deptId: $('#deptId').text()?.trim(),
-     	        filemovedby: $('#userId').text()?.trim(),
-     	        filecategory: $('#filecategory').text()?.trim()
-     	    };
-
-     	    
-     	// Validate each required field separately
-
-     	   if (!entryDetails.typeOfRetirement) {
-     	       Swal.fire({
-     	           icon: 'warning',
-     	           title: 'Validation Error!',
-     	           text: 'Type of Retirement is required.',
-     	           confirmButtonText: 'OK'
-     	       });
-     	       console.warn("Validation error: Missing Type of Retirement");
-     	       return;
-     	   }
-
-     	   if (!entryDetails.ReasonofPension) {
-     	       Swal.fire({
-     	           icon: 'warning',
-     	           title: 'Validation Error!',
-     	           text: 'Reason of Pension is required.',
-     	           confirmButtonText: 'OK'
-     	       });
-     	       console.warn("Validation error: Missing Reason of Pension");
-     	       return;
-     	   }
-     	   
-     	  if (!entryDetails.pendingDuration) {
-    	       Swal.fire({
-    	           icon: 'warning',
-    	           title: 'Validation Error!',
-    	           text: 'Pending Duration is required.',
-    	           confirmButtonText: 'OK'
-    	       });
-    	       console.warn("Validation error: Missing Pending Duration");
-    	       return;
-    	   }
-
-     	   if (!entryDetails.dp) {
-     	       Swal.fire({
-     	           icon: 'warning',
-     	           title: 'Validation Error!',
-     	           text: 'DP is required.',
-     	           confirmButtonText: 'OK'
-     	       });
-     	       console.warn("Validation error: Missing DP");
-     	       return;
-     	   }
-
-
-
-     	   if (!entryDetails.remarks) {
-     	       Swal.fire({
-     	           icon: 'warning',
-     	           title: 'Validation Error!',
-     	           text: 'Remarks are required.',
-     	           confirmButtonText: 'OK'
-     	       });
-     	       console.warn("Validation error: Missing Remarks");
-     	       return;
-     	   }
-
-
-
-     	    console.log("entryDetails==", entryDetails);
-
-     	    // Disable the button to prevent multiple submissions
-     	    $('#submitButton').prop('disabled', true).text('Processing...');
-
-     	    // Make AJAX POST request
-     	    $.ajax({
-     	        url: '/gcc/api/department/newentry/saveEmployeeDetailsProvisionalretirement',
-     	        type: 'POST',
-     	        contentType: 'application/json',
-     	        data: JSON.stringify(entryDetails),
-     	        success: function (response) {
-     	            $('#submitButton').prop('disabled', false).text('Mark as Forward to Pension');
-     	            Swal.fire({
-     	                icon: 'success',
-     	                title: 'Success',
-     	                text: response,
-     	                allowOutsideClick: false,
-     	                allowEscapeKey: false,
-     	                allowEnterKey: false,
-     	                confirmButtonText: 'OK'
-     	            }).then((result) => {
-     	                if (result.isConfirmed) {
-     	                    window.location.href = "/gcc/department/newentry/provisionalretirement";
-     	                }
-     	            });
-     	        },
-     	        error: function (xhr, status, error) {
-     	            $('#submitButton').prop('disabled', false).text('Mark as Forward to Pension');
-     	            Swal.fire({
-     	                icon: 'error',
-     	                title: 'Error',
-     	                text: 'Failed to save details. Please try again.',
-     	                confirmButtonText: 'OK'
-     	            });
-     	            console.error('Error:', xhr.responseText);
-     	        }
-     	    });
-     	} 
-
-            
-	</script>
-
-
-</body>
-</html>
-
-
-
diff --git a/src/main/resources/templates/modules/pensioner/department/newentry/retirement.html b/src/main/resources/templates/modules/pensioner/department/newentry/retirement.html
deleted file mode 100644
index d64dfae6..00000000
--- a/src/main/resources/templates/modules/pensioner/department/newentry/retirement.html
+++ /dev/null
@@ -1,802 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-.modal-body label{
-	padding-top: 10px;
-}
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Retirement</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">NewEntry</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					       <h5 style="font-weight:bold;"> <span th:text="${deptname}"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;"><span th:text="${deptId}" id="deptId" style="display:none"></span><span th:text="${filecategory}" id="filecategory" style="display:none"></span>
-					        <span th:text="${userId}" id="userId" style="display:none"></span> New Entry - Retirement</h5>
-								<div class="row mb-4">
-								
-								<div class="col-md-4">
-			                        <label for="fromDate" class="form-label fw-bold">From Date<span class="text-danger">*</span></label>
-			                        <input type="date" id="fromDate" class="form-control" onclick="this.showPicker()">
-			                    </div>
-			                     <div class="col-md-4">
-			                        <label for="toDate" class="form-label fw-bold">To Date<span class="text-danger">*</span></label>
-			                        <input type="date" id="toDate" class="form-control" onclick="this.showPicker()" >
-			                    </div>
-			                    </div>
-			                    
-			                    <div class="row mt-4">
-									<div class="col-12 d-flex justify-content-center">			                    	                                
-								        <button id="searchButton" class="btn btn-primary mx-2" >Search</button>
-								        <button id="resetButton" class="btn btn-secondary">Reset</button>
-								    </div>
-							    </div>
-												           
-					            <div  id="employeedetails">
-					                <table id="FollowupDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-												<th class="text-center">DOB</th>
-					                            <th class="text-center">Retirement Date</th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                         	<th class="text-center">View</th>
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                        
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  				
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	<!-- Modal -->
-			<div class="modal fade" id="returnretrieddetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-lg" role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    New Entry - Retirement (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                   
-			                    <div class="col-sm-6">
-			                        <label for="employeeno" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
-			                        <input type="number" id="employeeno" class="form-control" readonly>
-			                    </div>					                   
-			                    <div class="col-sm-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>						                    
-			                    <div class="col-sm-6">
-			                        <label for="department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>			                   
-			                    <div class="col-sm-6">
-			                        <label for="designation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    			                   			                   
-			                    <div class="col-sm-6">
-			                        <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>
-			                    </div>
-			                    			                  		                   
-			                    <div class="col-sm-6">
-			                        <label for="classes" class="form-label fw-bold">Class <span class="text-danger">*</span></label>
-			                        <input type="text" id="classes" class="form-control" readonly>
-			                    </div>
-			                    			                   
-			                    <div class="col-sm-6">
-								    <label for="typeretirement" class="form-label fw-bold">Type Of Retirement<span class="text-danger">*</span></label>								    
-							        <select id="typeretirement" class="form-select"  style="width: 100%;height: 30px;" required>
-							          
-							        </select>
-								    
-								</div>
-			                    
-			                    <div class="col-sm-6">
-			                        <label for="datefile" class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
-			                        <input type="text" id="datefile" class="form-control" readonly>
-			                    </div>
-			
-			                  
-			                    <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="2" placeholder="Enter your remarks here"></textarea>
-			                    </div>
-			                    
-			                </div>
-			                <div class="row mt-4">
-								<div class="col-12 d-flex justify-content-center">
-									<button id="auditsubmit" class="btn btn-primary mx-2">Mark as sent audit</button>
-									<button type="button" class="btn btn-secondary" data-dismiss="modal" id="close">Close</button>
-								</div>
-							</div>
-			            </div>
-			           
-			        </div>
-			    </div>
-			   </div> 
-			    
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	
-	
-		    // Initialize DataTable
-		   // Helper function to convert yyyy-MM-dd to dd-MM-yyyy for API calls
-function formatDateForAPI(dateStr) {
-    const [year, month, day] = dateStr.split('-');
-    return `${day}-${month}-${year}`; // Convert to dd-MM-yyyy
-}
-
-document.getElementById('resetButton').addEventListener('click', function () {
- 	event.preventDefault();
- 	
- 	window.location.href="/gcc/department/newentry/retirement";
- 	
- 	});	
-
-
-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;
-
-        
-    });
-    
-    
-
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}	
-
-//Function to convert date to dd/mm/yyyy format
-		    
-		    
-$(document).ready(function () {
-    // Initialize the DataTable
-    const dataTable = $('#FollowupDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: false, // Disable searching as it's custom
-        paging: true,
-        info: true,
-        ordering: false,
-    });
-    
- // Update To Date's min attribute when From Date changes
-    $('#fromDate').on('change', function () {
-        const fromDate = $(this).val();
-        $('#toDate').attr('min', fromDate); // Update min attribute for To Date
-
-        // If To Date is earlier than the new From Date, adjust it
-        const toDate = $('#toDate').val();
-        if (new Date(toDate) < new Date(fromDate)) {
-            $('#toDate').val(fromDate);
-        }
-    });
-
-    // Update From Date's max attribute when To Date changes
-    $('#toDate').on('change', function () {
-        const toDate = $(this).val();
-        $('#fromDate').attr('max', toDate); // Update max attribute for From Date
-
-        // If From Date is later than the new To Date, adjust it
-        const fromDate = $('#fromDate').val();
-        if (new Date(fromDate) > new Date(toDate)) {
-            $('#fromDate').val(toDate);
-        }
-    });
-
-  	getstart(dataTable);
-  	
-  	document.getElementById('searchButton').addEventListener('click', function () {
-  	 	event.preventDefault();
-  	 	
-  	 	getstart(dataTable);
-  	 	
-  	 	});	
-  	
-  	function getstart(dataTable)
-  	{
-  		const fromDate=$('#fromDate').val();
-  		const toDate=$('#toDate').val();
-  		const deptId = $('#deptId').text().trim(); // Default department ID
-  		const file_category = $('#filecategory').text().trim();
-  				
-  		console.log("fromDate==",fromDate);
-  		console.log("toDate==",toDate);
-  	    console.log("deptId", deptId);
-  	    
-  	    
-/*   	  if (!fromDate && !toDate) {
-	        Swal.fire({
-	            icon: "info",
-	            title: "Info",
-	            text: "Select Both Date for Searching",
-	            confirmButtonText: "OK",
-	        });
-	        return;
-	    } */
-  	    
-  	    if (!deptId) {
-  	        Swal.fire({
-  	            icon: "warning",
-  	            title: "Error",
-  	            text: "Department ID is Missing",
-  	            confirmButtonText: "OK",
-  	        });
-  	        return;
-  	    }
-
-  	    $('#pageLoader').show();
-  	    // Call the API
-  	    $.ajax({
-  	        url: '/gcc/api/department/newentry/retirementdetails', // Correct API URL
-  	        type: 'GET',
-  	        data: { deptId: deptId,
-  	        		file_category:file_category,
-  	        		fromDate:fromDate,
-  	        		toDate:toDate
-  	        		},
-  	        success: function (response) {
-  	        	$('#pageLoader').hide();
-  	            console.log("response:", response.details);
-  	          	 fromDate1 = response.fromDate; // Extract the fromDate
-	             toDate1 = response.toDate; // Extract the toDate
-	            	            	         
-
-        // Set formatted date values
-        $('#fromDate').val(fromDate1);
-        $('#toDate').val(toDate1);
-		        
-  	          if (response.status === "success") {
-  	                  	            
-  	                // Clear existing data 	                 
-  	                dataTable.clear();
-  	              
-  	                let table = $('#FollowupDatatable').DataTable({
-  		                destroy: true,
-  		                searching: true,
-  		                autoWidth: true,
-  		                responsive: true,
-  		                paging: true,
-  		                info: true,
-  		                data: response.details.list, 
-
-  		                columns: [
-  		                    { 
-  		                        data: null, 
-  		                        render: (data, type, row, meta) => meta.row + 1, 
-  		                        className: 'text-center' 
-  		                    },
-  		                   
-  							{ data: 'EMPLOYEE_CODE', defaultContent: '-', className: 'text-center' }, 
-  							{ data: 'EMPLOYEE_NAME', defaultContent: '-', className: 'text-center' },
-  							{ data: 'DATE_OF_BIRTH', defaultContent: '-', className: 'text-center' },
-  							{ data: 'RETIREMENT_DATE', defaultContent: '-', className: 'text-center' },
-  							{ data: 'DEPARTMENT', defaultContent: '-', className: 'text-center' },
-  							{ data: 'DESIGNATION', defaultContent: '-', className: 'text-center' },
-  							{  
-  		                        data: 'EMPLOYEE_CODE', 
-  		                        render: function(data, type, row) {
-  		                            return `
-  		                                <td class="text-center">
-  		                                    <button type="button" class="btn btn-info" data-employee-code="${data}">
-  		                                        View
-  		                                    </button>
-  		                                </td>`;
-  		                        }, 
-  		                        className: 'text-center' 
-  		                    }
-  		                    
-  		                ],
-  		                dom: 'Bfrtip',
-  		                buttons: [
-  	 		                  {
-  	 		                      extend: 'pageLength',
-  	 		                      className: 'btn btn-warning'
-  	 		                  },
-  	 		                  {
-  	 		                      title: 'Data export',
-  	 		                      extend: 'copyHtml5',
-  	 		                      text: 'Copy',
-  	 		                      className: 'btn btn-secondary',
-  	 		                      id: 'copyBtn'
-  	 		                  },
-  	 		                  {
-  	 		                      extend: 'excelHtml5',
-  	 		                      text: 'Excel',
-  	 		                      className: 'btn btn-secondary',
-  	 		                      id: 'excelBtn'
-  	 		                  },
-  	 		                  {
-  	 		                      extend: 'csvHtml5',
-  	 		                      text: 'CSV',
-  	 		                      className: 'btn btn-secondary',
-  	 		                      id: 'csvBtn'
-  	 		                  },
-  	 		                  {
-  	 		                      extend: 'pdfHtml5',
-  	 		                      text: 'PDF',
-  	 		                      className: 'btn btn-secondary',
-  	 		                      id: 'pdfBtn'
-  	 		                  }
-  	 		              ],
-  	 		             columnDefs: [
-  	 		                { targets: 'no-sort', orderable: false }
-  	 		            ],
-  	 		            lengthMenu: [
-  	 		                [50, 100, 200, 500, -1],
-  	 		                ['50 rows', '100 rows', '200 rows', 'Show all']
-  	 		            ],
-  	 		            scrollY: '50vh',
-  	 		            fixedColumns: {
-  	 		                left: 1,
-  	 		                right: 1
-  	 		            }
-  	 		            });
-  	                 	            
-  	        }
-  	        else if (response.status === "deptid") {
-                // Display the error message for missing department ID
-                dataTable.clear().draw();
-                $('#FollowupDatatable tbody').html(`
-                    <tr>
-                        <td colspan="8" class="text-center text-danger">${response.message}</td>
-                    </tr>
-                `);
-            } else if (response.status === "nodata") {
-                // Display the no data message
-                dataTable.clear().draw();
-                $('#FollowupDatatable tbody').html(`
-                    <tr>
-                        <td colspan="8" class="text-center text-danger">${response.message}</td>
-                    </tr>
-                `);
-            }
-  	          else {
-  	            	$('#pageLoader').hide();
-  	                dataTable.clear().draw();
-  	                Swal.fire({
-  	                    icon: "info",
-  	                    title: "No Data",
-  	                    text: "No data available for the selected date range.",
-  	                    confirmButtonText: "OK",
-  	                });
-  	            }
-  	        },
-  	        error: function () {
-  	        	$('#pageLoader').hide();
-  	            Swal.fire({
-  	                icon: "error",
-  	                title: "Error",
-  	                text: "An error occurred while fetching data. Please try again.",
-  	                confirmButtonText: "OK",
-  	            });
-  	        }
-  	    });	
-  	}
-        
-});
-
-
-$(document).ready(function () {
-	    function loadRetirementTypes() {
-	        $.ajax({
-	            url: "/gcc/api/getRetrimentTypes",
-	            type: "GET",
-	            success: function (data) {
-	                var dropdown = $("#typeretirement");
-	                dropdown.empty();
-	                dropdown.append('<option value="" selected>-- Select Option --</option>');
-
-	                $.each(data, function (key, entry) {
-	                    if (entry.retriment_type !== "Provisional") {  // Exclude "Provisional"
-	                        dropdown.append($('<option></option>').attr('value', entry.retriment_type).text(entry.retriment_type));
-	                    }
-	                });
-	            },
-	            error: function () {
-	                console.log("Error loading dropdown data.");
-	            }
-	        });
-	    }
-
-	    // Call function on page load
-	    loadRetirementTypes();
-	});
-
-		    // Fetch count on page load
-		  
-         $(document).ready(function () {
-        	 
-        	 $(document).on('click', '.btn-info', function () {
-        		    const empCode = $(this).data('employee-code'); // Get EMPLOYEE_CODE from button
-        		    fetchEmployeeDetails(empCode); // Call the function to fetch employee details
-        		});
-
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#returnretrieddetailsModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-		   
-
-		    // Handle close button click
-		    $('#close').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    $('.close').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    
-		});
-
-		    
-         function fetchEmployeeDetails(empCode) {
-        	 
-        	 // Clear previous values in the modal fields
-        	    $('#employeeno').val('');
-        	    $('#employeename').val('');
-        	    $('#department').val('');
-        	    $('#designation').val('');
-        	    $('#retirementdate').val('');
-        	    $('#classes').val('');
-        	    $('#typeretirement').val('').prop('selected', true); // Reset the dropdown to default
-        	    //$('#datefile').val('');
-        	    $('#remarks').val('');
-        	 
-        	    $.ajax({
-        	        url: '/gcc/api/department/newentry/employeedetails', // API to fetch employee details
-        	        type: 'GET',
-        	        data: { empCode: empCode }, // Pass EMPLOYEE_CODE as a parameter
-        	        success: function (response) {
-        	            if (response.list && response.list.length > 0) {
-        	            	
-        	            	 let employeeDetails = response.list[0];
-        	            	console.log("employeecode",response);
-        	            	
-        	                // Populate modal fields
-        	                $('#employeeno').val(employeeDetails.EMPLOYEE_CODE);
-        	                $('#employeename').val(employeeDetails.EMPLOYEE_NAME);
-        	                $('#department').val(employeeDetails.DEPARTMENT);
-        	                $('#designation').val(employeeDetails.DESIGNATION);
-        	                $('#classes').val(employeeDetails.GROUP_TYPE);
-        	                $('#retirementdate').val(employeeDetails.RETIREMENT_DATE);
-        	               
-
-        	                // Update the modal title with the employee code
-        	                $('#modalEmployeeCode').text(empCode);
-
-        	                // Show the modal
-        	                $('#returnretrieddetailsModal').modal('show');
-        	                
-        	                
-        	               
-        	            } else {
-        	                Swal.fire({
-        	                    icon: 'info',
-        	                    title: 'No Data',
-        	                    text: 'No details found for the selected employee.',
-        	                    confirmButtonText: 'OK',
-        	                });
-        	            }
-        	        },
-        	        error: function () {
-        	            Swal.fire({
-        	                icon: 'error',
-        	                title: 'Error',
-        	                text: 'Failed to fetch employee details. Please try again.',
-        	                confirmButtonText: 'OK',
-        	            });
-        	        },
-        	    });
-        	}
-         
-         //$('#auditsubmit').one('click', saveEntryDetails);
-         
-         $('#auditsubmit').off('click').on('click', saveEntryDetails);
-         
-        /*  document.getElementById('auditsubmit').addEventListener('click', function () {
- 		    // Trigger the save function when the button is clicked
- 		    saveEntryDetails();
- 		}); */
- 		
- 		
- 		
- 		function saveEntryDetails() {
- 		    let entryDetails = {
- 		        empNo: $('#employeeno').val(),
- 		        empName: $('#employeename').val(),
- 		        deptName: $('#department').val(),
- 		        designation: $('#designation').val(),
- 		        typeOfRetirement: $('#typeretirement').val(),
- 		        retirementdate: $('#retirementdate').val(),
- 		        retirementclass: $('#classes').val(),
- 		        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
- 		        remarks: $('#remarks').val(),
- 		        deptId: $('#deptId').text().trim(),
- 		        filemovedby: $('#userId').text().trim(),
- 		        filecategory: $('#filecategory').text().trim()
- 		    };
-
- 		    console.log("entryDetails:", entryDetails);
-
- 		    
- 		    if(!entryDetails.typeOfRetirement){
- 		    	Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error!',
-                    text: 'Type of Retirement.',
-                    confirmButtonText: 'OK'
-                });
-                return;
- 		    }
-
- 		   
- 		  if(!entryDetails.remarks){
-		    	Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error!',
-                  text: 'Remarks.',
-                  confirmButtonText: 'OK'
-              });
-              return;
-		    }
- 		  
- 		    // Disable the button to prevent multiple submissions
- 		    $('#auditsubmit').prop('disabled', true).text('Processing...');
-
- 		    $.ajax({
- 		        url: '/gcc/api/department/newentry/saveEmployeeDetails',
- 		        type: 'POST',
- 		        contentType: 'application/json',
- 		        data: JSON.stringify(entryDetails),
- 		        success: function (response) {
- 		            $('#auditsubmit').prop('disabled', false).text('Mark as sent audit');
- 		            Swal.fire({
- 		                icon: 'success',
- 		                title: 'Success',
- 		                text: response,
- 		                allowOutsideClick: false,
- 		                allowEscapeKey: false,
- 		                allowEnterKey: false,
- 		                confirmButtonText: 'OK'
- 		            }).then((result) => {
- 		                if (result.isConfirmed) {
- 		                    $('#auditsubmit').prop('disabled', false).text('Mark as sent audit');
- 		                    window.location.href = "/gcc/department/newentry/retirement";
- 		                    console.log("Continue clicked");
- 		                }
- 		            });
- 		        },
- 		        error: function (xhr, status, error) {
- 		            $('#auditsubmit').prop('disabled', false).text('Mark as sent audit');
- 		            Swal.fire({
- 		                icon: 'error',
- 		                title: 'Error',
- 		                text: 'Failed to save details. Please try again.',
- 		                confirmButtonText: 'OK'
- 		            });
- 		            console.error('Error:', xhr.responseText);
- 		        }
- 		    });
- 		}
-
-
-
-</script>
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/partial/familypension.html b/src/main/resources/templates/modules/pensioner/department/partial/familypension.html
deleted file mode 100644
index 12f596b8..00000000
--- a/src/main/resources/templates/modules/pensioner/department/partial/familypension.html
+++ /dev/null
@@ -1,1195 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-     #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-
-    
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                   <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Family Pension</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Partially Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">Partially Completed - Family Pension</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-                
-                <!--  page loader-->
-  
-  
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Partially Completed - Family Pension (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                
-			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                       <!-- pending duration-->
-			                    
-			                    
-                    				<div class="col-md-4">
-										    <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" placeholder="Enter details for pending duration" 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="date" id="servicedeath" class="form-control" readonly>
-			                    </div>
-			                    
-			                     <!-- Relationship of Deceased -->
-			                    <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-4">
-			                        <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 -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Received From Department </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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" readonly></textarea>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-
-						</div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Edit Benefits</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">	
-			            <p style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</p>		           
-			            	<div class="row mt-2" id="sec2">	                		
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)" >
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						<hr>
-						<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">
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		</div>
-	                   		
-	                   		<div class="row mt-2">
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2" id="dcrgCard" style="display: none;">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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>
-			            <hr>
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile "  class="form-label fw-bold">Date File Completed <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly>
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditsubmit">Mark as Completed</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			            
-			            
-			            
-			            
-					           
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-
-document.getElementById("submitbutton").addEventListener("click", function () {
-    // Clear the inputs in the receivedcard section
-    //$('#datefile').val('');
-    $('#remarks').val('');
-    
-    // Make the receivedcard section visible
-    document.getElementById("receivedcard").style.display = "block";
-
-    // Scroll the receivedcard section into view
-    document.getElementById("receivedcard").scrollIntoView({
-        behavior: "smooth", // Smooth scrolling effect
-        block: "center" // Aligns the element to the center of the viewport
-    });
-});
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // Populate modal fields
-	 	                $('#employeenomodel').val(employeeDetails.emp_no);
-	 	                $('#employeename').val(employeeDetails.emp_name);
-	 	                $('#department').val(employeeDetails.dept_name);
-	 	                $('#designation').val(employeeDetails.designation);
-	 	                $('#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);
-	 	               //$('#retirementdate').val(employeeDetails.retirement_date);
-	 	                
-	 	               
-	 	                     
-	 	              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);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	            	   
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-	                        } else {
-	                            $('#gpfAmountDiv').hide();
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                        }
-	                        //recover emp
- 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        if(employeeDetails.dcrg ==="yes"){
-	                        	$('#dcrgCard').show();
-	                        }else{
-	                        	$('#dcrgCard').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);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount).prop('readonly',true);
-	                          //  bpYes bpNo PbAmountDiv benefit_pension_amount
-	                            $('#bpYes').prop('checked', true);
-			                     $('#bpNo').prop('disabled', true);
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                            $('#bpNo').prop('checked', true);
-			                     $('#bpYes').prop('disabled', true);
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount).prop('readonly',true);
-	                            // DcrgYes DcrgNo dcrgAmountDiv benefit_dcrg_amount
-	                            $('#DcrgYes').prop('checked', true);
-			                     $('#DcrgNo').prop('disabled', true);
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                            $('#DcrgNo').prop('checked', true);
-			                     $('#DcrgYes').prop('disabled', true);
-	                            
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount).prop('readonly',true);
-	                            // commutationYes commutationNo CommutationAmountDiv benefit_commutation_amount
-	                            $('#commutationYes').prop('checked', true);
-			                     $('#commutationNo').prop('disabled', true);
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                            $('#commutationNo').prop('checked', true);
-			                     $('#commutationYes').prop('disabled', true);
-	                        }
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    //$('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditsubmit').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	        		
-	 	        		
-	 	              $('#auditsubmit').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	 // Listen for changes on the GPF radio buttons
-	    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-	            if (this.value === 'yes' || this.value === '90') {
-	                gpfAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	                gpfAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('gpfAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 // Listen for changes on the private affaires radio buttons
-	    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-	            if (this.value === 'yes') {
-	            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	 // Listen for changes on the spfgs radio buttons
-	    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-	            if (this.value === 'yes') {
-	            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 
-	    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const PbAmountDiv = document.getElementById('PbAmountDiv');
-	            if (this.value === 'yes') {
-	            	PbAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	PbAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-	            if (this.value === 'yes') {
-	            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-	            if (this.value === 'yes') {
-	            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	});
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
- const options = {
-     day: '2-digit',
-     month: '2-digit',
-     year: 'numeric',
- };
- return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-
-	 
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);
-	       
-	       let selectedGpfValue = $('input[name="gpf"]:checked').val(); // Get the selected radio button value
-    		let gpfAmount = null;
-
-	    // Check if GPF Amount input is visible and get its value
-	    if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-	        gpfAmount = $('#gpfAmount').val(); // Retrieve the amount if available, else null
-	        if (!gpfAmount) {
-	             Swal.fire({
-	                 icon: 'warning',
-	                 title: 'Validation Error',
-	                 text: 'Please Enter GPF Amount',
-	                 confirmButtonText: 'OK'
-	             });
-		            return; // Stop further execution if validation fails
-		        }
-	    }
-    
-    
-    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-    let earnedleaveAmount=null;   
-    if (selectedElValue === 'yes') {
-    	earnedleaveAmount = $('#earnedleaveAmount').val(); // Retrieve the amount if available, else null
-    	if (!earnedleaveAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter EL/LPA Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    
-  
-    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-    let spfgsAmount=null;
-    if (selectedspfgsValue === 'yes') {
-    	spfgsAmount = $('#spfgsAmount').val(); // Retrieve the amount if available, else null
-    	if (!spfgsAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter SPFGS Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-       
-    //dcrf
-    let selecteddcrgValue = $('input[name="dcrg"]:checked').val();
-    
-    
-    let selectedPd = $('input[name="benefit_pension"]:checked').val();
-    let selectedPdAmount=null;
-    if (selectedPd === 'yes') {
- 	   selectedPdAmount = $('#benefit_pension_amount').val(); 
- 	   if (!selectedPdAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Pension Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    let selecteddcrg = $('input[name="benefit_dcrg"]:checked').val();
-    let seldcrgAmount=null;
-    if (selecteddcrg === 'yes') {
-    	seldcrgAmount = $('#benefit_dcrg_amount').val(); 
-  	   if (!seldcrgAmount) {
-              Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error',
-                  text: 'Please Enter DCRG Benefit Amount',
-                  confirmButtonText: 'OK'
-              });
- 	            return; // Stop further execution if validation fails
- 	        }
-     }
-    
-    let selectedcom = $('input[name="benefit_commutation"]:checked').val();
-    let selectedcomAmount=null;
-    if (selectedcom === 'yes') {
- 	   selectedcomAmount = $('#benefit_commutation_amount').val(); 
- 	   if (!selectedcomAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Commutation Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-	       
-  	    let entryDetails = {
-  	    	empNo:empNo,
-  	      	tempId: tempId, // Pass the stored tempId value		
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim(),
-  	       gpf: selectedGpfValue, // Add GPF value (null if none selected)
-  	       gpfAmount: gpfAmount, // Include the GPF amount
-  	       private_affairs:selectedElValue,
-  	       private_affairs_amount:earnedleaveAmount,
-  	       spfgs:selectedspfgsValue,
-  	       spfgs_amount:spfgsAmount,
-  	       recovery_emp:$('#recoveryemployeevalue').val()|| null,      	       
-  	       dcrg:selecteddcrgValue,
-  	       pension_number:$('#pensionNumber').val(),
-	        ledger_number:$('#ledgerNumber').val(),
-	      	benefit_pension:selectedPd,
-	      	benefit_dcrg:selecteddcrg,
-	    	benefit_commutation:selectedcom,
-	        benefit_pension_amount:selectedPdAmount,
-	        benefit_dcrg_amount:seldcrgAmount,
-	        benefit_commutation_amount:selectedcomAmount
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	   
-  	    
-  	  if (!entryDetails.dcrg) {
-          Swal.fire({
-              icon: 'warning',
-              title: 'Validation Error!',
-              text: 'DCRG are required.',
-              confirmButtonText: 'OK'
-          });
-          return;
-      }
-
-  	  
-  	  
-  	 if (!entryDetails.spfgs) {
-         Swal.fire({
-             icon: 'warning',
-             title: 'Validation Error!',
-             text: 'SPFGS are required.',
-             confirmButtonText: 'OK'
-         });
-         return;
-     }
-  	 
-  	 
-  	 
-  	 if (!entryDetails.private_affairs) {
-         Swal.fire({
-             icon: 'warning',
-             title: 'Validation Error!',
-             text: 'Private affairs are required.',
-             confirmButtonText: 'OK'
-         });
-         return;
-     }
-  	 
-  	 
-  	 if (!entryDetails.gpf) {
-         Swal.fire({
-             icon: 'warning',
-             title: 'Validation Error!',
-             text: 'GPF are required.',
-             confirmButtonText: 'OK'
-         });
-         return;
-     }
-  	 
-  	if (!entryDetails.remarks) {
-        Swal.fire({
-            icon: 'warning',
-            title: 'Validation Error!',
-            text: 'Remarks are required.',
-            confirmButtonText: 'OK'
-        });
-        return;
-    }
-  	 
-  	 
-  		// Disable the button to prevent multiple submissions
-  	      $('#auditsubmit').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/department/partial/updateEmployeeDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-	                        	window.location.href = "/gcc/department/partial/familypension";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-
-	 
-	 //amount field validation
-	 
-	 function validatePositiveNumber(input) {
-		    if (input.value < 1) {
-		        input.value = "";
-		    }
-		}
-
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/partial/pendency.html b/src/main/resources/templates/modules/pensioner/department/partial/pendency.html
deleted file mode 100644
index 09202149..00000000
--- a/src/main/resources/templates/modules/pensioner/department/partial/pendency.html
+++ /dev/null
@@ -1,1188 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-     #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-
-    
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                   <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Pendency</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Partially Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">Partially Completed - 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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-                
-                <!--  page loader-->
-  
-  
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Partially Completed - Pendency (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                
-			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <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-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-4">
-										    <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="text" id="pendingDurationInputContainer" style="display: none; margin-top: 10px;">
-										        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control" placeholder="Enter details for pending duration" readonly>
-										    </div>
-										</div>
-			                    
-			                    
-			                    <!-- Type of Retirement -->
-			                    <div class="col-md-4">
-			                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-			                        <input type="text" id="typeofretirement" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Received From Department </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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" readonly></textarea>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-
-						</div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Edit Benefits</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">	
-			            <p style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</p>		           
-			            	<div class="row mt-2" id="sec2">	                		
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						<hr>
-						<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">
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		</div>
-	                   		
-	                   		<div class="row mt-2">
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2" id="dcrgCard" style="display: none;">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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>
-			            <hr>
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile "  class="form-label fw-bold">Date File Completed <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly>
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditsubmit">Mark as Completed</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			            
-			            
-			            
-			            
-					           
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-
-document.getElementById("submitbutton").addEventListener("click", function () {
-    // Clear the inputs in the receivedcard section
-    //$('#datefile').val('');
-    $('#remarks').val('');
-    
-    // Make the receivedcard section visible
-    document.getElementById("receivedcard").style.display = "block";
-
-    // Scroll the receivedcard section into view
-    document.getElementById("receivedcard").scrollIntoView({
-        behavior: "smooth", // Smooth scrolling effect
-        block: "center" // Aligns the element to the center of the viewport
-    });
-});
-	
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	               $('#classes').val(employeeDetails.retirement_class);
-	 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                
-	 	               
-	 	              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);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	            	   
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-	                        } else {
-	                            $('#gpfAmountDiv').hide();
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                        }
-	                        //recover emp
- 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        if(employeeDetails.dcrg ==="yes"){
-	                        	$('#dcrgCard').show();
-	                        }else{
-	                        	$('#dcrgCard').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);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount).prop('readonly',true);
-	                          //  bpYes bpNo PbAmountDiv benefit_pension_amount
-	                            $('#bpYes').prop('checked', true);
-			                     $('#bpNo').prop('disabled', true);
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                            $('#bpNo').prop('checked', true);
-			                     $('#bpYes').prop('disabled', true);
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount).prop('readonly',true);
-	                            // DcrgYes DcrgNo dcrgAmountDiv benefit_dcrg_amount
-	                            $('#DcrgYes').prop('checked', true);
-			                     $('#DcrgNo').prop('disabled', true);
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                            $('#DcrgNo').prop('checked', true);
-			                     $('#DcrgYes').prop('disabled', true);
-	                            
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount).prop('readonly',true);
-	                            // commutationYes commutationNo CommutationAmountDiv benefit_commutation_amount
-	                            $('#commutationYes').prop('checked', true);
-			                     $('#commutationNo').prop('disabled', true);
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                            $('#commutationNo').prop('checked', true);
-			                     $('#commutationYes').prop('disabled', true);
-	                        }
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    //$('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	    });
-	 	                
-	 	               /*  document.getElementById('auditsubmit').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	        		
-	 	              $('#auditsubmit').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	 // Listen for changes on the GPF radio buttons
-	    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-	            if (this.value === 'yes' || this.value === '90') {
-	                gpfAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	                gpfAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('gpfAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 // Listen for changes on the private affaires radio buttons
-	    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-	            if (this.value === 'yes') {
-	            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	 // Listen for changes on the spfgs radio buttons
-	    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-	            if (this.value === 'yes') {
-	            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 
-	    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const PbAmountDiv = document.getElementById('PbAmountDiv');
-	            if (this.value === 'yes') {
-	            	PbAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	PbAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-	            if (this.value === 'yes') {
-	            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-	            if (this.value === 'yes') {
-	            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	});
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
- const options = {
-     day: '2-digit',
-     month: '2-digit',
-     year: 'numeric',
- };
- return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-
-	 
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);
-	       
-	       let selectedGpfValue = $('input[name="gpf"]:checked').val(); // Get the selected radio button value
-    		let gpfAmount = null;
-
-	    // Check if GPF Amount input is visible and get its value
-	    if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-	        gpfAmount = $('#gpfAmount').val(); // Retrieve the amount if available, else null
-	        if (!gpfAmount) {
-	             Swal.fire({
-	                 icon: 'warning',
-	                 title: 'Validation Error',
-	                 text: 'Please Enter GPF Amount',
-	                 confirmButtonText: 'OK'
-	             });
-		            return; // Stop further execution if validation fails
-		        }
-	    }
-    
-    
-    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-    let earnedleaveAmount=null;   
-    if (selectedElValue === 'yes') {
-    	earnedleaveAmount = $('#earnedleaveAmount').val(); // Retrieve the amount if available, else null
-    	if (!earnedleaveAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter EL/LPA Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    
-  
-    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-    let spfgsAmount=null;
-    if (selectedspfgsValue === 'yes') {
-    	spfgsAmount = $('#spfgsAmount').val(); // Retrieve the amount if available, else null
-    	if (!spfgsAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter SPFGS Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-       
-    //dcrf
-    let selecteddcrgValue = $('input[name="dcrg"]:checked').val();
-    
-    
-    let selectedPd = $('input[name="benefit_pension"]:checked').val();
-    let selectedPdAmount=null;
-    if (selectedPd === 'yes') {
- 	   selectedPdAmount = $('#benefit_pension_amount').val(); 
- 	   if (!selectedPdAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Pension Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    let selecteddcrg = $('input[name="benefit_dcrg"]:checked').val();
-    let seldcrgAmount=null;
-    if (selecteddcrg === 'yes') {
-    	seldcrgAmount = $('#benefit_dcrg_amount').val(); 
-  	   if (!seldcrgAmount) {
-              Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error',
-                  text: 'Please Enter DCRG Benefit Amount',
-                  confirmButtonText: 'OK'
-              });
- 	            return; // Stop further execution if validation fails
- 	        }
-     }
-    
-    let selectedcom = $('input[name="benefit_commutation"]:checked').val();
-    let selectedcomAmount=null;
-    if (selectedcom === 'yes') {
- 	   selectedcomAmount = $('#benefit_commutation_amount').val(); 
- 	   if (!selectedcomAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Commutation Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-	       
-  	    let entryDetails = {
-  	    	empNo:empNo,
-  	      	tempId: tempId, // Pass the stored tempId value		
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim(),
-  	       gpf: selectedGpfValue, // Add GPF value (null if none selected)
-  	       gpfAmount: gpfAmount, // Include the GPF amount
-  	       private_affairs:selectedElValue,
-  	       private_affairs_amount:earnedleaveAmount,
-  	       spfgs:selectedspfgsValue,
-  	       spfgs_amount:spfgsAmount,
-  	       recovery_emp:$('#recoveryemployeevalue').val()|| null,      	       
-  	       dcrg:selecteddcrgValue,
-  	       pension_number:$('#pensionNumber').val(),
-	        ledger_number:$('#ledgerNumber').val(),
-	      	benefit_pension:selectedPd,
-	      	benefit_dcrg:selecteddcrg,
-	    	benefit_commutation:selectedcom,
-	        benefit_pension_amount:selectedPdAmount,
-	        benefit_dcrg_amount:seldcrgAmount,
-	        benefit_commutation_amount:selectedcomAmount
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	    
-  	  if (!entryDetails.dcrg) {
-          Swal.fire({
-              icon: 'warning',
-              title: 'Validation Error!',
-              text: 'DCRG are required.',
-              confirmButtonText: 'OK'
-          });
-          return;
-      }
-
-  	  
-  	  
-  	 if (!entryDetails.spfgs) {
-         Swal.fire({
-             icon: 'warning',
-             title: 'Validation Error!',
-             text: 'SPFGS are required.',
-             confirmButtonText: 'OK'
-         });
-         return;
-     }
-  	 
-  	 
-  	 
-  	 if (!entryDetails.private_affairs) {
-         Swal.fire({
-             icon: 'warning',
-             title: 'Validation Error!',
-             text: 'Private affairs are required.',
-             confirmButtonText: 'OK'
-         });
-         return;
-     }
-  	 
-  	 
-  	 if (!entryDetails.gpf) {
-         Swal.fire({
-             icon: 'warning',
-             title: 'Validation Error!',
-             text: 'GPF are required.',
-             confirmButtonText: 'OK'
-         });
-         return;
-     }
-  	 
-  	if (!entryDetails.remarks) {
-        Swal.fire({
-            icon: 'warning',
-            title: 'Validation Error!',
-            text: 'Remarks are required.',
-            confirmButtonText: 'OK'
-        });
-        return;
-    }
-
-   
-  		// Disable the button to prevent multiple submissions
-  	      $('#auditsubmit').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/department/partial/updateEmployeeDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-	                        	window.location.href = "/gcc/department/partial/pendency";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-
-		
-	 
-	 //amount field validation
-	 
-	 function validatePositiveNumber(input) {
-		    if (input.value < 1) {
-		        input.value = "";
-		    }
-		}
-		    
-		    
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/partial/retirement.html b/src/main/resources/templates/modules/pensioner/department/partial/retirement.html
deleted file mode 100644
index 12ef9c1c..00000000
--- a/src/main/resources/templates/modules/pensioner/department/partial/retirement.html
+++ /dev/null
@@ -1,1159 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-     #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-
-    
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Retirement</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Partially Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">Partially Completed - Retirement</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-                
-                <!--  page loader-->
-  
-  
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Partially Completed - Retirement (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                
-			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <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>
-			                    
-			                    <!-- Class -->
-			                    <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>
-			                    
-			                    <!-- Type of Retirement -->
-			                    <div class="col-md-4">
-			                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-			                        <input type="text" id="typeofretirement" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Received From Department</label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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"  readonly></textarea>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-
-						</div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Edit Benefits</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">	
-			            <p style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</p>		           
-			            	<div class="row mt-2" id="sec2">	                		
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						<hr>
-						<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" >
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		</div>
-	                   		
-	                   		<div class="row mt-2">
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2" id="dcrgCard" style="display: none;">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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>
-			            <hr>
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile"  class="form-label fw-bold">Date File Completed <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly="readonly">
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditsubmit">Mark as Completed</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			            
-			            
-			            
-			            
-					           
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	
-	document.getElementById("submitbutton").addEventListener("click", function () {
-	    // Clear the inputs in the receivedcard section
-	    //$('#datefile').val('');
-	    $('#remarks').val('');
-	    
-	    // Make the receivedcard section visible
-	    document.getElementById("receivedcard").style.display = "block";
-
-	    // Scroll the receivedcard section into view
-	    document.getElementById("receivedcard").scrollIntoView({
-	        behavior: "smooth", // Smooth scrolling effect
-	        block: "center" // Aligns the element to the center of the viewport
-	    });
-	});	
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	                $('#classes').val(employeeDetails.retirement_class);
-	 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                
-	 	               
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	            	   
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-	                        } else {
-	                            $('#gpfAmountDiv').hide();
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                        }
-	                        //recover emp
- 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        if(employeeDetails.dcrg ==="yes"){
-	                        	$('#dcrgCard').show();
-	                        }else{
-	                        	$('#dcrgCard').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);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount).prop('readonly',true);
-	                          //  bpYes bpNo PbAmountDiv benefit_pension_amount
-	                            $('#bpYes').prop('checked', true);
-			                     $('#bpNo').prop('disabled', true);
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                            $('#bpNo').prop('checked', true);
-			                     $('#bpYes').prop('disabled', true);
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount).prop('readonly',true);
-	                            // DcrgYes DcrgNo dcrgAmountDiv benefit_dcrg_amount
-	                            $('#DcrgYes').prop('checked', true);
-			                     $('#DcrgNo').prop('disabled', true);
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                            $('#DcrgNo').prop('checked', true);
-			                     $('#DcrgYes').prop('disabled', true);
-	                            
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount).prop('readonly',true);
-	                            // commutationYes commutationNo CommutationAmountDiv benefit_commutation_amount
-	                            $('#commutationYes').prop('checked', true);
-			                     $('#commutationNo').prop('disabled', true);
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                            $('#commutationNo').prop('checked', true);
-			                     $('#commutationYes').prop('disabled', true);
-	                        }
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    //$('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditsubmit').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	                
-	 	                
-	 	               $('#auditsubmit').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	 // Listen for changes on the GPF radio buttons
-	    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-	            if (this.value === 'yes' || this.value === '90') {
-	                gpfAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	                gpfAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('gpfAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 // Listen for changes on the private affaires radio buttons
-	    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-	            if (this.value === 'yes') {
-	            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	 // Listen for changes on the spfgs radio buttons
-	    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-	            if (this.value === 'yes') {
-	            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 
-	    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const PbAmountDiv = document.getElementById('PbAmountDiv');
-	            if (this.value === 'yes') {
-	            	PbAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	PbAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-	            if (this.value === 'yes') {
-	            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-	            if (this.value === 'yes') {
-	            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	});
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
- const options = {
-     day: '2-digit',
-     month: '2-digit',
-     year: 'numeric',
- };
- return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-
-	 
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);
-	       
-	       let selectedGpfValue = $('input[name="gpf"]:checked').val(); // Get the selected radio button value
-    		let gpfAmount = null;
-
-	    // Check if GPF Amount input is visible and get its value
-	    if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-	        gpfAmount = $('#gpfAmount').val(); // Retrieve the amount if available, else null
-	        if (!gpfAmount) {
-	             Swal.fire({
-	                 icon: 'warning',
-	                 title: 'Validation Error',
-	                 text: 'Please Enter GPF Amount',
-	                 confirmButtonText: 'OK'
-	             });
-		            return; // Stop further execution if validation fails
-		        }
-	    }
-    
-    
-    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-    let earnedleaveAmount=null;   
-    if (selectedElValue === 'yes') {
-    	earnedleaveAmount = $('#earnedleaveAmount').val(); // Retrieve the amount if available, else null
-    	if (!earnedleaveAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter EL/LPA Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    
-  
-    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-    let spfgsAmount=null;
-    if (selectedspfgsValue === 'yes') {
-    	spfgsAmount = $('#spfgsAmount').val(); // Retrieve the amount if available, else null
-    	if (!spfgsAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter SPFGS Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-       
-    //dcrf
-    let selecteddcrgValue = $('input[name="dcrg"]:checked').val();
-    
-    
-    let selectedPd = $('input[name="benefit_pension"]:checked').val();
-    let selectedPdAmount=null;
-    if (selectedPd === 'yes') {
- 	   selectedPdAmount = $('#benefit_pension_amount').val(); 
- 	   if (!selectedPdAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Pension Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    let selecteddcrg = $('input[name="benefit_dcrg"]:checked').val();
-    let seldcrgAmount=null;
-    if (selecteddcrg === 'yes') {
-    	seldcrgAmount = $('#benefit_dcrg_amount').val(); 
-  	   if (!seldcrgAmount) {
-              Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error',
-                  text: 'Please Enter DCRG Benefit Amount',
-                  confirmButtonText: 'OK'
-              });
- 	            return; // Stop further execution if validation fails
- 	        }
-     }
-    
-    let selectedcom = $('input[name="benefit_commutation"]:checked').val();
-    let selectedcomAmount=null;
-    if (selectedcom === 'yes') {
- 	   selectedcomAmount = $('#benefit_commutation_amount').val(); 
- 	   if (!selectedcomAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Commutation Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-	       
-  	    let entryDetails = {
-  	    	empNo:empNo,
-  	      	tempId: tempId, // Pass the stored tempId value		
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim(),
-  	       gpf: selectedGpfValue, // Add GPF value (null if none selected)
-  	       gpfAmount: gpfAmount, // Include the GPF amount
-  	       private_affairs:selectedElValue,
-  	       private_affairs_amount:earnedleaveAmount,
-  	       spfgs:selectedspfgsValue,
-  	       spfgs_amount:spfgsAmount,
-  	       recovery_emp:$('#recoveryemployeevalue').val()|| null,      	       
-  	       dcrg:selecteddcrgValue,
-  	       pension_number:$('#pensionNumber').val(),
-	        ledger_number:$('#ledgerNumber').val(),
-	      	benefit_pension:selectedPd,
-	      	benefit_dcrg:selecteddcrg,
-	    	benefit_commutation:selectedcom,
-	        benefit_pension_amount:selectedPdAmount,
-	        benefit_dcrg_amount:seldcrgAmount,
-	        benefit_commutation_amount:selectedcomAmount
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-
-  	    
-  	  if (!entryDetails.dcrg) {
-          Swal.fire({
-              icon: 'warning',
-              title: 'Validation Error!',
-              text: 'DCRG are required.',
-              confirmButtonText: 'OK'
-          });
-          return;
-      }
-
-  	  
-  	  
-  	 if (!entryDetails.spfgs) {
-         Swal.fire({
-             icon: 'warning',
-             title: 'Validation Error!',
-             text: 'SPFGS are required.',
-             confirmButtonText: 'OK'
-         });
-         return;
-     }
-  	 
-  	 
-  	 
-  	 if (!entryDetails.private_affairs) {
-         Swal.fire({
-             icon: 'warning',
-             title: 'Validation Error!',
-             text: 'Private affairs are required.',
-             confirmButtonText: 'OK'
-         });
-         return;
-     }
-  	 
-  	 
-  	 if (!entryDetails.gpf) {
-         Swal.fire({
-             icon: 'warning',
-             title: 'Validation Error!',
-             text: 'GPF are required.',
-             confirmButtonText: 'OK'
-         });
-         return;
-     }
-  	 
-
-  	 
-  	if (!entryDetails.remarks) {
-        Swal.fire({
-            icon: 'warning',
-            title: 'Validation Error!',
-            text: 'Remarks are required.',
-            confirmButtonText: 'OK'
-        });
-        return;
-    }
-  	    
-  	  
-  		// Disable the button to prevent multiple submissions
-  	      $('#auditsubmit').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/department/partial/updateEmployeeDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-	                        	window.location.href = "/gcc/department/partial/retirement";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-
-		
-	 
-	 //amount field validation
-	 
-	 function validatePositiveNumber(input) {
-		    if (input.value < 1) {
-		        input.value = "";
-		    }
-		}
-		    
-		    
-		    
-		    
-		    		     
-		     
-
-
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/received/familypension.html b/src/main/resources/templates/modules/pensioner/department/received/familypension.html
deleted file mode 100644
index b34fe358..00000000
--- a/src/main/resources/templates/modules/pensioner/department/received/familypension.html
+++ /dev/null
@@ -1,998 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-   
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-4,.col-md-12{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-    
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-    .form-check-label{
-    	padding-top: 4%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <div class="d-inline">	
-                                        <h5>Family Pension</h5>
-                                       <span>Department Entries </span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received From Pension</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">Received From Pension - Family Pension</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">
-					                <table id="ReturnRetriedDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>					
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					               
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                       
-					                       <!-- Thymeleaf loop to populate data -->
-								            <tr th:each="received, iterStat : ${receivedlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${received['emp_no']}" class="text-center"></td>
-								                <td th:text="${received['emp_name']}" class="text-center"></td>
-								                <td th:text="${received['dept_name']}" class="text-center"></td>
-								                <td th:text="${received['designation']}" class="text-center"></td>
-								                <td th:text="${received['file_moved_date'] != null ? #dates.format(received['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>								               
-								                <td th:text="${received['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${received['emp_no']}, data-temp-id=${received['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                       
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-   
-<!--  Modal Box -->    
-<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="detailsModalLabel">
-                    Received From Pension - Family Pension (<span id="modalEmployeeCode"></span>)
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Employee No -->
-                    <div class="col-md-4">
-                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-                        <input type="number" id="employeenomodel" class="form-control" readonly>
-                    </div>
-
-                    <!-- Employee Name -->
-                    <div class="col-md-4">
-                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-                        <input type="text" id="employeename" class="form-control" readonly>
-                    </div>
-
-                    <!-- Department -->
-                    <div class="col-md-4">
-                        <label for="department" class="form-label fw-bold">Department </label>
-                        <input type="text" id="department" class="form-control" readonly>
-                    </div>
-
-                    <!-- Designation -->
-                    <div class="col-md-4">
-                        <label for="designation" class="form-label fw-bold">Designation </label>
-                        <input type="text" id="designation" class="form-control" readonly>
-                    </div>
-                    
-                   									
-				<div class="col-md-4">
-					    <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" placeholder="Enter details for pending duration" readonly>
-					    </div>
-					</div>
-					
-	                  <div class="col-md-4">
-					    <label for="servicedeath" class="form-label fw-bold">While In Service Death </label>
-					    <div class="dropdown">
-	                           <input type="date" id="servicedeath" class="form-control"  readonly>
-	                       </div>
-					</div>
-					
-					 <div class="col-md-4">
-					    <label for="deceased" class="form-label fw-bold">Relationship of Deceased</label>
-					    <div class="dropdown">
-	                           <input type="text" id="deceased" class="form-control" readonly>
-	                       </div>
-					</div>
-					
-					<div class="col-md-4">
-	                       <label for="sanctionedgis" class="form-label fw-bold">Sanctioned GIS</label>
-	                       <div class="dropdown">
-	                           <input type="number" id="sanctionedgis" class="form-control" readonly>
-	                       </div>
-	                   </div>
-                    
-                    <!-- Date File Sent to Audit -->
-                    <div class="col-md-4">
-                        <label for="datefile_modal" class="form-label fw-bold">File Forward to Department Date </label>
-                        <input type="date" id="datefile_modal" class="form-control" readonly>
-                    </div>
-
-                    <!-- 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" readonly></textarea>
-                    </div>
-                     
-                    <!-- new -->
-
-					<div class="col-md-12 mt-4">
-						<h5>File History</h5>
-							<div id="fileHistoryContainer" class="file-history-list">
-								<!-- File History will be dynamically loaded here -->
-						</div>
-					</div>  
-                                                         
-                </div>
-                <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Add Zone/Department Benefits</button>
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div>
-	            
-	            <div style="display :none" id="receivedcard">
-	                <div class="row">
-	                
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						<div class="row">
-	                    <!-- Date File Forwarded to Pension  -->
-			            <div class="col-md-4">
-	                        <label for="datefile" class="form-label fw-bold">Date File Forwarded to Pension <span class="text-danger">*</span></label>
-	                        <input type="text" id="datefile" class="form-control" readonly>
-		                </div>
-		                
-			             <!-- Remarks -->       
-			            <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>
-		                </div>	
-		                
-		               
-
-			           </div>
-			            <div class="row mb-2 mt-2">
-					        <div class="col-md-12 d-flex justify-content-center">
-					            <button type="button" class="btn btn-primary" id="sendtopension">Submit</button>
-					        </div>
-			              </div>				               
-			               
-			         </div>
-	            
-	            
-            </div>
-
-            
-
-        </div>
-    </div>
-</div>
-		
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-		
-		$(document).ready(function () {
-		    // Initialize DataTable
-		    const table = $('#ReturnRetriedDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-		    
-		    
-		    
-		    
-
-		    
-		    document.getElementById("submitbutton").addEventListener("click", function () {
-			    // Clear the inputs in the receivedcard section
-			    //$('#datefile').val('');
-			    $('#remarks').val('');
-			    
-			    // Make the receivedcard section visible
-			    document.getElementById("receivedcard").style.display = "block";
-			
-			    // Scroll the receivedcard section into view
-			    document.getElementById("receivedcard").scrollIntoView({
-			        behavior: "smooth", // Smooth scrolling effect
-			        block: "center" // Aligns the element to the center of the viewport
-			    });
-			});
-		    
-		    
-		 // Listen for changes on the GPF radio buttons
-		    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-		            if (this.value === 'yes' || this.value === '90') {
-		                gpfAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		                gpfAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('gpfAmount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		 // Listen for changes on the private affaires radio buttons
-		    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-		            if (this.value === 'yes') {
-		            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		    
-		 // Listen for changes on the spfgs radio buttons
-		    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-		            if (this.value === 'yes') {
-		            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		 
-		 
-
-		});	
-		
-		//model function
-		 function fetchEmployeeDetails(tempId) {
-		 	    $.ajax({
-		 	        url: '/gcc/api/department/audit/getzonebenefitsdetails', // API to fetch employee details
-		 	        type: 'GET',
-		 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-		 	        success: function (response) {
-		 	            if (response && response.length > 0) {
-		 	            	
-		 	            	let employeeDetails = response[0]; // Access the first object in the array
-		 	            	console.log("response:",response);
-		 	            	
-		 	            	
-		 	                // Populate modal fields
-		 	                $('#employeenomodel').val(employeeDetails.emp_no);
-		 	                $('#employeename').val(employeeDetails.emp_name);
-		 	                $('#department').val(employeeDetails.dept_name);
-		 	                $('#designation').val(employeeDetails.designation);
-		 	             // 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);
-		 	                }
-		 	                
-		 	                $('#servicedeath').val(employeeDetails.service_death);
-		 	                $('#deceased').val(employeeDetails.relationship_deceased);
-		 	                $('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
-		 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-		 	               	$('#remarks_modal').val(employeeDetails.remarks);
-			 	           
-		 	               //pendingDuration,yes,no,servicedeath,deceased,sanctionedgis
-		 	               
-		 	                // Update the modal title with the employee code
-		 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-		 	                // Show the modal
-		 	                $('#returnretrieddetailsModal').modal('show');
-		 	                
-		 	                let status=employeeDetails.file_status;
-		 	                console.log("status=:"+status);
-		 	                
-		 	              	 	             	
-		 	             	
-		 	             	$('#submitbutton').off('click').on('click', function() {
-		 	                    if (status === 6) {
-		 	                        $('#receivedcard').show();
-
-		 	                        // GPF
-		 	                        $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-		 	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-		 	                            $('#gpfAmountDiv').show();
-		 	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-		 	                        } else {
-		 	                            $('#gpfAmountDiv').hide();
-		 	                        }
-
-		 	                        // Earned Leave & Leave on Private Affairs
-		 	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-		 	                        if (employeeDetails.private_affairs === "yes") {
-		 	                            $('#earnedleaveAmountDiv').show();
-		 	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-		 	                        } else {
-		 	                            $('#earnedleaveAmountDiv').hide();
-		 	                        }
-
-		 	                        // SPFGS
-		 	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-		 	                        if (employeeDetails.spfgs === "yes") {
-		 	                            $('#spfgsAmountDiv').show();
-		 	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-		 	                        } else {
-		 	                            $('#spfgsAmountDiv').hide();
-		 	                        }
-		 	                       //recover emp
-		 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-		 	                        // DCRG File
-		 	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-		 	                        
-		 	                       //$('#datefile').val('');
-		 	                        //$('#remarks').val('');
-		 	                    } 
-
-		 	                    if (status === 5) {
-		 	                        $('#gpfAmount').val('');
-		 	                        $('#earnedleaveAmount').val('');
-		 	                        $('#spfgsAmount').val('');
-		 	                        $('#recoveryemployeevalue').val('');
-		 	                        //$('#datefile').val('');
-		 	                        //$('#remarks').val('');
-
-		 	                        $('input[name="gpf"]').prop('checked', false);
-		 	                        $('input[name="earnedleave"]').prop('checked', false);
-		 	                        $('input[name="spfgs"]').prop('checked', false);
-		 	                        $('input[name="dcrg"]').prop('checked', false);
-
-		 	                        $('#gpfAmountDiv').hide();
-		 	                        $('#earnedleaveAmountDiv').hide();
-		 	                        $('#spfgsAmountDiv').hide();
-
-		 	                        $('#receivedcard').show();
-		 	                    }
-		 	                });
-		 	                
-		 	                /* document.getElementById('sendtopension').addEventListener('click', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-		 	                    // Trigger the save function and pass the value
-		 	                    saveEntryDetails(tempId,employeeNo);
-		 	        		}); */
-		 	                
-		 	                
-		 	               $('#sendtopension').off('click').on('click', function () {
-		 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-		 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-		 	            	});
-		 	                
-		 	             	
-		 	                
-		 	            } else {
-		 	                Swal.fire({
-		 	                    icon: 'info',
-		 	                    title: 'No Data',
-		 	                    text: 'No details found for the selected employee.',
-		 	                    confirmButtonText: 'OK',
-		 	                });
-		 	            }
-		 	        },
-		 	        error: function () {
-		 	            Swal.fire({
-		 	                icon: 'error',
-		 	                title: 'Error',
-		 	                text: 'Failed to fetch employee details. Please try again.',
-		 	                confirmButtonText: 'OK',
-		 	            });
-		 	        },
-		 	    });
-		 	}
-		
-$(document).ready(function () {
-	    	 
-	    	 $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		});
-
-
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#returnretrieddetailsModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-		   
-		    // Handle close button click
-		    $('#back').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    $('.close').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		        
-		    });
-		});
-		
-function loadFileHistory(tempId) {
-    $.ajax({
-        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-        type: 'GET',
-        data: { tempId: tempId }, // Pass empCode as a parameter
-        success: function (response) {
-            if (response.length > 0) {
-                let historyHtml = '';
-                response.forEach(item => {
-                    historyHtml += `
-                        <div class="file-history-item">
-                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-                            <div class="file-history-content">
-                                <div class="file-history-status">${item.fileStatusHistory}</div>
-                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-                            </div>
-                        </div>
-                    `;
-                });
-
-
-
-                $('#fileHistoryContainer').html(historyHtml);
-            } else {
-                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-            }
-        },
-        error: function () {
-            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-        }
-    });
-}
-
-	// Function to format date and time
-	function formatDateTime(dateString) {
-	const options = {
-	day: '2-digit',
-	month: '2-digit',
-	year: 'numeric',
-	};
-	return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-		
-	
-function saveEntryDetails(tempId,empCode) {
-    //console.log("emp_no inside=="+empCode);
-    // Get the selected GPF value
-    let selectedGpfValue = $('input[name="gpf"]:checked').val(); // Get the selected radio button value
-    let gpfAmount = null;
-
-    if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-        gpfAmount = $('#gpfAmount').val(); // Retrieve the amount if available, else null
-        if(!gpfAmount){
-        	 Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error!',
-                 text: 'GPF amount are required.',
-                 confirmButtonText: 'OK'
-             });
-             return;
-        }
-    }
-    
-    
-    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-    let earnedleaveAmount=null;
-    
-    if (selectedElValue === 'yes') {
-    	earnedleaveAmount = $('#earnedleaveAmount').val();  // Retrieve the amount if available, else null
-    	 if(!earnedleaveAmount){
-        	 Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error!',
-                 text: 'Earned Leave Amount are required.',
-                 confirmButtonText: 'OK'
-             });
-             return;
-        }
-    }
-    
-  
-    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-    let spfgsAmount=null;
-    if (selectedspfgsValue === 'yes') {
-    	spfgsAmount = $('#spfgsAmount').val(); // Retrieve the amount if available, else null
-    	
-    	 if(!spfgsAmount){
-        	 Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error!',
-                 text: 'SPFGS amount are required.',
-                 confirmButtonText: 'OK'
-             });
-             return;
-        }
-    }
-    // Check if GPF Amount input is visible and get its value
-   /*  if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-        gpfAmount = $('#gpfAmount').val() || null; // Retrieve the amount if available, else null
-    }
-    
-    
-    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-    let earnedleaveAmount=null;
-    
-    if (selectedElValue === 'yes') {
-    	earnedleaveAmount = $('#earnedleaveAmount').val() || null; // Retrieve the amount if available, else null
-    }
-    
-  
-    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-    let spfgsAmount=null;
-    if (selectedspfgsValue === 'yes') {
-    	spfgsAmount = $('#spfgsAmount').val() || null; // Retrieve the amount if available, else null
-    } */
-    
-        
-    
-    //dcrf
-    let selecteddcrgValue = $('input[name="dcrg"]:checked').val();
-    
-   let entryDetails = {
-       empNo: empCode,
-       tempId:tempId,
-       file_moved_date: convertDateFormat($('#datefile').val()?.trim()),
-       remarks: $('#remarks').val(),
-       deptId:$('#deptId').text().trim(),
-       filemovedby:$('#userId').text().trim(),
-       gpf: selectedGpfValue, // Add GPF value (null if none selected)
-       gpfAmount: gpfAmount || null, // Include the GPF amount
-       private_affairs:selectedElValue,
-       private_affairs_amount:earnedleaveAmount || null,
-       spfgs:selectedspfgsValue,
-       spfgs_amount:spfgsAmount || null,
-       recovery_emp:$('#recoveryemployeevalue').val()|| null,       
-       dcrg:selecteddcrgValue	
-   };
-   
-   console.log("entryDetails:",entryDetails);
-
-   if (!entryDetails.dcrg) {
-       Swal.fire({
-           icon: 'warning',
-           title: 'Validation Error!',
-           text: 'DCRG are required.',
-           confirmButtonText: 'OK'
-       });
-       return;
-   }
-
-	  
-	  
-	 if (!entryDetails.spfgs) {
-      Swal.fire({
-          icon: 'warning',
-          title: 'Validation Error!',
-          text: 'SPFGS are required.',
-          confirmButtonText: 'OK'
-      });
-      return;
-  }
-	 
-	 
-	 
-	 if (!entryDetails.private_affairs) {
-      Swal.fire({
-          icon: 'warning',
-          title: 'Validation Error!',
-          text: 'Private affairs are required.',
-          confirmButtonText: 'OK'
-      });
-      return;
-  }
-	 
-	 
-	 if (!entryDetails.gpf) {
-      Swal.fire({
-          icon: 'warning',
-          title: 'Validation Error!',
-          text: 'GPF are required.',
-          confirmButtonText: 'OK'
-      });
-      return;
-  }
-	 
-	if (!entryDetails.remarks) {
-     Swal.fire({
-         icon: 'warning',
-         title: 'Validation Error!',
-         text: 'Remarks are required.',
-         confirmButtonText: 'OK'
-     });
-     return;
- }
-   
-   
-	
-   $('#sendtopension').prop('disabled', true).text('Processing...');
-   
-   $.ajax({
-       url: '/gcc/api/department/received/updateEmployeeDetails',
-       type: 'POST',
-       contentType: 'application/json',
-       data: JSON.stringify(entryDetails),
-       success: function (response) {
-       	$('#sendtopension').prop('disabled', false).text('Submit');	
-           Swal.fire({
-               icon: 'success',
-               title: 'Success',
-               text: response,
-              	allowOutsideClick: false,
-             	allowEscapeKey: false,
-             	allowEnterKey: false,
-               confirmButtonText: 'OK'
-           }).then((result) => {
-                     if (result.isConfirmed) {
-                     	$('#sendtopension').prop('disabled', false).text('Submit');
-                     	window.location.href = "/gcc/department/received/familypension";
-                         console.log("Continue clicked");
-                     }
-           });
-       },
-       error: function (xhr, status, error) {
-       	$('#sendtopension').prop('disabled', false).text('Submit');	
-           Swal.fire({
-               icon: 'error',
-               title: 'Error',
-               text: 'Failed to save details. Please try again.',
-               confirmButtonText: 'OK'
-           });
-           console.error('Error:', xhr.responseText);
-       }
-   });  
-}
-
-
-document.querySelectorAll('input[name="pendingDuration"]').forEach(radio => {
-    radio.addEventListener('change', function () {
-        const pendingDurationInputContainer = document.getElementById('pendingDurationInputContainer');
-        if (this.value === 'yes') {
-        	pendingDurationInputContainer.style.display = 'block'; // Show the input field
-        } else {
-        	pendingDurationInputContainer.style.display = 'none'; // Hide the input field
-            document.getElementById('pendingDurationInput').value = ''; // Clear the input field
-        }
-    });
-});
-
-
-
-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;
-
-    
-});
-
-
-		function convertDateFormat(dateString) {
-			if (!dateString) return '';
-			let [day, month, year] = dateString.split('-');
-			return `${year}-${month}-${day}`;
-		}
-		
-		
-		//amount field validation
-		
-		function validatePositiveNumber(input) {
-			    if (input.value < 1) {
-			        input.value = "";
-			    }
-			}
-
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/received/pendency.html b/src/main/resources/templates/modules/pensioner/department/received/pendency.html
deleted file mode 100644
index 206a8f5b..00000000
--- a/src/main/resources/templates/modules/pensioner/department/received/pendency.html
+++ /dev/null
@@ -1,970 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-   
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-4,.col-md-12{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-    
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-    .form-check-label{
-    	padding-top: 4%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Pendency</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received From Pension</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">Received From Pension - 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">
-					                <table id="ReturnRetriedDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>					
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					               
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                       
-					                       <!-- Thymeleaf loop to populate data -->
-								            <tr th:each="received, iterStat : ${receivedlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${received['emp_no']}" class="text-center"></td>
-								                <td th:text="${received['emp_name']}" class="text-center"></td>
-								                <td th:text="${received['dept_name']}" class="text-center"></td>
-								                <td th:text="${received['designation']}" class="text-center"></td>
-								                <td th:text="${received['file_moved_date'] != null ? #dates.format(received['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>								               
-								                <td th:text="${received['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${received['emp_no']}, data-temp-id=${received['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                       
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-   
-<!--  Modal Box -->    
-<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="detailsModalLabel">
-                    Received From Pension - Pendency (<span id="modalEmployeeCode"></span>)
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Employee No -->
-                    <div class="col-md-4">
-                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-                        <input type="number" id="employeenomodel" class="form-control" readonly>
-                    </div>
-
-                    <!-- Employee Name -->
-                    <div class="col-md-4">
-                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-                        <input type="text" id="employeename" class="form-control" readonly>
-                    </div>
-
-                    <!-- Department -->
-                    <div class="col-md-4">
-                        <label for="department" class="form-label fw-bold">Department </label>
-                        <input type="text" id="department" class="form-control" readonly>
-                    </div>
-
-                    <!-- Designation -->
-                    <div class="col-md-4">
-                        <label for="designation" class="form-label fw-bold">Designation </label>
-                        <input type="text" id="designation" class="form-control" readonly>
-                    </div>
-                    
-                    <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>
-                    
-                    <!-- Class -->
-                    <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>
-					
-					<!-- Type of Retirement -->
-                    <div class="col-md-4">
-                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-                        <input type="text" id="typeofretirement" class="form-control" readonly>
-                    </div>
-                    
-                    <div class="col-md-4">
-					    <label for="pendingDuration" class="form-label fw-bold">
-					        Pending Duration
-					        <span class="text-danger">*</span>
-					    </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" placeholder="Enter details for pending duration" readonly>
-					    </div>
-					</div>
-                    
-                    <!-- Date File Sent to Audit -->
-                    <div class="col-md-4">
-                        <label for="datefile_modal" class="form-label fw-bold">File Forward to Department Date </label>
-                        <input type="date" id="datefile_modal" class="form-control" readonly>
-                    </div>
-
-                    <!-- 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" readonly></textarea>
-                    </div>
-                     
-                    <!-- new -->
-
-					<div class="col-md-12 mt-4">
-						<h5>File History</h5>
-							<div id="fileHistoryContainer" class="file-history-list">
-								<!-- File History will be dynamically loaded here -->
-						</div>
-					</div>  
-                                                         
-                </div>
-                <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Add Zone/Department Benefits</button>
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div>
-	            
-	            <div style="display :none" id="receivedcard">
-	                <div class="row">
-	                
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						<div class="row">
-	                    <!-- Date File Forwarded to Pension  -->
-			            <div class="col-md-4">
-	                        <label for="filedate" class="form-label fw-bold">Date File Forwarded to Pension <span class="text-danger">*</span></label>
-	                        <input type="text" id="filedate" class="form-control" readonly>
-		                </div>
-		                
-			             <!-- Remarks -->       
-			            <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" ></textarea>
-		                </div>	
-		                
-		               
-
-			           </div>
-			            <div class="row mb-2 mt-2">
-					        <div class="col-md-12 d-flex justify-content-center">
-					            <button type="button" class="btn btn-primary" id="sendtopension">Submit</button>
-					        </div>
-			              </div>				               
-			               
-			         </div>            
-            </div>
-
-        </div>
-    </div>
-</div>
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-		
-		$(document).ready(function () {
-		    // Initialize DataTable
-		    const table = $('#ReturnRetriedDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-		    
-		   
-		    document.getElementById("submitbutton").addEventListener("click", function () {
-			    // Clear the inputs in the receivedcard section
-			   //$('#filedate').val('');
-			    $('#remarks').val('');
-			    
-			    // Make the receivedcard section visible
-			    document.getElementById("receivedcard").style.display = "block";
-			
-			    // Scroll the receivedcard section into view
-			    document.getElementById("receivedcard").scrollIntoView({
-			        behavior: "smooth", // Smooth scrolling effect
-			        block: "center" // Aligns the element to the center of the viewport
-			    });
-			});
-		    
-		    
-		 // Listen for changes on the GPF radio buttons
-		    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-		            if (this.value === 'yes' || this.value === '90') {
-		                gpfAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		                gpfAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('gpfAmount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		 // Listen for changes on the private affaires radio buttons
-		    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-		            if (this.value === 'yes') {
-		            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		    
-		 // Listen for changes on the spfgs radio buttons
-		    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-		            if (this.value === 'yes') {
-		            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		 
-		 
-
-		});	
-		
-		//model function
-		 function fetchEmployeeDetails(tempId) {
-		 	    $.ajax({
-		 	        url: '/gcc/api/department/audit/getzonebenefitsdetails', // API to fetch employee details
-		 	        type: 'GET',
-		 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-		 	        success: function (response) {
-		 	            if (response && response.length > 0) {
-		 	            	
-		 	            	let employeeDetails = response[0]; // Access the first object in the array
-		 	            	console.log("response:",response);
-		 	            	
-		 	            	
-		 	                // 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);
-		 	                $('#classes').val(employeeDetails.retirement_class);
-		 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-		 	               	$('#remarks_modal').val(employeeDetails.remarks);
-			 	            $('#retirementdate').val(employeeDetails.retirement_date);
-		 	                
-		 	               
-			                 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);
-
-		 	                // Show the modal
-		 	                $('#returnretrieddetailsModal').modal('show');
-		 	                
-		 	                let status=employeeDetails.file_status;
-		 	                console.log("status=:"+status);
-		 	                
-		 	             
-		 	             	
-		 	             	
-		 	             	$('#submitbutton').off('click').on('click', function() {
-		 	                    if (status === 6) {
-		 	                        $('#receivedcard').show();
-
-		 	                        // GPF
-		 	                        $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-		 	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "50") {
-		 	                            $('#gpfAmountDiv').show();
-		 	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-		 	                        } else {
-		 	                            $('#gpfAmountDiv').hide();
-		 	                        }
-
-		 	                        // Earned Leave & Leave on Private Affairs
-		 	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-		 	                        if (employeeDetails.private_affairs === "yes") {
-		 	                            $('#earnedleaveAmountDiv').show();
-		 	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-		 	                        } else {
-		 	                            $('#earnedleaveAmountDiv').hide();
-		 	                        }
-
-		 	                        // SPFGS
-		 	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-		 	                        if (employeeDetails.spfgs === "yes") {
-		 	                            $('#spfgsAmountDiv').show();
-		 	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-		 	                        } else {
-		 	                            $('#spfgsAmountDiv').hide();
-		 	                            
-		 	                        }
-		 	                        //recover emp
-		 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-		 	                        // DCRG File
-		 	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-		 	                        
-		 	                       //$('#filedate').val('');
-		 	                        //$('#remarks').val('');
-		 	                    } 
-
-		 	                    if (status === 5) {
-		 	                        $('#gpfAmount').val('');
-		 	                        $('#earnedleaveAmount').val('');
-		 	                        $('#spfgsAmount').val('');
-		 	                        $('#recoveryemployeevalue').val('');
-		 	                        //$('#filedate').val('');
-		 	                        //$('#remarks').val('');
-
-		 	                        $('input[name="gpf"]').prop('checked', false);
-		 	                        $('input[name="earnedleave"]').prop('checked', false);
-		 	                        $('input[name="spfgs"]').prop('checked', false);
-		 	                        $('input[name="dcrg"]').prop('checked', false);
-
-		 	                        $('#gpfAmountDiv').hide();
-		 	                        $('#earnedleaveAmountDiv').hide();
-		 	                        $('#spfgsAmountDiv').hide();
-
-		 	                        $('#receivedcard').show();
-		 	                    }
-		 	                });
-		 	                
-		 	                /* document.getElementById('sendtopension').addEventListener('click', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-		 	                    // Trigger the save function and pass the value
-		 	                    saveEntryDetails(tempId,employeeNo);
-		 	        		}); */
-		 	        		
-		 	        		
-		 	             	$('#sendtopension').off('click').on('click', function () {
-		 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-		 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-		 	            	});
-		 	                
-		 	             	
-		 	                
-		 	            } else {
-		 	                Swal.fire({
-		 	                    icon: 'info',
-		 	                    title: 'No Data',
-		 	                    text: 'No details found for the selected employee.',
-		 	                    confirmButtonText: 'OK',
-		 	                });
-		 	            }
-		 	        },
-		 	        error: function () {
-		 	            Swal.fire({
-		 	                icon: 'error',
-		 	                title: 'Error',
-		 	                text: 'Failed to fetch employee details. Please try again.',
-		 	                confirmButtonText: 'OK',
-		 	            });
-		 	        },
-		 	    });
-		 	}
-		
-		$(document).ready(function () {
-	    	 
-	    	 $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		});
-
-
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#returnretrieddetailsModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-		   
-		    // Handle close button click
-		    $('#back').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    $('.close').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		        
-		    });
-		});
-		
-			function loadFileHistory(tempId) {
-			    $.ajax({
-			        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-			        type: 'GET',
-			        data: { tempId: tempId }, // Pass empCode as a parameter
-			        success: function (response) {
-			            if (response.length > 0) {
-			                let historyHtml = '';
-			                response.forEach(item => {
-			                    historyHtml += `
-			                        <div class="file-history-item">
-			                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-			                            <div class="file-history-content">
-			                                <div class="file-history-status">${item.fileStatusHistory}</div>
-			                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-			                            </div>
-			                        </div>
-			                    `;
-			                });
-			
-			
-			
-			                $('#fileHistoryContainer').html(historyHtml);
-			            } else {
-			                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-			            }
-			        },
-			        error: function () {
-			            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-			        }
-			    });
-			}
-
-			// Function to format date and time
-			function formatDateTime(dateString) {
-			const options = {
-			day: '2-digit',
-			month: '2-digit',
-			year: 'numeric',
-			};
-			return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-			}
-					
-			function saveEntryDetails(tempId,empCode) {
-			    //console.log("emp_no inside=="+empCode);
-			    // Get the selected GPF value
-			    let selectedGpfValue = $('input[name="gpf"]:checked').val(); // Get the selected radio button value
-			    let gpfAmount = null;
-			    
-			    if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-			        gpfAmount = $('#gpfAmount').val(); // Retrieve the amount if available, else null
-			        if(!gpfAmount){
-			        	 Swal.fire({
-			                 icon: 'warning',
-			                 title: 'Validation Error!',
-			                 text: 'GPF amount are required.',
-			                 confirmButtonText: 'OK'
-			             });
-			             return;
-			        }
-			    }
-			    
-			    
-			    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-			    let earnedleaveAmount=null;
-			    
-			    if (selectedElValue === 'yes') {
-			    	earnedleaveAmount = $('#earnedleaveAmount').val();  // Retrieve the amount if available, else null
-			    	 if(!earnedleaveAmount){
-			        	 Swal.fire({
-			                 icon: 'warning',
-			                 title: 'Validation Error!',
-			                 text: 'Earned Leave Amount are required.',
-			                 confirmButtonText: 'OK'
-			             });
-			             return;
-			        }
-			    }
-			    
-			  
-			    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-			    let spfgsAmount=null;
-			    if (selectedspfgsValue === 'yes') {
-			    	spfgsAmount = $('#spfgsAmount').val(); // Retrieve the amount if available, else null
-			    	
-			    	 if(!spfgsAmount){
-			        	 Swal.fire({
-			                 icon: 'warning',
-			                 title: 'Validation Error!',
-			                 text: 'SPFGS amount are required.',
-			                 confirmButtonText: 'OK'
-			             });
-			             return;
-			        }
-			    }
-			
-			    // Check if GPF Amount input is visible and get its value
-			   /*  if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-			        gpfAmount = $('#gpfAmount').val() || null; // Retrieve the amount if available, else null
-			    }
-			    
-			    
-			    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-			    let earnedleaveAmount=null;
-			    
-			    if (selectedElValue === 'yes') {
-			    	earnedleaveAmount = $('#earnedleaveAmount').val() || null; // Retrieve the amount if available, else null
-			    }
-			    
-			  
-			    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-			    let spfgsAmount=null;
-			    if (selectedspfgsValue === 'yes') {
-			    	spfgsAmount = $('#spfgsAmount').val() || null; // Retrieve the amount if available, else null
-			    } */
-			    
-			        
-			    
-			    //dcrf
-			    let selecteddcrgValue = $('input[name="dcrg"]:checked').val();
-			    
-			   let entryDetails = {
-			       empNo: empCode,
-			       tempId:tempId,
-			       file_moved_date:convertDateFormat($('#filedate').val()?.trim()),
-			       remarks: $('#remarks').val(),
-			       deptId:$('#deptId').text().trim(),
-			       filemovedby:$('#userId').text().trim(),
-			       gpf: selectedGpfValue, // Add GPF value (null if none selected)
-			       gpfAmount: gpfAmount || null, // Include the GPF amount
-			       private_affairs:selectedElValue,
-			       private_affairs_amount:earnedleaveAmount || null,
-			       spfgs:selectedspfgsValue,
-			       spfgs_amount:spfgsAmount || null,
-			       recovery_emp:$('#recoveryemployeevalue').val()|| null,       
-			       dcrg:selecteddcrgValue	
-			   };
-			   
-			   console.log("entryDetails:",entryDetails);
-			
-			   
-			   
-			   if (!entryDetails.dcrg) {
-			       Swal.fire({
-			           icon: 'warning',
-			           title: 'Validation Error!',
-			           text: 'DCRG are required.',
-			           confirmButtonText: 'OK'
-			       });
-			       return;
-			   }
-
-				  
-				  
-				 if (!entryDetails.spfgs) {
-			      Swal.fire({
-			          icon: 'warning',
-			          title: 'Validation Error!',
-			          text: 'SPFGS are required.',
-			          confirmButtonText: 'OK'
-			      });
-			      return;
-			  }
-				 
-				 
-				 
-				 if (!entryDetails.private_affairs) {
-			      Swal.fire({
-			          icon: 'warning',
-			          title: 'Validation Error!',
-			          text: 'Private affairs are required.',
-			          confirmButtonText: 'OK'
-			      });
-			      return;
-			  }
-				 
-				 
-				 if (!entryDetails.gpf) {
-			      Swal.fire({
-			          icon: 'warning',
-			          title: 'Validation Error!',
-			          text: 'GPF are required.',
-			          confirmButtonText: 'OK'
-			      });
-			      return;
-			  }
-				 
-				if (!entryDetails.remarks) {
-			     Swal.fire({
-			         icon: 'warning',
-			         title: 'Validation Error!',
-			         text: 'Remarks are required.',
-			         confirmButtonText: 'OK'
-			     });
-			     return;
-			 }
-			   // Validate required fields
-			   /*  if (!entryDetails.file_moved_date || !entryDetails.gpf || !entryDetails.private_affairs || !entryDetails.spfgs || !entryDetails.dcrg || !entryDetails.remarks) {
-			       Swal.fire({
-			           icon: 'warning',
-			           title: 'Fill All Fields',
-			           text: 'Please fill all mandatory fields.',
-			           confirmButtonText: 'OK'
-			       });
-			       return;
-			   } */
-				
-			   $('#sendtopension').prop('disabled', true).text('Processing...');
-			   
-			   $.ajax({
-			       url: '/gcc/api/department/received/updateEmployeeDetails',
-			       type: 'POST',
-			       contentType: 'application/json',
-			       data: JSON.stringify(entryDetails),
-			       success: function (response) {
-			       	$('#sendtopension').prop('disabled', false).text('Submit');	
-			           Swal.fire({
-			               icon: 'success',
-			               title: 'Success',
-			               text: response,
-			              	allowOutsideClick: false,
-			             	allowEscapeKey: false,
-			             	allowEnterKey: false,
-			               confirmButtonText: 'OK'
-			           }).then((result) => {
-			                     if (result.isConfirmed) {
-			                     	$('#sendtopension').prop('disabled', false).text('Submit');
-			                     	window.location.href = "/gcc/department/received/pendency";
-			                         console.log("Continue clicked");
-			                     }
-			           });
-			       },
-			       error: function (xhr, status, error) {
-			       	$('#sendtopension').prop('disabled', false).text('Submit');	
-			           Swal.fire({
-			               icon: 'error',
-			               title: 'Error',
-			               text: 'Failed to save details. Please try again.',
-			               confirmButtonText: 'OK'
-			           });
-			           console.error('Error:', xhr.responseText);
-			       }
-			   });  
-			}
-
-			
-			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("filedate").value = formattedDateDisplay;
-
-		        
-		    });
-		  
-		  
-		function convertDateFormat(dateString) {
-		    if (!dateString) return '';
-		    let [day, month, year] = dateString.split('-');
-		    return `${year}-${month}-${day}`;
-		}
-			
-
-	</script>										
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/received/provisionalretirement.html b/src/main/resources/templates/modules/pensioner/department/received/provisionalretirement.html
deleted file mode 100644
index 65d95ca7..00000000
--- a/src/main/resources/templates/modules/pensioner/department/received/provisionalretirement.html
+++ /dev/null
@@ -1,939 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#receivedprovisionalModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Provisional Pension</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received From Pension</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Provisional Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					       <div class="card-block">
-					       <h5 style="font-weight:bold;"> <span th:text="${deptname}"></span>&nbsp;Department</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>Received From Pension - Provisional Pension</h5>
-					        <span th:text="${userId}" id="userId" style="display:none"></span>
-					            <div  id="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="provisional, iterStat : ${provisionallist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${provisional['emp_no']}" class="text-center"></td>
-								                <td th:text="${provisional['emp_name']}" class="text-center"></td>
-								                <td th:text="${provisional['dept_name']}" class="text-center"></td>
-								                <td th:text="${provisional['designation']}" class="text-center"></td>
-								                <td th:text="${provisional['file_moved_date'] != null ? #dates.format(provisional['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${provisional['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${provisional['emp_no']}, data-temp-id=${provisional['temp_id']}">
-												        View
-												    </button>
-												</td> 
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-         <!--  Modal Box -->    
-		<div class="modal fade" id="receivedprovisionalModal" 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-content">
-		            <div class="modal-header">
-		                <h5 class="modal-title" id="detailsModalLabel">
-		                    Received From Department - Provisional Pension (<span id="modalEmployeeCode"></span>)
-		                </h5>
-		                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-		            </div>
-		            <div class="modal-body">
-		                <div class="row">
-		                    <!-- Employee No -->
-		                    <div class="col-md-6">
-		                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-		                        <input type="number" id="employeenomodel" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Employee Name -->
-		                    <div class="col-md-6">
-		                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-		                        <input type="text" id="employeename" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Department -->
-		                    <div class="col-md-6">
-		                        <label for="department" class="form-label fw-bold">Department </label>
-		                        <input type="text" id="department" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Designation -->
-		                    <div class="col-md-6">
-		                        <label for="designation" class="form-label fw-bold">Designation </label>
-		                        <input type="text" id="designation" class="form-control" readonly>
-		                    </div>
-		                    
-		                    <!-- Class -->
-		                    <div class="col-md-6">
-							    <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">
-		                        <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>
-		                    </div>
-							
-							<!-- Type Of Retirement typeofretirement-->
-							<div class="col-md-6">
-								<label for="typeofretirement" class="form-label fw-bold">Type Of Retirement<span class="text-danger">*</span></label>								    
-								<select id="typeofretirement" class="form-select"  style="width: 100%; height:34px;" required>
-									<option value=""  selected>-- Select Option --</option>
-								</select>								    
-							</div>
-
-		                    
-							<!-- Reason For Provisional Pension is given -->
-<!-- 							
-							otherReason -->
-							<div class="col-sm-6">
-									<label for="provisionalreason" class="form-label fw-bold">Reason For Provisional Pension Given<span class="text-danger">*</span></label>								    
-								<select id="provisionalreason" class="form-select"  style="width: 100%; height: 35px;" required>
-									<option value=""  selected>-- Select Option --</option>
-								</select>	
-								<div id="otherReasonDiv" style="display: none; margin-top: 10px;">
-										<label for="otherReason" class="form-label">Please specify:</label>
-										<input type="text" id="otherReason" class="form-control" placeholder="Enter reason">
-								</div>										    
-							</div>	
-							
-							
-		                    
-		                    <!-- Date File Sent to Pension Section -->
-		                    <div class="col-md-6">
-		                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Pension Section<span class="text-danger">*</span> </label>
-		                        <input type="date" id="datefile_modal" class="form-control" readonly>
-		                    </div>
-		                    
-		                    <!-- Pending Duration -->
-							<div class="col-md-6">
-							    <label for="pendingDuration" class="form-label fw-bold">Pending Duration <span class="text-danger">*</span></label>
-							    <div class="d-flex align-items-center">
-							        <div class="form-check" style="padding-right:10px;">
-							            <input type="radio" id="yespen" name="pendingDuration" value="Yes" class="form-check-input" onclick="toggleInputField(this)">
-							            <label for="yespen" class="form-check-label">yes</label>
-							        </div>
-							        <div class="form-check">
-							            <input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" onclick="toggleInputField(this)">
-							            <label for="nopen" class="form-check-label">no</label>
-							        </div>
-							    </div>
-							    <div id="clickyesdiv" style="display: none; margin-top: 10px;">
-							        <label for="clickyes" class="form-label">Please specify:<span class="text-danger">*</span></label>
-							        <input type="text" id="Clickyes" class="form-control" placeholder="Enter reason">
-							    </div>
-							</div> 
-								
-							<!-- dp -->	
-							<div class="col-md-6">
-							    <label for="DP" class="form-label fw-bold">DP<span class="text-danger">*</span></label>
-							    <div class="d-flex align-items-center">
-							        <div class="form-check  " style="padding-right:10px;">
-							            <input type="radio" id="yes" name="DP" value="yes" class="form-check-input" >
-							            <label for="yes" class="form-check-label">yes</label>
-							        </div>
-							        <br>
-							        <div class="form-check" >
-							            <input type="radio" id="no" name="DP" value="no" class="form-check-input" >
-							            <label for="no" class="form-check-label">no</label>
-							        </div>
-							    </div>
-							</div>	
-							
-		                    <!-- 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"  readonly></textarea>
-		                    </div>
-		                    
-		                    <!-- new -->
-
-							<div class="col-md-12 mt-4">
-								<h5>File History</h5>
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-								</div>
-							</div>  
-							
-							
-							<div class="col-md-6">
-			                        <label for="datefile "  class="form-label fw-bold">File Received date<span class="text-danger">*</span></label>
-			                        <input type="text" id="datefile"  class="form-control" readonly>
-			               </div>
-					                    
-				            <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>
-			               </div>
-							          
-		                </div>
-		                
-		          <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="submitbutton" >Rectify & Forward to Pension</button>
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div> 
-
-		                
-		     </div>
-
-        </div>
-    </div>
-</div>
-
- 
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	// Initialize DataTable
-    const table = $('#AuditDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-	
-	
-	
-    $(document).ready(function () {
-		  
-		  $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		});
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#receivedprovisionalModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-
-
-
-		 // Handle Close button click
-		    $('.close').click(function () {
-		        $('#receivedprovisionalModal').modal('hide'); // Hide the modal
-		        clearFields(); // Clear input fields
-		    });
-
-		    // Handle Back button click
-		    $('#back').click(function () {
-		        $('#receivedprovisionalModal').modal('hide'); // Hide the modal
-		        clearFields(); // Clear input fields
-		    });
-
-		    // Function to clear input fields
-		    function clearFields() {
-		        //$('#datefile').val(''); // Clear date input
-		        $('#remarks').val(''); // Clear textarea
-		    }
-
-		});
-	
-    
-
-    document.getElementById('provisionalreason').addEventListener('change', function () {
-        const otherReasonDiv = document.getElementById('otherReasonDiv'); // Get the div to show/hide
-        if (this.value === 'Others') {
-            otherReasonDiv.style.display = 'block'; // Show the input field if "Others" is selected
-        } else {
-            otherReasonDiv.style.display = 'none'; // Hide the input field otherwise
-            document.getElementById('otherReason').value = ''; // Clear the input field
-        }
-    });
-    
-	function toggleInputField(radio) {
-	    const inputFieldDiv = document.getElementById('clickyesdiv');
-	    if (radio.value === "Yes") {
-	        inputFieldDiv.style.display = 'block';
-	    } else {
-	        inputFieldDiv.style.display = 'none';
-	        document.getElementById('Clickyes').value = ''; // Clear the input field
-	    }
-	}
-	
-    
-    
-    
-  //model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	               $('#retirementdate').val(employeeDetails.retirement_date);
-
-	 	                $('#classes').val(employeeDetails.retirement_class);
-	 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-		 	            $('#provisionalreason').val(employeeDetails.reason_for_provisional_pension);
-		 	           
-	 	                
-		 	        /* // Populate Pending Duration and Reason fields
-		                if (employeeDetails.pending_duration === "Yes") {
-		                    $('#yespen').prop('checked', true); // Check the Yes radio button
-		                    $('#clickyesdiv').show(); // Show the reason input
-		                    $('#Clickyes').val(employeeDetails.reason_for_pending || '').prop( true); // Set reason and make readonly
-		                } else if (employeeDetails.pending_duration === "No") {
-		                    $('#nopen').prop('checked', true); // Check the No radio button
-		                    $('#clickyesdiv').hide(); // Hide the reason input
-		                } */
-		                
-		                
-		             // Populate Pending Duration and Reason fields
-		                if (employeeDetails.pending_duration === "Yes") {
-		                    $('#yespen').prop('checked', true).prop('disabled', false); // Check and enable Yes radio button
-		                    $('#nopen').prop('disabled', true); // Disable No radio button
-		                    $('#clickyesdiv').show(); // Show the reason input
-		                    $('#Clickyes').val(employeeDetails.reason_for_pending || '').prop('readonly', true); // Set reason and make readonly
-		                } else if (employeeDetails.pending_duration === "No") {
-		                    $('#nopen').prop('checked', true).prop('disabled', false); // Check and enable No radio button
-		                    $('#yespen').prop('disabled', true); // Disable Yes radio button
-		                    $('#clickyesdiv').hide(); // Hide the reason input
-		                }
-
-		                // Add event listeners to ensure mutual exclusivity
-		                $('#yespen').on('change', function () {
-		                    if ($(this).prop('checked')) {
-		                        $('#nopen').prop('disabled', true);
-		                        $('#clickyesdiv').show();
-		                        $('#Clickyes').prop('readonly', false);
-		                    }
-		                });
-
-		                $('#nopen').on('change', function () {
-		                    if ($(this).prop('checked')) {
-		                        $('#yespen').prop('disabled', true);
-		                        $('#clickyesdiv').hide();
-		                    }
-		                });
-
-		 	        //populate reason for provisional pension
-		                if (employeeDetails.reason_for_provisional_pension === "Others") {
-		                    $('#otherReasonDiv').show(); // Show the input field for 'Others'
-		                    $('#otherReason')
-		                        .val(employeeDetails.others_provisional_pension || '')
-		                        .prop( true); // Populate and make readonly
-		                } else {
-		                    $('#otherReasonDiv').hide(); // Hide the input field if reason is not 'Others'
-		                }
-	 	               
-		             // Handle DP value
-		                if (employeeDetails.dp === "yes") {
-		                    $('#yes').prop('checked', true); // Select 'yes' radio button
-		                } else if (employeeDetails.dp === "no") {
-		                    $('#no').prop('checked', true); // Select 'no' radio button
-		                }
-		 	        
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#receivedprovisionalModal').modal('show');
-	 	                
-
-	 	                
-	 	               $(document).ready(function () {
-	 	            	  $(document).off('click', '#submitbutton').on('click', '#submitbutton', function () {
-	 	            	    	
-	 	            	    	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-	 	            	    // Trigger the save function and pass the value
-		 	                    saveEntryDetails(tempId,employeeNo);
-	 	            	    });
-	 	            	});
-
-	 	                
-	 	              
-
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-  
-  
-  
-	 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;
-
-	        
-	    });
-	  
-	  
-	function convertDateFormat(dateString) {
-	    if (!dateString) return '';
-	    let [day, month, year] = dateString.split('-');
-	    return `${year}-${month}-${day}`;
-	}
-  
-	//typeofretirement,provisionalreason
-	
-    // Dropdown for Type of Retriment
-	$(document).ready(function () {
-	    function loadRetirementTypes() {
-	        $.ajax({
-	            url: "/gcc/api/getRetrimentTypes",
-	            type: "GET",
-	            success: function (data) {
-	                var dropdown = $("#typeofretirement");
-	                dropdown.empty();
-	                dropdown.append('<option value="" selected>-- Select Option --</option>');
-
-	                $.each(data, function (key, entry) {
-	                    dropdown.append($('<option></option>').attr('value', entry.retriment_type).text(entry.retriment_type));
-	                });
-	            },
-	            error: function () {
-	                console.log("Error loading dropdown data.");
-	            }
-	        });
-	    }
-
-	    // Call function on page load
-	    loadRetirementTypes();
-	    });
-
-
-
-
-	//Dropdown for Reason of Provisional
-	$(document).ready(function () {
-	function loadRetirementReasonTypes() {
-	    $.ajax({
-	        url: "/gcc/api/getProvisionalReasonTypes",
-	        type: "GET",
-	        success: function (data) {
-	            var dropdown = $("#provisionalreason");
-	            dropdown.empty();
-	            dropdown.append('<option value="" selected>-- Select Option --</option>');
-	
-	            $.each(data, function (key, entry) {
-	                dropdown.append($('<option></option>').attr('value', entry.provisional_reason).text(entry.provisional_reason));
-	            });
-	        },
-	        error: function () {
-	            console.log("Error loading dropdown data.");
-	        }
-	    });
-	}
-	
-	// Call function on page load
-	loadRetirementReasonTypes();
-	});
-  
-  
-	 ///history function to show in modal
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
-	 const options = {
-	     day: '2-digit',
-	     month: '2-digit',
-	     year: 'numeric',
-	 };
-	 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-	 
-	 
-	 
-	 
-	function saveEntryDetails(tempId, empCode) {
- 	    let selectedDPValue = $('input[name="DP"]:checked').val();
- 	    let selectedPendingDurationValue = $('input[name="pendingDuration"]:checked').val();
- 	    let selectedReasonValue = $('#provisionalreason').val();  
- 	    let selectedOtherReason = null;
- 	    let selectedReasonPending = null;
-
- 	    // Check for "Others" in Reason of Pension
- 	    if (selectedReasonValue === 'Others') {
- 	        selectedOtherReason = $('#otherReason').val()?.trim() || null;
- 	        if (!selectedOtherReason) {
- 	            Swal.fire({
- 	                icon: 'warning',
- 	                title: 'Validation Error',
- 	                text: 'Please specify the reason for selecting "Others".',
- 	                confirmButtonText: 'OK'
- 	            });
- 	            return;
- 	        }
- 	    }
-
- 	    // Check for "Yes" in Pending Duration
- 	    if (selectedPendingDurationValue === 'Yes') {
- 	        selectedReasonPending = $('#Clickyes').val()?.trim() || null;
- 	        if (!selectedReasonPending) {
- 	            Swal.fire({
- 	                icon: 'warning',
- 	                title: 'Validation Error',
- 	                text: 'Please specify the reason for selecting "Yes" for Pending Duration.',
- 	                confirmButtonText: 'OK'
- 	            });
- 	            return;
- 	        }
- 	    }
-
- 	    // Create the entryDetails object
- 	    let entryDetails = {
- 	        empNo: empCode,
- 	        tempId: tempId,
- 	        empName: $('#employeename').val(),
- 	        deptName: $('#department').val(),
- 	        designation: $('#designation').val(),
- 	        retirementClass: $('#classes').val(),
- 	        typeOfRetirement: $('#typeofretirement').val(),
- 	        ReasonofPension: selectedReasonValue || null,
- 	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
- 	        pendingDuration: selectedPendingDurationValue,
- 	        reasonofPending: selectedReasonPending || null,
- 	        Dp: selectedDPValue,
- 	        otherReason: selectedOtherReason,
- 	        remarks: $('#remarks').val(),
- 	        deptId: $('#deptId').text()?.trim(),
- 	        filemovedby: $('#userId').text()?.trim(),
- 	        filecategory: $('#filecategory').text()?.trim()
- 	    };
-
- 
- 	   if (!entryDetails.typeOfRetirement) {
- 	       Swal.fire({
- 	           icon: 'warning',
- 	           title: 'Validation Error!',
- 	           text: 'Type of Retirement is required.',
- 	           confirmButtonText: 'OK'
- 	       });
- 	       console.warn("Validation error: Missing Type of Retirement");
- 	       return;
- 	   }
-
- 	   if (!entryDetails.ReasonofPension) {
- 	       Swal.fire({
- 	           icon: 'warning',
- 	           title: 'Validation Error!',
- 	           text: 'Reason of Pension is required.',
- 	           confirmButtonText: 'OK'
- 	       });
- 	       console.warn("Validation error: Missing Reason of Pension");
- 	       return;
- 	   }
- 	   
- 	  if (!entryDetails.pendingDuration) {
-	       Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Pending Duration is required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Pending Duration");
-	       return;
-	   }
-
- 	   if (!entryDetails.Dp) {
- 	       Swal.fire({
- 	           icon: 'warning',
- 	           title: 'Validation Error!',
- 	           text: 'DP is required.',
- 	           confirmButtonText: 'OK'
- 	       });
- 	       console.warn("Validation error: Missing DP");
- 	       return;
- 	   }
-
-
-
- 	   if (!entryDetails.remarks) {
- 	       Swal.fire({
- 	           icon: 'warning',
- 	           title: 'Validation Error!',
- 	           text: 'Remarks are required.',
- 	           confirmButtonText: 'OK'
- 	       });
- 	       console.warn("Validation error: Missing Remarks");
- 	       return;
- 	   }
- 	    
- 	    
-
-
- 	    console.log("entryDetails==", entryDetails);
-
- 	    // Disable the button to prevent multiple submissions
- 	    $('#submitbutton').prop('disabled', true).text('Processing...');
-
- 	    // Make AJAX POST request
- 	    $.ajax({
- 	        url: '/gcc/api/pensioner/received/provisional/updateEmployeeDetailsSentToPension',
- 	        type: 'POST',
- 	        contentType: 'application/json',
- 	        data: JSON.stringify(entryDetails),
- 	        success: function (response) {
- 	            $('#submitbutton').prop('disabled', false).text('Rectify & Forward to Pension');
- 	            Swal.fire({
- 	                icon: 'success',
- 	                title: 'Success',
- 	                text: response,
- 	                allowOutsideClick: false,
- 	                allowEscapeKey: false,
- 	                allowEnterKey: false,
- 	                confirmButtonText: 'OK'
- 	            }).then((result) => {
- 	                if (result.isConfirmed) {
- 	                    window.location.href = "/gcc/department/received/provisionalretirement";
- 	                }
- 	            });
- 	        },
- 	        error: function (xhr, status, error) {
- 	            $('#submitbutton').prop('disabled', false).text('Rectify & Forward to Pension');
- 	            Swal.fire({
- 	                icon: 'error',
- 	                title: 'Error',
- 	                text: 'Failed to save details. Please try again.',
- 	                confirmButtonText: 'OK'
- 	            });
- 	            console.error('Error:', xhr.responseText);
- 	        }
- 	    });
- 	}
-	
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/received/retirement.html b/src/main/resources/templates/modules/pensioner/department/received/retirement.html
deleted file mode 100644
index 3944531b..00000000
--- a/src/main/resources/templates/modules/pensioner/department/received/retirement.html
+++ /dev/null
@@ -1,918 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-   
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-4,.col-md-12{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-    
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-    .form-check-label{
-    	padding-top: 4%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Retirement</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received From Pension</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">Received From Pension - Retirement</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">
-					                <table id="ReturnRetriedDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>					
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					               
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                       
-					                       <!-- Thymeleaf loop to populate data -->
-								            <tr th:each="received, iterStat : ${receivedlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${received['emp_no']}" class="text-center"></td>
-								                <td th:text="${received['emp_name']}" class="text-center"></td>
-								                <td th:text="${received['dept_name']}" class="text-center"></td>
-								                <td th:text="${received['designation']}" class="text-center"></td>
-								                <td th:text="${received['file_moved_date'] != null ? #dates.format(received['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>								               
-								                <td th:text="${received['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${received['emp_no']}, data-temp-id=${received['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                       
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-   
-<!--  Modal Box -->    
-<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="detailsModalLabel">
-                    Received From Pension - Retirement (<span id="modalEmployeeCode"></span>)
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Employee No -->
-                    <div class="col-md-4">
-                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-                        <input type="number" id="employeenomodel" class="form-control" readonly>
-                    </div>
-
-                    <!-- Employee Name -->
-                    <div class="col-md-4">
-                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-                        <input type="text" id="employeename" class="form-control" readonly>
-                    </div>
-
-                    <!-- Department -->
-                    <div class="col-md-4">
-                        <label for="department" class="form-label fw-bold">Department </label>
-                        <input type="text" id="department" class="form-control" readonly>
-                    </div>
-
-                    <!-- Designation -->
-                    <div class="col-md-4">
-                        <label for="designation" class="form-label fw-bold">Designation </label>
-                        <input type="text" id="designation" class="form-control" readonly>
-                    </div>
-                    
-                    <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>
-                    
-                    <!-- Class -->
-                    <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>
-					
-					<!-- Type of Retirement -->
-                    <div class="col-md-4">
-                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-                        <input type="text" id="typeofretirement" class="form-control" readonly>
-                    </div>
-                    
-                    <!-- Date File Sent to Audit -->
-                    <div class="col-md-4">
-                        <label for="datefile_modal" class="form-label fw-bold">File Forward to Department Date </label>
-                        <input type="date" id="datefile_modal" class="form-control" readonly>
-                    </div>
-
-                    <!-- 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"  readonly></textarea>
-                    </div>
-                     
-                    <!-- new -->
-
-					<div class="col-md-12 mt-4">
-						<h5>File History</h5>
-							<div id="fileHistoryContainer" class="file-history-list">
-								<!-- File History will be dynamically loaded here -->
-						</div>
-					</div>  
-                                                         
-                </div>
-                <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Add Zone/Department Benefits</button>
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div>
-	            
-	            <div style="display :none" id="receivedcard">
-	                <div class="row">
-	                
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						<div class="row">
-	                    <!-- Date File Forwarded to Pension  -->
-			            <div class="col-md-4">
-	                        <label for="datefile" class="form-label fw-bold">Date File Forwarded to Pension <span class="text-danger">*</span></label>
-	                        <input type="text" id="datefile" class="form-control" readonly>
-		                </div>
-		                
-			             <!-- Remarks -->       
-			            <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>
-		                </div>	
-		                
-		               
-
-			           </div>
-			            <div class="row mb-2 mt-2">
-					        <div class="col-md-12 d-flex justify-content-center">
-					            <button type="button" class="btn btn-primary" id="sendtopension">Submit</button>
-					        </div>
-			              </div>				               
-			               
-			         </div>
-	            
-	            
-            </div>
-
-            
-
-        </div>
-    </div>
-</div>
-		
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-		
-		$(document).ready(function () {
-		    // Initialize DataTable
-		    const table = $('#ReturnRetriedDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-		    
-		    
-		    
-		    document.getElementById("submitbutton").addEventListener("click", function () {
-			    // Clear the inputs in the receivedcard section
-			    //$('#datefile').val('');
-			    $('#remarks').val('');			    
-			    // Make the receivedcard section visible
-			    document.getElementById("receivedcard").style.display = "block";
-			    // Scroll the receivedcard section into view
-			    document.getElementById("receivedcard").scrollIntoView({
-			        behavior: "smooth", // Smooth scrolling effect
-			        block: "center" // Aligns the element to the center of the viewport
-			    });
-			});	
-		    
-		 // Listen for changes on the GPF radio buttons
-		    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-		            if (this.value === 'yes' || this.value === '90') {
-		                gpfAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		                gpfAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('gpfAmount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		 // Listen for changes on the private affaires radio buttons
-		    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-		            if (this.value === 'yes') {
-		            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		    
-		 // Listen for changes on the spfgs radio buttons
-		    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-		            if (this.value === 'yes') {
-		            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		 
-		 
-
-		});	
-		
-		
-		
-		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;
-
-	        
-	    });
-	  
-	  
-	function convertDateFormat(dateString) {
-	    if (!dateString) return '';
-	    let [day, month, year] = dateString.split('-');
-	    return `${year}-${month}-${day}`;
-	}
-		
-		//model function
-		 function fetchEmployeeDetails(tempId) {
-		 	    $.ajax({
-		 	        url: '/gcc/api/department/audit/getzonebenefitsdetails', // API to fetch employee details
-		 	        type: 'GET',
-		 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-		 	        success: function (response) {
-		 	            if (response && response.length > 0) {
-		 	            	
-		 	            	let employeeDetails = response[0]; // Access the first object in the array
-		 	            	console.log("response:",response);
-		 	            	
-		 	            	
-		 	                // 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);
-		 	               $('#classes').val(employeeDetails.retirement_class);
-		 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
-		 	               	$('#remarks_modal').val(employeeDetails.remarks);
-			 	             $('#retirementdate').val(employeeDetails.retirement_date);
-		 	                
-		 	               
-		 	                // Update the modal title with the employee code
-		 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-		 	                // Show the modal
-		 	                $('#returnretrieddetailsModal').modal('show');
-		 	                
-		 	                let status=employeeDetails.file_status;
-		 	                console.log("status=:"+status);
-		 	                
-		 	                 
-		 	             	
-		 	             	
-		 	             	$('#submitbutton').off('click').on('click', function() {
-		 	                    if (status === 6) {
-		 	                        $('#receivedcard').show();
-
-		 	                        // GPF
-		 	                        $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-		 	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-		 	                            $('#gpfAmountDiv').show();
-		 	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-		 	                        } else {
-		 	                            $('#gpfAmountDiv').hide();
-		 	                        }
-
-		 	                        // Earned Leave & Leave on Private Affairs
-		 	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-		 	                        if (employeeDetails.private_affairs === "yes") {
-		 	                            $('#earnedleaveAmountDiv').show();
-		 	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-		 	                        } else {
-		 	                            $('#earnedleaveAmountDiv').hide();
-		 	                        }
-
-		 	                        // SPFGS
-		 	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-		 	                        if (employeeDetails.spfgs === "yes") {
-		 	                            $('#spfgsAmountDiv').show();
-		 	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-		 	                        } else {
-		 	                            $('#spfgsAmountDiv').hide();
-		 	                        }
-		 	                       //recover emp
-		 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-		 	                        // DCRG File
-		 	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-		 	                        
-		 	                       //$('#datefile').val('');
-		 	                       //$('#remarks').val('');
-		 	                    } 
-
-		 	                    if (status === 5) {
-		 	                        $('#gpfAmount').val('');
-		 	                        $('#earnedleaveAmount').val('');
-		 	                        $('#spfgsAmount').val('');
-		 	                        $('#recoveryemployeevalue').val('');
-		 	                        //$('#datefile').val('');
-		 	                        //$('#remarks').val('');
-
-		 	                        $('input[name="gpf"]').prop('checked', false);
-		 	                        $('input[name="earnedleave"]').prop('checked', false);
-		 	                        $('input[name="spfgs"]').prop('checked', false);
-		 	                        $('input[name="dcrg"]').prop('checked', false);
-
-		 	                        $('#gpfAmountDiv').hide();
-		 	                        $('#earnedleaveAmountDiv').hide();
-		 	                        $('#spfgsAmountDiv').hide();
-
-		 	                        $('#receivedcard').show();
-		 	                    }
-		 	                });
-		 	                
-		 	                /* document.getElementById('sendtopension').addEventListener('click', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-		 	                    // Trigger the save function and pass the value
-		 	                    saveEntryDetails(tempId,employeeNo);
-		 	        		}); */
-		 	                
-		 	               $('#sendtopension').off('click').on('click', function () {
-		 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-		 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-		 	            	});
-		 	                
-		 	             	
-		 	                
-		 	            } else {
-		 	                Swal.fire({
-		 	                    icon: 'info',
-		 	                    title: 'No Data',
-		 	                    text: 'No details found for the selected employee.',
-		 	                    confirmButtonText: 'OK',
-		 	                });
-		 	            }
-		 	        },
-		 	        error: function () {
-		 	            Swal.fire({
-		 	                icon: 'error',
-		 	                title: 'Error',
-		 	                text: 'Failed to fetch employee details. Please try again.',
-		 	                confirmButtonText: 'OK',
-		 	            });
-		 	        },
-		 	    });
-		 	}
-		
-$(document).ready(function () {
-	    	 
-	    	 $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		});
-
-
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#returnretrieddetailsModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-		   
-		    // Handle close button click
-		    $('#back').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    $('.close').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		        
-		    });
-		});
-		
-function loadFileHistory(tempId) {
-    $.ajax({
-        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-        type: 'GET',
-        data: { tempId: tempId }, // Pass empCode as a parameter
-        success: function (response) {
-            if (response.length > 0) {
-                let historyHtml = '';
-                response.forEach(item => {
-                    historyHtml += `
-                        <div class="file-history-item">
-                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-                            <div class="file-history-content">
-                                <div class="file-history-status">${item.fileStatusHistory}</div>
-                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-                            </div>
-                        </div>
-                    `;
-                });
-
-                $('#fileHistoryContainer').html(historyHtml);
-            } else {
-                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-            }
-        },
-        error: function () {
-            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-        }
-    });
-}
-
-		// Function to format date and time
-		function formatDateTime(dateString) {
-		const options = {
-		day: '2-digit',
-		month: '2-digit',
-		year: 'numeric',
-		};
-		return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-		}
-		
-function saveEntryDetails(tempId,empCode) {
-    //console.log("emp_no inside=="+empCode);
-    // Get the selected GPF value
-    let selectedGpfValue = $('input[name="gpf"]:checked').val(); // Get the selected radio button value
-    let gpfAmount = null;
-
-    // Check if GPF Amount input is visible and get its value
-    if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-        gpfAmount = $('#gpfAmount').val(); // Retrieve the amount if available, else null
-        if(!gpfAmount){
-        	 Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error!',
-                 text: 'GPF amount are required.',
-                 confirmButtonText: 'OK'
-             });
-             return;
-        }
-    }
-    
-    
-    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-    let earnedleaveAmount=null;
-    
-    if (selectedElValue === 'yes') {
-    	earnedleaveAmount = $('#earnedleaveAmount').val();  // Retrieve the amount if available, else null
-    	 if(!earnedleaveAmount){
-        	 Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error!',
-                 text: 'Earned Leave Amount are required.',
-                 confirmButtonText: 'OK'
-             });
-             return;
-        }
-    }
-    
-  
-    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-    let spfgsAmount=null;
-    if (selectedspfgsValue === 'yes') {
-    	spfgsAmount = $('#spfgsAmount').val(); // Retrieve the amount if available, else null
-    	
-    	 if(!spfgsAmount){
-        	 Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error!',
-                 text: 'SPFGS amount are required.',
-                 confirmButtonText: 'OK'
-             });
-             return;
-        }
-    }
-    
-        
-    
-    //dcrf
-    let selecteddcrgValue = $('input[name="dcrg"]:checked').val();
-    
-   let entryDetails = {
-       empNo: empCode,
-       tempId:tempId,
-       file_moved_date:convertDateFormat($('#datefile').val()?.trim()),
-       remarks: $('#remarks').val(),
-       deptId:$('#deptId').text().trim(),
-       filemovedby:$('#userId').text().trim(),
-       gpf: selectedGpfValue, // Add GPF value (null if none selected)
-       gpfAmount: gpfAmount || null, // Include the GPF amount
-       private_affairs:selectedElValue,
-       private_affairs_amount:earnedleaveAmount || null,
-       spfgs:selectedspfgsValue,
-       spfgs_amount:spfgsAmount || null,
-       recovery_emp:$('#recoveryemployeevalue').val()|| null,       
-       dcrg:selecteddcrgValue	
-   };
-   
-   console.log("entryDetails:",entryDetails);
-
-   if (!entryDetails.dcrg) {
-       Swal.fire({
-           icon: 'warning',
-           title: 'Validation Error!',
-           text: 'DCRG are required.',
-           confirmButtonText: 'OK'
-       });
-       return;
-   }
-
-	  
-	  
-	 if (!entryDetails.spfgs) {
-      Swal.fire({
-          icon: 'warning',
-          title: 'Validation Error!',
-          text: 'SPFGS are required.',
-          confirmButtonText: 'OK'
-      });
-      return;
-  }
-	 
-	 
-	 
-	 if (!entryDetails.private_affairs) {
-      Swal.fire({
-          icon: 'warning',
-          title: 'Validation Error!',
-          text: 'Private affairs are required.',
-          confirmButtonText: 'OK'
-      });
-      return;
-  }
-	 
-	 
-	 if (!entryDetails.gpf) {
-      Swal.fire({
-          icon: 'warning',
-          title: 'Validation Error!',
-          text: 'GPF are required.',
-          confirmButtonText: 'OK'
-      });
-      return;
-  }
-	 
-	 
-	 
-	if (!entryDetails.remarks) {
-     Swal.fire({
-         icon: 'warning',
-         title: 'Validation Error!',
-         text: 'Remarks are required.',
-         confirmButtonText: 'OK'
-     });
-     return;
- }
-   
-   
-
-	
-   $('#sendtopension').prop('disabled', true).text('Processing...');
-   
-   $.ajax({
-       url: '/gcc/api/department/received/updateEmployeeDetails',
-       type: 'POST',
-       contentType: 'application/json',
-       data: JSON.stringify(entryDetails),
-       success: function (response) {
-       	$('#sendtopension').prop('disabled', false).text('Submit');	
-           Swal.fire({
-               icon: 'success',
-               title: 'Success',
-               text: response,
-              	allowOutsideClick: false,
-             	allowEscapeKey: false,
-             	allowEnterKey: false,
-               confirmButtonText: 'OK'
-           }).then((result) => {
-                     if (result.isConfirmed) {
-                     	$('#sendtopension').prop('disabled', false).text('Submit');
-                     	window.location.href = "/gcc/department/received/retirement";
-                         console.log("Continue clicked");
-                     }
-           });
-       },
-       error: function (xhr, status, error) {
-       	$('#sendtopension').prop('disabled', false).text('Submit');	
-           Swal.fire({
-               icon: 'error',
-               title: 'Error',
-               text: 'Failed to save details. Please try again.',
-               confirmButtonText: 'OK'
-           });
-           console.error('Error:', xhr.responseText);
-       }
-   });  
-}
-
-
-
-
-				//amount field validation
-				
-				function validatePositiveNumber(input) {
-					    if (input.value < 1) {
-					        input.value = "";
-					    }
-					}
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/reports.html b/src/main/resources/templates/modules/pensioner/department/reports.html
deleted file mode 100644
index 3900bb61..00000000
--- a/src/main/resources/templates/modules/pensioner/department/reports.html
+++ /dev/null
@@ -1,1411 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#returnretrieddetailsModal .modal-body{
-
-	max-height:80vh;
-	overflow-y:auto; 
-}
-#returnretrieddreportetailsModals .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-/* Ensure consistent table borders */
-.table {
-    border-collapse: collapse !important;
-}
-
-.table thead th {
-    background-color: #343a40; /* Dark header background */
-    color: #ffffff; /* White text */
-    text-align: center;
-}
-
-.table-bordered td, .table-bordered th {
-    border: 1px solid #dee2e6 !important; /* Ensure borders are visible */
-}
-
-/* Ensure proper column width */
-#SecondFollowupDatatables, #FollowupDatatable, #reportFollowupDatatables {
-    table-layout: fixed;
-    width: 100%;
-}
-
-#SecondFollowupDatatables th, 
-#FollowupDatatable th, 
-#reportFollowupDatatables th {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-/* Add padding for better readability */
-td, th {
-    padding: 10px;
-    text-align: center;
-}
-
-.col-md-3 label{
-	padding-top: 2%;
-}
-
-
-</style>
-
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Report</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Reports</li>
-                                      
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">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>
-								<div class="row mb-4">
-								
-								    <!-- Input Fields for Year Selection -->
-								  
-									  <!-- Start Year Dropdown as Button Dropdown -->
-										<!-- Start Year Dropdown as Button Dropdown -->
-									 <div class="col-md-3">
-			                        <label for="startdate" class="form-label fw-bold">Start Date<span class="text-danger">*</span></label>
-			                        <input type="date" id="startdate" class="form-control" onclick="this.showPicker()"   >
-			                    </div>
-			                     <div class="col-md-3">
-			                        <label for="enddate" class="form-label fw-bold">End Date<span class="text-danger">*</span></label>
-			                        <input type="date" id="enddate" class="form-control" onclick="this.showPicker()"  >
-			                    </div>
-			                    
-			                    
-			                    <div class="col-md-3">
-										    <label for="typeofreport" class="form-label fw-bold">Type of Report<span class="text-danger">*</span></label>
-										    <select id="typeofreport" class="form-control" style="width: 100%;" required>
-										        <option value="" selected>-- Select Option --</option>
-										        <option value="Abstract">Abstract</option>
-										        <option value="Detailed">Detailed</option>
-										    </select>
-										</div>
-										
-										<!-- Type of Category (Initially Hidden) -->
-										<!-- <div class="col-md-3" id="categoryDiv" style="display: none;">
-										    <label for="typeofcategory" class="form-label fw-bold">Type of Category<span class="text-danger">*</span></label>
-										    <select id="typeofcategory" class="form-control" style="width: 100%;">
-										        <option value="" selected>-- Select Category --</option>
-										        <option value="1">Retirement</option>
-										        <option value="2">Family Pension</option>
-										        <option value="3">Pendency</option>
-										        <option value="4">GIS</option>
-										        <option value="5">Provisional Retirement</option>
-										        <option value="6">Contributory Pension Scheme</option>
-										    </select>
-										</div> -->
-										
-										<div class="col-md-3" id="categoryDiv" style="display: none;">
-										    <label for="typeofcategory" class="form-label fw-bold">Type of Category<span class="text-danger">*</span></label>
-										    <select id="typeofcategory" class="form-control" style="width: 100%;">
-										        <option value="" selected>-- Select Category --</option>
-										    </select>
-										</div>
-										
-										
-										<div class="col-md-3" id="statusDiv" style="display: none;">
-										    <label for="statusDropdown" class="form-label fw-bold">File Status</label>
-										    <select id="statusDropdown" class="form-control" style="width: 100%;">
-										        <option value="" selected>-- Select Status --</option>
-										        <option value="[1,3]">Audit Pending</option>
-										        <option value="[2,5,6,9]">Department Pending</option>
-										        <option value="[4,7,8,10]">Pension Pending</option>
-										        <option value="[11]">File Completed</option>
-										        <option value="[12]">File Closed</option>
-										    </select>
-										</div>
-																				
-			                    
-																			
-                                     <div class="col-md-4 mt-20">
-								        <button id="searchButton" class="btn btn-primary mt-2 mx-2">Search</button>
-								        <button id="resetButton" class="btn btn-secondary mt-2">Reset</button>
-								        
-								    </div>
-								</div>
-
-
-					            <div class="page-header-title"></div>
-					            <div style= display:none id="audittable">
-					            <!-- <div style="visibility: hidden; height: 0; overflow: hidden;" id="audittable"> -->
-					                <table id="FileCategoryTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">File Category</th>
-										            <th class="text-center">Department Pending</th>
-										            <th class="text-center">Audit Pending</th>
-										            <th class="text-center">Pension Pending</th>
-										            <th class="text-center">Completed</th>
-										            <th class="text-center">Total count</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileCategoryTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            
-					             <div style= display:none  id="cpstable">
-					                <table id="FileDetailsTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Type of Retirement</th>
-										            <th class="text-center">Date of Retirement</th>
-										            <th class="text-center">Pending Duration</th>
-										           	<th class="text-center">File Status</th>
-										            <th class="text-center">File category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileDetailsTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            
-					            <!-- retirement datatable -->
-					            <div style= display:none  id="retiretable">
-					                <table id="FileRetirementTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Type of Retirement</th>
-										            <th class="text-center">Date of Retirement</th>
-										            <th class="text-center">File Status</th>
-										            <th class="text-center">File Category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileRetireTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            
-					            <!-- Family pension datatable -->
-					            
-					            <div style= display:none  id="familypensiontable">
-					                <table id="FileFamilyPensionTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Service Death Date</th>
-										            <th class="text-center">Relationship Type</th>
-										            <th class="text-center">Pending Duration</th>
-										            <th class="text-center">File Status</th>
-										            <th class="text-center">File Category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileFamilyTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            <!-- Pendency datatable -->
-					            
-					            <div style= display:none  id="pendencytable">
-					                <table id="FilePendencyTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Type of Retirement</th>
-										            <th class="text-center">Date of Retirement</th>
-										            <th class="text-center">Pending Duration</th>
-										            <th class="text-center">File Status</th>
-										            <th class="text-center">File Category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="filePendencyTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            <!-- Gis datatable -->
-					            
-					            <div style= display:none  id="gistable">
-					                <table id="FileGisTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Service Death Date</th>
-										            <th class="text-center">Sanctioned Amount</th>
-										            <th class="text-center">File Status</th>
-										            <th class="text-center">File category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileGisTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            <!-- provisonal datatable -->
-					            
-					            
-					            <div style= display:none  id="provisionaltable">
-					                <table id="FileProvisionalTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Type of Retirement</th>
-										            <th class="text-center">Date of Retirement</th>
-										            <th class="text-center">File Status</th>
-										            <th class="text-center">File category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileProvisionalTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-                
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 	
-
-   <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    
-
-	<script>
-	
-	$(document).ready(function () {
-	    function loadFileCategories() {
-	        $.ajax({
-	            url: "/gcc/api/report/getFileCategories", // Ensure this is the correct endpoint
-	            type: "GET",
-	            dataType: "json",
-	            success: function (response) {
-	                console.log("File Categories Loaded:", response); // Debugging
-
-	                if (response.length === 0) {
-	                    console.warn("No categories found!");
-	                    return;
-	                }
-
-	                let $categoryDropdown = $("#typeofcategory");
-	               // $categoryDropdown.empty().append('<option value="">-- Select Category --</option>');
-
-	                response.forEach(category => {
-	                	 $categoryDropdown.append(`<option value="${category.id}">${category.file_name}</option>`);
-	                });
-	            },
-	            error: function (xhr, status, error) {
-	                console.error("Error fetching categories:", xhr.responseText);
-	                Swal.fire({
-	                    icon: "error",
-	                    title: "Error Fetching Data",
-	                    text: "Failed to load categories. Please try again later.",
-	                });
-	            }
-	        });
-	    }
-
-	    // Call function to load categories when the page is ready
-	    loadFileCategories();
-	    
-	    $('#resetButton').on('click', function () {
-	    	window.location.href = "/gcc/department/reports";
-	    });
-	});
-	
-	
-	
-	$(document).ready(function () {
-	    // Initialize DataTables
-	    
-	    // count datatable
-	    
-	    let fileCategoryTable = $("#FileCategoryTable").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 ' }, // GIS-style
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' } // GIS-style
-		        ],
-		        fixedHeader: false,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false,
-		        data: [], // Start with an empty table
-		        columns: [
-		            { title: "S.No", data: "index", className: "text-center" },
-		            { title: "File Category", data: "file_name", className: "text-center" },
-		            { title: "Department Pending", data: "department_pending", className: "text-center" },
-		            { title: "Audit Pending", data: "audit_pending", className: "text-center" },
-		            { title: "Pension Pending", data: "pension_pending", className: "text-center" },
-		            { title: "Completed", data: "completed", className: "text-center" },
-		            { title: "Total Count", data: "total_count", className: "text-center" }
-		        ]
-	    });
-
-	    
-	    //cps datatable
-	    
-	    let fileDetailsTable = $("#FileDetailsTable").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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' } // GIS-style
-	        ],
-	        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: "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",
-		                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" },
-	            
-	        ]
-	    });
-	    
-	    // retirement datatable
-	    
-/* 	    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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' } // GIS-style
-	        ],
-	        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" },
-		            { 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({
-	        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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' } // GIS-style
-	        ],
-	        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: "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",
-		                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" },
-	            
-	        ]
-	    });
-
-	    // pendency datatable
-	    
-	    let filePendencyTable = $("#FilePendencyTable").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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' } // GIS-style
-	        ],
-	        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: "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",
-		                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" },
-	            
-	        ]
-	    });
-	    
-	    // Gis datatable
-	    
-	    let fileGisTable = $("#FileGisTable").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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' } // GIS-style
-	        ],
-	        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: "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",
-		                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" },
-	            
-	        ]
-	    });
-	    
-	    // provisional datatable
-	    
-	    let fileProvisionalTable = $("#FileProvisionalTable").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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' } // GIS-style
-	        ],
-	        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 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",
-		                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" },
-	            
-	        ]
-	    });
-	    
-	    // Listen for changes in the Type of Report dropdown
-	    $("#typeofreport").change(function () {
-	        let selectedValue = $(this).val();
-	        if (selectedValue === "Detailed") {
-	            $("#categoryDiv").show();
-	            
-	        } else {
-	            $("#categoryDiv").hide();
-	            $("#typeofcategory").val(""); // Reset category value
-	            $("#statusDiv").hide(); 
-	            $("#statusDropdown").val("");
-	        }
-	    });
-	    
-	    
-	    $("#typeofcategory").change(function () {
-            let selectedCatValue = $(this).val();
-            let statusDropdown = $("#statusDropdown");
-            
-            if(selectedCatValue==""){
-            	$("#statusDiv").hide();
-            	$("#statusDropdown").val("");
-            }
-            else{
-            	$("#statusDiv").show();
-            }
-
-            // Backup of all options (only once)
-            if (!statusDropdown.data("original-options")) {
-                statusDropdown.data("original-options", statusDropdown.html());
-            }
-
-            if (selectedCatValue === "1") {
-                // Restore all options
-                statusDropdown.html(statusDropdown.data("original-options"));
-            } else {
-                // Remove the last two options ("File Completed" and "File Closed")
-                statusDropdown.html(statusDropdown.data("original-options"));
-                statusDropdown.find("option[value='[12]']").remove();
-            }
-            
-            
-        });
-	    
-
-	    /* $('#statusDropdown').on('change', function () {
-		    let selectedValue = $(this).val();
-		    let statusArray = selectedValue ? JSON.parse(selectedValue) : []; // Convert string to array
-		    console.log(statusArray); // Output: [1,3] or [2,5,6,9] etc.
-		}); */
-	    
-
-	    // Handle Search Button click
-	    $("#searchButton").click(function () {
-	        let startDate = $("#startdate").val();
-	        let endDate = $("#enddate").val();
-	        let deptId = $('#deptId').text().trim();
-	        let typeOfReport = $("#typeofreport").val();
-	        let typeOfCategory = $("#typeofcategory").val();
-	        
-	        let selectedStatus = $("#statusDropdown").val();
-	        let statusArray = selectedStatus ? JSON.parse(selectedStatus) : [];
-	        console.log("statusArray", statusArray);
-	        
-	        if (!startDate || !endDate) {
-	            Swal.fire({
-	                icon: "warning",
-	                title: "Validation Error",
-	                text: "Please select Both Date before searching.",
-	                confirmButtonText: "OK"
-	            });
-	            return;
-	        }
-	        
-	        // Validation
-	        if (!typeOfReport) {
-	            Swal.fire({
-	                icon: "warning",
-	                title: "Validation Error",
-	                text: "Please select a Type of Report before searching.",
-	                confirmButtonText: "OK"
-	            });
-	            return; // Stop execution if validation fails
-	        }
-
-	        // Handle Detailed Report or Summary Report based on selection
-	        if (typeOfReport === "Detailed" && !typeOfCategory) {
-	            Swal.fire({
-	                icon: "warning",
-	                title: "Validation Error",
-	                text: "Please select a Category for Detailed report.",
-	                confirmButtonText: "OK"
-	            });
-	            return;
-	        }
-
-	        // Perform AJAX for FileCategory (Summary) or FileDetails (Detailed)
-	        let url, data;
-	        if (typeOfReport === "Detailed") {
-	            url = "/gcc/api/report/getReportDetails";
-	            data = { startDate: startDate, endDate: endDate, deptId: deptId, fileCatId: typeOfCategory , fileStatus:statusArray};
-	        } else {
-	            url = "/gcc/api/report/getReportData";
-	            data = { startDate: startDate, endDate: endDate, deptId: deptId };
-	        }
-	        $('#pageLoader').show();
-	        // Make AJAX request based on selected report type
-	        $.ajax({
-	            url: url,
-	            type: "GET",
-	            data: data,
-	            traditional: true,
-	            dataType: "json",
-	            success: function (response) {
-	            	$('#pageLoader').hide();
-	                if (response.length === 0) {
-	                	$('#FileCategoryTable').DataTable().clear().draw();
-	                	$('#FileDetailsTable').DataTable().clear().draw();
-	                	$('#FileRetirementTable').DataTable().clear().draw();
-	                	$('#FileFamilyPensionTable').DataTable().clear().draw();
-	                	$('#FilePendencyTable').DataTable().clear().draw();
-	                	$('#FileGisTable').DataTable().clear().draw();
-	                	$('#FileProvisionalTable').DataTable().clear().draw();
-	                	
-	                    Swal.fire({
-	                        icon: "info",
-	                        title: "No Data Found",
-	                        text: "No records match your selection.",
-	                        confirmButtonText: "OK"
-	                    });
-	                } else {
-	                	$('#pageLoader').hide();
-	                    // Format and add data to the correct table based on the report type
-	                    if (typeOfReport === "Detailed" && typeOfCategory=='6' ) {
-	                    	$("#cpstable").css("display", "block").css("height", "auto");
-	                    	$("#audittable").css("display", "none").css("height", "auto");
-	                    	$("#retiretable").css("display", "none").css("height", "auto");
-	                    	$("#familypensiontable").css("display", "none").css("height", "auto");
-	                    	$("#pendencytable").css("display", "none").css("height", "auto");
-	                    	$("#gistable").css("display", "none").css("height", "auto");
-	                    	$("#provisionaltable").css("display", "none").css("height", "auto");
-	                    	
-	                        let formattedData = response.map((row, index) => ({
-	                           index: index + 1,
-		        	            emp_no: row.emp_no,
-		        	            emp_name: row.emp_name,
-		        	            designation: row.designation,
-		        	            type_of_retirement: row.type_of_retirement,
-		        	            retirement_date: row.retirement_date,
-		        	            reason_for_pending: row.reason_for_pending,
-		        	            fst: row.fst,
-		        	            file_category_name:row.file_category_name,
-		        	            remarks: row.remarks,
-		        	            created_date: row.created_date,
-	                        }));
-	                        fileDetailsTable.clear().rows.add(formattedData).draw();
-	                        console.log("retirement data",formattedData);
-	                    }
-	                    
-	                    
-	                    if (typeOfReport === "Detailed" && typeOfCategory=='1' ) {
-	                    	$("#cpstable").css("display", "none").css("height", "auto");
-	                    	$("#audittable").css("display", "none").css("height", "auto");
-	                    	$("#retiretable").css("display", "block").css("height", "auto");
-	                    	$("#familypensiontable").css("display", "none").css("height", "auto");
-	                    	$("#pendencytable").css("display", "none").css("height", "auto");
-	                    	$("#gistable").css("display", "none").css("height", "auto");
-	                    	$("#provisionaltable").css("display", "none").css("height", "auto");
-	                    	
-	                        let formattedData = response.map((row, index) => ({
-	                           index: index + 1,
-		        	            emp_no: row.emp_no,
-		        	            emp_name: row.emp_name,
-		        	            designation: row.designation,
-		        	            type_of_retirement: row.type_of_retirement,
-		        	            retirement_date: row.retirement_date,
-		        	            fst: row.fst,
-		        	            file_category_name:row.file_category_name,
-		        	            remarks: row.remarks,
-		        	            file_moved_date: row.file_moved_date,
-	                        }));
-	                        fileRetireTable.clear().rows.add(formattedData).draw();
-	                    }
-	                    
-	                    if (typeOfReport === "Detailed" && typeOfCategory=='2' ) {
-	                    	$("#cpstable").css("display", "none").css("height", "auto");
-	                    	$("#audittable").css("display", "none").css("height", "auto");
-	                    	$("#retiretable").css("display", "none").css("height", "auto");
-	                    	$("#familypensiontable").css("display", "block").css("height", "auto");
-	                    	$("#pendencytable").css("display", "none").css("height", "auto");
-	                    	$("#gistable").css("display", "none").css("height", "auto");
-	                    	$("#provisionaltable").css("display", "none").css("height", "auto");
-	                    	
-	                        let formattedData = response.map((row, index) => ({
-	                           index: index + 1,
-		        	            emp_no: row.emp_no,
-		        	            emp_name: row.emp_name,
-		        	            designation: row.designation,
-		        	            service_death:row.service_death,
-		        	            relationship_deceased: row.relationship_deceased,
-		        	            reason_for_pending: row.reason_for_pending,
-		        	            fst: row.fst,
-		        	            file_category_name:row.file_category_name,
-		        	            remarks: row.remarks,
-		        	            file_moved_date: row.file_moved_date,
-	                        }));
-	                        fileFamilyPensionTable.clear().rows.add(formattedData).draw();
-	                    }
-	                    
-	                    if (typeOfReport === "Detailed" && typeOfCategory=='3' ) {
-	                    	$("#cpstable").css("display", "none").css("height", "auto");
-	                    	$("#audittable").css("display", "none").css("height", "auto");
-	                    	$("#retiretable").css("display", "none").css("height", "auto");
-	                    	$("#familypensiontable").css("display", "none").css("height", "auto");
-	                    	$("#pendencytable").css("display", "block").css("height", "auto");
-	                    	$("#gistable").css("display", "none").css("height", "auto");
-	                    	$("#provisionaltable").css("display", "none").css("height", "auto");
-	                    	
-	                    	let formattedData = response.map((row, index) => ({
-		                           index: index + 1,
-			        	            emp_no: row.emp_no,
-			        	            emp_name: row.emp_name,
-			        	            designation: row.designation,
-			        	            type_of_retirement: row.type_of_retirement,
-			        	            retirement_date: row.retirement_date,
-			        	            reason_for_pending:row.reason_for_pending,
-			        	            fst: row.fst,
-			        	            file_category_name:row.file_category_name,
-			        	            remarks: row.remarks,
-			        	            file_moved_date: row.file_moved_date,
-		                        }));
-	                    	filePendencyTable.clear().rows.add(formattedData).draw();
-	                    }
-	                    
-	                    if (typeOfReport === "Detailed" && typeOfCategory=='4' ) {
-	                    	$("#cpstable").css("display", "none").css("height", "auto");
-	                    	$("#audittable").css("display", "none").css("height", "auto");
-	                    	$("#retiretable").css("display", "none").css("height", "auto");
-	                    	$("#familypensiontable").css("display", "none").css("height", "auto");
-	                    	$("#pendencytable").css("display", "none").css("height", "auto");
-	                    	$("#gistable").css("display", "block").css("height", "auto");
-	                    	$("#provisionaltable").css("display", "none").css("height", "auto");
-	                    	
-	                        let formattedData = response.map((row, index) => ({
-	                           index: index + 1,
-		        	            emp_no: row.emp_no,
-		        	            emp_name: row.emp_name,
-		        	            designation: row.designation,
-		        	            service_death: row.service_death,
-		        	            sanctional_gis_amount: row.sanctional_gis_amount,
-		        	            fst: row.fst,
-		        	            file_category_name:row.file_category_name,
-		        	            remarks: row.remarks,
-		        	            file_moved_date: row.file_moved_date,
-	                        }));
-	                        fileGisTable.clear().rows.add(formattedData).draw();
-	                    }
-	                    
-	                    if (typeOfReport === "Detailed" && typeOfCategory=='5' ) {
-	                    	$("#cpstable").css("display", "none").css("height", "auto");
-	                    	$("#audittable").css("display", "none").css("height", "auto");
-	                    	$("#retiretable").css("display", "none").css("height", "auto");
-	                    	$("#familypensiontable").css("display", "none").css("height", "auto");
-	                    	$("#pendencytable").css("display", "none").css("height", "auto");
-	                    	$("#gistable").css("display", "none").css("height", "auto");
-	                    	$("#provisionaltable").css("display", "block").css("height", "auto");
-	                    	
-	                        let formattedData = response.map((row, index) => ({
-	                           index: index + 1,
-		        	            emp_no: row.emp_no,
-		        	            emp_name: row.emp_name,
-		        	            designation: row.designation,
-		        	            type_of_retirement: row.type_of_retirement,
-		        	            retirement_date: row.retirement_date,
-		        	            fst: row.fst,
-		        	            file_category_name:row.file_category_name,
-		        	            remarks: row.remarks,
-		        	            file_moved_date: row.file_moved_date,
-	                        }));
-	                        fileProvisionalTable.clear().rows.add(formattedData).draw();
-	                    }
-	                    
-	                   
-	                    
-	                      if(typeOfReport === "Abstract"){
-	                    	$("#cpstable").css("display", "none").css("height", "auto");
-	                    	$("#audittable").css("display", "block").css("height", "auto");
-	                    	$("#retiretable").css("display", "none").css("height", "auto");
-	                    	$("#familypensiontable").css("display", "none").css("height", "auto");
-	                    	$("#pendencytable").css("display", "none").css("height", "auto");
-	                    	$("#gistable").css("display", "none").css("height", "auto");
-	                    	$("#provisionaltable").css("display", "none").css("height", "auto");
-	                    	
-	                        let formattedData = response.map((row, index) => ({
-	                            index: index + 1,
-		                        file_name: row.file_name,
-		                        department_pending: row.department_pending,
-		                        audit_pending: row.audit_pending,
-		                        pension_pending: row.pension_pending,
-		                        completed: row.completed,
-		                        total_count: row.total_files
-	                        }));
-	                        fileCategoryTable.clear().rows.add(formattedData).draw();
-	                    }
-	                }
-	            },
-	            error: function (xhr, status, error) {
-	            	$('#pageLoader').hide();
-	                Swal.fire({
-	                    icon: "error",
-	                    title: "Error",
-	                    text: "Failed to load data. Please try again.",
-	                    confirmButtonText: "OK"
-	                });
-	            }
-	        });
-	    });
-	});
-
-	
-	
-    $('#startdate').on('change', function () {
-        const fromDate = $(this).val();
-        $('#enddate').attr('min', fromDate); // Update min attribute for To Date
-
-        // If To Date is earlier than the new From Date, adjust it
-        const toDate = $('#enddate').val();
-        if (new Date(toDate) < new Date(fromDate)) {
-            $('#enddate').val(fromDate);
-        }
-    });
-
-    // Update From Date's max attribute when To Date changes
-    $('#enddate').on('change', function () {
-        const toDate = $(this).val();
-        $('#startdate').attr('max', toDate); // Update max attribute for From Date
-
-        // If From Date is later than the new To Date, adjust it
-        const fromDate = $('#startdate').val();
-        if (new Date(fromDate) > new Date(toDate)) {
-            $('#startdate').val(toDate);
-        }
-    });
-    
-	
-	
-	//disable future dates
-	document.addEventListener("DOMContentLoaded", function () {
-        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
-        let startdateInput = document.getElementById("startdate");
-        let enddateInput = document.getElementById("enddate");
-
-        // Set max attribute to disable future dates
-        startdateInput.setAttribute("max", today);
-        enddateInput.setAttribute("max", today);
-        
-
-        // Prevent manual future date entry
-        startdateInput.addEventListener("change", function () {
-            if (this.value > today) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Invalid Date',
-                    text: 'Future dates are not allowed.',
-                    confirmButtonText: 'OK'
-                });
-                this.value = ""; // Clear the invalid input
-            }
-        });
-    });
-	
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/return/familypension.html b/src/main/resources/templates/modules/pensioner/department/return/familypension.html
deleted file mode 100644
index 8baa7f31..00000000
--- a/src/main/resources/templates/modules/pensioner/department/return/familypension.html
+++ /dev/null
@@ -1,728 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-
-#returnfamilydetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Family Pension</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Return from Audit</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">Return from Audit - Family Pension</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="returnfamilytable">
-					                <table id="ReturnFamilyDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                    	
-					                    	<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="return, iterStat : ${returnlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${return['emp_no']}" class="text-center"></td>
-								                <td th:text="${return['emp_name']}" class="text-center"></td>
-								                <td th:text="${return['dept_name']}" class="text-center"></td>
-								                <td th:text="${return['designation']}" class="text-center"></td>	
-								                <td th:text="${return['file_moved_date'] != null ? #dates.format(return['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>							               
-								                <td th:text="${return['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${return['emp_no']}, data-temp-id=${return['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                    		
-					                       
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-        <!--  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-lg" role="document">
-		        <div class="modal-content">
-		            <div class="modal-header">
-		                <h5 class="modal-title" id="detailsModalLabel">
-		                    Returned From Audit - Family Pension (<span id="modalEmployeeCode"></span>)
-		                </h5>
-		                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-		            </div>
-		            <div class="modal-body">
-		                <div class="row">
-		                    <!-- Employee No -->
-		                    <div class="col-md-6">
-		                        <label for="employeeno" class="form-label fw-bold">Employee No  </label>
-		                        <input type="number" id="employeeno" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Employee Name -->
-		                    <div class="col-md-6">
-		                        <label for="employeename" class="form-label fw-bold">Employee Name  </label>
-		                        <input type="text" id="employeename" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Department -->
-		                    <div class="col-md-6">
-		                        <label for="department" class="form-label fw-bold">Department  </label>
-		                        <input type="text" id="department" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Designation -->
-		                    <div class="col-md-6">
-		                        <label for="designation" class="form-label fw-bold">Designation  </label>
-		                        <input type="text" id="designation" class="form-control" readonly>
-		                    </div>
-		                    
-		                     <!-- pending duration-->
-			                    
-			                    
-              				<div class="col-md-6">
-							    <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" placeholder="Enter details for pending duration" readonly>
-							    </div>
-							</div>
-		                    
-		                    
-							<!-- While in Service Death -->
-							   <div class="col-md-6">
-			                        <label for="servicedeath" class="form-label fw-bold">While in Service Death  </label>
-			                        <input type="date" id="servicedeath"  class="form-control" readonly>
-			                    </div>
-			                    
-			                     <!-- Relationship of Deceased -->
-			                    <div class="col-md-6">
-			                        <label for="relationship" class="form-label fw-bold">Relationship of Deceased  </label>
-			                        <input type="text" id="relationship" class="form-control" readonly>
-			                    </div>
-		                    
-		                    <!-- Sanctioned GIS -->
-		                    <div class="col-md-6">
-		                        <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 -->
-		                    <div class="col-md-6">
-		                        <label for="datefile" class="form-label fw-bold">Date File Sent to Audit  </label>
-		                        <input type="date" id="datefile" class="form-control" readonly >
-		                    </div>
-		
-		                    <!-- 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"  readonly></textarea>
-		                    </div>
-		                    
-		                   
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-		                    
-		                </div>
-		                
-		          <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Rectify & Submit for Audit</button>
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div> 
-		                
-		           <div style="display :none" id="receivedcard">
-			            <div class="row">
-			            		
-			            	<!-- Date File Sent to Audit -->		            
-				            <div class="col-md-6">
-		                        <label for="datefiles" class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
-		                        <input type="text" id="datefiles" class="form-control" readonly>
-				            </div>
-					         
-					        <!-- Remarks -->             
-					        <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>
-					        </div>
-					       </div> 
-					       
-					<div class="row mb-2 mt-2">
-			            <div class="col-md-12 d-flex justify-content-center">
-			                <button type="button" class="btn btn-primary" id="rectifysubmit">Submit</button>
-			            </div>
-	                </div>       
-				</div>      
-		                
-		</div>
-
-					         
-		        </div>
-		    </div>
-		</div>
-
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-	$(document).ready(function () {
-	    // Initialize DataTable
-	    const table = $('#ReturnFamilyDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        select: false,
-	        processing: false
-	    });
-
-	});		
-	
-	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("datefiles").value = formattedDateDisplay;
-        document.getElementById("servicedeath").value = formattedDateDisplay;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	document.getElementById("submitbutton").addEventListener("click", function () {
-	    // Clear the inputs in the receivedcard section
-	   // $('#datefile').val('');
-	    $('#remarks').val('');
-	    
-	    // Make the receivedcard section visible
-	    document.getElementById("receivedcard").style.display = "block";
-	
-	    // Scroll the receivedcard section into view
-	    document.getElementById("receivedcard").scrollIntoView({
-	        behavior: "smooth", // Smooth scrolling effect
-	        block: "center" // Aligns the element to the center of the viewport
-	    });
-	});
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // Populate modal fields
-	 	                $('#employeeno').val(employeeDetails.emp_no);
-	 	                $('#employeename').val(employeeDetails.emp_name);
-	 	                $('#department').val(employeeDetails.dept_name);
-	 	                $('#designation').val(employeeDetails.designation);
-	 	                $('#servicedeath').val(employeeDetails.service_death);
-	 	               	$('#relationship').val(employeeDetails.relationship_deceased);
-	 	              	$('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
-	 	               	$('#datefile').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               	
-	 	               
-	 	              // 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);
-
-	 	                // Show the modal
-	 	                $('#returnfamilydetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	          	       
-			 	            	 //$('#datefiles').val('');
-			 	         	    $('#remarkss').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('rectifysubmit').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeeno').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	                
-	 	               $('#rectifysubmit').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeeno').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-
-	 $(document).ready(function () {
-    	 
-    	 $(document).on('click', '.view-btn', function () {
-    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-    		    console.log("empCode====="+empCode);
-    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnfamilydetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnfamilydetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnfamilydetailsModal').modal('hide');
-	    });
-	});
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
-	 const options = {
-	     day: '2-digit',
-	     month: '2-digit',
-	     year: 'numeric',
-	 };
- return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-	 
-	 function saveEntryDetails(tempId,empCode) {
-	       //console.log("emp_no inside=="+empCode);	 
-  	    let entryDetails = {
-  	        empNo: empCode,
-  	        tempId: tempId,
-  	        dateToAudit: convertDateFormat($('#datefiles').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim()
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-
-  	  if (!entryDetails.remarks) {
-	       Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Remarks are required.',
-	           confirmButtonText: 'OK'
-	       });
-	      
-	       return;
-	   }
-  	    
-  	  
-  		// Disable the button to prevent multiple submissions
-  	     $('#rectifysubmit').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/department/return/updateReturnFamilyPension',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#rectifysubmit').prop('disabled', false).text('Rectify & Submit for Audit');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#rectifysubmit').prop('disabled', false).text('Rectify & Submit for Audit');
-	                        	window.location.href = "/gcc/department/return/familypension";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#rectifysubmit').prop('disabled', false).text('Rectify & Submit for Audit');	
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-
-	</script>
-
-</body>
-</html>
-
-
diff --git a/src/main/resources/templates/modules/pensioner/department/return/pendency.html b/src/main/resources/templates/modules/pensioner/department/return/pendency.html
deleted file mode 100644
index 76bd478d..00000000
--- a/src/main/resources/templates/modules/pensioner/department/return/pendency.html
+++ /dev/null
@@ -1,726 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-
-#returnpendencydetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Pendency</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Return from Audit</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					         <h5 style="font-weight:bold;">Return from Audit - 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="returnpendencytable">
-					                <table id="ReturnPendencyDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">File Category Type</th>
-					                            <th class="text-center">View</th>
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                      
-					                      <!-- Thymeleaf loop to populate data -->
-								            <tr th:each="return, iterStat : ${returnlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${return['emp_no']}" class="text-center"></td>
-								                <td th:text="${return['emp_name']}" class="text-center"></td>
-								                <td th:text="${return['dept_name']}" class="text-center"></td>
-								                <td th:text="${return['designation']}" class="text-center"></td>
-								                <td th:text="${return['file_moved_date'] != null ? #dates.format(return['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${return['file_category_name']}" class="text-center"></td>								               
-								                <td th:text="${return['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${return['emp_no']}, data-temp-id=${return['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                      
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-    
-    <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-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Return from Audit -Pendency(<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeeno" class="form-label fw-bold">Employee No  </label>
-			                        <input type="number" id="employeeno" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name  </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department  </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation  </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                   
-			                 
-			                    <!-- Class -->
-			                    <div class="col-md-6">
-			                        <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">
-						                        <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" id="retirementDetailsContainer" style="display: none; margin-top: 10px;">
-									    <label for="retirement" class="form-label fw-bold">Type Of Retirement </label>
-									    <input type="text" id="retirement" class="form-control" readonly>
-									</div>
-									
-								
-			                    <div class="col-md-6">
-										    <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="text" id="pendingDurationInputContainer" style="display: none; margin-top: 10px;">
-										        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control" placeholder="Enter details for pending duration" readonly>
-										    </div>
-										</div>
-			                    
-			                   
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
-			                        <input type="date" id="datefile_modal" class="form-control" onclick="this.showPicker()" readonly>
-			                    </div>
-			
-			                    <!-- 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"  readonly></textarea>
-			                    </div>
-			                    
-			                    
-			                    <!-- file history -->
-			                    <div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-			                    
-			                    
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Rectify & Submit for Audit</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile "  class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly >
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditbutton">Submit</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			               
-			        </div>
-			    </div>
-			</div>
-    
-    
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#ReturnPendencyDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	console.log("employeecode:",tempId);
-	 	            	
-	 	                // Populate modal fields
-	 	                $('#employeeno').val(employeeDetails.emp_no);
-	 	                $('#employeename').val(employeeDetails.emp_name);
-	 	                $('#department').val(employeeDetails.dept_name);
-	 	                $('#designation').val(employeeDetails.designation);
-	 	               	$('#classes').val(employeeDetails.retirement_class);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
-	 	               	$('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               	$('#typeofcategory').val(employeeDetails.file_category_name);
-	 	               	
-	 	               // 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);
-	 	                }
-	 	               	
-	 	                
-	 	                let typeOfCategory=employeeDetails.file_category_name;
-	 	                let typeOfRetirement=employeeDetails.type_of_retirement;
-	 	                
-	 	      
-	 	               
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#returnpendencydetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	 	    // Scroll the receivedcard section into view
-	 	          	 	    document.getElementById("receivedcard").scrollIntoView({
-	 	          	 	        behavior: "smooth", // Smooth scrolling effect
-	 	          	 	        block: "center" // Aligns the element to the center of the viewport
-	 	          	 	    });
-	 	          	            
-
-	 	          	        
-	 	          	    });
-	 	                
-	 	               /*  document.getElementById('auditbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeeno').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	        		
-	 	        		
-	 	              $('#auditbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-    	 
-    	 $(document).on('click', '.view-btn', function () {
-    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-    		 const tempId = $(this).data('temp-id');
-    		    console.log("empCode====="+empCode);
-    		    console.log("tempId====="+tempId);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    	        fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnfamilypensiondetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnpendencydetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnpendencydetailsModal').modal('hide');
-	    });
-	});
-	 
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-	 
-	 
-		function formatDateTime(dateString) {
-			 const options = {
-			     day: '2-digit',
-			     month: '2-digit',
-			     year: 'numeric',
-			 };
-			 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-			}
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);	 
-  	    let entryDetails = {
-  	    	empNo: $('#employeeno').val(),
-  	      	tempId: tempId,
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim()
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-
-  	  if (!entryDetails.remarks) {
-	       Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Remarks are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       
-	       return;
-	   }
-  	    
-
-  		// Disable the button to prevent multiple submissions
-  	     $('#auditbutton').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/department/return/updateReturnPendency',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditbutton').prop('disabled', false).text('Mark As Returned From Audit');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditbutton').prop('disabled', false).text('Mark As Returned From Audit');
-	                        	window.location.href = "/gcc/department/return/pendency";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditbutton').prop('disabled', false).text('Mark As Returned From Audit');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-    
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/department/return/retirement.html b/src/main/resources/templates/modules/pensioner/department/return/retirement.html
deleted file mode 100644
index 74023264..00000000
--- a/src/main/resources/templates/modules/pensioner/department/return/retirement.html
+++ /dev/null
@@ -1,613 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Retirement</h5>
-                                        <span>Department Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Return from Audit</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					        <h5 style="font-weight:bold;">Return from Audit - Retirement</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">
-					                <table id="ReturnRetriedDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>					
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					               
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                       
-					                       <!-- Thymeleaf loop to populate data -->
-								            <tr th:each="return, iterStat : ${returnlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${return['emp_no']}" class="text-center"></td>
-								                <td th:text="${return['emp_name']}" class="text-center"></td>
-								                <td th:text="${return['dept_name']}" class="text-center"></td>
-								                <td th:text="${return['designation']}" class="text-center"></td>
-								                <td th:text="${return['file_moved_date'] != null ? #dates.format(return['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>								               
-								                <td th:text="${return['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${return['emp_no']}, data-temp-id=${return['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                       
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-   
-<!--  Modal Box -->    
-<div class="modal fade" id="returnretrieddetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="detailsModalLabel">
-                    Returned From Audit - Retirement (<span id="modalEmployeeCode"></span>)
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Employee No -->
-                    <div class="col-md-6">
-                        <label for="employeenomodel" class="form-label fw-bold">Employee No  </label>
-                        <input type="number" id="employeenomodel" class="form-control" readonly>
-                    </div>
-
-                    <!-- Employee Name -->
-                    <div class="col-md-6">
-                        <label for="employeename" class="form-label fw-bold">Employee Name  </label>
-                        <input type="text" id="employeename" class="form-control" readonly>
-                    </div>
-
-                    <!-- Department -->
-                    <div class="col-md-6">
-                        <label for="department" class="form-label fw-bold">Department  </label>
-                        <input type="text" id="department" class="form-control" readonly>
-                    </div>
-
-                    <!-- Designation -->
-                    <div class="col-md-6">
-                        <label for="designation" class="form-label fw-bold">Designation  </label>
-                        <input type="text" id="designation" class="form-control" readonly>
-                    </div>
-                    
-                    <div class="col-md-6">
-                        <label for="retirementdate" class="form-label fw-bold">Retirement Date  </label>
-                        <input type="date" id="retirementdate" class="form-control" readonly>
-                    </div>
-                    
-                    <!-- Class -->
-                    <div class="col-md-6">
-                        <label for="classes" class="form-label fw-bold">Class  </label>
-                        <input type="text" id="classes" class="form-control" readonly>
-                    </div>
-					
-					<!-- Type of Retirement -->
-                    <div class="col-md-6">
-                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement  </label>
-                        <input type="text" id="typeofretirement" class="form-control" readonly>
-                    </div>
-                    
-                    <!-- Date File Sent to Audit -->
-                    <div class="col-md-6">
-                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit  </label>
-                        <input type="date" id="datefile_modal" class="form-control" readonly>
-                    </div>
-
-                    <!-- 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"  readonly></textarea>
-                    </div>
-                    
-                    <!-- new -->
-
-					<div class="col-md-12 mt-4">						
-						<h5>File History</h5>							 
-						<div id="fileHistoryContainer" class="file-history-list">
-							<!-- File History will be dynamically loaded here -->
-						</div>
-					</div>
-                                                         
-                </div>         
-            
-                 <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Rectify & Submit for Audit</button>
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div>
-          
-				   <div  style="display :none" id="receivedcard">
-		             <div class="row">
-		             
-		             <!-- Date File Sent to Audit -->
-		             <div class="col-md-6">
-	                       <label for="datefile "  class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
-	                       <input type="text" id="datefile"  class="form-control" readonly>
-		             </div>
-		             
-		             <!-- 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>
-		             </div>              
-		           </div>
-		           <div class="row mb-2 mt-2">
-			            <div class="col-md-12 d-flex justify-content-center">
-			                <button type="button" class="btn btn-primary" id="rectifysubmit">Submit</button>
-			            </div>
-	              </div>					          
-			    </div>
-				 
-			</div>         
-        </div>
-    </div>
-</div>
-
-					
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	
-		$(document).ready(function () {
-		    // Initialize DataTable
-		    const table = $('#ReturnRetriedDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-
-		});		
-		
-		
-		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;
-
-	        
-	    });
-	  
-	  
-	function convertDateFormat(dateString) {
-	    if (!dateString) return '';
-	    let [day, month, year] = dateString.split('-');
-	    return `${year}-${month}-${day}`;
-	}
-		
-		
-		 document.getElementById("submitbutton").addEventListener("click", function () {
-			    // Clear the inputs in the receivedcard section
-			    //$('#datefile').val('');
-			    $('#remarks').val('');
-			    
-			    // Make the receivedcard section visible
-			    document.getElementById("receivedcard").style.display = "block";
-			
-			    // Scroll the receivedcard section into view
-			    document.getElementById("receivedcard").scrollIntoView({
-			        behavior: "smooth", // Smooth scrolling effect
-			        block: "center" // Aligns the element to the center of the viewport
-			    });
-			});
-		
-		//model function
-		 function fetchEmployeeDetails(tempId) {
-		 	    $.ajax({
-		 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-		 	        type: 'GET',
-		 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-		 	        success: function (response) {
-		 	            if (response && response.length > 0) {
-		 	            	
-		 	            	let employeeDetails = response[0]; // Access the first object in the array
-		 	            	console.log("response:",response);
-		 	            	
-		 	            	
-		 	                // 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);
-		 	                $('#classes').val(employeeDetails.retirement_class);
-		 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-		 	               	$('#remarks_modal').val(employeeDetails.remarks);
-		 	                $('#retirementdate').val(employeeDetails.retirement_date);
-		 	               
-		 	                // Update the modal title with the employee code
-		 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-		 	                // Show the modal
-		 	                $('#returnretrieddetailsModal').modal('show');
-		 	                
-		 	             	//additional card display 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
-
-		 	                    // Trigger the save function and pass the value
-		 	                    saveEntryDetails(tempId,employeeNo);
-		 	        		}); */
-		 	                
-		 	               $('#rectifysubmit').off('click').on('click', function () {
-		 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-		 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-		 	            	});
-		 	             	
-		 	                
-		 	            } else {
-		 	                Swal.fire({
-		 	                    icon: 'info',
-		 	                    title: 'No Data',
-		 	                    text: 'No details found for the selected employee.',
-		 	                    confirmButtonText: 'OK',
-		 	                });
-		 	            }
-		 	        },
-		 	        error: function () {
-		 	            Swal.fire({
-		 	                icon: 'error',
-		 	                title: 'Error',
-		 	                text: 'Failed to fetch employee details. Please try again.',
-		 	                confirmButtonText: 'OK',
-		 	            });
-		 	        },
-		 	    });
-		 	}
-
-		 $(document).ready(function () {
-	    	 
-	    	 $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		});
-
-
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#returnretrieddetailsModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-		   
-		    // Handle close button click
-		    $('#back').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    $('.close').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		});
-		 
-		 function loadFileHistory(tempId) {
-			    $.ajax({
-			        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-			        type: 'GET',
-			        data: { tempId: tempId }, // Pass empCode as a parameter
-			        success: function (response) {
-			            if (response.length > 0) {
-			                let historyHtml = '';
-			                response.forEach(item => {
-			                    historyHtml += `
-			                        <div class="file-history-item">
-			                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-			                            <div class="file-history-content">
-			                                <div class="file-history-status">${item.fileStatusHistory}</div>
-			                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-			                            </div>
-			                        </div>
-			                    `;
-			                });
-
-
-
-			                $('#fileHistoryContainer').html(historyHtml);
-			            } else {
-			                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-			            }
-			        },
-			        error: function () {
-			            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-			        }
-			    });
-			}
-
-		 // Function to format date and time
-		function formatDateTime(dateString) {
-			 const options = {
-			     day: '2-digit',
-			     month: '2-digit',
-			     year: 'numeric',
-			 };
-			 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-			}
-		 
-		 
-		 function saveEntryDetails(tempId,empCode) {
-		       //console.log("emp_no inside=="+empCode);	 
-	  	    let entryDetails = {
-	  	        empNo: empCode,
-	  	        tempId: tempId,
-	  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-	  	        remarks: $('#remarks').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-
-	  	  if (!entryDetails.remarks) {
-		       Swal.fire({
-		           icon: 'warning',
-		           title: 'Validation Error!',
-		           text: 'Remarks are required.',
-		           confirmButtonText: 'OK'
-		       });
-		      
-		       return;
-		   }
-	  	    
-	  	   
-	  		// Disable the button to prevent multiple submissions
-	  	     $('#rectifysubmit').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/department/return/updateEmployeeDetails',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#rectifysubmit').prop('disabled', false).text('Submit');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#rectifysubmit').prop('disabled', false).text('Submit');
-		                        	window.location.href = "/gcc/department/return/retirement";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#rectifysubmit').prop('disabled', false).text('Submit');	
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });  
-	  	}
-
-	</script>
-
-
-</body>
-</html>
-
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/.DS_Store b/src/main/resources/templates/modules/pensioner/pensioner/.DS_Store
deleted file mode 100644
index 58fc95d173d3cfb367c51955530c598862712674..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMOKRLe5Un1|*v28r(qIfafx$PBhe;r7FS5;i;txn@n8?X0pndL;E94Tv8|N0;
z<QB=R>Lzqa-FRpGsfOy3TCck6J+;)+8X|Jj>(vR-0TJ!O*uUOKl_-3jZB!<q<q+N>
zo~V0Qx64J{E=E{uFa=BjQ@|831x$g5p#auwF1wj^-(R)b6fgyzr2_nZC}HfY;Ct`o
z)qzU30PqExrQjI*0EsDsuY&Krmr(TScMmRvy0FD?J{;FehQn9E_ul((az30~7}<p#
zij&b1R|=e5<-OIWfGIFmfcNg(G^cA?(Usc2^MiB>JN_$0LL+2-adNh7o3*sNx9{Pj
zt4%wbh3^3TVBWs^dBc4v#Oe;j`Z69t2HK+~wbam>YWheWY!!WR;EaF3;*1j!D)Y(j
zEkq<x83svYl1T!o7;SO7^b)$y=@VVj0?g*L!TB-HI<TxYH-445)97yO&^cl@^u@;w
z(BIH|ti%AVRB%&HW`Gzd@GIQI5lXSopcHc__i_h!k@<F*ck>}vnR(w8SA|yDPnxfi
zy+UNOAD}YXE0oH9(qk~JRvXN|CG3hmXXas?{|K)b6vdxZpBWCLzM3}4VuVvXijsM}
z5FTrpM;+#2Ztfic8}X4<7?rL6ETR=t;1MdoD<8@M@BiQAzyAx!DpSA|c$x~hVs<v0
zf}5=B368wVm#_~oE{yBFmk?CyhXBt1|6z#Z5>Sq*g73XY3yOUR5E-m81@2XWe=}AJ
A1^@s6

diff --git a/src/main/resources/templates/modules/pensioner/pensioner/audit/familypension.html b/src/main/resources/templates/modules/pensioner/pensioner/audit/familypension.html
deleted file mode 100644
index fbe19842..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/audit/familypension.html
+++ /dev/null
@@ -1,742 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#returnfamilypensiondetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Family Pension</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Audit</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Audit- Family Pension</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-												<th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  			
-					                  			
-					                  			<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']},data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                        
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  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-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Audit - Family Pension (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    
-			                    
-			                    <!-- pending duration-->
-			                    
-			                    
-                  				<div class="col-md-6">
-								    <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" 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" class="form-check-input" disabled>
-								            <label for="no" class="form-check-label">No</label>
-								        </div>
-								    </div>
-								    <div class="dropdown" id="pendingDurationInputContainer" style="margin-top: 10px;">
-								        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control" readonly>
-								    </div>
-								</div>
-			                    
-			                    
-			                    <!-- While in Service Death -->
-			                    <div class="col-md-6">
-			                        <label for="servicedeath" class="form-label fw-bold">While in Service Death </label>
-			                        <input type="date" id="servicedeath" class="form-control" readonly>
-			                    </div>
-			                    
-			                     <!-- Relationship of Deceased -->
-			                    <div class="col-md-6">
-			                        <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">
-			                        <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 -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit </label>
-			                        <input type="date" id="datefile_modal" class="form-control" onclick="this.showPicker()" readonly>
-			                    </div>
-			
-			                    <!-- 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"  readonly></textarea>
-			                    </div>
-			                    
-			                    
-			                    <div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Submit</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile"  class="form-label fw-bold">Audit Certificate Received Date<span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly>
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditbutton">Mark As Audit Certificate Received</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			        
-					           
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    
-    
-    
-    <script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	
-	document.getElementById("submitbutton").addEventListener("click", function () {
-	    // Clear the inputs in the receivedcard section
-	    //$('#datefile').val('');
-	    $('#remarks').val('');
-	    
-	    // Make the receivedcard section visible
-	    document.getElementById("receivedcard").style.display = "block";
-	
-	    // Scroll the receivedcard section into view
-	    document.getElementById("receivedcard").scrollIntoView({
-	        behavior: "smooth", // Smooth scrolling effect
-	        block: "center" // Aligns the element to the center of the viewport
-	    });
-	});
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	console.log("employeecode:",tempId);
-	 	            	
-	 	                // Populate modal fields
-	 	                $('#employeenomodel').val(employeeDetails.emp_no);
-	 	                $('#employeename').val(employeeDetails.emp_name);
-	 	                $('#department').val(employeeDetails.dept_name);
-	 	                $('#designation').val(employeeDetails.designation);
-	 	                $('#servicedeath').val(employeeDetails.service_death);
-	 	               	$('#relationship').val(employeeDetails.relationship_deceased);
-	 	              	$('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
-	 	               	$('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               	
-	 	               	
-	 	               // 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);
-
-	 	                // Show the modal
-	 	                $('#returnfamilypensiondetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    //$('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	                
-	 	               $('#auditbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-    	 
-    	 $(document).on('click', '.view-btn', function () {
-    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-    		 const tempId = $(this).data('temp-id');
-    		    console.log("empCode====="+empCode);
-    		    console.log("tempId====="+tempId);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    	        fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnfamilypensiondetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnfamilypensiondetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnfamilypensiondetailsModal').modal('hide');
-	    });
-	});
-	 
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-	 
-	 
-		function formatDateTime(dateString) {
-			 const options = {
-			     day: '2-digit',
-			     month: '2-digit',
-			     year: 'numeric',
-			 };
-			 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-			}
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);	 
-  	    let entryDetails = {
-  	        empNo: empNo,
-  	      	tempId: tempId,
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim()
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	  if (!entryDetails.remarks) {
-	       Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Remarks are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Remarks");
-	       return;
-	   }
- 	    
-		   
-  		// Disable the button to prevent multiple submissions
-  	     $('#auditbutton').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/pensioner/audit/updateFamilyPensionDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditbutton').prop('disabled', false).text('Mark As Audit Certificate Received');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditbutton').prop('disabled', false).text('Mark As Audit Certificate Received');
-	                        	window.location.href = "/gcc/pensioner/audit/familypension";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditbutton').prop('disabled', false).text('Mark As Audit Certificate Received');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-    
-    
-
-	</script>
-
-
-</body>
-</html>
-
-
-
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/audit/pendency.html b/src/main/resources/templates/modules/pensioner/pensioner/audit/pendency.html
deleted file mode 100644
index 0bfc0835..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/audit/pendency.html
+++ /dev/null
@@ -1,738 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#returnpendencydetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Pendency</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Audit</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;">Audit- 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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Category Type</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  			
-					                  					
-					                  			<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_category_name']}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']},data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                        
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  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-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Audit -Pendency(<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeeno" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeeno" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                   
-			                 
-			                    <!-- Class -->
-			                    <div class="col-md-6">
-			                        <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">
-						                        <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" >
-									    <label for="retirement" class="form-label fw-bold">Type Of Retirement</label>
-									    <input type="text" id="retirement" class="form-control" readonly>
-									</div>
-									
-								
-			                    <div class="col-md-6">
-										    <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="text" id="pendingDurationInputContainer" style="margin-top: 10px;">
-										        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control"  readonly>
-										    </div>
-										</div>
-			                    
-			                   
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit </label>
-			                        <input type="date" id="datefile_modal" class="form-control" onclick="this.showPicker()" readonly>
-			                    </div>
-			
-			                    <!-- 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"  readonly></textarea>
-			                    </div>
-			                    
-			                    
-			                    <!-- file history -->
-			                    <div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-			                    
-			                    
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Submit</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile "  class="form-label fw-bold">Audit Certificate Received Date<span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly >
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditbutton">Mark As Audit Certificate Received</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			               
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	 <script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	console.log("employeecode:",tempId);
-	 	            	
-	 	                // Populate modal fields
-	 	                $('#employeeno').val(employeeDetails.emp_no);
-	 	                $('#employeename').val(employeeDetails.emp_name);
-	 	                $('#department').val(employeeDetails.dept_name);
-	 	                $('#designation').val(employeeDetails.designation);
-	 	               	$('#classes').val(employeeDetails.retirement_class);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
-	 	               	$('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	              	$('#retirement').val(employeeDetails.type_of_retirement);
-	 	               	
-	 	               // 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);
-
-	 	                // Show the modal
-	 	                $('#returnpendencydetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	 	    // Scroll the receivedcard section into view
-	 	          	 	    document.getElementById("receivedcard").scrollIntoView({
-	 	          	 	        behavior: "smooth", // Smooth scrolling effect
-	 	          	 	        block: "center" // Aligns the element to the center of the viewport
-	 	          	 	    });
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeeno').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	                
-	 	               $('#auditbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-    	 
-    	 $(document).on('click', '.view-btn', function () {
-    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-    		 const tempId = $(this).data('temp-id');
-    		    console.log("empCode====="+empCode);
-    		    console.log("tempId====="+tempId);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    	        fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnfamilypensiondetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnpendencydetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnpendencydetailsModal').modal('hide');
-	    });
-	});
-	 
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-	 
-	 
-		function formatDateTime(dateString) {
-			 const options = {
-			     day: '2-digit',
-			     month: '2-digit',
-			     year: 'numeric',
-			 };
-			 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-			}
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);	 
-  	    let entryDetails = {
-  	    	empNo: $('#employeeno').val(),
-  	      	tempId: tempId,
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim()
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	  if (!entryDetails.remarks) {
-	       Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Remarks are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Remarks");
-	       return;
-	   }
- 	    
-
-		   
-  		// Disable the button to prevent multiple submissions
-  	     $('#auditbutton').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/pensioner/audit/updatePendencyDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditbutton').prop('disabled', false).text('Mark As Audit Certificate Received');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditbutton').prop('disabled', false).text('Mark As Audit Certificate Received');
-	                        	window.location.href = "/gcc/pensioner/audit/pendency";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditbutton').prop('disabled', false).text('Mark As Returned From Audit');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-    
-    
-
-	</script>
-
-
-</body>
-</html>
-
-
-
-
-
-
-
-
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/audit/retirement.html b/src/main/resources/templates/modules/pensioner/pensioner/audit/retirement.html
deleted file mode 100644
index a4164d73..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/audit/retirement.html
+++ /dev/null
@@ -1,614 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Retirement</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" 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>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Audit- Retirement</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Audit - Retirement (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div class="col-md-6">
-			                        <label for="retirementdate" class="form-label fw-bold">Retirement Date </label>
-			                        <input type="date" id="retirementdate" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Class -->
-			                    <div class="col-md-6">
-			                        <label for="classes" class="form-label fw-bold">Class </label>
-			                        <input type="text" id="classes" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Type of Retirement -->
-			                    <div class="col-md-6">
-			                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-			                        <input type="text" id="typeofretirement" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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"  readonly></textarea>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">
-									<h5>File History</h5>
-										<div id="fileHistoryContainer" class="file-history-list">
-											<!-- File History will be dynamically loaded here -->
-									</div>
-								</div> 
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Mark As Audit Certificate Received</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile "  class="form-label fw-bold">Audit Certificate Received Date<span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly>
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditsubmit">Submit</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
- 
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-		
-		    // Initialize DataTable
-		    const table = $('#AuditDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-		    
-		    
-		    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;
-
-		        
-		    });
-		  
-		  
-		function convertDateFormat(dateString) {
-		    if (!dateString) return '';
-		    let [day, month, year] = dateString.split('-');
-		    return `${year}-${month}-${day}`;
-		}
-		    
-		    
-		    document.getElementById("submitbutton").addEventListener("click", function () {
-			    // Clear the inputs in the receivedcard section
-			    //$('#datefile').val('');
-			    $('#remarks').val('');
-			    
-			    // Make the receivedcard section visible
-			    document.getElementById("receivedcard").style.display = "block";
-			
-			    // Scroll the receivedcard section into view
-			    document.getElementById("receivedcard").scrollIntoView({
-			        behavior: "smooth", // Smooth scrolling effect
-			        block: "center" // Aligns the element to the center of the viewport
-			    });
-			});
-		 
-		  //model function
-			 function fetchEmployeeDetails(tempId) {
-			 	    $.ajax({
-			 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-			 	        type: 'GET',
-			 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-			 	        success: function (response) {
-			 	            if (response && response.length > 0) {
-			 	            	
-			 	            	let employeeDetails = response[0]; // Access the first object in the array
-			 	            	console.log("response:",response);
-			 	            	
-			 	            	
-			 	                // 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);
-			 	               $('#classes').val(employeeDetails.retirement_class);
-			 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
-			 	               	$('#remarks_modal').val(employeeDetails.remarks);
-				 	             $('#retirementdate').val(employeeDetails.retirement_date);
-			 	                
-			 	               
-			 	                // Update the modal title with the employee code
-			 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-			 	                // Show the modal
-			 	                $('#returnretrieddetailsModal').modal('show');
-			 	                
-			 	             	//additional card display function
-			 	               document.getElementById("submitbutton").addEventListener("click", function() {
-			 	          	       
-					 	            	// $('#datefile').val('');
-					 	         	    //$('#remarks').val('');
-			 	          	            document.getElementById("receivedcard").style.display = "block";
-			 	          	        
-			 	          	    });
-			 	                
-			 	                /* document.getElementById('auditsubmit').addEventListener('click', function () {
-			 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-			 	                    // Trigger the save function and pass the value
-			 	                    saveEntryDetails(tempId,employeeNo);
-			 	        		}); */
-			 	                
-			 	               $('#auditsubmit').off('click').on('click', function () {
-			 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-			 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-			 	            	});
-			 	                
-			 	             	
-			 	                
-			 	            } else {
-			 	                Swal.fire({
-			 	                    icon: 'info',
-			 	                    title: 'No Data',
-			 	                    text: 'No details found for the selected employee.',
-			 	                    confirmButtonText: 'OK',
-			 	                });
-			 	            }
-			 	        },
-			 	        error: function () {
-			 	            Swal.fire({
-			 	                icon: 'error',
-			 	                title: 'Error',
-			 	                text: 'Failed to fetch employee details. Please try again.',
-			 	                confirmButtonText: 'OK',
-			 	            });
-			 	        },
-			 	    });
-			 	}
-		  
-			 $(document).ready(function () {
-		    	 
-		    	 $(document).on('click', '.view-btn', function () {
-		    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-		    		    console.log("empCode====="+empCode);
-		    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-		    		    // Hide the receivedcard section before showing the modal
-		    	        $("#receivedcard").hide();
-		    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-		    		    loadFileHistory(tempId); // Load the file history for the selected employee
-		    		});
-
-
-			    // Initialize the modal with static backdrop and disabled keyboard closing
-			    $('#returnretrieddetailsModal').modal({
-			        backdrop: 'static',
-			        keyboard: false,
-			        show: false // Ensure it doesn't auto-show on page load
-			    });
-
-			   
-			    // Handle close button click
-			    $('#back').click(function () {
-			        $('#returnretrieddetailsModal').modal('hide');
-			    });
-			    
-			    $('.close').click(function () {
-			        $('#returnretrieddetailsModal').modal('hide');
-			    });
-			});
-			 
-			 
-			 function loadFileHistory(tempId) {
-				    $.ajax({
-				        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-				        type: 'GET',
-				        data: { tempId: tempId }, // Pass empCode as a parameter
-				        success: function (response) {
-				            if (response.length > 0) {
-				                let historyHtml = '';
-				                response.forEach(item => {
-				                    historyHtml += `
-				                        <div class="file-history-item">
-				                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-				                            <div class="file-history-content">
-				                                <div class="file-history-status">${item.fileStatusHistory}</div>
-				                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-				                            </div>
-				                        </div>
-				                    `;
-				                });
-
-
-
-				                $('#fileHistoryContainer').html(historyHtml);
-				            } else {
-				                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-				            }
-				        },
-				        error: function () {
-				            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-				        }
-				    });
-				}
-
-			 // Function to format date and time
-			function formatDateTime(dateString) {
-		 const options = {
-		     day: '2-digit',
-		     month: '2-digit',
-		     year: 'numeric',
-		 };
-		 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-		}
-			 
-			 function saveEntryDetails(tempId,empCode) {
-			       //console.log("emp_no inside=="+empCode);	 
-		  	    let entryDetails = {
-		  	        empNo: empCode, 
-		  	      	tempId: tempId,
-		  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-		  	        remarks: $('#remarks').val(),
-		  	        deptId:$('#deptId').text().trim(),
-		  	        filemovedby:$('#userId').text().trim()
-		  	    };
-		  	    
-		  	    console.log("entryDetails:",entryDetails);
-		  	    
-		  	  if (!entryDetails.remarks) {
-			       Swal.fire({
-			           icon: 'warning',
-			           title: 'Validation Error!',
-			           text: 'Remarks are required.',
-			           confirmButtonText: 'OK'
-			       });
-			       console.warn("Validation error: Missing Remarks");
-			       return;
-			   }
-		  	    
-		   
-		  		// Disable the button to prevent multiple submissions
-		  	     $('#auditsubmit').prop('disabled', true).text('Processing...');
-		  	    
-		  	    $.ajax({
-		  	        url: '/gcc/api/pensioner/audit/updateEmployeeDetails',
-		  	        type: 'POST',
-		  	        contentType: 'application/json',
-		  	        data: JSON.stringify(entryDetails),
-		  	        success: function (response) {
-		  	        	$('#auditsubmit').prop('disabled', false).text('Submit');	
-		  	            Swal.fire({
-		  	                icon: 'success',
-		  	                title: 'Success',
-		  	                text: response,
-		  	               	allowOutsideClick: false,
-		  	              	allowEscapeKey: false,
-		  	              	allowEnterKey: false,
-		  	                confirmButtonText: 'OK'
-		  	            }).then((result) => {
-			                        if (result.isConfirmed) {
-			                        	$('#auditsubmit').prop('disabled', false).text('Submit');
-			                        	window.location.href = "/gcc/pensioner/audit/retirement";
-			                            console.log("Continue clicked");
-			                        }
-		  	            });
-		  	        },
-		  	        error: function (xhr, status, error) {
-		  	        	$('#auditsubmit').prop('disabled', false).text('Submit');
-		  	            Swal.fire({
-		  	                icon: 'error',
-		  	                title: 'Error',
-		  	                text: 'Failed to save details. Please try again.',
-		  	                confirmButtonText: 'OK'
-		  	            });
-		  	            console.error('Error:', xhr.responseText);
-		  	        }
-		  	    });  
-		  	}
-		    
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/completed/contributorypensionscheme.html b/src/main/resources/templates/modules/pensioner/pensioner/completed/contributorypensionscheme.html
deleted file mode 100644
index 391b9e44..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/completed/contributorypensionscheme.html
+++ /dev/null
@@ -1,703 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#completedDetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-#completedDetailsModal label{
-	padding-top: 3%;
-}
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Contributory Pension Scheme</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Contributory Pension Scheme</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-					    <div class="col-md-12">
-					        <div class="card">
-					            <div class="card-block">
-					                <h5 style="font-weight:bold;">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">
-					                    <table id="CompletedCPSDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                        <thead class="thead-dark">
-					                            <tr role="row">
-					                                <th class="text-center">S.No</th>
-					                                <th class="text-center">Employee Code</th>
-					                                <th class="text-center">Name</th>
-					                                <th class="text-center">Department</th>
-					                                <th class="text-center">Designation</th>
-					                                <th class="text-center">File Created Date</th>					                            
-					                     		    <th class="text-center">File Type</th> 
-					                                <th class="text-center">View</th>
-					                            </tr>
-					                        </thead>
-					                        <tbody style="text-align:center;">
-					                            <!-- Thymeleaf loop to populate data -->
-					                            <tr th:each="cps, iterStat : ${completedCPSList}">
-					                                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-					                                <td th:text="${cps['emp_no']}" class="text-center"></td>
-					                                <td th:text="${cps['emp_name']}" class="text-center"></td>
-					                                <td th:text="${cps['dept_name']}" class="text-center"></td>
-					                                <td th:text="${cps['designation']}" class="text-center"></td>
-					                                <td th:text="${cps['created_date'] != null ? #dates.format(cps['created_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                    <td th:text="${cps['file_entry_type']}" class="text-center"></td> 
-					                                <td class="text-center">
-					                                    <button class="btn btn-primary btn-sm view-btn" 
-					                                            th:attr="data-id=${cps['emp_no']}, data-temp-id=${cps['temp_id']}">
-					                                        View
-					                                    </button>
-					                                </td>
-					                            </tr>
-					                        </tbody>
-					                    </table>
-					                </div>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-
-</div>
-
-                    </div>
-                    <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-                </div>
-        </div>
-
-    
-<!-- Modal Box for CompletedDetails -->
-<!-- Modal Box for CompletedDetails -->
-<div class="modal fade" id="completedDetailsModal" tabindex="-1" role="dialog" aria-labelledby="completedDetailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="completedDetailsModalLabel">
-                     Contributory pension Scheme Completed Details - (<span id="completedModalEmployeeCode"></span>)
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <div class="col-md-6">
-                        <label for="completedEmployeeNo" class="form-label fw-bold">Employee No </label>
-                        <input type="text" id="completedEmployeeNo" class="form-control" readonly>
-                    </div>
-                    <div class="col-md-6">
-                        <label for="completedEmployeeName" class="form-label fw-bold">Employee Name </label>
-                        <input type="text" id="completedEmployeeName" class="form-control" readonly>
-                    </div>
-                    <div class="col-md-6">
-                        <label for="completedDepartment" class="form-label fw-bold">Department </label>
-                        <input type="text" id="completedDepartment" class="form-control" readonly>
-                    </div>
-                    <div class="col-md-6">
-                        <label for="completedDesignation" class="form-label fw-bold">Designation </label>
-                        <input type="text" id="completedDesignation" class="form-control" readonly>
-                    </div>
-
-                    <div class="col-md-6">
-                        <label for="completedClass" class="form-label fw-bold">Class </label>
-                        <input type="text" id="completedClass" class="form-control" readonly>
-                    </div>
-                    <div class="col-sm-6">
-                        <label for="completedretirementdate" class="form-label fw-bold">Retirement Date </label>
-                        <input type="date" id="completedretirementdate" class="form-control" readonly>
-                    </div>
-                    <div class="col-md-6">
-                        <label for="completedType" class="form-label fw-bold">Type of Retirement </label>
-                        <input type="text" id="completedType" class="form-control" readonly>
-                    </div>
-					<!-- UAC Section -->
-					    <div class="col-md-6">
-					        <label class="form-label fw-bold" for="uac">Whether File Sent UAC Date </label>
-					        <div class="d-flex">
-					            <div class="form-check" style="padding-right:10px;">
-					                <input type="radio" id="uacYes" name="uac" class="form-check-input" value="Yes" >
-					                <label for="uacYes" class="form-check-label">Yes</label>
-					            </div>
-					            <div class="form-check">
-					                <input type="radio" id="uacNo" name="uac" class="form-check-input" value="No" >
-					                <label for="uacNo" class="form-check-label">No</label>
-					            </div>
-					        </div>
-					        <div class="mt-3" id="uacInputDiv" style="display: none;">
-					            <input type="date" id="uacDate" class="form-control" readonly>
-					        </div>
-					    </div>
-                    
-						<!-- Pending Duration Section -->
-						<!-- <div class="col-md-6">
-						    <label class="form-label fw-bold">Pending Duration </label>
-						    <div class="d-flex">
-						        <div class="form-check" style="padding-right:10px;">
-						            <input type="radio" id="oneYear" name="pendingDuration" class="form-check-input" value="ONE_YEAR" disabled>
-						            <label for="oneYear" class="form-check-label">yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input type="radio" id="moreThanOneYear" name="pendingDuration" class="form-check-input" value="MORETHAN_ONE_YEAR" disabled>
-						            <label for="moreThanOneYear" class="form-check-label">no</label>
-						        </div>
-						    </div>
-						    <div class="mt-3" id="reasonForPendingDiv" style="display: none;">
-						        <input type="text" id="reasonForPending" class="form-control" readonly>
-						    </div>
-						</div> -->
-						
-						
-                   <!-- Pending Duration -->
-							<div class="col-md-6">
-							    <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="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled>
-							            <label for="yespen" class="form-check-label">Yes</label>
-							        </div>
-							        <div class="form-check">
-							            <input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" disabled>
-							            <label for="nopen" class="form-check-label">No</label>
-							        </div>
-							    </div>
-							    <div id="clickyesdiv" style="display: none; margin-top: 10px;">
-							        <label for="clickyes" class="form-label">Please specify:</label>
-							        <input type="text" id="Clickyes" class="form-control" >
-							    </div>
-							</div> 
-                    
-				    <!-- CPS Section -->
-				    <div class="col-md-6">
-				        <label class="form-label fw-bold">Whether CPS Amount Settled </label>
-				        <div class="d-flex">
-				            <div class="form-check" style="padding-right:10px;">
-				                <input type="radio" id="cpsYes" name="cps" class="form-check-input" value="Yes" >
-				                <label for="cpsYes" class="form-check-label">Yes</label>
-				            </div>
-				            <div class="form-check">
-				                <input type="radio" id="cpsNo" name="cps" class="form-check-input" value="No">
-				                <label for="cpsNo" class="form-check-label">No</label>
-				            </div>
-				        </div>
-				        <div class="mt-3" id="cpsInputDiv" style="display: none;">
-				            <input type="text" id="cpsAmount" class="form-control" readonly>
-				        </div>
-				    </div>
-				
-				    <!-- EL/LPA Section -->
-				    <div class="col-md-6">
-				        <label class="form-label fw-bold">Whether EL/LPA Amount Settled </label>
-				        <div class="d-flex">
-				            <div class="form-check" style="padding-right:10px;">
-				                <input type="radio" id="elLpaYes" name="el_or_lpa" class="form-check-input" value="yes" >
-				                <label for="elLpaYes" class="form-check-label">Yes</label>
-				            </div>
-				            <div class="form-check">
-				                <input type="radio" id="elLpaNo" name="el_or_lpa" class="form-check-input" value="no" >
-				                <label for="elLpaNo" class="form-check-label">No</label>
-				            </div>
-				        </div>
-				        <div class="mt-3" id="elLpaInputDiv" style="display: none;">
-				            <input type="text" id="elLpaAmount" class="form-control" readonly>
-				        </div>
-				    </div>
-				
-				    <!-- SPFGS Section -->
-				    <div class="col-md-6">
-				        <label class="form-label fw-bold">Whether SPFGS Amount Settled </label>
-				        <div class="d-flex">
-				            <div class="form-check" style="padding-right:10px;">
-				                <input type="radio" id="spfgsYes" name="spfgs" class="form-check-input" value="yes" >
-				                <label for="spfgsYes" class="form-check-label">Yes</label>
-				            </div>
-				            <div class="form-check">
-				                <input type="radio" id="spfgsNo" name="spfgs" class="form-check-input" value="no" >
-				                <label for="spfgsNo" class="form-check-label">No</label>
-				            </div>
-				        </div>
-				        <div class="mt-3" id="spfgsInputDiv" style="display: none;">
-				            <input type="text" id="spfgsAmount" class="form-control" readonly>
-				        </div>
-				    </div>				
-										
-                    <div class="col-md-12">
-                        <label for="completedRemarks" class="form-label fw-bold">Comments/Remarks  </label>
-                        <textarea id="completedRemarks" class="form-control" rows="4" placeholder="Enter remarks" readonly></textarea>
-                    </div>
-                    
-                    	<div class="col-md-12 mt-4">
-								<h5>File History</h5>
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-								</div>
-							</div> 
-                </div>
-                <div class="row mb-2 mt-2">
-                    <div class="col-md-12 d-flex justify-content-center">
-                         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="completedBackButton">Back</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-			
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    
-    
-
-	<script>
-	
-	 const table = $('#CompletedCPSDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        select: false,
-	        processing: false
-	    });
-	
-	$(document).ready(function () {
-
-	    // Handle view button click to fetch completed details
-	    $(document).on('click', '.view-btn', function () {
-	    	  const empCode = $(this).data('id');
-	          const tempId = $(this).data('temp-id');
-
-	          if (!tempId) {
-	              console.error("tempId is missing!");
-	              return;
-	          }
-
-	          console.log("empCode:", empCode || "Not Provided");
-	          console.log("tempId:", tempId);
-
-	          fetchCPSDetails(tempId);
-	          loadFileHistory(tempId);
-	    });
-
-	    // Initialize modal
-	    $('#completedDetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false
-	    });
-
-	    // Handle Close and Back button click
-	    $('.close, #back').click(function () {
-	        $('#completedDetailsModal').modal('hide');
-	        //clearFields();
-	    });
-
-
-	    function fetchCPSDetails(tempId) {
-	        $.ajax({
-	            url: '/gcc/api/department/audit/getemployeedetailscps',
-	            type: 'GET',
-	            data: { tempId: tempId },
-	            success: function (response) {
-	                if (response && response.length > 0) {
-	                    let cpsDetails = response[0]; // Access the first object in the array
-	                    console.log("response:", response);
-
-	                    // Populate modal fields with CPS details
-	                    $('#completedModalEmployeeCode').text(cpsDetails.emp_no);
-	                    $('#completedEmployeeNo').val(cpsDetails.emp_no);
-	                    $('#completedEmployeeName').val(cpsDetails.emp_name);
-	                    $('#completedDepartment').val(cpsDetails.dept_name);
-	                    $('#completedDesignation').val(cpsDetails.designation);
-	                    $('#completedClass').val(cpsDetails.retirement_class);
-	                    $('#completedType').val(cpsDetails.type_of_retirement);
-	                    $('#completedRemarks').val(cpsDetails.remarks);
-	                    $('#completedretirementdate').val(cpsDetails.retirement_date)
-
-	                    // Populate UAC Section
-	                    if (cpsDetails.uac === "yes") {
-	                        $('#uacYes').prop('checked', true); // Check Yes radio button
-	                        $('#uacNo').prop('disabled', true); // Disable No radio button
-	                        $('#uacInputDiv').show(); // Show date input field
-	                        $('#uacDate').val(cpsDetails.uac_date || '').prop('readonly', true); // Set UAC date and make readonly
-	                    } else if (cpsDetails.uac === "no") {
-	                        $('#uacNo').prop('checked', true); // Check No radio button
-	                        $('#uacYes').prop('disabled', true); // Disable Yes radio button
-	                        $('#uacInputDiv').hide(); // Hide date input field
-	                    }
-	                    
-	                    
-	 	                
-			 	        // Populate Pending Duration and Reason fields
-			                if (cpsDetails.pending_duration === "Yes") {
-			                    $('#yespen').prop('checked', true); // Check the Yes radio button
-			                    $('#clickyesdiv').show(); // Show the reason input
-			                    $('#Clickyes').val(cpsDetails.reason_for_pending || '').prop('readonly' ,true); // Set reason and make readonly
-			                } else if (cpsDetails.pending_duration === "No") {
-			                    $('#nopen').prop('checked', true); // Check the No radio button
-			                    $('#clickyesdiv').hide(); // Hide the reason input
-			                }
-	                    
-/* 	                 // Populate Pending Duration and Reason for Pending pendingDurationYes pendingDurationNo pendingDurationInputContainer pendingDurationInput
-	                    if (cpsDetails.pending_duration === "yes") {
-	                        $('#pendingDurationYes').prop('checked', true);
-	                        $('#pendingDurationNo').prop('disabled', true); // Disable the other option
-	                        $('#pendingDurationInputContainer').show(); // Hide reason input
-	                        $('#pendingDurationInput').val(cpsDetails.reason_for_pending || '').prop('readonly', true);
-	                    } else if (cpsDetails.pending_duration === "no") {
-	                    	 $('#pendingDurationYes').prop('disabled', true);
-		                     $('#pendingDurationNo').prop('checked', true);
-	                         $('#pendingDurationInputContainer').hide(); // Show reason input field
-	                        
-	                    } */
-
-	                    // Populate CPS Section based on response or data
-	                    if (cpsDetails.cps === "yes") {
-	                        $('#cpsYes').prop('checked', true); // Check Yes radio button
-	                        $('#cpsNo').prop('disabled', true); // Disable No radio button
-	                        $('#cpsInputDiv').show(); // Show CPS amount input field
-	                        $('#cpsAmount').val(cpsDetails.cps_amount || '').prop('readonly', true); // Set CPS amount and make readonly
-	                    } else if (cpsDetails.cps === "no") {
-	                        $('#cpsNo').prop('checked', true); // Check No radio button
-	                        $('#cpsYes').prop('disabled', true); // Disable Yes radio button
-	                        $('#cpsInputDiv').hide(); // Hide CPS amount input field
-	                    }
-
-	                    // Populate EL or LPA Section based on response or data
-	                    if (cpsDetails.el_or_lpa === "yes") {
-	                        $('#elLpaYes').prop('checked', true); // Check Yes radio button
-	                        $('#elLpaNo').prop('disabled', true); // Disable No radio button
-	                        $('#elLpaInputDiv').show(); // Show input field for EL or LPA Amount
-	                        $('#elLpaAmount').val(cpsDetails.el_or_lpa_amount || '').prop('readonly', true); // Set the amount and make readonly
-	                    } else if (cpsDetails.el_or_lpa === "no") {
-	                        $('#elLpaNo').prop('checked', true); // Check No radio button
-	                        $('#elLpaYes').prop('disabled', true); // Disable Yes radio button
-	                        $('#elLpaInputDiv').hide(); // Hide input field for EL or LPA Amount
-	                    }
-
-	                    // Populate SPFGS Section based on response or data
-	                    if (cpsDetails.spfgs === "yes") {
-	                        $('#spfgsYes').prop('checked', true); // Check Yes radio button
-	                        $('#spfgsNo').prop('disabled', true); // Disable No radio button
-	                        $('#spfgsInputDiv').show(); // Show SPFGS amount input field
-	                        $('#spfgsAmount').val(cpsDetails.spfgs_amount || '').prop('readonly', true); // Set SPFGS amount and make readonly
-	                    } else if (cpsDetails.spfgs === "no") {
-	                        $('#spfgsNo').prop('checked', true); // Check No radio button
-	                        $('#spfgsYes').prop('disabled', true); // Disable Yes radio button
-	                        $('#spfgsInputDiv').hide(); // Hide SPFGS amount input field
-	                    }
-
-	                    // Handle SPFGS changes
-	                    $('#spfgsYes').change(function () {
-	                        if ($(this).is(':checked')) {
-	                            $('#spfgsNo').prop('disabled', true); // Disable No radio button
-	                            $('#spfgsInputDiv').show(); // Show SPFGS amount input field
-	                        }
-	                    });
-
-	                    $('#spfgsNo').change(function () {
-	                        if ($(this).is(':checked')) {
-	                            $('#spfgsYes').prop('disabled', true); // Disable Yes radio button
-	                            $('#spfgsInputDiv').hide(); // Hide SPFGS amount input field
-	                        }
-	                    });
-
-	                    // Show the modal after fetching details
-	                     $('#completedDetailsModal').modal('show');
-	                } else {
-	                    Swal.fire({
-	                        icon: 'info',
-	                        title: 'No Data',
-	                        text: 'No details found for the selected CPS record.',
-	                        confirmButtonText: 'OK',
-	                    });
-	                }
-	            },
-	            error: function () {
-	                Swal.fire({
-	                    icon: 'error',
-	                    title: 'Error',
-	                    text: 'Failed to fetch CPS details. Please try again.',
-	                    confirmButtonText: 'OK',
-	                });
-	            },
-	        });
-	    }
-	    
-	   });
-
-
-	$('#completedBackButton').on('click', function () {
-	    $('#completedDetailsModal').modal('hide'); // Replace 'yourModalId' with the actual modal ID
-	});
-
-
-
-	  
-	 ///history function to show in modal
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
-	 const options = {
-	     day: '2-digit',
-	     month: '2-digit',
-	     year: 'numeric',
-	 };
-	 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-	 
-
-
-
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/completed/familypension.html b/src/main/resources/templates/modules/pensioner/pensioner/completed/familypension.html
deleted file mode 100644
index 1e299153..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/completed/familypension.html
+++ /dev/null
@@ -1,828 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-   #returnretrieddetailsModal .modal-body {
-        max-height: 80vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#receivedprovisionalModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
- #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5> Family Pension</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <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>Completed - Family Pension</h5>
-					        <span th:text="${userId}" id="userId" style="display:none"></span>
-					            <div  id="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="provisional, iterStat : ${provisionallist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${provisional['emp_no']}" class="text-center"></td>
-								                <td th:text="${provisional['emp_name']}" class="text-center"></td>
-								                <td th:text="${provisional['dept_name']}" class="text-center"></td>
-								                <td th:text="${provisional['designation']}" class="text-center"></td>
-								                <td th:text="${provisional['file_moved_date'] != null ? #dates.format(provisional['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${provisional['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${provisional['emp_no']}, data-temp-id=${provisional['temp_id']}">
-												        View
-												    </button>
-												</td> 
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-         <!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Completed - Family Pension (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div class="col-md-4">
-								    <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" 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" class="form-check-input" disabled>
-								            <label for="no" class="form-check-label">No</label>
-								        </div>
-								    </div>
-								    <div class="dropdown" id="pendingDurationInputContainer" style="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="date" id="servicedeath" class="form-control" readonly>
-			                    </div>
-			                    
-			                     <!-- Relationship of Deceased -->
-			                    <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-4">
-			                        <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 -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-						
-								</div>
-						<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</span>		
-						</div>
-								<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled>
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no" disabled>
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90" disabled>
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly>
-						    </div>
-						</div>
-						
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes" disabled>
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no" disabled>
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly>
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes" disabled>
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no" disabled>
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly>
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control"  readonly>
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no" disabled>
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-							
-							<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>		
-						</div>
-							
-							<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" readonly>
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
-	                   		</div>
-	                   		
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes" disabled>
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no" disabled>
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no" disabled>
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes" disabled>
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no" disabled>
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-	                   		
-								
-							</div>
-							
-							<div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					               
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-						</div>
-					           
-			        </div>
-			    </div>
-			</div>  
-	
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	// Initialize DataTable
-    const table = $('#AuditDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-	
-	
-    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({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // Populate modal fields
-	 	                $('#employeenomodel').val(employeeDetails.emp_no);
-	 	                $('#employeename').val(employeeDetails.emp_name);
-	 	                $('#department').val(employeeDetails.dept_name);
-	 	                $('#designation').val(employeeDetails.designation);
-	 	               $('#servicedeath').val(employeeDetails.service_death);
-	 	               	$('#relationship').val(employeeDetails.relationship_deceased);
-	 	              	$('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
-	 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	             
-	 	                
-	 	               
-	 	           // 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);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	
-	 	            	   
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-	                        } else {
-	                            $('#gpfAmountDiv').hide();
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                        }
-	                        //recover emp
- 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        
-	                        $('#pensionNumber').val(employeeDetails.pension_number);
-	                        $('#ledgerNumber').val(employeeDetails.ledger_number);
-	                        
-	                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount);
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount);
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount);
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                        }
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-  
-  
-$(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-
-	});
-	
-function loadFileHistory(tempId) {
-    $.ajax({
-        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-        type: 'GET',
-        data: { tempId: tempId }, // Pass empCode as a parameter
-        success: function (response) {
-            if (response.length > 0) {
-                let historyHtml = '';
-                response.forEach(item => {
-                    historyHtml += `
-                        <div class="file-history-item">
-                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-                            <div class="file-history-content">
-                                <div class="file-history-status">${item.fileStatusHistory}</div>
-                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-                            </div>
-                        </div>
-                    `;
-                });
-
-                $('#fileHistoryContainer').html(historyHtml);
-            } else {
-                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-            }
-        },
-        error: function () {
-            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-        }
-    });
-}
-
-// Function to format date and time
-function formatDateTime(dateString) {
-const options = {
-day: '2-digit',
-month: '2-digit',
-year: 'numeric',
-};
-return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-	 
-	 
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/completed/gis.html b/src/main/resources/templates/modules/pensioner/pensioner/completed/gis.html
deleted file mode 100644
index ee59a079..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/completed/gis.html
+++ /dev/null
@@ -1,559 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>GIS</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">GIS</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Completed-GIS</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="audittable">
-					                <table id="GISDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    GIS - Completed (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No</label>
-			                        <input type="text" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div class="col-md-6">
-			                        <label for="retirementdate" class="form-label fw-bold">While in service Death </label>
-			                        <input type="date" id="retirementdate" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Class -->
-			                    <div class="col-md-6">
-			                        <label for="classes" class="form-label fw-bold">Relationship of Deceased </label>
-			                        <input type="text" id="classes" class="form-control" readonly>
-			                    </div>
-
-			                    <div  class="row col-md-12" id="gisentrycontainer" style="display: none;padding-left: 0px;padding-right: 0px;margin-left: 3px;">			                    			                    
-			                    <div class="col-md-6">
-								    <label for="gisentry" class="form-label fw-bold">GIS Entry Type</label>
-							        <input type="text" id="gisentry" class="form-control" readonly>
-
-								</div>
-			                    
-			                    <div class="col-md-6">
-								    <label for="gisamount" class="form-label fw-bold">
-								       Sanctioned GIS Advance 
-
-								    </label>
-								    <div class="d-flex align-items-center">
-								        <div class="form-check" style="padding-right:10px;">
-								            <input type="radio" id="gisyes" name="gisamount" class="form-check-input" value="Yes">
-								            <label for="gisyes" class="form-check-label">Yes</label>
-								        </div>
-								        <div class="form-check">
-								            <input type="radio" id="gisno" name="gisamount" class="form-check-input" value="No">
-								            <label for="gisno" class="form-check-label">No</label>
-								        </div>
-								    </div>
-								    <div class="dropdown" id="gisAmountInputContainer" style="display: none; margin-top: 10px;">
-									    <input type="text" id="gisAmountInput"  class="form-control" readonly>
-									          
-									</div>
-								</div> 
-								
-								</div>
-								
-
-			                    
-			                    <div class="col-md-6">
-				                        <label for="sanctionalGISDate "  class="form-label fw-bold">Sanctional GIS Date</label>
-				                        <input type="date" id="sanctionalGISDate"  class="form-control" readonly>
-				               </div>
-				                <div class="col-md-6">
-				                       <label for="sanctionalGisAmount "  class="form-label fw-bold">Sanctional GIS Amount </label>
-				                        <input type="number" id="sanctionalGisAmount"  class="form-control" readonly>
-				               </div>
-				               <div class="col-md-6">
-				                       <label for="licDate "  class="form-label fw-bold">File Forward To LIC On</label>
-				                        <input type="date" id="licDate"  class="form-control" readonly>
-				               </div>
-		                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">File Completed Date </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">
-									<h5>File History</h5>
-										<div id="fileHistoryContainer" class="file-history-list">
-											<!-- File History will be dynamically loaded here -->
-									</div>
-								</div> 
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					           </div>
-										           
-			            </div>
-					           
-					    </div> 
-			            
-			          </div>
-			               
-			        </div>
-			    </div>
-		
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-		
-		    // Initialize DataTable
-		    const table = $('#GISDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-		 
-		  //model function
-			 function fetchEmployeeDetails(tempId) {
-			 	    $.ajax({
-			 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-			 	        type: 'GET',
-			 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-			 	        success: function (response) {
-			 	            if (response && response.length > 0) {
-			 	            	
-			 	            	let employeeDetails = response[0]; // Access the first object in the array
-			 	            	console.log("response:",response);
-			 	            	
-			 	            	
-			 	                // Populate modal fields
-			 	                $('#employeenomodel').val(employeeDetails.emp_no);
-			 	                $('#employeename').val(employeeDetails.emp_name);
-			 	                $('#department').val(employeeDetails.dept_name);
-			 	                $('#designation').val(employeeDetails.designation);
-			 	                
-			 	             
-			 	                $('#classes').val(employeeDetails.relationship_deceased);
-			 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-			 	               	$('#remarks_modal').val(employeeDetails.remarks);
-				 	            $('#retirementdate').val(employeeDetails.service_death);
-				 	             
-				 	            $('#sanctionalGISDate').val(employeeDetails.sanctional_gis_date);
-				 	            $('#sanctionalGisAmount').val(employeeDetails.sanctional_gis_amount);
-				 	            $('#licDate').val(employeeDetails.lic_date);
-				 	         
-				 	          /*  gisyes
-								gisno
-			                    gisAmountInputContainer
-			                    gisAmountInput */
-			 	               
-			                    
-			                    // Populate gis advance Section based on response or data
-				 	           if(employeeDetails.gis_entry!=null && employeeDetails.gis_advance!=null){
-				 	            	 
-				 	            	 $('#gisentrycontainer').show();
-				 	            	 
-				 	            	$('#gisentry').val(employeeDetails.gis_entry);
-					 	            // Populate gis advance  Section based on response or data
-					                    if (employeeDetails.gis_advance === "yes") {
-					                        $('#gisyes').prop('checked', true); // Check Yes radio button
-					                        $('#gisno').prop('disabled', true); // Disable No radio button
-					                        $('#gisAmountInputContainer').show(); // Show CPS amount input field
-					                        $('#gisAmountInput').val(employeeDetails.gis_advance_amount || '').prop('readonly', true); // Set CPS amount and make readonly
-					                    } else if (employeeDetails.gis_advance === "no") {
-					                        $('#gisno').prop('checked', true); // Check No radio button
-					                        $('#gisyes').prop('disabled', true); // Disable Yes radio button
-					                        $('#gisAmountInputContainer').hide(); // Hide CPS amount input field
-					                    }
-				 	             }
-				 	             else{
-				 	            	$('#gisentrycontainer').hide();
-				 	             }
-			 	                // Update the modal title with the employee code
-			 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-			 	                // Show the modal
-			 	                $('#returnretrieddetailsModal').modal('show');
-			 	                
-			 	             	//additional card display function
-			 	               document.getElementById("submitbutton").addEventListener("click", function() {
-			 	          	       
-					 	            	// $('#datefile').val('');
-					 	         	    $('#remarks').val('');
-			 	          	            document.getElementById("receivedcard").style.display = "block";
-			 	          	        
-			 	          	    });
-			 	                
-			 	               /*  document.getElementById('auditsubmit').addEventListener('click', function () {
-			 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-			 	                    // Trigger the save function and pass the value
-			 	                    saveEntryDetails(tempId,employeeNo);
-			 	        		}); */
-			 	                
-			 	             	
-			 	                
-			 	            } else {
-			 	                Swal.fire({
-			 	                    icon: 'info',
-			 	                    title: 'No Data',
-			 	                    text: 'No details found for the selected employee.',
-			 	                    confirmButtonText: 'OK',
-			 	                });
-			 	            }
-			 	        },
-			 	        error: function () {
-			 	            Swal.fire({
-			 	                icon: 'error',
-			 	                title: 'Error',
-			 	                text: 'Failed to fetch employee details. Please try again.',
-			 	                confirmButtonText: 'OK',
-			 	            });
-			 	        },
-			 	    });
-			 	}
-		  
-			 $(document).ready(function () {
-		    	 
-		    	 $(document).on('click', '.view-btn', function () {
-		    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-		    		    console.log("empCode====="+empCode);
-		    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-		    		    // Hide the receivedcard section before showing the modal
-		    	        $("#receivedcard").hide();
-		    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-		    		    loadFileHistory(tempId); // Load the file history for the selected employee
-		    		});
-
-
-			    // Initialize the modal with static backdrop and disabled keyboard closing
-			    $('#returnretrieddetailsModal').modal({
-			        backdrop: 'static',
-			        keyboard: false,
-			        show: false // Ensure it doesn't auto-show on page load
-			    });
-
-			   
-			    // Handle close button click
-			    $('#back').click(function () {
-			        $('#returnretrieddetailsModal').modal('hide');
-			    });
-			    
-			    $('.close').click(function () {
-			        $('#returnretrieddetailsModal').modal('hide');
-			    });
-			});
-			 
-			 
-			 function loadFileHistory(tempId) {
-				    $.ajax({
-				        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-				        type: 'GET',
-				        data: { tempId: tempId }, // Pass empCode as a parameter
-				        success: function (response) {
-				            if (response.length > 0) {
-				                let historyHtml = '';
-				                response.forEach(item => {
-				                    historyHtml += `
-				                        <div class="file-history-item">
-				                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-				                            <div class="file-history-content">
-				                                <div class="file-history-status">${item.fileStatusHistory}</div>
-				                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-				                            </div>
-				                        </div>
-				                    `;
-				                });
-
-
-
-				                $('#fileHistoryContainer').html(historyHtml);
-				            } else {
-				                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-				            }
-				        },
-				        error: function () {
-				            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-				        }
-				    });
-				}
-
-			 // Function to format date and time
-			function formatDateTime(dateString) {
-		 const options = {
-		     day: '2-digit',
-		     month: '2-digit',
-		     year: 'numeric',
-		 };
-		 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-		}
-			
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/completed/pendency.html b/src/main/resources/templates/modules/pensioner/pensioner/completed/pendency.html
deleted file mode 100644
index 80a83b3f..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/completed/pendency.html
+++ /dev/null
@@ -1,809 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #returnretrieddetailsModal .modal-body {
-        max-height: 80vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#receivedprovisionalModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
- #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5> Pendency</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <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>Completed - Pendency</h5>
-					        <span th:text="${userId}" id="userId" style="display:none"></span>
-					            <div  id="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="provisional, iterStat : ${provisionallist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${provisional['emp_no']}" class="text-center"></td>
-								                <td th:text="${provisional['emp_name']}" class="text-center"></td>
-								                <td th:text="${provisional['dept_name']}" class="text-center"></td>
-								                <td th:text="${provisional['designation']}" class="text-center"></td>
-								                <td th:text="${provisional['file_moved_date'] != null ? #dates.format(provisional['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${provisional['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${provisional['emp_no']}, data-temp-id=${provisional['temp_id']}">
-												        View
-												    </button>
-												</td> 
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-         <!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Completed - Pendency (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-
-			                   <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-4">
-			                        <label for="retirementdate" class="form-label fw-bold">Retirement Date </label>
-			                        <input type="date" id="retirementdate" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Type of Retirement -->
-			                    <div class="col-md-4">
-			                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-			                        <input type="text" id="typeofretirement" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div class="col-md-4">
-								    <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="text" id="pendingDurationInputContainer" style="margin-top: 10px;">
-								        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control"  readonly>
-								    </div>
-								</div>
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-						
-								</div>
-						<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</span>		
-						</div>
-								<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled>
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no" disabled>
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90" disabled>
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly>
-						    </div>
-						</div>
-						
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes" disabled>
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no" disabled>
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly>
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes" disabled>
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no" disabled>
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly>
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control"  readonly>
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no" disabled>
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-							
-							<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>		
-						</div>
-							
-							<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" readonly>
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
-	                   		</div>
-	                   		
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes" disabled>
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no" disabled>
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no" disabled>
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes" disabled>
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no" disabled>
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-	                   		
-								
-							</div>
-							
-							<div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					               
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-						</div>
-					           
-			        </div>
-			    </div>
-			</div>  
-	
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	// Initialize DataTable
-    const table = $('#AuditDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-  //model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	               	$('#classes').val(employeeDetails.retirement_class);
-	 	               	$('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               	$('#retirementdate').val(employeeDetails.retirement_date);
-	 	              
-	 	                
-	 	              // 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);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	
-	 	            	   
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-	                        } else {
-	                            $('#gpfAmountDiv').hide();
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                        }
-
-	                        //recover emp
- 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        
-	                        $('#pensionNumber').val(employeeDetails.pension_number);
-	                        $('#ledgerNumber').val(employeeDetails.ledger_number);
-	                        
-	                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount);
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount);
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount);
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                        }
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-  
-  
-$(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-
-	});
-	
-function loadFileHistory(tempId) {
-    $.ajax({
-        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-        type: 'GET',
-        data: { tempId: tempId }, // Pass empCode as a parameter
-        success: function (response) {
-            if (response.length > 0) {
-                let historyHtml = '';
-                response.forEach(item => {
-                    historyHtml += `
-                        <div class="file-history-item">
-                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-                            <div class="file-history-content">
-                                <div class="file-history-status">${item.fileStatusHistory}</div>
-                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-                            </div>
-                        </div>
-                    `;
-                });
-
-
-
-                $('#fileHistoryContainer').html(historyHtml);
-            } else {
-                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-            }
-        },
-        error: function () {
-            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-        }
-    });
-}
-
-// Function to format date and time
-function formatDateTime(dateString) {
-const options = {
-day: '2-digit',
-month: '2-digit',
-year: 'numeric',
-};
-return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-	 
-	 
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/completed/provisionalretirement.html b/src/main/resources/templates/modules/pensioner/pensioner/completed/provisionalretirement.html
deleted file mode 100644
index 2a381571..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/completed/provisionalretirement.html
+++ /dev/null
@@ -1,722 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#receivedprovisionalModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Provisional Retriement</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" 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>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <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>Completed - Provisional Retirement</h5>
-					        <span th:text="${userId}" id="userId" style="display:none"></span>
-					            <div  id="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="provisional, iterStat : ${provisionallist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${provisional['emp_no']}" class="text-center"></td>
-								                <td th:text="${provisional['emp_name']}" class="text-center"></td>
-								                <td th:text="${provisional['dept_name']}" class="text-center"></td>
-								                <td th:text="${provisional['designation']}" class="text-center"></td>
-								                <td th:text="${provisional['file_moved_date'] != null ? #dates.format(provisional['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${provisional['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${provisional['emp_no']}, data-temp-id=${provisional['temp_id']}">
-												        View
-												    </button>
-												</td> 
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-         <!--  Modal Box -->    
-		<div class="modal fade" id="receivedprovisionalModal" 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-content">
-		            <div class="modal-header">
-		                <h5 class="modal-title" id="detailsModalLabel">
-		                    Received From Department - Provisional Retirement (<span id="modalEmployeeCode"></span>)
-		                </h5>
-		                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-		            </div>
-		            <div class="modal-body">
-		                <div class="row">
-		                    <!-- Employee No -->
-		                    <div class="col-md-6">
-		                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-		                        <input type="number" id="employeenomodel" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Employee Name -->
-		                    <div class="col-md-6">
-		                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-		                        <input type="text" id="employeename" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Department -->
-		                    <div class="col-md-6">
-		                        <label for="department" class="form-label fw-bold">Department </label>
-		                        <input type="text" id="department" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Designation -->
-		                    <div class="col-md-6">
-		                        <label for="designation" class="form-label fw-bold">Designation </label>
-		                        <input type="text" id="designation" class="form-control" readonly>
-		                    </div>
-		                    
-		                    <!-- Class -->
-		                    <div class="col-md-6">
-							    <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">
-		                        <label for="retirementdate" class="form-label fw-bold">Retirement Date </label>
-		                        <input type="date" id="retirementdate" class="form-control" readonly>
-		                    </div>
-							
-							<!-- Type Of Retirement -->
-							<div class="col-md-6">
-							    <label for="typeofretirement" class="form-label fw-bold">Type Of Retirement</label>
-							    <input type="text" id="typeofretirement" class="form-control" readonly>
-							</div>
-
-		                    
-							<!-- Reason For Provisional Pension is given -->
-<!-- 							provisionalreason
-							otherReason -->
-							<div class="col-md-6">
-							    <label for="provisionalreason" class="form-label fw-bold">Reason For Provisional Pension is given </label>
-		                        <input type="text" id="provisionalreason" class="form-control" readonly>
-								 <div  id="otherReasonDiv" style="display: none; margin-top: 10px;">								
-							        <label for="otherReason" class="form-label">Please specify:</label>
-							        <input type="text" id="otherReason" class="form-control" placeholder="Enter reason" readonly>							    	
-						      </div>		
-		                        
-							</div>		
-							
-							
-		                    
-		                    <!-- Date File Sent to Pension Section -->
-		                    <div class="col-md-6">
-		                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Pension Section </label>
-		                        <input type="date" id="datefile_modal" class="form-control" readonly onclick="this.showPicker()">
-		                    </div>
-		                    
-		                    <!-- Pending Duration -->
-							<div class="col-md-6">
-							    <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="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled>
-							            <label for="yespen" class="form-check-label">yes</label>
-							        </div>
-							        <div class="form-check">
-							            <input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" disabled>
-							            <label for="nopen" class="form-check-label">no</label>
-							        </div>
-							    </div>
-							    <div id="clickyesdiv" style="display: none; margin-top: 10px;">
-							        <label for="clickyes" class="form-label">Please specify:</label>
-							        <input type="text" id="Clickyes" class="form-control" placeholder="Enter reason">
-							    </div>
-							</div> 
-								
-							<!-- dp -->	
-							<div class="col-md-6">
-							    <label for="DP" class="form-label fw-bold">DP</label>
-							    <div class="d-flex align-items-center">
-							        <div class="form-check  " style="padding-right:10px;">
-							            <input type="radio" id="yes" name="DP" value="yes" class="form-check-input" disabled>
-							            <label for="yes" class="form-check-label">yes</label>
-							        </div>
-							        <br>
-							        <div class="form-check" >
-							            <input type="radio" id="no" name="DP" value="no" class="form-check-input" disabled>
-							            <label for="no" class="form-check-label" >no</label>
-							        </div>
-							    </div>
-							</div>
-							
-					<!-- Retirement Amount -->
-							<div class="col-md-6">
-							    <label for="RetirementAmount" class="form-label fw-bold">
-							        Provisional Retirement Amount 
-							    </label>
-							    <div class="d-flex align-items-center">
-							        <div class="form-check" style="padding-right:10px;">
-							            <input type="radio" id="fifty" name="RetirementAmount" value="50" class="form-check-input" disabled>
-							            <label for="fifty" class="form-check-label">50%</label>
-							        </div>
-							        <div class="form-check" style="padding-right:10px;">
-							            <input type="radio" id="seventyfive" name="RetirementAmount" value="75" class="form-check-input" disabled>
-							            <label for="seventyfive" class="form-check-label">75%</label>
-							        </div>
-							        <div class="form-check" style="padding-right:10px;">
-							            <input type="radio" id="hundred" name="RetirementAmount" value="100" class="form-check-input" disabled>
-							            <label for="hundred" class="form-check-label">100%</label>
-							        </div>
-							    </div>
-							
-							    <!-- Additional Input Field -->
-							    <div class="mt-3" id="additionalInputDiv" style="display: none;">
-							        <input type="number" id="additionalInput" class="form-control" placeholder="Enter Amount" readonly>
-							    </div>
-							</div>
-
-	
-		                    <!-- 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>
-		                    </div>
-		                    
-		                    <!-- new -->
-
-							<div class="col-md-12 mt-4">
-								<h5>File History</h5>
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-								</div>
-							</div>  
-							
-							
-							
-							          
-		                </div>
-		                
-		          <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		               
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div> 
-
-		                
-		     </div>
-
-        </div>
-    </div>
-</div>
-
- 
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	// Initialize DataTable
-    const table = $('#AuditDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-	
-	
-	
-    $(document).ready(function () {
-		  
-		  $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		});
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#receivedprovisionalModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-
-
-
-		 // Handle Close button click
-		    $('.close').click(function () {
-		        $('#receivedprovisionalModal').modal('hide'); // Hide the modal
-		        clearFields(); // Clear input fields
-		    });
-
-		    // Handle Back button click
-		    $('#back').click(function () {
-		        $('#receivedprovisionalModal').modal('hide'); // Hide the modal
-		        clearFields(); // Clear input fields
-		    });
-
-		    // Function to clear input fields
-		    function clearFields() {
-		        $('#datefile').val(''); // Clear date input
-		        $('#remarks').val(''); // Clear textarea
-		    }
-
-		});
-	
-    
-        
-    
-    
-  //model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                $('#classes').val(employeeDetails.retirement_class);
-	 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-		 	            $('#provisionalreason').val(employeeDetails.reason_for_provisional_pension);
-		 	            
-		 	        // Ensure employeeDetails exists
-		 	           if (employeeDetails) {
-		 	               let prPercentage = employeeDetails.pr_percentage;
-		 	               let prAmount = employeeDetails.pr_amount || '';
-
-		 	               // Convert pr_percentage to string to avoid type mismatches
-		 	               prPercentage = prPercentage ? prPercentage.toString() : '';
-
-		 	               // Reset any previously selected radio buttons (in case of multiple calls)
-		 	               $('#fifty').prop('checked', false).prop('disabled', false);
-		 	               $('#seventyfive').prop('checked', false).prop('disabled', false);
-		 	               $('#hundred').prop('checked', false).prop('disabled', false);
-
-		 	               // Hide the additional input field initially
-		 	               $('#additionalInputDiv').hide();
-
-		 	               // Check if pr_percentage is a valid percentage
-		 	               if (prPercentage === "50") {
-		 	                   // Select 50% radio button and disable all
-		 	                   $('#fifty').prop('checked', true).prop('disabled', true);
-		 	                   $('#seventyfive').prop('disabled', true);
-		 	                   $('#hundred').prop('disabled', true);
-		 	                   
-		 	                  $('#additionalInputDiv').show();
-		 	                   $('#additionalInput').val(prAmount).prop('readonly', true);
-		 	               } else if (prPercentage === "75" || prPercentage === "75.00") {
-		 	                   // Select 75% radio button and disable all
-		 	                   $('#seventyfive').prop('checked', true).prop('disabled', true);
-		 	                   $('#fifty').prop('disabled', true);
-		 	                   $('#hundred').prop('disabled', true);
-
-		 	                   // If pr_amount exists, set it in the additional input
-		 	                   $('#additionalInputDiv').show();
-		 	                   $('#additionalInput').val(prAmount).prop('readonly', true);
-		 	               } else if (prPercentage === "100") {
-		 	                   // Select 100% radio button and disable all
-		 	                   $('#hundred').prop('checked', true).prop('disabled', true);
-		 	                   $('#fifty').prop('disabled', true);
-		 	                   $('#seventyfive').prop('disabled', true);
-		 	                   
-		 	                  $('#additionalInputDiv').show();
-		 	                  $('#additionalInput').val(prAmount).prop('readonly', true);
-		 	               } else {
-		 	                   // If pr_percentage is NOT 50, 75, or 100, show the additional input field
-		 	                   $('#additionalInputDiv').show();
-		 	                   $('#additionalInput').val(prAmount).prop('readonly', true);
-		 	               }
-		 	           }
-
-
-
-
-
-	 	                
-		 	        // Populate Pending Duration and Reason fields
-		                if (employeeDetails.pending_duration === "Yes") {
-		                    $('#yespen').prop('checked', true); // Check the Yes radio button
-		                    $('#clickyesdiv').show(); // Show the reason input
-		                    $('#Clickyes').val(employeeDetails.reason_for_pending || '').prop('readonly' ,true); // Set reason and make readonly
-		                } else if (employeeDetails.pending_duration === "No") {
-		                    $('#nopen').prop('checked', true); // Check the No radio button
-		                    $('#clickyesdiv').hide(); // Hide the reason input
-		                }
-		 	        //populate reason for provisional pension
-		                if (employeeDetails.reason_for_provisional_pension === "Others") {
-		                    $('#otherReasonDiv').show(); // Show the input field for 'Others'
-		                    $('#otherReason')
-		                        .val(employeeDetails.others_provisional_pension || '')
-		                        .prop('readonly' ,true); // Populate and make readonly
-		                } else {
-		                    $('#otherReasonDiv').hide(); // Hide the input field if reason is not 'Others'
-		                }
-	 	               
-		             // Handle DP value
-		                if (employeeDetails.dp === "yes") {
-		                    $('#yes').prop('checked', true); // Select 'yes' radio button
-		                } else if (employeeDetails.dp === "no") {
-		                    $('#no').prop('checked', true); // Select 'no' radio button
-		                }
-		 	        
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#receivedprovisionalModal').modal('show');
-	 	                
-
-	 	                
-	 	               $(document).ready(function () {
-	 	            	    $(document).on('click', '#submitbutton', function () {
-	 	            	    	
-	 	            	    	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-	 	            	    // Trigger the save function and pass the value
-		 	                    saveEntryDetails(tempId,employeeNo);
-	 	            	    });
-	 	            	});
-
-	 	                
-	 	              
-
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-  
-  
-  
-  
-  
-	 ///history function to show in modal
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
-	 const options = {
-	     day: '2-digit',
-	     month: '2-digit',
-	     year: 'numeric',
-	 };
-	 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-	 
-	 
-	 
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/completed/retirement.html b/src/main/resources/templates/modules/pensioner/pensioner/completed/retirement.html
deleted file mode 100644
index b354c0b8..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/completed/retirement.html
+++ /dev/null
@@ -1,772 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #returnretrieddetailsModal .modal-body {
-        max-height: 80vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#receivedprovisionalModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
- #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5> Retirement</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <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>Completed - Retirement</h5>
-					        <span th:text="${userId}" id="userId" style="display:none"></span>
-					            <div  id="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="provisional, iterStat : ${provisionallist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${provisional['emp_no']}" class="text-center"></td>
-								                <td th:text="${provisional['emp_name']}" class="text-center"></td>
-								                <td th:text="${provisional['dept_name']}" class="text-center"></td>
-								                <td th:text="${provisional['designation']}" class="text-center"></td>
-								                <td th:text="${provisional['file_moved_date'] != null ? #dates.format(provisional['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${provisional['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${provisional['emp_no']}, data-temp-id=${provisional['temp_id']}">
-												        View
-												    </button>
-												</td> 
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-         <!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Completed - Retirement (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <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>
-			                    
-			                    <!-- Class -->
-			                    <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>
-			                    
-			                    <!-- Type of Retirement -->
-			                    <div class="col-md-4">
-			                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-			                        <input type="text" id="typeofretirement" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-						
-								</div>
-						<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</span>		
-						</div>
-								<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled>
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no" disabled>
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90" disabled>
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly>
-						    </div>
-						</div>
-						
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes" disabled>
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no" disabled>
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly>
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes" disabled>
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no" disabled>
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly>
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control"  readonly>
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no" disabled>
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-							
-							<div class="col-md-12 ">
-						<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>		
-						</div>
-							
-							<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" readonly>
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
-	                   		</div>
-	                   		
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes" disabled>
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no" disabled>
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes" disabled>
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no" disabled>
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes" disabled>
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no" disabled>
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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" readonly>
-						    </div>
-						</div>
-	                   		
-								
-							</div>
-							
-							<div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					               
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-						</div>
-					           
-			        </div>
-			    </div>
-			</div>  
-	
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	// Initialize DataTable
-    const table = $('#AuditDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-  //model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	               $('#classes').val(employeeDetails.retirement_class);
-	 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                
-	 	               
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	
-	 	            	   
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes" || employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount);
-	                        } else {
-	                            $('#gpfAmountDiv').hide();
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                        }
-	                        //recover emp
- 	                       	$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
-
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        
-	                        $('#pensionNumber').val(employeeDetails.pension_number);
-	                        $('#ledgerNumber').val(employeeDetails.ledger_number);
-	                        
-	                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount);
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount);
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount);
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                        }
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-  
-  
-$(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-
-	});
-	
-function loadFileHistory(tempId) {
-    $.ajax({
-        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-        type: 'GET',
-        data: { tempId: tempId }, // Pass empCode as a parameter
-        success: function (response) {
-            if (response.length > 0) {
-                let historyHtml = '';
-                response.forEach(item => {
-                    historyHtml += `
-                        <div class="file-history-item">
-                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-                            <div class="file-history-content">
-                                <div class="file-history-status">${item.fileStatusHistory}</div>
-                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-                            </div>
-                        </div>
-                    `;
-                });
-
-
-
-                $('#fileHistoryContainer').html(historyHtml);
-            } else {
-                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-            }
-        },
-        error: function () {
-            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-        }
-    });
-}
-
-// Function to format date and time
-function formatDateTime(dateString) {
-const options = {
-day: '2-digit',
-month: '2-digit',
-year: 'numeric',
-};
-return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-	 
-	 
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/dashboard.html b/src/main/resources/templates/modules/pensioner/pensioner/dashboard.html
deleted file mode 100644
index be7ef801..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/dashboard.html
+++ /dev/null
@@ -1,966 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    /* Base Layout and Styling */
-
-body {
-    font-family: 'Arial', sans-serif;
-    background-color: #f8f9fa;
-}
-
-/* Card Styling */
-.card-box {
-    border-radius: 12px;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-    background-color: #ffffff;
-    padding: 20px;
-    transition: transform 0.3s ease-in-out;
-}
-
-.card-box:hover {
-    transform: translateY(-5px);
-}
-
-/* Title Styling */
-h3 {
-    font-size: 1.2rem;
-    color: #444;
-}
-
-/* Styling for Overall Pendency and Stage Wise Sections */
-.charts {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 30px; /* Increased gap between charts */
-    margin-top: 30px; /* Increased margin-top */
-}
-
-.chart {
-    flex: 1;
-    background: #ffffff; /* White background */
-    padding: 20px;
-    border-radius: 8px;
-    border: 2px solid #1e90ff; /* Add a colored border */
-    width: 100%;
-    box-sizing: border-box;
-    text-align: center;
-    transition: all 0.3s ease-in-out;
-}
-
-.chart:hover {
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
-}
-
-.chart h3 {
-    font-size: 1.2rem;
-    color: #333;
-    margin-bottom: 15px;
-}
-
-.chart canvas {
-    display: block;
-    max-width: 100%;
-    height: auto;
-}
-
-/* Stats Cards */
-.stats {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    gap: 30px; /* Increased gap between stats cards */
-    margin-top: 30px; /* Increased margin-top */
-}
-
-.stat-card {
-    background: #ffffff;
-    border: 2px solid #1e90ff;
-    padding: 20px;
-    border-radius: 8px;
-    text-align: center;
-    flex: 1;
-    margin: 10px; /* Reduced margin for cleaner look */
-}
-
-.stat-card:hover {
-    transform: scale(1.05);
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
-}
-
-.stat-card h2 {
-    margin: 0;
-    font-size: 36px;
-    color: #007bff; 
-}
-
-.stat-card p {
-    margin: 5px 0 0;
-    font-size: 13px;
-    color: #555;
-    font-weight:bold;
-}
-
-/* Buttons */
-.btn-primary:hover {
-    background-color: #0056b3;
-}
-
-.btn-warning:hover {
-    background-color: #e0a800;
-}
-
-/* Container Styling */
-.container {
-    max-width: 1200px;
-    margin: 20px auto;
-    padding: 20px;
-    background: #fff;
-    border-radius: 8px;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-
-/* Date Input Row */
-.row.mt-3.ml-2 {
-    margin-top: 20px; /* Increased margin-top */
-}
-
-/* Responsive Design */
-@media (min-width: 768px) {
-    .charts {
-        flex-direction: row;
-    }
-
-    .charts .chart {
-        width: calc(50% - 15px); /* Increased gap between charts */
-    }
-
-    .stats {
-        flex-direction: row;
-    }
-}
-
-@media (max-width: 576px) {
-    .charts,
-    .stats {
-        flex-direction: column;
-    }
-
-    .stat-card {
-        margin: 15px 0; /* Increased margin for better spacing */
-    }
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}   
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-table.dataTable td {
-    white-space: normal !important;
-    word-wrap: break-word !important;
-}
-
-
-</style>
-
-<body>
-    <div class="wrapper">
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <div class="page-wrap">
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Dashboard</h5>
-                                        <span>Pension Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item">Pension Entries</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mt-4">
-                        <div class="col-md-12">
-                           
-                              <div class="card">
-					        <div class="card-block">
-                                 <h5 style="font-weight: bold;">Pension Department</h5>
-                                         
-                                          <div class="d-flex justify-content-end align-items-center">
-											    <label for="EmpCode" style="font-weight: bold; margin-right: 10px;" class="mb-0">EmpCode:</label>
-											    <input type="text" id="EmpCode" name="EmpCode" class="form-control" style="width: auto; min-width: 150px; margin-right: 10px;">
-											    <button id="searchEmpButton" class="btn btn-primary">Search</button>
-											</div>
-											                                         
-										<div class="row mt-3 ml-2 ">
-											    <div class="col-md-3">
-											        <label for="startDate" class="form-label">From Date:</label>
-											        <input type="date" id="startDate" class="form-control" onclick="this.showPicker()">
-											    </div>
-											    <div class="col-md-3">
-											        <label for="endDate" class="form-label">To Date:</label>
-											        <input type="date" id="endDate" class="form-control" onclick="this.showPicker()">
-											    </div>
-											    <div class="col-md-3">
-											        <label for="deptId" class="form-label fw-bold">Department Name:</label>
-											        <div class="dropdown">
-											            <select id="deptId" class="form-control" style="width: 100%;" required>
-											                <option value="" selected>-- Select Option --</option>
-											            </select>
-											        </div>
-											    </div>
-											    
-											    <!-- Centering the Buttons -->
-											    <div class="col-12 d-flex justify-content-center mt-3">
-											        <button id="searchButton" class="btn btn-primary mx-2">Search</button>
-											        <input type="reset" class="btn btn-warning mx-2" value="Reset">
-											    </div>
-											</div>
-
-
-                                            <div id="stats" class="stats"></div>
-                                            <div class="charts">
-                                                <div class="chart">
-                                                    <h3>File Category  - Overall</h3>
-                                                    <div id="overallPieChart" style="width: 100%; height: 400px;"></div>
-                                                    
-                                                </div>
-                                                <div class="chart">
-                                                    <h3>File Category Stages Wise</h3>
-                                                    <div id="stagesBarChart" style="width: 100%; height: 400px;"></div>
-                                                </div>
-                                            </div>
-                                </div>
-                           
-                        </div>
-                    </div>
-                </div>
-                
-            </div>
-          
-        </div>
-          <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-    </div>
-    </div>
-    <!-- Modal -->
-	<div class="modal fade" id="zoneDetailsModal" tabindex="-1"
-		role="dialog" aria-labelledby="zoneDetailsModalLabel"
-		aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div id="zone-details-content"></div>
-			</div>
-		</div>
-	</div>
-	<div class="modal fade" id="EmpcodeDetailsModal" tabindex="-1"
-		role="dialog" aria-labelledby="zoneDetailsModalLabel"
-		aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-xl" role="document">
-			<div class="modal-content">
-				<div id="emp-details-content"></div>
-			</div>
-		</div>
-	</div>
-	
-	
-	
-  <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-    <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-	<script src="node_modules/amcharts3/amcharts/serial.js"></script>
-	
-	<script src="node_modules/amcharts3/amcharts/pie.js"></script>
-	<script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-	
-    <script>
-    document.addEventListener('DOMContentLoaded', function () {
-    	 $('#searchEmpButton').on('click', function () { // Ensure there's a button with id "searchButton"
-    	        const Empcode = document.getElementById('EmpCode').value.trim(); // Get input value
-    	        console.log("empcode",Empcode);
-    	
-    	   //fetch details
-    	if (Empcode) {
-            $.ajax({
-                url: `/gcc/api/pensionerdashboard/fetchPensionEmpDetails?Empcode=${Empcode}`, // Backend API route
-                type: 'GET',
-                success: function (response) {
-                    console.log(response);
-
-                    if (!response || response.length === 0) {  // Check if response is empty
-                        Swal.fire({
-                            icon: "warning",
-                            title: "No Data Found",
-                            text: "No records found for the entered Employee Code.",
-                            confirmButtonText: "OK",
-                        });
-                    } else {
-                        renderEmpDetailsModal(response);
-                    }
-                },
-                error: function (xhr) {
-                    console.error("Error fetching employee details:", xhr.status, xhr.responseText);
-                }
-            });
-        } else {
-		            Swal.fire({
-		                icon: "warning",
-		                title: "Enter Employee Code",
-		                text: "Please enter an Employee Code before searching.",
-		                confirmButtonText: "OK",
-		            });
-		        }
-    	   })
- 
-
-    	 
-    			function renderEmpDetailsModal(data) {
-        		    const Empcode = document.getElementById('EmpCode').value.trim();
-
-        		    let modalContent = `
-        		        <div class="modal-header">
-        		            <h5 class="modal-title">Employee Details for ${Empcode}</h5>
-        		            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-        		                <span aria-hidden="true">&times;</span>
-        		            </button>
-        		        </div>
-        		        <div class="modal-body">
-        		            <div class="table-responsive">
-        		                <table id="DashboardDatatable" class="table table-striped table-bordered table-hover dataTable">
-        		                    <thead class="thead-dark">
-        		                        <tr>
-        		                            <th class="text-center">S.NO</th>
-        		                            <th class="text-center">Department Name</th>
-        		                            <th class="text-center">File Name</th>
-        		                            <th class="text-center">File Status</th>
-        		                            <th class="text-center">History</th>
-        		                        </tr>
-        		                    </thead>
-        		                    <tbody>
-        		                        ${data.map((item, index) => `
-        		                            <tr data-temp-id="${item.temp_id}">
-        		                                <td>${index + 1}</td>
-        		                                <td>${item.dept_name}</td>
-        		                                <td>${item.file_name}</td>
-        		                                <td>${item.file_status}</td>
-        		                                <td class="file-history-column" id="history-${item.temp_id}">Loading...</td>
-        		                            </tr>
-        		                        `).join('')}
-        		                    </tbody>
-        		                </table>
-        		            </div>
-        		        </div>
-        		    `;
-
-        		    document.getElementById('emp-details-content').innerHTML = modalContent;
-
-        		    // **Fetch History Before Initializing DataTable**
-        		    let fetchPromises = data.map(item => fetchDetailsByTempId(item.temp_id));
-
-        		    Promise.all(fetchPromises).then(() => {
-        		        $('#EmpcodeDetailsModal').modal({
-        		            backdrop: 'static',
-        		            keyboard: false
-        		        });
-
-        		        // **Initialize DataTable AFTER Data is Loaded and reason for intialize**
-        		        setTimeout(() => {
-        		            let table = $('#DashboardDatatable').DataTable({
-        		                dom: 'Bftip',
-        		                columnDefs: [{ targets: 'no-sort', orderable: false }],
-        		                lengthMenu: [
-        		                    [50, 100, 200, 500, -1],
-        		                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-        		                ],
-        		                scrollY: '50vh',
-        		             // ✅ Prevents automatic column width issues
-								        		               buttons: [
-								    { extend: 'pageLength', className: 'btn btn-warning' },
-								    { 
-								        extend: 'copyHtml5', 
-								        text: 'Copy', 
-								        className: 'btn btn-secondary',
-								        exportOptions: { columns: ':visible', modifier: { page: 'all' } }
-								    },
-								    { 
-								        extend: 'excelHtml5', 
-								        text: 'Excel', 
-								        className: 'btn btn-secondary',
-								        customize: function (xlsx) {
-								            let sheet = xlsx.xl.worksheets['sheet1.xml'];
-								            $('row c[r]', sheet).attr('s', '55'); // Apply word-wrap formatting
-								        }
-								    },
-								    { 
-								        extend: 'csvHtml5', 
-								        text: 'CSV', 
-								        className: 'btn btn-secondary',
-								        exportOptions: { columns: ':visible' }
-								    },
-								    { 
-								        extend: 'pdfHtml5', 
-								        text: 'PDF', 
-								        className: 'btn btn-secondary',
-								        orientation: 'landscape',
-								        pageSize: 'A4',
-								        customize: function (doc) {
-								            doc.styles.tableBodyEven.alignment = 'left';
-								            doc.styles.tableBodyOdd.alignment = 'left';
-								            doc.styles.tableHeader.alignment = 'center';
-								            doc.defaultStyle.fontSize = 9;
-								            doc.styles.tableHeader.fontSize = 10;
-								            doc.content[1].table.widths = Array(doc.content[1].table.body[0].length + 1).join('*').split('');
-								        }
-								    }
-								],
-
-        		                responsive: false,
-        		                processing: false
-        		            });
-
-        		            // ✅ Adjust column width after table is fully initialized
-        		            
-        		        }, 200);
-        		    });
-        		}
-
-        		
-        		
-
-        		// **Fetch History & Update Table**
-        		function fetchDetailsByTempId(tempId) {
-        		    return new Promise((resolve, reject) => {
-        		        $.ajax({
-        		            url: `/gcc/api/pensionerdashboard/fetchTempDetails?tempId=${tempId}`,
-        		            type: 'GET',
-        		            success: function (response) {
-        		                let historyContainer = $(`#history-${tempId}`);
-        		                if (response.length > 0) {
-        		                    let historyHtml = response.map(item => `
-        		                        <div class="file-history-item">
-        		                            <div class="file-history-date">${formatDateTime(item.file_moved_date)}</div>
-        		                            <div class="file-history-content">
-        		                                <div class="file-history-status">${item.file_status}</div>
-        		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarks || 'N/A'}</div>
-        		                            </div>
-        		                        </div>
-        		                    `).join('');
-        		                    historyContainer.html(historyHtml);
-        		                    $('#EmpcodeDetailsModal').modal({
-        		                        backdrop: 'static',
-        		                        keyboard: false
-        		                    });
-        		                    $('#EmpcodeDetailsModal').modal('show');
-        		                    $('.close').click(function () {
-        		                        $('#EmpcodeDetailsModal').modal('hide');
-        		                    });
-        		                } else {
-        		                    historyContainer.html('<p>No file history available.</p>');
-        		                    $('#EmpcodeDetailsModal').modal({
-        		                        backdrop: 'static',
-        		                        keyboard: false
-        		                    });
-        		                    $('#EmpcodeDetailsModal').modal('show');
-        		                    $('.close').click(function () {
-        		                        $('#EmpcodeDetailsModal').modal('hide');
-        		                    });
-        		                }
-        		                resolve();
-        		            },
-        		            error: function () {
-        		                $(`#history-${tempId}`).html('<p>Failed to load file history.</p>');
-        		                $('#EmpcodeDetailsModal').modal({
-    		                        backdrop: 'static',
-    		                        keyboard: false
-    		                    });
-    		                    $('#EmpcodeDetailsModal').modal('show');
-    		                    $('.close').click(function () {
-    		                        $('#EmpcodeDetailsModal').modal('hide');
-    		                    });
-        		                resolve();
-        		            }
-        		        });
-        		    });
-        		}
-
-        		// **Helper Function to Format Date**
-        		function formatDateTime(dateString) {
-        		    const options = { day: '2-digit', month: '2-digit', year: 'numeric' };
-        		    return new Date(dateString).toLocaleDateString('en-GB', options);
-        		}
-    				
-                
-    	
-    	 $.ajax({
- 	        url: "/gcc/api/pensionerdashboard/getDepartments",
- 	        type: "GET",
- 	       dataType: "json",
- 	        success: function (data) {
- 	            var dropdown = $("#deptId");
- 	            dropdown.empty();
- 	            dropdown.append('<option value="" selected>-- Select Option --</option>');
- 	            $.each(data, function (key, entry) {
- 	            	//console.log(entry);
- 	                dropdown.append($('<option></option>').attr('value', entry.dept_id).text(entry.dept_name));
- 	            });
- 	        },
- 	        error: function () {
- 	            console.log("Error loading dropdown data.");
- 	        }
- 	    });
-        // Function to fetch data from /dashboard endpoint
-        function loadDashboardData() {
-        	
-            $.ajax({
-                url: `/gcc/api/pensionerdashboard/dashboard`,
-                type: 'GET',
-                contentType: 'application/json',
-                success: function (data) {
-                    const statsDiv = document.getElementById('stats');
-                    statsDiv.innerHTML = ''; // Clear previous stats
-
-                    data.forEach(item => {
-                        const statCard = document.createElement('div');
-                        statCard.className = 'stat-card';
-                        statCard.innerHTML = `
-                            <h2>${item.category_count}</h2>
-                            <p>${item.file_name}</p>
-                        `;
-                        statsDiv.appendChild(statCard);
-                    });
-
-                    // Call renderCharts after data is loaded
-                    console.log("Dashboard data loaded, rendering charts...");
-                    renderCharts();
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching dashboard data:', status, error);
-                }
-            });
-        }
-
-        // Function to handle search button click
-        document.getElementById('searchButton').addEventListener('click', function () {
-            const startDate = document.getElementById('startDate').value;
-            const endDate = document.getElementById('endDate').value;
-            const deptId= document.getElementById('deptId').value;
-            
-            console.log(deptId);
-            if (!startDate || !endDate ) {
-	 	        Swal.fire({
-	 	            icon: "warning",
-	 	            title: "Incomplete Search",
-	 	            text: "Please select the Date Before searching",
-	 	            confirmButtonText: "OK",
-	 	        });
-	 	    } else {
-
-            $.ajax({
-                url: `/gcc/api/pensionerdashboard/dashboardsearch?startdate=${startDate}&enddate=${endDate}&deptId=${encodeURIComponent(deptId)}`,
-                type: 'GET',
-                
-                dataType: 'json',
-                success: function (data) {
-                    const statsDiv = document.getElementById('stats');
-                    statsDiv.innerHTML = data.map(item => `
-                        <div class='stat-card'>
-                            <h2>${item.category_count}</h2>
-                            <p>${item.file_name}</p>
-                        </div>
-                    `).join('');
-
-                    // Re-render charts after search results load
-                    renderCharts(startDate, endDate);
-                },
-                error: function () {
-                    console.error('Error fetching search data.');
-                }
-            });
-	 	    }
-        });
-
-        // Function to validate and set min-date for endDate
-       /*  function validateEndDate() {
-            const startDate = document.getElementById('startDate').value;
-            const endDateInput = document.getElementById('endDate');
-
-            if (startDate) {
-                const startDateObj = new Date(startDate);
-                const minEndDateISO = startDateObj.toISOString().split('T')[0];
-
-                endDateInput.setAttribute('min', minEndDateISO);
-
-                // Clear endDate if it's less than startDate
-                if (endDateInput.value && new Date(endDateInput.value) < startDateObj) {
-                    endDateInput.value = '';
-                }
-            }
-        }
-
-        document.getElementById('startDate').addEventListener('change', validateEndDate); */
-    	
-        
-      function renderCharts(startDate = null, endDate = null) {
-        	 const deptId= document.getElementById('deptId').value;
-        	 const dataParams = deptId ? { deptId, startDate, endDate } : { startDate, endDate };
-        	 console.log("deptId",deptId);
-        	  disposeExistingCharts();
-
-        // Dispose existing amCharts instances (amCharts v3 doesn't have a built-in registry)
-        function disposeExistingCharts() {
-            if (window.chart1) {
-                window.chart1.clear();
-                window.chart1 = null;
-            }
-            if (window.chart2) {
-                window.chart2.clear();
-                window.chart2 = null;
-            }
-        }
-
-        // Function to render charts using amCharts v3
-        	  const fixedColors = {
-		    "Retirement": "#6A0572", // Deep Purple
-		    "Family Pension": "#2C3E50", // Dark Blue-Gray
-		    "Pendency": "#A569BD", // Soft Lavender
-		    "GIS": "#17A589", // Teal Green
-		    "Provisional Retirement": "#D35400", // Warm Orange
-		    "Contributory Pension Scheme": "#5D6D7E"  // Muted Gray-Blue
-		};
-      $.ajax({
-                url: `/gcc/api/pensionerdashboard/categoryCounts`,
-                type: 'GET',
-                data: dataParams,
-                dataType: 'json',
-                success: function (data,index) {
-                    const chartData = data.map(item => ({
-                        category: item.file_name,
-                        value: item.category_count,
-                        color: fixedColors[item.file_name] ,
-                        id:item.id
-                    }));
-
-                    window.chart1 = AmCharts.makeChart("overallPieChart", {
-                        type: "pie",
-                        theme: "dark",
-                        dataProvider: chartData,
-                        valueField: "value",
-                        titleField: "category",
-                        colorField: "color",
-                        radius: "40%", // Outer radius
-                        innerRadius: "50%", // Inner radius to create the donut shape
-                        labelText: "[[[[title]]]] - [[[[value]]]]",// this is to show the values on the  piechart
-                        fontSize: 14,
-                        labelsEnabled: true,
-                        pullOutRadius:0,
-                        gradientRatio: [-0.4, -0.4, -0.4, -0.4, -0.4, -0.4, 0, 0.1, 0.2, 0.1, 0, -0.2, -0.5],//this is to show the piechart in better look
-                        export: {
-                            enabled: true,
-                        },
-                        responsive: {
-                            enabled: true,
-                        },
-                        legend: {
-                            position: "bottom",
-                            markerType: "circle",
-                            valueText: "[[[[value]]]]",
-                            switchable: false,
-                            markerSize: 12,
-                            fontSize: 12
-                        },
-                        balloon: {
-                            fixedPosition: true
-                        },
-                        listeners: [
-                            {
-                                event: "clickSlice",
-                                method: function (event) {
-                                    const FileId = event.dataItem.dataContext.id;
-                                    const FileNumber = event.dataItem.dataContext.category;
-                                    // Fetch emp_no from the server based on file_name
-                                    fetchempno(FileId,FileNumber);
-                                }
-                            }
-                        ]
-                    });
-                },
-                error: function (xhr, status, error) {
-                	console.error("AJAX Request Failed:", status, error);
-                    console.error("Response Text:", xhr.responseText); 
-                }
-            });
-        function fetchempno(FileId,FileNumber){
-        	 $.ajax({
-        		 url: `/gcc/api/pensionerdashboard/getEmpNoByFileName?file_id=${FileId}`,
-                 type: 'GET',
-                 success: function (response) {
-                     // Render the modal with emp_no data
-                     renderEmpNoModal(FileNumber, response);
-                 },
-                 error: function(error) {
-                     console.error("Error fetching region details:", error);
-                 }
-             });
-        }
-
-        function renderEmpNoModal(FileNumber, empNos) {
-        	console.log(empNos);
-            const modalContent = `
-                <div class="modal-header">
-                    <h5 class="modal-title">Employee Numbers for ${FileNumber}</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <table class="table table-bordered">
-                        <thead>
-                            <tr>
-                                <th>Employee Number</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        ${empNos.map(empNo => `<tr><td>${empNo.emp_no}</td></tr>`).join('')}
-                        </tbody>
-                    </table>
-                </div>
-            `;
-            
-            document.getElementById('zone-details-content').innerHTML = modalContent;
-            //$('#zoneDetailsModal').modal('show');
-            $('.close').click(function () {
-		        $('#zoneDetailsModal').modal('hide');
-		        
-		    });
-        }
-
-     function getRandomColor() {
-    	    const letters = '0123456789ABCDEF';
-    	    let color = '#';
-    	    for (let i = 0; i < 6; i++) {
-    	        color += letters[Math.floor(Math.random() * 16)];
-    	    }
-    	    return color;
-    	}
-    
-            // Bar Chart - Pendency Stages Wise
-     $.ajax({
-         url: `/gcc/api/pensionerdashboard/stageWiseCounts`,
-         type: 'GET',
-         data: dataParams,
-         
-         success: function (data) {
-             const colorMapping = {
-                 "Audit Pending": "#FF5733",
-                 "Department Pending": "#FFC300",
-                 "Pension Pending": "#28B463",
-                 "Completed": "#3498DB"
-             };
-
-             const chartData = data.map(item => ({
-                 category: item.category,
-                 value: item.category_count,
-                 color: colorMapping[item.category]  // Default gray color if no match
-             }));
-
-             window.chart2 = AmCharts.makeChart("stagesBarChart", {
-                 type: "serial",
-                 theme: "light",
-                 dataProvider: chartData,
-                 depth3D: 2,
-                 angle: 10,
-                 valueAxes: [{
-                     axisAlpha: 0,
-                     gridAlpha: 0,
-                     labelsEnabled: false,
-                     dashLength: 0
-                 }],
-                 startDuration: 1,
-                 startEffect: "easeInSine",
-                 graphs: [{
-                     balloonText: "[[[[category]]]]: [[[[value]]]]",
-                     fillAlphas: 0.8,
-                     lineAlpha: 0.2,
-                     topRadius: 1,
-                     type: "column",
-                     valueField: "value",
-                     fillColorsField: "color",
-                     columnWidth: 0.5,
-                     labelText: "[[[[value]]]]",
-                     labelPosition: "right",
-                     fontSize: 14,
-                     color: "#000000"
-                 }],
-                 categoryField: "category",
-                 categoryAxis: {
-                     gridPosition: "start",
-                     gridAlpha: 0,
-                     autoWrap: false,
-                     axisAlpha: 0,
-                     fontSize: 14
-                 },
-                 rotate: true,
-                 export: {
-                     enabled: true,
-                     position: "bottom-right"
-                 }
-             });
-
-             console.log("Stages Bar Chart Data:", chartData);
-         },
-         error: function (xhr, status, error) {
-             console.error("AJAX Request Failed:", status, error);
-         }
-     });
- }
-    
-  
-        
-        // Initial data load
-        loadDashboardData();
-        document.querySelector("input[type='reset']").addEventListener('click', function () {
-            window.location.href = "/gcc/pensioner/dashboard";
-        });
-        
-
-        // Initial chart rendering
-        }) 
-
-        
-        $('#startDate').on('change', function () {
-	        const fromDate = $(this).val();
-	        $('#endDate').attr('min', fromDate); // Update min attribute for To Date
-
-	        // If To Date is earlier than the new From Date, adjust it
-	        const toDate = $('#endDate').val();
-	        if (new Date(toDate) < new Date(fromDate)) {
-	            $('#endDate').val(fromDate);
-	        }
-	    });
-
-	    // Update From Date's max attribute when To Date changes
-	    $('#endDate').on('change', function () {
-	        const toDate = $(this).val();
-	        $('#startDate').attr('max', toDate); // Update max attribute for From Date
-
-	        // If From Date is later than the new To Date, adjust it
-	        const fromDate = $('#startDate').val();
-	        if (new Date(fromDate) > new Date(toDate)) {
-	            $('#startDate').val(toDate);
-	        }
-	    });
-        
-        
-         	//disable future dates
-	document.addEventListener("DOMContentLoaded", function () {
-        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
-        let startdateInput = document.getElementById("startDate");
-        let enddateInput = document.getElementById("endDate");
-
-        // Set max attribute to disable future dates
-        startdateInput.setAttribute("max", today);
-        enddateInput.setAttribute("max", today);
-        
-
-        // Prevent manual future date entry
-        startdateInput.addEventListener("change", function () {
-            if (this.value > today) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Invalid Date',
-                    text: 'Future dates are not allowed.',
-                    confirmButtonText: 'OK'
-                });
-                this.value = ""; // Clear the invalid input
-            }
-        });
-    });
-  
-    </script>
-</body>
-
-</html>
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/forward/familypension.html b/src/main/resources/templates/modules/pensioner/pensioner/forward/familypension.html
deleted file mode 100644
index 650cbc4c..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/forward/familypension.html
+++ /dev/null
@@ -1,731 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#returnfamilypensiondetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Family Pension</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Forward to Dept</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Forward to Department- Family Pension</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-												<th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  			
-					                  			
-					                  			<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${forwardlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']},data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                        
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  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-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Forward to Department - Family Pension (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    
-			                    
-			                    <!-- pending duration-->
-			                    
-			                    
-                    				<div class="col-md-6">
-										    <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" 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" class="form-check-input" disabled>
-										            <label for="no" class="form-check-label">No</label>
-										        </div>
-										    </div>
-										    <div class="dropdown" id="pendingDurationInputContainer" style="margin-top: 10px;">
-										        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control" readonly>
-										    </div>
-										</div>
-			                    
-			                    
-			                    <!-- 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>
-			                    </div>
-			                    
-			                     <!-- Relationship of Deceased -->
-			                    <div class="col-md-6">
-			                        <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">
-			                        <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 -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">Audit Certificate Received Date</label>
-			                        <input type="date" id="datefile_modal" class="form-control" onclick="this.showPicker()" readonly>
-			                    </div>
-			
-			                    <!-- 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"  readonly></textarea>
-			                    </div>
-			                    
-			                    
-			                    <div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Submit</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile"  class="form-label fw-bold">Enter Date File Forward to Department <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly>
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditbutton">Forward To Department</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			        
-					           
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    
-    
-    
-    <script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	console.log("employeecode:",tempId);
-	 	            	
-	 	                // Populate modal fields
-	 	                $('#employeenomodel').val(employeeDetails.emp_no);
-	 	                $('#employeename').val(employeeDetails.emp_name);
-	 	                $('#department').val(employeeDetails.dept_name);
-	 	                $('#designation').val(employeeDetails.designation);
-	 	                $('#servicedeath').val(employeeDetails.service_death);
-	 	               	$('#relationship').val(employeeDetails.relationship_deceased);
-	 	              	$('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
-	 	               	$('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	               	
-	 	               	
-	 	               // 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);
-
-	 	                // Show the modal
-	 	                $('#returnfamilypensiondetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	            document.getElementById("receivedcard").scrollIntoView({
-	 	          		        behavior: "smooth", // Smooth scrolling effect
-	 	          		        block: "center" // Aligns the element to the center of the viewport
-	 	          		    });
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	                
-	 	               $('#auditbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-    	 
-    	 $(document).on('click', '.view-btn', function () {
-    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-    		 const tempId = $(this).data('temp-id');
-    		    console.log("empCode====="+empCode);
-    		    console.log("tempId====="+tempId);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    	        fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnfamilypensiondetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnfamilypensiondetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnfamilypensiondetailsModal').modal('hide');
-	    });
-	});
-	 
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-	 
-	 
-		function formatDateTime(dateString) {
-			 const options = {
-			     day: '2-digit',
-			     month: '2-digit',
-			     year: 'numeric',
-			 };
-			 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-			}
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);	 
-  	    let entryDetails = {
-  	        empNo: empNo,
-  	      	tempId: tempId,
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim()
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-
-  	  if (!entryDetails.remarks) {
-	       Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Remarks are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Remarks");
-	       return;
-	   }
-  	    
-
-  		// Disable the button to prevent multiple submissions
-  	     $('#auditbutton').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/pension/forward/updateForwardFamilyPension',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditbutton').prop('disabled', false).text('Forward To Department');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditbutton').prop('disabled', false).text('Forward To Department');
-	                        	window.location.href = "/gcc/pensioner/forward/familypension";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditbutton').prop('disabled', false).text('Forward To Department');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-    
-    
-
-	</script>
-
-
-</body>
-</html>
-
-
-
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/forward/pendency.html b/src/main/resources/templates/modules/pensioner/pensioner/forward/pendency.html
deleted file mode 100644
index a0a1a1f1..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/forward/pendency.html
+++ /dev/null
@@ -1,730 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#returnpendencydetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Pendency</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Forward to Dept</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					         <h5 style="font-weight:bold;">Forward to 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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Category Type</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  			
-					                  					
-					                  			<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${forwardlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_category_name']}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']},data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                        
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  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-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Forward to Department -Pendency(<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeeno" class="form-label fw-bold">Employee No </label>
-			                        <input type="number" id="employeeno" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                   
-			                 
-			                    <!-- Class -->
-			                    <div class="col-md-6">
-			                        <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">
-			                        <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" >
-									    <label for="retirement" class="form-label fw-bold">Type Of Retirement</label>
-									    <input type="text" id="retirement" class="form-control" readonly>
-									</div>
-									
-								
-			                    <div class="col-md-6">
-										    <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="text" id="pendingDurationInputContainer" style="margin-top: 10px;">
-										        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control"  readonly>
-										    </div>
-										</div>
-			                    
-			                   
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">Audit Certificate Received Date</label>
-			                        <input type="date" id="datefile_modal" class="form-control" onclick="this.showPicker()" readonly>
-			                    </div>
-			
-			                    <!-- 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" readonly></textarea>
-			                    </div>
-			                    
-			                    
-			                    <!-- file history -->
-			                    <div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-			                    
-			                    
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Submit</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile "  class="form-label fw-bold">Enter Date File Forward to Department<span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly>
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditbutton">Forward To Department</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			               
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	 <script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	console.log("employeecode:",tempId);
-	 	            	
-	 	                // Populate modal fields
-	 	                $('#employeeno').val(employeeDetails.emp_no);
-	 	                $('#employeename').val(employeeDetails.emp_name);
-	 	                $('#department').val(employeeDetails.dept_name);
-	 	                $('#designation').val(employeeDetails.designation);
-	 	               	$('#classes').val(employeeDetails.retirement_class);
-	 	               $('#retirementdate').val(employeeDetails.retirement_date);
-	 	               	$('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	              	$('#retirement').val(employeeDetails.type_of_retirement);
-	 	               	
-	 	               // 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);
-
-	 	                // Show the modal
-	 	                $('#returnpendencydetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	 	    // Scroll the receivedcard section into view
-	 	          	 	    document.getElementById("receivedcard").scrollIntoView({
-	 	          	 	        behavior: "smooth", // Smooth scrolling effect
-	 	          	 	        block: "center" // Aligns the element to the center of the viewport
-	 	          	 	    });
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeeno').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	        		
-	 	              $('#auditbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-    	 
-    	 $(document).on('click', '.view-btn', function () {
-    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-    		 const tempId = $(this).data('temp-id');
-    		    console.log("empCode====="+empCode);
-    		    console.log("tempId====="+tempId);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    	        fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnfamilypensiondetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnpendencydetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnpendencydetailsModal').modal('hide');
-	    });
-	});
-	 
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-	 
-	 
-		function formatDateTime(dateString) {
-			 const options = {
-			     day: '2-digit',
-			     month: '2-digit',
-			     year: 'numeric',
-			 };
-			 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-			}
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);	 
-  	    let entryDetails = {
-  	    	empNo: $('#employeeno').val(),
-  	      	tempId: tempId,
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim()
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	  if (!entryDetails.remarks) {
-	       Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Remarks are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Remarks");
-	       return;
-	   }
-
-		   
-  		// Disable the button to prevent multiple submissions
-  	     $('#auditbutton').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/pension/forward/updateForwardPendency',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditbutton').prop('disabled', false).text('Forward To Department');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditbutton').prop('disabled', false).text('Forward To Department');
-	                        	window.location.href = "/gcc/pensioner/forward/pendency";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditbutton').prop('disabled', false).text('Forward To Department');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-    
-    
-
-	</script>
-
-
-</body>
-</html>
-
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/forward/retirement.html b/src/main/resources/templates/modules/pensioner/pensioner/forward/retirement.html
deleted file mode 100644
index f9a0d696..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/forward/retirement.html
+++ /dev/null
@@ -1,595 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-   
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Retirement</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Forward to Dept</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Forward To Department - Retirement</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">
-					                <table id="ReturnRetriedDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>					
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                             <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					               
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                       
-					                       <!-- Thymeleaf loop to populate data -->
-								            <tr th:each="forward, iterStat : ${forwardlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${forward['emp_no']}" class="text-center"></td>
-								                <td th:text="${forward['emp_name']}" class="text-center"></td>
-								                <td th:text="${forward['dept_name']}" class="text-center"></td>
-								                <td th:text="${forward['designation']}" class="text-center"></td>
-								                <td th:text="${forward['file_moved_date'] != null ? #dates.format(forward['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>								               
-								                <td th:text="${forward['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${forward['emp_no']}, data-temp-id=${forward['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                       
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-   
-<!--  Modal Box -->    
-<div class="modal fade" id="returnretrieddetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="detailsModalLabel">
-                    Forward to Department - Retirement (<span id="modalEmployeeCode"></span>)
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Employee No -->
-                    <div class="col-md-6">
-                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-                        <input type="number" id="employeenomodel" class="form-control" readonly>
-                    </div>
-
-                    <!-- Employee Name -->
-                    <div class="col-md-6">
-                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-                        <input type="text" id="employeename" class="form-control" readonly>
-                    </div>
-
-                    <!-- Department -->
-                    <div class="col-md-6">
-                        <label for="department" class="form-label fw-bold">Department </label>
-                        <input type="text" id="department" class="form-control" readonly>
-                    </div>
-
-                    <!-- Designation -->
-                    <div class="col-md-6">
-                        <label for="designation" class="form-label fw-bold">Designation </label>
-                        <input type="text" id="designation" class="form-control" readonly>
-                    </div>
-                    
-                    <div class="col-md-6">
-                        <label for="retirementdate" class="form-label fw-bold">Retirement Date </label>
-                        <input type="date" id="retirementdate" class="form-control" readonly>
-                    </div>
-                    
-                    <!-- Class -->
-                    <div class="col-md-6">
-                        <label for="classes" class="form-label fw-bold">Class </label>
-                        <input type="text" id="classes" class="form-control" readonly>
-                    </div>
-					
-					<!-- Type of Retirement -->
-                    <div class="col-md-6">
-                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-                        <input type="text" id="typeofretirement" class="form-control" readonly>
-                    </div>
-                    
-                    <!-- Date File Sent to Audit -->
-                    <div class="col-md-6">
-                        <label for="datefile_modal" class="form-label fw-bold">Audit Certificate Received Date </label>
-                        <input type="date" id="datefile_modal" class="form-control" readonly>
-                    </div>
-
-                    <!-- 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" readonly></textarea>
-                    </div>
-                    
-                    <!-- new -->
-
-					<div class="col-md-12 mt-4">
-						<h5>File History</h5>
-							<div id="fileHistoryContainer" class="file-history-list">
-								<!-- File History will be dynamically loaded here -->
-						</div>
-					</div> 
-                                                         
-                </div>         
-            
-                 <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Forward To Department</button>
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div>
-          
-				   <div  style="display :none" id="receivedcard">
-		             <div class="row">
-		             
-		             <!-- Date File Sent to Audit -->
-		             <div class="col-md-6">
-	                       <label for="datefile "  class="form-label fw-bold">Enter Date File Forward to Department <span class="text-danger">*</span></label>
-	                       <input type="text" id="datefile"  class="form-control" readonly>
-		             </div>
-		             
-		             <!-- Remarks -->       
-		             <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>
-		             </div>              
-		           </div>
-		           <div class="row mb-2 mt-2">
-			            <div class="col-md-12 d-flex justify-content-center">
-			                <button type="button" class="btn btn-primary" id="forwardsubmit">Submit</button>
-			            </div>
-	              </div>					          
-			    </div>
-				 
-			</div>         
-        </div>
-    </div>
-</div>
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	
-		$(document).ready(function () {
-		    // Initialize DataTable
-		    const table = $('#ReturnRetriedDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-
-		});		
-		
-		
-		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;
-
-	        
-	    });
-	  
-	  
-	function convertDateFormat(dateString) {
-	    if (!dateString) return '';
-	    let [day, month, year] = dateString.split('-');
-	    return `${year}-${month}-${day}`;
-	}
-		
-		
-		 document.getElementById("submitbutton").addEventListener("click", function () {
-			    // Clear the inputs in the receivedcard section
-			   // $('#datefile').val('');
-			    $('#remarks').val('');
-			    
-			    // Make the receivedcard section visible
-			    document.getElementById("receivedcard").style.display = "block";
-			
-			    // Scroll the receivedcard section into view
-			    document.getElementById("receivedcard").scrollIntoView({
-			        behavior: "smooth", // Smooth scrolling effect
-			        block: "center" // Aligns the element to the center of the viewport
-			    });
-			});
-
-		
-		//model function
-		 function fetchEmployeeDetails(tempId) {
-		 	    $.ajax({
-		 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-		 	        type: 'GET',
-		 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-		 	        success: function (response) {
-		 	            if (response && response.length > 0) {
-		 	            	
-		 	            	let employeeDetails = response[0]; // Access the first object in the array
-		 	            	console.log("response:",response);
-		 	            	
-		 	            	
-		 	                // 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);
-		 	               $('#classes').val(employeeDetails.retirement_class);
-		 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
-		 	               	$('#remarks_modal').val(employeeDetails.remarks);
-			 	             $('#retirementdate').val(employeeDetails.retirement_date);
-		 	                
-		 	               
-		 	                // Update the modal title with the employee code
-		 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-		 	                // Show the modal
-		 	                $('#returnretrieddetailsModal').modal('show');
-		 	                
-		 	             	//additional card display function
-		 	               document.getElementById("submitbutton").addEventListener("click", function() {
-		 	          	       
-				 	            	 //$('#datefile').val('');
-				 	         	    //$('#remarks').val('');
-		 	          	            document.getElementById("receivedcard").style.display = "block";
-		 	          	        
-		 	          	    });
-		 	                
-		 	                /* document.getElementById('forwardsubmit').addEventListener('click', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-		 	                    // Trigger the save function and pass the value
-		 	                    saveEntryDetails(tempId,employeeNo);
-		 	        		}); */
-		 	                
-		 	               $('#forwardsubmit').off('click').on('click', function () {
-		 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-		 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-		 	            	});
-		 	                
-		 	             	
-		 	                
-		 	            } else {
-		 	                Swal.fire({
-		 	                    icon: 'info',
-		 	                    title: 'No Data',
-		 	                    text: 'No details found for the selected employee.',
-		 	                    confirmButtonText: 'OK',
-		 	                });
-		 	            }
-		 	        },
-		 	        error: function () {
-		 	            Swal.fire({
-		 	                icon: 'error',
-		 	                title: 'Error',
-		 	                text: 'Failed to fetch employee details. Please try again.',
-		 	                confirmButtonText: 'OK',
-		 	            });
-		 	        },
-		 	    });
-		 	}
-
-		 $(document).ready(function () {
-	    	 
-	    	 $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		});
-
-
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#returnretrieddetailsModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-		   
-		    // Handle close button click
-		    $('#back').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    $('.close').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		});
-		 
-		 function loadFileHistory(tempId) {
-			    $.ajax({
-			        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-			        type: 'GET',
-			        data: { tempId: tempId }, // Pass empCode as a parameter
-			        success: function (response) {
-			            if (response.length > 0) {
-			                let historyHtml = '';
-			                response.forEach(item => {
-			                    historyHtml += `
-			                        <div class="file-history-item">
-			                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-			                            <div class="file-history-content">
-			                                <div class="file-history-status">${item.fileStatusHistory}</div>
-			                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-			                            </div>
-			                        </div>
-			                    `;
-			                });
-
-
-
-			                $('#fileHistoryContainer').html(historyHtml);
-			            } else {
-			                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-			            }
-			        },
-			        error: function () {
-			            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-			        }
-			    });
-			}
-
-		 // Function to format date and time
-		function formatDateTime(dateString) {
-	 const options = {
-	     day: '2-digit',
-	     month: '2-digit',
-	     year: 'numeric',
-	 };
-	 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-		 
-		 function saveEntryDetails(tempId,empCode) {
-		       //console.log("emp_no inside=="+empCode);	 
-	  	    let entryDetails = {
-	  	        empNo: empCode, 
-	  	        tempId: tempId,
-	  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-	  	        remarks: $('#remarks').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-
-	  	  if (!entryDetails.remarks) {
-		       Swal.fire({
-		           icon: 'warning',
-		           title: 'Validation Error!',
-		           text: 'Remarks are required.',
-		           confirmButtonText: 'OK'
-		       });
-		      
-		       return;
-		   }
-
-	  		// Disable the button to prevent multiple submissions
-	  	     $('#forwardsubmit').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/pension/forward/updateEmployeeDetails',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#forwardsubmit').prop('disabled', false).text('Submit');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#forwardsubmit').prop('disabled', false).text('Submit');
-		                        	window.location.href = "/gcc/pensioner/forward/retirement";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#forwardsubmit').prop('disabled', false).text('Submit');	
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });  
-	  	}
-
-	</script>
-
-
-</body>
-</html>
-
-
-
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/partial/familypension.html b/src/main/resources/templates/modules/pensioner/pensioner/partial/familypension.html
deleted file mode 100644
index de3e20b0..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/partial/familypension.html
+++ /dev/null
@@ -1,1230 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-     #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-
-    
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Family Pension</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Partially Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-	
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Partially Completed - Family Pension</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-                
-                <!--  page loader-->
-  
-  
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Partially Completed - Family Pension (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                
-			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div class="col-md-4">
-										    <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>
-			                   
-			                    <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-4">
-			                        <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 -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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" readonly></textarea>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-
-						</div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Edit Benefits</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">	
-			            <p style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</p>		           
-			            	<div class="row mt-2" id="sec2">	                		
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						<hr>
-						<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<span class="text-danger">*</span></label>
-						        <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number">
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		</div>
-	                   		
-	                   		<div class="row mt-2">
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2" id="dcrgCard" style="display: none;">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></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>
-			            <hr>
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile"  class="form-label fw-bold">Date File Completed <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly="readonly">
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditsubmit">Mark as Completed</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			            
-			            
-			            
-			            
-					           
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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("retirementdate").value = formattedDateDisplay;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	
-	document.getElementById("submitbutton").addEventListener("click", function () {
-	    // Clear the inputs in the receivedcard section
-	    //$('#datefile').val('');
-	    $('#remarks').val('');
-	    
-	    // Make the receivedcard section visible
-	    document.getElementById("receivedcard").style.display = "block";
-
-	    // Scroll the receivedcard section into view
-	    document.getElementById("receivedcard").scrollIntoView({
-	        behavior: "smooth", // Smooth scrolling effect
-	        block: "center" // Aligns the element to the center of the viewport
-	    });
-	});	
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	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);
-	 	                $('#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);
-	 	                $('#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);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	            	   
-	 	            	  
-                          $('#recoveryemployeevalue').val(employeeDetails.recovery_emp).prop('readonly',true);
-	 	            	  
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount).prop('readonly',true);
-	                            $('#gpfYes').prop('checked', true);
-			                    $('#gpfNo').prop('disabled', true);
-			                    $('#gpf50').prop('disabled', true);
-	                        }
-	                        else if (employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount).prop('readonly',true);
-	                            $('#gpfYes').prop('disabled', true);
-			                    $('#gpfNo').prop('disabled', true);
-			                    $('#gpf50').prop('checked', true);
-	                        }
-	                        else {
-	                            $('#gpfAmountDiv').hide();
-	                            $('#gpfYes').prop('disabled', true);
-			                    $('#gpfNo').prop('checked', true);
-			                    $('#gpf50').prop('disabled', true);
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount).prop('readonly',true);
-	                            $('#earnedleaveYes').prop('checked', true);
-			                    $('#earnedleaveNo').prop('disabled', true);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                            $('#earnedleaveYes').prop('disabled', true);
-			                    $('#earnedleaveNo').prop('checked', true);
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount).prop('readonly',true);
-	                            $('#spfgsYes').prop('checked', true);
-			                    $('#spfgsNo').prop('disabled', true);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                            $('#spfgsYes').prop('disabled', true);
-			                    $('#spfgsNo').prop('checked', true);
-	                        }
-
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        if(employeeDetails.dcrg === "yes")
-                        	{
-	                        	$('#dcrgYes').prop('checked', true);
-			                    $('#dcrgNo').prop('disabled', true);
-			                    $('#dcrgCard').show();
-                        	}
-	                        else{
-	                        	$('#dcrgYes').prop('disabled', true);
-			                    $('#dcrgNo').prop('checked', true);
-			                    $('#dcrgCard').hide();
-	                        }
-	                        
-	                        
-	                        $('#pensionNumber').val(employeeDetails.pension_number);
-	                        $('#ledgerNumber').val(employeeDetails.ledger_number);
-	                        
-	                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount);
-	                          
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                            
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount);
-	                            
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                            
-	                            
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount);
-	                            
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                            
-	                        }
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    //$('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditsubmit').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	        		
-	 	        		
-	 	              $('#auditsubmit').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	 // Listen for changes on the GPF radio buttons
-	    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-	            if (this.value === 'yes' || this.value === '90') {
-	                gpfAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	                gpfAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('gpfAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 // Listen for changes on the private affaires radio buttons
-	    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-	            if (this.value === 'yes') {
-	            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	 // Listen for changes on the spfgs radio buttons
-	    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-	            if (this.value === 'yes') {
-	            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 
-	    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const PbAmountDiv = document.getElementById('PbAmountDiv');
-	            if (this.value === 'yes') {
-	            	PbAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	PbAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-	            if (this.value === 'yes') {
-	            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-	            if (this.value === 'yes') {
-	            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	});
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
- const options = {
-     day: '2-digit',
-     month: '2-digit',
-     year: 'numeric',
- };
- return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-
-	 
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);
-	       
-	       let selectedGpfValue = $('input[name="gpf"]:checked').val(); // Get the selected radio button value
-    		let gpfAmount = null;
-
-	    // Check if GPF Amount input is visible and get its value
-	    if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-	        gpfAmount = $('#gpfAmount').val(); // Retrieve the amount if available, else null
-	        if (!gpfAmount) {
-	             Swal.fire({
-	                 icon: 'warning',
-	                 title: 'Validation Error',
-	                 text: 'Please Enter GPF Amount',
-	                 confirmButtonText: 'OK'
-	             });
-		            return; // Stop further execution if validation fails
-		        }
-	    }
-    
-    
-    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-    let earnedleaveAmount=null;   
-    if (selectedElValue === 'yes') {
-    	earnedleaveAmount = $('#earnedleaveAmount').val(); // Retrieve the amount if available, else null
-    	if (!earnedleaveAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter EL/LPA Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    
-  
-    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-    let spfgsAmount=null;
-    if (selectedspfgsValue === 'yes') {
-    	spfgsAmount = $('#spfgsAmount').val(); // Retrieve the amount if available, else null
-    	if (!spfgsAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter SPFGS Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-       
-    //dcrf
-    let selecteddcrgValue = $('input[name="dcrg"]:checked').val();
-    
-    
-    let selectedPd = $('input[name="benefit_pension"]:checked').val();
-    let selectedPdAmount=null;
-    if (selectedPd === 'yes') {
- 	   selectedPdAmount = $('#benefit_pension_amount').val(); 
- 	   if (!selectedPdAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Pension Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    let selecteddcrg = $('input[name="benefit_dcrg"]:checked').val();
-    let seldcrgAmount=null;
-    if (selecteddcrg === 'yes') {
-    	seldcrgAmount = $('#benefit_dcrg_amount').val(); 
-  	   if (!seldcrgAmount) {
-              Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error',
-                  text: 'Please Enter DCRG Benefit Amount',
-                  confirmButtonText: 'OK'
-              });
- 	            return; // Stop further execution if validation fails
- 	        }
-     }
-    
-    let selectedcom = $('input[name="benefit_commutation"]:checked').val();
-    let selectedcomAmount=null;
-    if (selectedcom === 'yes') {
- 	   selectedcomAmount = $('#benefit_commutation_amount').val(); 
- 	   if (!selectedcomAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Commutation Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-	       
-  	    let entryDetails = {
-  	    	empNo:empNo,
-  	      	tempId: tempId, // Pass the stored tempId value		
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim(),
-  	       gpf: selectedGpfValue, // Add GPF value (null if none selected)
-  	       gpfAmount: gpfAmount, // Include the GPF amount
-  	       private_affairs:selectedElValue,
-  	       private_affairs_amount:earnedleaveAmount,
-  	       spfgs:selectedspfgsValue,
-  	       spfgs_amount:spfgsAmount,
-  	       recovery_emp:$('#recoveryemployeevalue').val()|| null,      	       
-  	       dcrg:selecteddcrgValue,
-  	       pension_number:$('#pensionNumber').val(),
-	        ledger_number:$('#ledgerNumber').val(),
-	      	benefit_pension:selectedPd,
-	      	benefit_dcrg:selecteddcrg,
-	    	benefit_commutation:selectedcom,
-	        benefit_pension_amount:selectedPdAmount,
-	        benefit_dcrg_amount:seldcrgAmount,
-	        benefit_commutation_amount:selectedcomAmount
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	   if(!entryDetails.benefit_pension){
-  		 Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Benefit Pension are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Remarks");
-	       return;
-  	   }
-  	   
-  	   
-  	 if(!entryDetails.benefit_dcrg){
-  		 Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Benefit DCRG are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Remarks");
-	       return;
-  	   }
-  	 
-  	if(!entryDetails.benefit_commutation){
- 		 Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Benefit Commutation are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Remarks");
-	       return;
- 	   }
-  	
-  	if(!entryDetails.pension_number){
- 		 Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Pension Number are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Remarks");
-	       return;
- 	   }
-  	
-  	if(!entryDetails.ledger_number){
- 		 Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Ledger Number are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Remarks");
-	       return;
- 	   }
-  	    
-  	  if (!entryDetails.remarks) {
-	       Swal.fire({
-	           icon: 'warning',
-	           title: 'Validation Error!',
-	           text: 'Remarks are required.',
-	           confirmButtonText: 'OK'
-	       });
-	       console.warn("Validation error: Missing Remarks");
-	       return;
-	   }
-
-  	    
-  		// Disable the button to prevent multiple submissions
-  	      $('#auditsubmit').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/pensioner/partial/updateEmployeeDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-	                        	window.location.href = "/gcc/pensioner/partial/familypension";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-
-		
-
-		
-		//amount field validation
-		
-		function validatePositiveNumber(input) {
-			    if (input.value < 1) {
-			        input.value = "";
-			    }
-			}
-		    
-		    
-		    
-		    
-		    		     
-		     
-
-
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/partial/pendency.html b/src/main/resources/templates/modules/pensioner/pensioner/partial/pendency.html
deleted file mode 100644
index 0d3dc7fa..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/partial/pendency.html
+++ /dev/null
@@ -1,1184 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-     #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-
-    
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Pendency</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Partially Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-	
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Partially Completed - 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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		<th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-                
-                <!--  page loader-->
-  
-  
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Partially Completed - Pendency (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                
-			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </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>
-			                    </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>
-			                    </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>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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"  readonly></textarea>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-
-						</div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Edit Benefits</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">	
-			            <p style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</p>		           
-			            	<div class="row mt-2" id="sec2">	                		
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						<hr>
-						<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<span class="text-danger">*</span></label>
-						        <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number">
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		</div>
-	                   		
-	                   		<div class="row mt-2">
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2" id="dcrgCard" style="display: none;">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></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>
-			            <hr>
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile"  class="form-label fw-bold">Date File Completed <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly="readonly">
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditsubmit">Mark as Completed</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			            
-			            
-			            
-			            
-					           
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	
-	document.getElementById("submitbutton").addEventListener("click", function () {
-	    // Clear the inputs in the receivedcard section
-	    //$('#datefile').val('');
-	    $('#remarks').val('');
-	    
-	    // Make the receivedcard section visible
-	    document.getElementById("receivedcard").style.display = "block";
-
-	    // Scroll the receivedcard section into view
-	    document.getElementById("receivedcard").scrollIntoView({
-	        behavior: "smooth", // Smooth scrolling effect
-	        block: "center" // Aligns the element to the center of the viewport
-	    });
-	});	
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	                $('#classes').val(employeeDetails.retirement_class);
-	 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                
-	 	               
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	            	   
-	 	            	  
-                          $('#recoveryemployeevalue').val(employeeDetails.recovery_emp).prop('readonly',true);
-	 	            	  
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount).prop('readonly',true);
-	                            $('#gpfYes').prop('checked', true);
-			                    $('#gpfNo').prop('disabled', true);
-			                    $('#gpf50').prop('disabled', true);
-	                        }
-	                        else if (employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount).prop('readonly',true);
-	                            $('#gpfYes').prop('disabled', true);
-			                    $('#gpfNo').prop('disabled', true);
-			                    $('#gpf50').prop('checked', true);
-	                        }
-	                        else {
-	                            $('#gpfAmountDiv').hide();
-	                            $('#gpfYes').prop('disabled', true);
-			                    $('#gpfNo').prop('checked', true);
-			                    $('#gpf50').prop('disabled', true);
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount).prop('readonly',true);
-	                            $('#earnedleaveYes').prop('checked', true);
-			                    $('#earnedleaveNo').prop('disabled', true);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                            $('#earnedleaveYes').prop('disabled', true);
-			                    $('#earnedleaveNo').prop('checked', true);
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount).prop('readonly',true);
-	                            $('#spfgsYes').prop('checked', true);
-			                    $('#spfgsNo').prop('disabled', true);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                            $('#spfgsYes').prop('disabled', true);
-			                    $('#spfgsNo').prop('checked', true);
-	                        }
-
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        if(employeeDetails.dcrg === "yes")
-                        	{
-	                        	$('#dcrgYes').prop('checked', true);
-			                    $('#dcrgNo').prop('disabled', true);
-			                    $('#dcrgCard').show();
-                        	}
-	                        else{
-	                        	$('#dcrgYes').prop('disabled', true);
-			                    $('#dcrgNo').prop('checked', true);
-			                    $('#dcrgCard').hide();
-	                        }
-	                        
-	                        
-	                        $('#pensionNumber').val(employeeDetails.pension_number);
-	                        $('#ledgerNumber').val(employeeDetails.ledger_number);
-	                        
-	                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount);
-	                          
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                            
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount);
-	                            
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                            
-	                            
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount);
-	                            
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                            
-	                        }
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	    //$('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditsubmit').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	        		
-	 	              $('#auditsubmit').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	 // Listen for changes on the GPF radio buttons
-	    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-	            if (this.value === 'yes' || this.value === '90') {
-	                gpfAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	                gpfAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('gpfAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 // Listen for changes on the private affaires radio buttons
-	    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-	            if (this.value === 'yes') {
-	            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	 // Listen for changes on the spfgs radio buttons
-	    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-	            if (this.value === 'yes') {
-	            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 
-	    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const PbAmountDiv = document.getElementById('PbAmountDiv');
-	            if (this.value === 'yes') {
-	            	PbAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	PbAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-	            if (this.value === 'yes') {
-	            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-	            if (this.value === 'yes') {
-	            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	});
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
- const options = {
-     day: '2-digit',
-     month: '2-digit',
-     year: 'numeric',
- };
- return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-
-	 
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);
-	       
-	       let selectedGpfValue = $('input[name="gpf"]:checked').val(); // Get the selected radio button value
-    		let gpfAmount = null;
-
-	    // Check if GPF Amount input is visible and get its value
-	    if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-	        gpfAmount = $('#gpfAmount').val(); // Retrieve the amount if available, else null
-	        if (!gpfAmount) {
-	             Swal.fire({
-	                 icon: 'warning',
-	                 title: 'Validation Error',
-	                 text: 'Please Enter GPF Amount',
-	                 confirmButtonText: 'OK'
-	             });
-		            return; // Stop further execution if validation fails
-		        }
-	    }
-    
-    
-    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-    let earnedleaveAmount=null;   
-    if (selectedElValue === 'yes') {
-    	earnedleaveAmount = $('#earnedleaveAmount').val(); // Retrieve the amount if available, else null
-    	if (!earnedleaveAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter EL/LPA Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    
-  
-    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-    let spfgsAmount=null;
-    if (selectedspfgsValue === 'yes') {
-    	spfgsAmount = $('#spfgsAmount').val(); // Retrieve the amount if available, else null
-    	if (!spfgsAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter SPFGS Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-       
-    //dcrf
-    let selecteddcrgValue = $('input[name="dcrg"]:checked').val();
-    
-    
-    let selectedPd = $('input[name="benefit_pension"]:checked').val();
-    let selectedPdAmount=null;
-    if (selectedPd === 'yes') {
- 	   selectedPdAmount = $('#benefit_pension_amount').val(); 
- 	   if (!selectedPdAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Pension Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    let selecteddcrg = $('input[name="benefit_dcrg"]:checked').val();
-    let seldcrgAmount=null;
-    if (selecteddcrg === 'yes') {
-    	seldcrgAmount = $('#benefit_dcrg_amount').val(); 
-  	   if (!seldcrgAmount) {
-              Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error',
-                  text: 'Please Enter DCRG Benefit Amount',
-                  confirmButtonText: 'OK'
-              });
- 	            return; // Stop further execution if validation fails
- 	        }
-     }
-    
-    let selectedcom = $('input[name="benefit_commutation"]:checked').val();
-    let selectedcomAmount=null;
-    if (selectedcom === 'yes') {
- 	   selectedcomAmount = $('#benefit_commutation_amount').val(); 
- 	   if (!selectedcomAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Commutation Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-	       
-  	    let entryDetails = {
-  	    	empNo:empNo,
-  	      	tempId: tempId, // Pass the stored tempId value		
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim(),
-  	       gpf: selectedGpfValue, // Add GPF value (null if none selected)
-  	       gpfAmount: gpfAmount, // Include the GPF amount
-  	       private_affairs:selectedElValue,
-  	       private_affairs_amount:earnedleaveAmount,
-  	       spfgs:selectedspfgsValue,
-  	       spfgs_amount:spfgsAmount,
-  	       recovery_emp:$('#recoveryemployeevalue').val()|| null,      	       
-  	       dcrg:selecteddcrgValue,
-  	       pension_number:$('#pensionNumber').val(),
-	        ledger_number:$('#ledgerNumber').val(),
-	      	benefit_pension:selectedPd,
-	      	benefit_dcrg:selecteddcrg,
-	    	benefit_commutation:selectedcom,
-	        benefit_pension_amount:selectedPdAmount,
-	        benefit_dcrg_amount:seldcrgAmount,
-	        benefit_commutation_amount:selectedcomAmount
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-  	    
-  	  if(!entryDetails.benefit_pension){
-   		 Swal.fire({
- 	           icon: 'warning',
- 	           title: 'Validation Error!',
- 	           text: 'Benefit Pension are required.',
- 	           confirmButtonText: 'OK'
- 	       });
- 	     
- 	       return;
-   	   }
-   	   
-   	   
-   	 if(!entryDetails.benefit_dcrg){
-   		 Swal.fire({
- 	           icon: 'warning',
- 	           title: 'Validation Error!',
- 	           text: 'Benefit DCRG are required.',
- 	           confirmButtonText: 'OK'
- 	       });
- 	     
- 	       return;
-   	   }
-   	 
-   	if(!entryDetails.benefit_commutation){
-  		 Swal.fire({
- 	           icon: 'warning',
- 	           title: 'Validation Error!',
- 	           text: 'Benefit Commutation are required.',
- 	           confirmButtonText: 'OK'
- 	       });
- 	      
- 	       return;
-  	   }
-   	
-   	if(!entryDetails.pension_number){
-  		 Swal.fire({
- 	           icon: 'warning',
- 	           title: 'Validation Error!',
- 	           text: 'Pension Number are required.',
- 	           confirmButtonText: 'OK'
- 	       });
- 	     
- 	       return;
-  	   }
-   	
-   	if(!entryDetails.ledger_number){
-  		 Swal.fire({
- 	           icon: 'warning',
- 	           title: 'Validation Error!',
- 	           text: 'Ledger Number are required.',
- 	           confirmButtonText: 'OK'
- 	       });
- 	     
- 	       return;
-  	   }
-   	    
-   	  if (!entryDetails.remarks) {
- 	       Swal.fire({
- 	           icon: 'warning',
- 	           title: 'Validation Error!',
- 	           text: 'Remarks are required.',
- 	           confirmButtonText: 'OK'
- 	       });
- 	     
- 	       return;
- 	   }
-
-  	    
-  		// Disable the button to prevent multiple submissions
-  	      $('#auditsubmit').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/pensioner/partial/updateEmployeeDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-	                        	window.location.href = "/gcc/pensioner/partial/pendency";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-
-		
-   
-
-		
-		//amount field validation
-		
-		function validatePositiveNumber(input) {
-			    if (input.value < 1) {
-			        input.value = "";
-			    }
-			}
-		    
-
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/partial/retirement.html b/src/main/resources/templates/modules/pensioner/pensioner/partial/retirement.html
deleted file mode 100644
index 6409c78f..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/partial/retirement.html
+++ /dev/null
@@ -1,1184 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-     #sec1 .col-md-4,.col-md-12{
-    	padding-top: 1%;
-    } 
-    .col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-
-    
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Retirement</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Partially Completed</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-	
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Partially Completed - Retirement</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="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-                
-                <!--  page loader-->
-  
-  
-  				<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    Partially Completed - Retirement (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">			           			            
-			                <div class="row" id="sec1">
-			                
-			                
-			                    <!-- Employee No -->
-			                    <div class="col-md-4">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
-			                        <input type="number" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-4">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-4">
-			                        <label for="department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-4">
-			                        <label for="designation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </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>
-			                    </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>
-			                    </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>
-			                    </div>
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-4">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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"  readonly></textarea>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">						
-									<h5>File History</h5>							 
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-									</div>
-								</div>
-
-						</div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Edit Benefits</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">	
-			            <p style="font-weight: bold;font-size: medium;text-decoration: underline;">Department Benefits</p>		           
-			            	<div class="row mt-2" id="sec2">	                		
-						<!-- GPF -->
-						<div class="col-md-4 mb-2">  
-						    <label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- Earned Leave & Leave on Private Affairs -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<!-- SPFGS -->
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-												
-						
-						
-						<div class="col-md-4 mb-2">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee">
-						</div>
-						
-						
-						
-							<!-- DCRF File is Ready -->
-							<div class="col-md-4">
-							    <label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-							</div>
-						</div>
-						<hr>
-						<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<span class="text-danger">*</span></label>
-						        <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number">
-	                   		</div>
-	                   		
-	                   		<div class="col-md-4 mt-2 mb-2">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		</div>
-	                   		
-	                   		<div class="row mt-2">
-	                   		
-	                   		<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2" id="dcrgCard" style="display: none;">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-4  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></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>
-			            <hr>
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="datefile"  class="form-label fw-bold">Date File Completed <span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly="readonly">
-					               </div>
-					                    
-					            <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary" id="auditsubmit">Mark as Completed</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-			            
-			            
-			            
-			            
-					           
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-	
-	
-	$(document).ready(function () {
-	    // Initialize the DataTable
-	    const dataTable = $('#AuditDatatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        paging: true,
-	        info: true,
-	        ordering: 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;
-
-        
-    });
-  
-  
-function convertDateFormat(dateString) {
-    if (!dateString) return '';
-    let [day, month, year] = dateString.split('-');
-    return `${year}-${month}-${day}`;
-}
-	
-	
-	document.getElementById("submitbutton").addEventListener("click", function () {
-	    // Clear the inputs in the receivedcard section
-	    //$('#datefile').val('');
-	    $('#remarks').val('');
-	    
-	    // Make the receivedcard section visible
-	    document.getElementById("receivedcard").style.display = "block";
-
-	    // Scroll the receivedcard section into view
-	    document.getElementById("receivedcard").scrollIntoView({
-	        behavior: "smooth", // Smooth scrolling effect
-	        block: "center" // Aligns the element to the center of the viewport
-	    });
-	});	
-	
-	//model function
-	 function fetchEmployeeDetails(tempId) {
-	 	    $.ajax({
-	 	        url: '/gcc/api/department/audit/getpartialdetails', // API to fetch employee details
-	 	        type: 'GET',
-	 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-	 	        success: function (response) {
-	 	            if (response && response.length > 0) {
-	 	            	
-	 	            	let employeeDetails = response[0]; // Access the first object in the array
-	 	            	console.log("response:",response);
-	 	            	
-	 	            	
-	 	                // 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);
-	 	                $('#classes').val(employeeDetails.retirement_class);
-	 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
-	 	                
-	 	               
-	 	                // Update the modal title with the employee code
-	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-	 	                // Show the modal
-	 	                $('#returnretrieddetailsModal').modal('show');
-	 	                
-	 	             	//additional card display function
-	 	               document.getElementById("submitbutton").addEventListener("click", function() {
-	 	            	   
-	 	            	  
-                          $('#recoveryemployeevalue').val(employeeDetails.recovery_emp).prop('readonly',true);
-	 	            	  
-	 	            	  $('input[name="gpf"][value="' + employeeDetails.gpf + '"]').prop('checked', true);
-	                        if (employeeDetails.gpf === "yes") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount).prop('readonly',true);
-	                            $('#gpfYes').prop('checked', true);
-			                    $('#gpfNo').prop('disabled', true);
-			                    $('#gpf50').prop('disabled', true);
-	                        }
-	                        else if (employeeDetails.gpf === "90") {
-	                            $('#gpfAmountDiv').show();
-	                            $('#gpfAmount').val(employeeDetails.gpf_amount).prop('readonly',true);
-	                            $('#gpfYes').prop('disabled', true);
-			                    $('#gpfNo').prop('disabled', true);
-			                    $('#gpf50').prop('checked', true);
-	                        }
-	                        else {
-	                            $('#gpfAmountDiv').hide();
-	                            $('#gpfYes').prop('disabled', true);
-			                    $('#gpfNo').prop('checked', true);
-			                    $('#gpf50').prop('disabled', true);
-	                        }
-
-	                        // Earned Leave & Leave on Private Affairs
-	                        $('input[name="earnedleave"][value="' + employeeDetails.private_affairs + '"]').prop('checked', true);
-	                        if (employeeDetails.private_affairs === "yes") {
-	                            $('#earnedleaveAmountDiv').show();
-	                            $('#earnedleaveAmount').val(employeeDetails.private_affairs_amount).prop('readonly',true);
-	                            $('#earnedleaveYes').prop('checked', true);
-			                    $('#earnedleaveNo').prop('disabled', true);
-	                        } else {
-	                            $('#earnedleaveAmountDiv').hide();
-	                            $('#earnedleaveYes').prop('disabled', true);
-			                    $('#earnedleaveNo').prop('checked', true);
-	                        }
-
-	                        // SPFGS
-	                        $('input[name="spfgs"][value="' + employeeDetails.spfgs + '"]').prop('checked', true);
-	                        if (employeeDetails.spfgs === "yes") {
-	                            $('#spfgsAmountDiv').show();
-	                            $('#spfgsAmount').val(employeeDetails.spfgs_amount).prop('readonly',true);
-	                            $('#spfgsYes').prop('checked', true);
-			                    $('#spfgsNo').prop('disabled', true);
-	                        } else {
-	                            $('#spfgsAmountDiv').hide();
-	                            $('#spfgsYes').prop('disabled', true);
-			                    $('#spfgsNo').prop('checked', true);
-	                        }
-
-	                        // DCRG File
-	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
-	                        if(employeeDetails.dcrg === "yes")
-                        	{
-	                        	$('#dcrgYes').prop('checked', true);
-			                    $('#dcrgNo').prop('disabled', true);
-			                    $('#dcrgCard').show();
-                        	}
-	                        else{
-	                        	$('#dcrgYes').prop('disabled', true);
-			                    $('#dcrgNo').prop('checked', true);
-			                    $('#dcrgCard').hide();
-	                        }
-	                        
-	                        
-	                        $('#pensionNumber').val(employeeDetails.pension_number);
-	                        $('#ledgerNumber').val(employeeDetails.ledger_number);
-	                        
-	                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_pension === "yes") {
-	                            $('#PbAmountDiv').show();
-	                            $('#benefit_pension_amount').val(employeeDetails.benefit_pension_amount);
-	                          
-	                        } else {
-	                            $('#PbAmountDiv').hide();
-	                            
-	                        }
-	                        
-	                        $('input[name="benefit_dcrg"][value="' + employeeDetails.benefit_dcrg + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_dcrg === "yes") {
-	                            $('#dcrgAmountDiv').show();
-	                            $('#benefit_dcrg_amount').val(employeeDetails.benefit_dcrg_amount);
-	                            
-	                        } else {
-	                            $('#dcrgAmountDiv').hide();
-	                            
-	                            
-	                        }
-	                        
-	                        $('input[name="benefit_commutation"][value="' + employeeDetails.benefit_commutation + '"]').prop('checked', true);
-	                        if (employeeDetails.benefit_commutation === "yes") {
-	                            $('#CommutationAmountDiv').show();
-	                            $('#benefit_commutation_amount').val(employeeDetails.benefit_commutation_amount);
-	                            
-	                        } else {
-	                            $('#CommutationAmountDiv').hide();
-	                            
-	                        }
-	 	          	       
-			 	            	 //$('#datefile').val('');
-			 	         	   // $('#remarks').val('');
-	 	          	            document.getElementById("receivedcard").style.display = "block";
-	 	          	        
-	 	          	    });
-	 	                
-	 	                /* document.getElementById('auditsubmit').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-	 	                    // Trigger the save function and pass the value
-	 	                    saveEntryDetails(tempId,employeeNo);
-	 	        		}); */
-	 	                
-	 	               $('#auditsubmit').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-	 	                
-	 	             	
-	 	                
-	 	            } else {
-	 	                Swal.fire({
-	 	                    icon: 'info',
-	 	                    title: 'No Data',
-	 	                    text: 'No details found for the selected employee.',
-	 	                    confirmButtonText: 'OK',
-	 	                });
-	 	            }
-	 	        },
-	 	        error: function () {
-	 	            Swal.fire({
-	 	                icon: 'error',
-	 	                title: 'Error',
-	 	                text: 'Failed to fetch employee details. Please try again.',
-	 	                confirmButtonText: 'OK',
-	 	            });
-	 	        },
-	 	    });
-	 	}
-	    
-	
-	
-	 $(document).ready(function () {
-		 
-    	 
-    	 $(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);
-    		    // Hide the receivedcard section before showing the modal
-    	        $("#receivedcard").hide();
-    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-    		    loadFileHistory(tempId); // Load the file history for the selected employee
-    		    
-
-    		});
-
-
-	    // Initialize the modal with static backdrop and disabled keyboard closing
-	    $('#returnretrieddetailsModal').modal({
-	        backdrop: 'static',
-	        keyboard: false,
-	        show: false // Ensure it doesn't auto-show on page load
-	    });
-
-	   
-	    // Handle close button click
-	    $('#back').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	    $('.close').click(function () {
-	        $('#returnretrieddetailsModal').modal('hide');
-	    });
-	    
-	 // Listen for changes on the GPF radio buttons
-	    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-	            if (this.value === 'yes' || this.value === '90') {
-	                gpfAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	                gpfAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('gpfAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 // Listen for changes on the private affaires radio buttons
-	    document.querySelectorAll('input[name="earnedleave"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const earnedleaveAmountDiv = document.getElementById('earnedleaveAmountDiv');
-	            if (this.value === 'yes') {
-	            	earnedleaveAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	earnedleaveAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('earnedleaveAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    
-	 // Listen for changes on the spfgs radio buttons
-	    document.querySelectorAll('input[name="spfgs"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const spfgsAmountDiv = document.getElementById('spfgsAmountDiv');
-	            if (this.value === 'yes') {
-	            	spfgsAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	spfgsAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('spfgsAmount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	 
-	    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const PbAmountDiv = document.getElementById('PbAmountDiv');
-	            if (this.value === 'yes') {
-	            	PbAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	PbAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-	            if (this.value === 'yes') {
-	            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-	        radio.addEventListener('change', function () {
-	            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-	            if (this.value === 'yes') {
-	            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-	            } else {
-	            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-	                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-	            }
-	        });
-	    });
-	});
-	 
-	 function loadFileHistory(tempId) {
-		    $.ajax({
-		        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-		        type: 'GET',
-		        data: { tempId: tempId }, // Pass empCode as a parameter
-		        success: function (response) {
-		            if (response.length > 0) {
-		                let historyHtml = '';
-		                response.forEach(item => {
-		                    historyHtml += `
-		                        <div class="file-history-item">
-		                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-		                            <div class="file-history-content">
-		                                <div class="file-history-status">${item.fileStatusHistory}</div>
-		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-		                            </div>
-		                        </div>
-		                    `;
-		                });
-
-
-
-		                $('#fileHistoryContainer').html(historyHtml);
-		            } else {
-		                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-		            }
-		        },
-		        error: function () {
-		            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-		        }
-		    });
-		}
-
-	 // Function to format date and time
-	function formatDateTime(dateString) {
- const options = {
-     day: '2-digit',
-     month: '2-digit',
-     year: 'numeric',
- };
- return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-}
-
-	 
-	
-	 function saveEntryDetails(tempId,empNo) {
-	       //console.log("emp_no inside=="+empCode);
-	       
-	       let selectedGpfValue = $('input[name="gpf"]:checked').val(); // Get the selected radio button value
-    		let gpfAmount = null;
-
-	    // Check if GPF Amount input is visible and get its value
-	    if (selectedGpfValue === 'yes' || selectedGpfValue === '90') {
-	        gpfAmount = $('#gpfAmount').val(); // Retrieve the amount if available, else null
-	        if (!gpfAmount) {
-	             Swal.fire({
-	                 icon: 'warning',
-	                 title: 'Validation Error',
-	                 text: 'Please Enter GPF Amount',
-	                 confirmButtonText: 'OK'
-	             });
-		            return; // Stop further execution if validation fails
-		        }
-	    }
-    
-    
-    let selectedElValue = $('input[name="earnedleave"]:checked').val();
-    let earnedleaveAmount=null;   
-    if (selectedElValue === 'yes') {
-    	earnedleaveAmount = $('#earnedleaveAmount').val(); // Retrieve the amount if available, else null
-    	if (!earnedleaveAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter EL/LPA Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    
-  
-    let selectedspfgsValue = $('input[name="spfgs"]:checked').val();
-    let spfgsAmount=null;
-    if (selectedspfgsValue === 'yes') {
-    	spfgsAmount = $('#spfgsAmount').val(); // Retrieve the amount if available, else null
-    	if (!spfgsAmount) {
-            Swal.fire({
-                icon: 'warning',
-                title: 'Validation Error',
-                text: 'Please Enter SPFGS Amount',
-                confirmButtonText: 'OK'
-            });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-       
-    //dcrf
-    let selecteddcrgValue = $('input[name="dcrg"]:checked').val();
-    
-    
-    let selectedPd = $('input[name="benefit_pension"]:checked').val();
-    let selectedPdAmount=null;
-    if (selectedPd === 'yes') {
- 	   selectedPdAmount = $('#benefit_pension_amount').val(); 
- 	   if (!selectedPdAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Pension Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-    let selecteddcrg = $('input[name="benefit_dcrg"]:checked').val();
-    let seldcrgAmount=null;
-    if (selecteddcrg === 'yes') {
-    	seldcrgAmount = $('#benefit_dcrg_amount').val(); 
-  	   if (!seldcrgAmount) {
-              Swal.fire({
-                  icon: 'warning',
-                  title: 'Validation Error',
-                  text: 'Please Enter DCRG Benefit Amount',
-                  confirmButtonText: 'OK'
-              });
- 	            return; // Stop further execution if validation fails
- 	        }
-     }
-    
-    let selectedcom = $('input[name="benefit_commutation"]:checked').val();
-    let selectedcomAmount=null;
-    if (selectedcom === 'yes') {
- 	   selectedcomAmount = $('#benefit_commutation_amount').val(); 
- 	   if (!selectedcomAmount) {
-             Swal.fire({
-                 icon: 'warning',
-                 title: 'Validation Error',
-                 text: 'Please Enter Commutation Benefit Amount',
-                 confirmButtonText: 'OK'
-             });
-	            return; // Stop further execution if validation fails
-	        }
-    }
-	       
-  	    let entryDetails = {
-  	    	empNo:empNo,
-  	      	tempId: tempId, // Pass the stored tempId value		
-  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-  	        remarks: $('#remarks').val(),
-  	        deptId:$('#deptId').text().trim(),
-  	        filemovedby:$('#userId').text().trim(),
-  	       gpf: selectedGpfValue, // Add GPF value (null if none selected)
-  	       gpfAmount: gpfAmount, // Include the GPF amount
-  	       private_affairs:selectedElValue,
-  	       private_affairs_amount:earnedleaveAmount,
-  	       spfgs:selectedspfgsValue,
-  	       spfgs_amount:spfgsAmount,
-  	       recovery_emp:$('#recoveryemployeevalue').val()|| null,      	       
-  	       dcrg:selecteddcrgValue,
-  	       pension_number:$('#pensionNumber').val(),
-	        ledger_number:$('#ledgerNumber').val(),
-	      	benefit_pension:selectedPd,
-	      	benefit_dcrg:selecteddcrg,
-	    	benefit_commutation:selectedcom,
-	        benefit_pension_amount:selectedPdAmount,
-	        benefit_dcrg_amount:seldcrgAmount,
-	        benefit_commutation_amount:selectedcomAmount
-  	    };
-  	    
-  	    console.log("entryDetails:",entryDetails);
-
-  	  if(!entryDetails.benefit_pension){
-    		 Swal.fire({
-  	           icon: 'warning',
-  	           title: 'Validation Error!',
-  	           text: 'Benefit Pension are required.',
-  	           confirmButtonText: 'OK'
-  	       });
-  	       console.warn("Validation error: Missing Remarks");
-  	       return;
-    	   }
-    	   
-    	   
-    	 if(!entryDetails.benefit_dcrg){
-    		 Swal.fire({
-  	           icon: 'warning',
-  	           title: 'Validation Error!',
-  	           text: 'Benefit DCRG are required.',
-  	           confirmButtonText: 'OK'
-  	       });
-  	       console.warn("Validation error: Missing Remarks");
-  	       return;
-    	   }
-    	 
-    	if(!entryDetails.benefit_commutation){
-   		 Swal.fire({
-  	           icon: 'warning',
-  	           title: 'Validation Error!',
-  	           text: 'Benefit Commutation are required.',
-  	           confirmButtonText: 'OK'
-  	       });
-  	       console.warn("Validation error: Missing Remarks");
-  	       return;
-   	   }
-    	
-    	if(!entryDetails.pension_number){
-   		 Swal.fire({
-  	           icon: 'warning',
-  	           title: 'Validation Error!',
-  	           text: 'Pension Number are required.',
-  	           confirmButtonText: 'OK'
-  	       });
-  	       console.warn("Validation error: Missing Remarks");
-  	       return;
-   	   }
-    	
-    	if(!entryDetails.ledger_number){
-   		 Swal.fire({
-  	           icon: 'warning',
-  	           title: 'Validation Error!',
-  	           text: 'Ledger Number are required.',
-  	           confirmButtonText: 'OK'
-  	       });
-  	       console.warn("Validation error: Missing Remarks");
-  	       return;
-   	   }
-    	    
-    	  if (!entryDetails.remarks) {
-  	       Swal.fire({
-  	           icon: 'warning',
-  	           title: 'Validation Error!',
-  	           text: 'Remarks are required.',
-  	           confirmButtonText: 'OK'
-  	       });
-  	       console.warn("Validation error: Missing Remarks");
-  	       return;
-  	   }
-
-  		// Disable the button to prevent multiple submissions
-  	      $('#auditsubmit').prop('disabled', true).text('Processing...');
-  	    
-  	    $.ajax({
-  	        url: '/gcc/api/pensioner/partial/updateEmployeeDetails',
-  	        type: 'POST',
-  	        contentType: 'application/json',
-  	        data: JSON.stringify(entryDetails),
-  	        success: function (response) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');	
-  	            Swal.fire({
-  	                icon: 'success',
-  	                title: 'Success',
-  	                text: response,
-  	               	allowOutsideClick: false,
-  	              	allowEscapeKey: false,
-  	              	allowEnterKey: false,
-  	                confirmButtonText: 'OK'
-  	            }).then((result) => {
-	                        if (result.isConfirmed) {
-	                        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-	                        	window.location.href = "/gcc/pensioner/partial/retirement";
-	                            console.log("Continue clicked");
-	                        }
-  	            });
-  	        },
-  	        error: function (xhr, status, error) {
-  	        	$('#auditsubmit').prop('disabled', false).text('Mark as Completed');
-  	            Swal.fire({
-  	                icon: 'error',
-  	                title: 'Error',
-  	                text: 'Failed to save details. Please try again.',
-  	                confirmButtonText: 'OK'
-  	            });
-  	            console.error('Error:', xhr.responseText);
-  	        }
-  	    });  
-  	}
-
-		//amount field validation
-		
-		function validatePositiveNumber(input) {
-			    if (input.value < 1) {
-			        input.value = "";
-			    }
-			}
-		    
-		    
-		    
-		    		     
-		     
-
-
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/received/familypension.html b/src/main/resources/templates/modules/pensioner/pensioner/received/familypension.html
deleted file mode 100644
index e55a2427..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/received/familypension.html
+++ /dev/null
@@ -1,1429 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-   
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-12,.col-md-4,.col-md-6{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-.col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-    .form-check-label{
-    	padding-top: 4%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Family Pension</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-										<li class="breadcrumb-item" aria-current="page">Received from Dept</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Received From Department - Family Pension</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">
-					                <table id="ReturnRetriedDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>					
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					               
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                       
-					                       <!-- Thymeleaf loop to populate data -->
-								            <tr th:each="forward, iterStat : ${forwardlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${forward['emp_no']}" class="text-center"></td>
-								                <td th:text="${forward['emp_name']}" class="text-center"></td>
-								                <td th:text="${forward['dept_name']}" class="text-center"></td>
-								                <td th:text="${forward['designation']}" class="text-center"></td>
-								                <td th:text="${forward['file_moved_date'] != null ? #dates.format(forward['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>								               
-								                <td th:text="${forward['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${forward['emp_no']}, data-temp-id=${forward['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                       
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-   
-<!--  Modal Box -->    
-<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="detailsModalLabel">
-                    Received From Department - Family Pension (<span id="modalEmployeeCode"></span>)
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Employee No -->
-                    <div class="col-md-4">
-                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-                        <input type="number" id="employeenomodel" class="form-control" readonly>
-                    </div>
-
-                    <!-- Employee Name -->
-                    <div class="col-md-4">
-                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-                        <input type="text" id="employeename" class="form-control" readonly>
-                    </div>
-
-                    <!-- Department -->
-                    <div class="col-md-4">
-                        <label for="department" class="form-label fw-bold">Department </label>
-                        <input type="text" id="department" class="form-control" readonly>
-                    </div>
-
-                    <!-- Designation -->
-                    <div class="col-md-4">
-                        <label for="designation" class="form-label fw-bold">Designation </label>
-                        <input type="text" id="designation" class="form-control" readonly>
-                    </div>
-                    
-                    <div class="col-md-4">
-					    <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" placeholder="Enter details for pending duration" readonly>
-					    </div>
-					</div>
-	                <!-- pendingDuration,yes,no,servicedeath,deceased,sanctionedgis -->
-					
-					
-	                  <div class="col-md-4">
-					    <label for="servicedeath" class="form-label fw-bold">While In Service Death </label>
-					    <div class="dropdown">
-	                           <input type="date" id="servicedeath" class="form-control"  readonly>
-	                       </div>
-					</div>
-					
-					 <div class="col-md-4">
-					    <label for="deceased" class="form-label fw-bold">Relationship of Deceased</label>
-					    <div class="dropdown">
-	                           <input type="text" id="deceased" class="form-control" readonly>
-	                       </div>
-					</div>
-					
-					<div class="col-md-4">
-	                       <label for="sanctionedgis" class="form-label fw-bold">Sanctioned GIS</label>
-	                       <div class="dropdown">
-	                           <input type="number" id="sanctionedgis" class="form-control" readonly>
-	                       </div>
-	                   </div>
-                    
-                    
-                    </div>
-                    <div class="row mt-2">
-                    <div class="col-md-4">
-                    	<label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-                    </div>
-                    
-                     <div class="col-md-4">
-                     	<label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-                     </div>
-                     
-                     <div class="col-md-4">
-                     	<label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-                     </div>
-                     
-                    <div class="col-md-4">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" >
-					</div> 
-					
-					<div class="col-md-4">
-						<label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-					</div>
-					</div>
-					
-                    <div class="row mt-2">
-                    <!-- Date File Sent to Audit -->
-                    <div class="col-md-4">
-                        <label for="datefile_modal" class="form-label fw-bold">Date File sent to Pension </label>
-                        <input type="date" id="datefile_modal" class="form-control" readonly>
-                    </div>
-
-                    <!-- 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"  readonly></textarea>
-                    </div>
-                    </div>
-                    
-                    <!-- new -->
-
-					<div class="col-md-12 mt-4">
-						<h5>File History</h5>
-							<div id="fileHistoryContainer" class="file-history-list">
-								<!-- File History will be dynamically loaded here -->
-						</div>
-					</div> 
-                                                         
-                      
-            
-                 <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="benefitbutton">Add Pension Benefits</button>
-		                <button type="button" class="btn btn-info mx-2" id="returndisplaybutton">Return to Department</button>
-		                <button type="button" class="btn btn-secondary mx-2" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div>
-                  
-                   <div  style="display :none" id="commonbenefitcard">
-	                   
-	                   		<div class="col-md-6">
-							<label class="form-label fw-bold">File Pending<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="PendingYes" name="filepending" value="yes">
-						            <label class="form-check-label" for="PendingYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="PendingNo" name="filepending" value="no">
-						            <label class="form-check-label" for="PendingNo">No</label>
-						        </div>
-						    </div>
-					</div>	
-
-                   </div>
-                   
-                   <div  style="display :none" id="filependingContainer"> 
-	                    <div class="row">
-		                   	<div class="col-md-6">
-			                       <label for="datefileyes"  class="form-label fw-bold">Enter file received  Date<span class="text-danger">*</span></label>
-			                       <input type="text" id="datefileyes" readonly class="form-control">
-				             </div>
-				             
-				             <div class="col-md-12">
-			                       <label for="remarksyes" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
-			                       <textarea id="remarksyes" class="form-control"  rows="4" placeholder="Enter your remarks here"></textarea>
-				             </div>
-			             </div>
-			             <div class="row mb-2 mt-2">
-			            <div class="col-md-12 d-flex justify-content-center">
-			                <button type="button" class="btn btn-primary" id="pendingbutton">Submit</button>
-			            </div>
-	              </div>
-                   </div>
-                   
-                   
-                   <div  style="display :none" id="benefitContainer">
-	                   <div class="row">
-	                   		<div class="col-md-6">
-	                   			<label for="pensionNumber" class="form-label">Pension Number<span class="text-danger">*</span></label>
-						        <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number">
-	                   		</div>
-	                   		
-	                   		<div class="col-md-6">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		
-	                   		
-	                   		<div class="col-md-6  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-6  mb-2" id="dcrgCard" style="display: none;">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-6  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></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 class="col-md-6">
-			                       <label for="datefilereceived"  class="form-label fw-bold">File Received Date <span class="text-danger">*</span></label>
-			                       <input type="text" id="datefilereceived"  class="form-control" readonly>
-				             </div>
-		             
-		                  
-				             <div class="col-md-12">
-			                       <label for="remarksreceived" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
-			                       <textarea id="remarksreceived" class="form-control"  rows="4" placeholder="Enter your remarks here"></textarea>
-				             </div>
-	                   		
-	                   </div>
-	                   <div class="row mb-2 mt-2">
-				            <div class="col-md-12 d-flex justify-content-center">
-				                <button type="button" class="btn btn-primary" id="completedbutton">Mark as Completed</button>
-				            </div>
-	              		</div>
-                   </div>
-                   
-          
-				   <div  style="display :none" id="receivedcard">
-		             <div class="row">
-		             
-		             <!-- Date File Sent to Audit -->
-		             <div class="col-md-6">
-	                       <label for="datefile"  class="form-label fw-bold">Enter Date File Returned to Department <span class="text-danger">*</span></label>
-	                       <input type="text" id="datefile"  class="form-control" readonly>
-		             </div>
-		             
-		             
-		             <!-- Remarks -->       
-		             <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>
-		             </div>
-		                           
-		           </div>
-		           <div class="row mb-2 mt-2">
-			            <div class="col-md-12 d-flex justify-content-center">
-			                <button type="button" class="btn btn-primary" id="returnsubmit">Return</button>
-			            </div>
-			            
-	              </div>
-		           					          
-			    </div>
-				 
-			</div>         
-        </div>
-    </div>
-</div>
-
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	
-		$(document).ready(function () {
-		    // Initialize DataTable
-		    const table = $('#ReturnRetriedDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-
-		});		
-		
-
-		 
-		 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("datefilereceived").value = formattedDateDisplay;
-		        document.getElementById("datefileyes").value = formattedDateDisplay;
-		        
-		    });
-		  
-		  
-		function convertDateFormat(dateString) {
-		    if (!dateString) return '';
-		    let [day, month, year] = dateString.split('-');
-		    return `${year}-${month}-${day}`;
-		}
-				
-		//model function
-		 function fetchEmployeeDetails(tempId) {
-		 	    $.ajax({
-		 	        url: '/gcc/api/department/audit/getfilependingbenefits', // API to fetch employee details
-		 	        type: 'GET',
-		 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-		 	        success: function (response) {
-		 	            if (response && response.length > 0) {
-		 	            	
-		 	            	let BenefitDetails = response[0]; // Access the first object in the array
-		 	            	console.log("response:",response);
-		 	            	
-		 	            	
-		 	                // Populate modal fields
-		 	                $('#employeenomodel').val(BenefitDetails.emp_no);
-		 	                $('#employeename').val(BenefitDetails.emp_name);
-		 	                $('#department').val(BenefitDetails.dept_name);
-		 	                $('#designation').val(BenefitDetails.designation);
-		 	
-		 	                $('#datefile_modal').val(BenefitDetails.file_moved_date);
-		 	               	$('#remarks_modal').val(BenefitDetails.remarks);
-		 	               let pendingDuration = BenefitDetails.pending_duration; // Assuming this comes from the response
-		 	                let pendingReason = BenefitDetails.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);
-		 	                }
-		 	                
-		 	                $('#servicedeath').val(BenefitDetails.service_death);
-		 	                $('#deceased').val(BenefitDetails.relationship_deceased);
-		 	                $('#sanctionedgis').val(BenefitDetails.sanctioned_gis_amount);
-			 	             
-			 	            let file_Pending=BenefitDetails.file_pending;
-		 	                console.log("file_pending=:"+file_Pending);
-			 	             
-			 	         // Populate GPF
-			                 if (BenefitDetails.gpf === 'yes') {
-			                     $('#gpfYes').prop('checked', true); // Disable radio
-			                     $('#gpfNo').prop('disabled', true);
-			                     $('#gpf50').prop('disabled', true);
-			                     $('#gpfAmountDiv').show();
-			                     $('#gpfAmount').val(BenefitDetails.gpf_amount).prop('readonly', true); // Make input readonly
-			                 } else if (BenefitDetails.gpf === 'no') {
-			                     $('#gpfNo').prop('checked', true);
-			                     $('#gpfYes').prop('disabled', true);
-			                     $('#gpf50').prop('disabled', true);
-			                     $('#gpfAmountDiv').hide();
-			                 } else if (BenefitDetails.gpf === '90') {
-			                     $('#gpf50').prop('checked', true);
-			                     $('#gpfYes').prop('disabled', true);
-			                     $('#gpfNo').prop('disabled', true);
-			                     $('#gpfAmountDiv').show();
-			                     $('#gpfAmount').val(BenefitDetails.gpf_amount).prop('readonly', true);
-			                 }
-
-			                 // Populate Earned Leave & Leave on Private Affairs
-			                 if (BenefitDetails.private_affairs === 'yes') {
-			                     $('#earnedleaveYes').prop('checked', true);
-			                     $('#earnedleaveNo').prop('disabled', true);
-			                     $('#earnedleaveAmountDiv').show();
-			                     $('#earnedleaveAmount').val(BenefitDetails.private_affairs_amount).prop('readonly', true);
-			                 } else if (BenefitDetails.private_affairs === 'no') {
-			                     $('#earnedleaveNo').prop('checked', true);
-			                     $('#earnedleaveYes').prop('disabled', true);
-			                     $('#earnedleaveAmountDiv').hide();
-			                 }
-
-			                 // Populate SPFGS
-			                 if (BenefitDetails.spfgs === 'yes') {
-			                     $('#spfgsYes').prop('checked', true);
-			                     $('#spfgsNo').prop('disabled', true);
-			                     $('#spfgsAmountDiv').show();
-			                     $('#spfgsAmount').val(BenefitDetails.spfgs_amount).prop('readonly', true);
-			                 } else if (BenefitDetails.spfgs === 'no') {
-			                     $('#spfgsNo').prop('checked', true);
-			                     $('#spfgsYes').prop('disabled', true);
-			                     $('#spfgsAmountDiv').hide();
-			                 }
-
-			                 // Populate Recovery From Employee
-			                 $('#recoveryemployeevalue')
-			                     .val(BenefitDetails.recovery_emp)
-			                     .prop('readonly', true); // Make input readonly
-
-			                 // Populate DCRG
-			                 if (BenefitDetails.dcrg === 'yes') {
-			                     $('#dcrgYes').prop('checked', true);
-			                     $('#dcrgNo').prop('disabled', true);
-			                     
-			                     /* $('#DcrgYes').prop('disabled', false);
-			                     $('#DcrgNo').prop('disabled', false); */
-			                     $('#dcrgCard').show();
-			                     
-			                 } if (BenefitDetails.dcrg === 'no') {
-			                     $('#dcrgNo').prop('checked', true);
-			                     $('#dcrgYes').prop('disabled', true);
-			                     
-			                    /*  $('#DcrgYes').prop('disabled', true);
-			                     $('#DcrgNo').prop('disabled', true); */
-			                     
-			                     $('#dcrgCard').hide();	
-			                     			                     
-			                 }		 	         	
-		 	                
-		 	               
-		 	                // Update the modal title with the employee code
-		 	                $('#modalEmployeeCode').text(BenefitDetails.emp_no);
-
-		 	                // Show the modal
-		 	                $('#returnretrieddetailsModal').modal('show');
-		 	                
-		 	             	//additional card display function
-		 	               document.getElementById("returndisplaybutton").addEventListener("click", function() {
-		 	          	       
-				 	            //$('#datefile').val('');
-				 	         	$('#remarks').val('');
-				 	         	document.getElementById("commonbenefitcard").style.display = "none";
-		 	          	        document.getElementById("receivedcard").style.display = "block";
-		 	          	        
-			 	          	     document.getElementById("returndisplaybutton").scrollIntoView({
-			 	        	        behavior: "smooth", // Smooth scrolling effect
-			 	        	        block: "center" // Aligns the element to the center of the viewport
-			 	        	    });
-		 	          	        
-		 	          	     	document.getElementById("benefitContainer").style.display = "none";
-		 	          	  		document.getElementById("filependingContainer").style.display = "none";
-		 	          	      		 	          	        
-		 	          	    });
-		 	             	
-		 	             /*  $('#benefitbutton').off('click').on('click', function() {
-		 	            	if(file_Pending==='yes'){
-		 	            		 $('input[name="filepending"][value="' + BenefitDetails.file_pending + '"]').prop('checked', true);		 	            		
-		 	            		$('#commonbenefitcard').show();
-		 	            		 $('#filependingContainer').show();
-		 	            		$('#datefileyes').val(BenefitDetails.file_moved_date);
-			 	               	$('#remarksyes').val(BenefitDetails.remarks);
-			 	               	
-			 	               document.getElementById("benefitbutton").scrollIntoView({
-			 	        	        behavior: "smooth", // Smooth scrolling effect
-			 	        	        block: "center" // Aligns the element to the center of the viewport
-			 	        	    });
-			 	               	 $('#pendingbutton').prop('disabled', true);
-			 	              
-		 	            	}
-		 	            	else{
-		 	            		
-		 	            		$('input[name="filepending"]').prop('checked', false);
-	 	          	            document.getElementById("commonbenefitcard").style.display = "block";
-	 	          	         	document.getElementById("receivedcard").style.display = "none";
-	 	          	         $('#pendingbutton').prop('disabled', false);
-		 	            	}
-		 	            	  
-		 	              });		 	 */              
-		 	              
-		 	              
-		 	              
-		 	             $('#benefitbutton').off('click').on('click', function() {
-			 	                // Show the required elements first
-			 	                $('#commonbenefitcard').show();
-			 	                
-			 	                // Delay scroll to ensure elements are fully rendered
-			 	                setTimeout(() => {
-			 	                    document.getElementById("benefitbutton").scrollIntoView({
-			 	                        behavior: "smooth",
-			 	                        block: "center"
-			 	                    });
-			 	                }, 100); // Small delay
-
-			 	                if (file_Pending === 'yes') {
-			 	                    $('input[name="filepending"][value="' + BenefitDetails.file_pending + '"]').prop('checked', true);
-			 	                    $('#filependingContainer').show();
-			 	                    $('#datefileyes').val(BenefitDetails.file_moved_date);
-			 	                   $('#remarksyes').val(BenefitDetails.remarks).prop('readonly', true); // Make readonly
-			 	                    $('#pendingbutton').prop('disabled', true);
-			 	                  $('#pendingbutton').hide();
-			 	                } else {
-			 	                    $('input[name="filepending"]').prop('checked', false);
-			 	                    document.getElementById("receivedcard").style.display = "none";
-			 	                    $('#pendingbutton').prop('disabled', false);
-			 	                }
-			 	            });
-		 	              
-		 	             // Function to scroll inside the modal
-		 	               function scrollToElement(targetElement) {
-		 	                   var modalBody = $('#returnretrieddetailsModal .modal-body');
-
-		 	                   // Ensure the modal content is fully loaded before scrolling
-		 	                   setTimeout(function () {
-		 	                       modalBody.animate({ 
-		 	                           scrollTop: $(targetElement).offset().top - modalBody.offset().top + modalBody.scrollTop() 
-		 	                       }, 'fast');
-		 	                   }, 200);
-		 	               }
-		 	              
-		 	              //Scroll when "PendingYes" is clicked
-		 	              $('input[name="filepending"]').on('change', function () {
-		 	                  if ($(this).val() === "yes") {
-		 	                      $("#filependingContainer").show(); // Show before scrolling
-		 	                      scrollToElement("#filependingContainer");
-		 	                  } else {
-		 	                      $("#filependingContainer").hide();
-		 	                      $("#benefitContainer").show(); // Ensure benefitContainer is visible
-		 	                      scrollToElement("#benefitContainer"); // Scroll to benefitContainer
-		 	                  }
-		 	              });
-		 	              
-		 	            /*  document.getElementById("benefitbutton").addEventListener("click", function() {
-		 	          	       
-		 	            	$('input[name="filepending"]').prop('checked', false);
- 	          	            document.getElementById("commonbenefitcard").style.display = "block";
- 	          	         	document.getElementById("receivedcard").style.display = "none";
-		 	          	         
- 	          	        
- 	          	    	}); 
-		 	             
-		 	            document.getElementById('pendingbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-	 	                    
-	 	                    savePendingDetails(tempId,employeeNo);
-	 	        		}); */
-	 	        		
-	 	        		$('#pendingbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	   savePendingDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-		 	                 		 	                
-		 	                
- 	          	    	/* $(document).off('click', '#completedbutton').on('click', '#completedbutton', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-		 	                    
-		 	                    saveCompletedDetails(tempId,employeeNo);
-		 	        		}); */
-		 	        		
-		 	        		$('#completedbutton').off('click').on('click', function () {
-		 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-		 	            	   saveCompletedDetails(tempId, employeeNo); // Call function with parameters
-		 	            	});
-		 	                
-		 	              /* document.getElementById('returnsubmit').addEventListener('click', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-		 	                    
-		 	                    saveReturnDetails(tempId,employeeNo);
-		 	        		}); */
-		 	        		
-		 	        		$('#returnsubmit').off('click').on('click', function () {
-		 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-		 	            	   saveReturnDetails(tempId, employeeNo); // Call function with parameters
-		 	            	});
-		 	                		 	              
-		 	                
-		 	            } else {
-		 	                Swal.fire({
-		 	                    icon: 'info',
-		 	                    title: 'No Data',
-		 	                    text: 'No details found for the selected employee.',
-		 	                    confirmButtonText: 'OK',
-		 	                });
-		 	            }
-		 	        },
-		 	        error: function () {
-		 	            Swal.fire({
-		 	                icon: 'error',
-		 	                title: 'Error',
-		 	                text: 'Failed to fetch employee details. Please try again.',
-		 	                confirmButtonText: 'OK',
-		 	            });
-		 	        },
-		 	    });
-		 	}
-
-		 $(document).ready(function () {
-	    	 
-	    	 $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    	        $("#commonbenefitcard").hide();	    	        
-	    	        $("#filependingContainer").hide();
-	    	        $("#benefitContainer").hide()
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		    
-	    		});
-
-
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#returnretrieddetailsModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-		   
-		    // Handle close button click
-		    $('#back').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    $('.close').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    document.querySelectorAll('input[name="filepending"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const filependingContainer = document.getElementById('filependingContainer')
-		            const benefitContainer = document.getElementById('benefitContainer');
-		            if (this.value === 'yes') {
-		            	filependingContainer.style.display = 'block'; // Show the input field
-		            	//document.getElementById('datefileyes').value = ''; 
-		            	document.getElementById('remarksyes').value = '';
-		            	document.getElementById("benefitContainer").style.display = "none";
-		            	 
-		            }if (this.value === 'no') {
-		            	benefitContainer.style.display = 'block'; // Hide the input field
-		            	filependingContainer.style.display = 'none';
-		                // pensionNumber,ledgerNumber,benefit_pension,benefit_dcrg,benefit_commutation,datefilereceived,remarksreceived
-		                document.getElementById('pensionNumber').value = ''; 
-		                document.getElementById('ledgerNumber').value = ''; 
-		                $('input[name="benefit_pension"]').prop('checked', false);
-		                $('input[name="benefit_dcrg"]').prop('checked', false);
-		                $('input[name="benefit_commutation"]').prop('checked', false);
-		                document.getElementById('benefit_pension_amount').value = ''; 
-		                document.getElementById('benefit_dcrg_amount').value = ''; 
-		                document.getElementById('benefit_commutation_amount').value = ''; 
-		                
-		                //document.getElementById('datefilereceived').value = ''; 
-		                document.getElementById('remarksreceived').value = '';
-		                document.getElementById("filependingContainer").style.display = "none";
-		                document.getElementById("PbAmountDiv").style.display = "none";
-		                document.getElementById("dcrgAmountDiv").style.display = "none";
-		                document.getElementById("CommutationAmountDiv").style.display = "none";
-		            }
-		        });
-		    });
-		    
-		    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const PbAmountDiv = document.getElementById('PbAmountDiv');
-		            if (this.value === 'yes') {
-		            	PbAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	PbAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-		            if (this.value === 'yes') {
-		            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-		            if (this.value === 'yes') {
-		            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		});
-		 
-		 function loadFileHistory(tempId) {
-			    $.ajax({
-			        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-			        type: 'GET',
-			        data: { tempId: tempId }, // Pass empCode as a parameter
-			        success: function (response) {
-			            if (response.length > 0) {
-			                let historyHtml = '';
-			                response.forEach(item => {
-			                    historyHtml += `
-			                        <div class="file-history-item">
-			                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-			                            <div class="file-history-content">
-			                                <div class="file-history-status">${item.fileStatusHistory}</div>
-			                                <div class="file-history-remarks">Commetns/Remarks: ${item.remarksHistory || 'N/A'}</div>
-			                            </div>
-			                        </div>
-			                    `;
-			                });
-
-
-
-			                $('#fileHistoryContainer').html(historyHtml);
-			            } else {
-			                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-			            }
-			        },
-			        error: function () {
-			            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-			        }
-			    });
-			}
-
-		 // Function to format date and time
-		function formatDateTime(dateString) {
-	 const options = {
-	     day: '2-digit',
-	     month: '2-digit',
-	     year: 'numeric',
-	 };
-	 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-		 
-		function saveCompletedDetails(tempId,empCode) {
-		       //console.log("emp_no inside=="+empCode);
-		       let selecteddcrg=null;
-		       let selbenefitdcrgamount=null;
-		       
-		       let selectedfilePending = $('input[name="filepending"]:checked').val();
-		       let selectedPd = $('input[name="benefit_pension"]:checked').val();
-		       let selectedPdAmount=null;
-		       if (selectedPd === 'yes') {
-		    	   selectedPdAmount = $('#benefit_pension_amount').val(); 
-		    	   if (!selectedPdAmount) {
-		                Swal.fire({
-		                    icon: 'warning',
-		                    title: 'Validation Error',
-		                    text: 'Please Enter Pension Benefit Amount',
-		                    confirmButtonText: 'OK'
-		                });
-			            return; // Stop further execution if validation fails
-			        }
-		       }
-		       let confirmDcrg=$('input[name="dcrg"]:checked').val();
-	    	   
-		       if(confirmDcrg == 'yes'){
-		    	   
-		    	    selecteddcrg = $('input[name="benefit_dcrg"]:checked').val();
-			        selbenefitdcrgamount=null;
-			       if(!selecteddcrg)
-		    	   {
-			    	   Swal.fire({
-		                    icon: 'warning',
-		                    title: 'Validation Error',
-		                    text: 'Please Select DCRG Pension Benefit',
-		                    confirmButtonText: 'OK'
-		                });
-			            return;
-		    	   }
-			       if(selecteddcrg ==='yes'){
-			    	   selbenefitdcrgamount=$('#benefit_dcrg_amount').val();
-			    	   if (!selbenefitdcrgamount) {
-			                Swal.fire({
-			                    icon: 'warning',
-			                    title: 'Validation Error',
-			                    text: 'Please Enter DCRG Benefit Amount',
-			                    confirmButtonText: 'OK'
-			                });
-				            return; // Stop further execution if validation fails
-				        }
-			       }
-			       
-		       }
-		       
-		       if(confirmDcrg == 'no'){
-		    	   
-		    	    selecteddcrg=null;
-		    	    selbenefitdcrgamount=null;
-		    	   
-		       }
-		       let selectedcom = $('input[name="benefit_commutation"]:checked').val();
-		       let selectedcomAmount=null;
-		       if (selectedcom === 'yes') {
-		    	   selectedcomAmount = $('#benefit_commutation_amount').val(); 
-		    	   if (!selectedcomAmount) {
-		                Swal.fire({
-		                    icon: 'warning',
-		                    title: 'Validation Error',
-		                    text: 'Please Enter Commutation Benefit Amount',
-		                    confirmButtonText: 'OK'
-		                });
-			            return; // Stop further execution if validation fails
-			        }
-		       }
-		       
-	  	    let entryDetails = {
-	  	        empNo: empCode, 
-	  	      	tempId: tempId,
-	  	      	file_pending:selectedfilePending,
-	  	      	pension_number:$('#pensionNumber').val(),
-	  	        ledger_number:$('#ledgerNumber').val(),
-	  	      	benefit_pension:selectedPd,
-	  	        benefit_dcrg:selecteddcrg || null,
-	  	    	benefit_commutation:selectedcom,
-	  	        benefit_pension_amount:selectedPdAmount,
-	  	        benefit_dcrg_amount:selbenefitdcrgamount || null,
-	  	        benefit_commutation_amount:selectedcomAmount,
-	  	        dateToAudit:  convertDateFormat($('#datefilereceived').val()?.trim()),
-	  	        remarks: $('#remarksreceived').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-	  	    
-	  	  if(!entryDetails.benefit_pension){
-	    		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Benefit Pension are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	    	   }
-	    	   
-	    	   
-	    	 if(!entryDetails.file_pending){
-	    		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'File Pending are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	       
-	  	       return;
-	    	   }
-	    	 
-	    	if(!entryDetails.benefit_commutation){
-	   		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Benefit Commutation are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	   	   }
-	    	
-	    	if(!entryDetails.pension_number){
-	   		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Pension Number are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	   	   }
-	    	
-	    	if(!entryDetails.ledger_number){
-	   		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Ledger Number are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	     
-	  	       return;
-	   	   }
-	    	    
-	    	  if (!entryDetails.remarks) {
-	  	       Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Remarks are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	  	   }
-
-	  		// Disable the button to prevent multiple submissions
-	  	      $('#completedbutton').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/pension/received/updateforretirementcompleted',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#completedbutton').prop('disabled', false).text('Mark as Completed');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#completedbutton').prop('disabled', false).text('Mark as Completed');
-		                        	window.location.href = "/gcc/pensioner/received/familypension";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#completedbutton').prop('disabled', false).text('Mark as Completed');	
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });   
-	  	}
-		
-		//savePendingDetails
-		function savePendingDetails(tempId,empCode) {
-		       //console.log("emp_no inside=="+empCode);
-		       let selectedfilePending = $('input[name="filepending"]:checked').val();
-		       
-		       
-	  	    let entryDetails = {
-	  	        empNo: empCode, 
-	  	      	tempId: tempId,
-	  	      	file_pending:selectedfilePending,	  	      	
-	  	        dateToAudit:  convertDateFormat($('#datefileyes').val()?.trim()),
-	  	        remarks: $('#remarksyes').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-	  	    
-	  	  if (!entryDetails.file_pending) {
-		       Swal.fire({
-		           icon: 'warning',
-		           title: 'Validation Error!',
-		           text: 'File Pending are required.',
-		           confirmButtonText: 'OK'
-		       });
-		     
-		       return;
-		   }
-	  	    
-	  	  if (!entryDetails.remarks) {
-		       Swal.fire({
-		           icon: 'warning',
-		           title: 'Validation Error!',
-		           text: 'Remarks are required.',
-		           confirmButtonText: 'OK'
-		       });
-		      
-		       return;
-		   }
-
-	  		// Disable the button to prevent multiple submissions  pendingbutton Submit
-	  	     $('#pendingbutton').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/pension/received/updateforretirementpending',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#pendingbutton').prop('disabled', false).text('Submit');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#pendingbutton').prop('disabled', false).text('Submit');	
-		                        	window.location.href = "/gcc/pensioner/received/familypension";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#pendingbutton').prop('disabled', false).text('Submit');		
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });  
-	  	} 
-		
-		//saveReturnDetails
-		//datefile  remarks
-		
-		function saveReturnDetails(tempId,empCode) {
-		       
-	  	    let entryDetails = {
-	  	        empNo: empCode, 
-	  	      	tempId: tempId,	  	      	  	      	
-	  	        dateToAudit:  convertDateFormat($('#datefile').val()?.trim()),
-	  	        remarks: $('#remarks').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-
-	  	// Validate required fields
-	  	    if (!entryDetails.remarks) {
-		       Swal.fire({
-		           icon: 'warning',
-		           title: 'Validation Error!',
-		           text: 'Remarks are required.',
-		           confirmButtonText: 'OK'
-		       });
-		       console.warn("Validation error: Missing Remarks");
-		       return;
-		   }
-	  	    
-	  	  //returnsubmit  Return
-	  		// Disable the button to prevent multiple submissions  pendingbutton Submit
-	  	     $('#returnsubmit').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/pension/received/updateforretirementreturn',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#returnsubmit').prop('disabled', false).text('Return');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#returnsubmit').prop('disabled', false).text('Return');	
-		                        	window.location.href = "/gcc/pensioner/received/familypension";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#returnsubmit').prop('disabled', false).text('Return');	
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });  
-	  	}
-		
-	
-	  	
-	  	document.querySelectorAll('input[name="pendingDuration"]').forEach(radio => {
-	  	    radio.addEventListener('change', function () {
-	  	        const pendingDurationInputContainer = document.getElementById('pendingDurationInputContainer');
-	  	        if (this.value === 'yes') {
-	  	        	pendingDurationInputContainer.style.display = 'block'; // Show the input field
-	  	        } else {
-	  	        	pendingDurationInputContainer.style.display = 'none'; // Hide the input field
-	  	            document.getElementById('pendingDurationInput').value = ''; // Clear the input field
-	  	        }
-	  	    });
-	  	});
-
-	  	
-
-		
-		//amount field validation
-		
-		function validatePositiveNumber(input) {
-			    if (input.value < 1) {
-			        input.value = "";
-			    }
-			}
-
-	</script>
-
-
-</body>
-</html>
-
-
-
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/received/gis.html b/src/main/resources/templates/modules/pensioner/pensioner/received/gis.html
deleted file mode 100644
index cfe70517..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/received/gis.html
+++ /dev/null
@@ -1,742 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-        color: red;
-    }
-    
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-6{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>GIS</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received from Dept</li>
-                                        <li class="breadcrumb-item active" aria-current="page">GIS</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Received From Department-GIS</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="audittable">
-					                <table id="GISDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="audit, iterStat : ${auditlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${audit['emp_no']}" class="text-center"></td>
-								                <td th:text="${audit['emp_name']}" class="text-center"></td>
-								                <td th:text="${audit['dept_name']}" class="text-center"></td>
-								                <td th:text="${audit['designation']}" class="text-center"></td>
-								                <td th:text="${audit['file_moved_date'] != null ? #dates.format(audit['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${audit['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${audit['emp_no']}, data-temp-id=${audit['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-			<div class="modal fade" id="returnretrieddetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-lg"  role="document">
-			        <div class="modal-content">
-			            <div class="modal-header">
-			                <h5 class="modal-title" id="detailsModalLabel">
-			                    GIS - Received (<span id="modalEmployeeCode"></span>)
-			                </h5>
-			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-			            </div>
-			            <div class="modal-body">
-			                <div class="row">
-			                    <!-- Employee No -->
-			                    <div class="col-md-6">
-			                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-			                        <input type="text" id="employeenomodel" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Employee Name -->
-			                    <div class="col-md-6">
-			                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-			                        <input type="text" id="employeename" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Department -->
-			                    <div class="col-md-6">
-			                        <label for="department" class="form-label fw-bold">Department </label>
-			                        <input type="text" id="department" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- Designation -->
-			                    <div class="col-md-6">
-			                        <label for="designation" class="form-label fw-bold">Designation </label>
-			                        <input type="text" id="designation" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div class="col-md-6">
-			                        <label for="retirementdate" class="form-label fw-bold">While in service Death </label>
-			                        <input type="date" id="retirementdate" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <!-- Class -->
-			                    <div class="col-md-6">
-			                        <label for="classes" class="form-label fw-bold">Relationship of Deceased </label>
-			                        <input type="text" id="classes" class="form-control" readonly>
-			                    </div>
-			                    
-			                    <div  class="row col-md-12" id="gisentrycontainer" style="display: none;padding-left: 0px;padding-right: 0px;margin-left: 3px;">
-			                     <div class="col-md-6">
-								    <label for="gisentry" class="form-label fw-bold">GIS Entry Type</label>
-							        <input type="text" id="gisentry" class="form-control" readonly>
-
-								</div>
-								
-			                    
-
-			                    <div class="col-md-6">
-								    <label for="gisamount" class="form-label fw-bold">
-								       Sanctioned GIS Advance 
-
-								    </label>
-								    <div class="d-flex align-items-center">
-								        <div class="form-check" style="padding-right:10px;">
-								            <input type="radio" id="gisyes" name="gisamount" class="form-check-input" value="Yes">
-								            <label for="gisyes" class="form-check-label">Yes</label>
-								        </div>
-								        <div class="form-check">
-								            <input type="radio" id="gisno" name="gisamount" class="form-check-input" value="No">
-								            <label for="gisno" class="form-check-label">No</label>
-								        </div>
-								    </div>
-								    <div class="dropdown" id="gisAmountInputContainer" style="display: none; margin-top: 10px;">
-									    <input type="text" id="gisAmountInput"  class="form-control" readonly>
-									          
-									</div>
-								</div>
-								
-								</div> 
-			                    
-			                    <!-- Date File Sent to Audit -->
-			                    <div class="col-md-6">
-			                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Pension </label>
-			                        <input type="date" id="datefile_modal" class="form-control" readonly>
-			                    </div>
-			
-			                    <!-- 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" readonly></textarea>
-			                    </div>
-			                    
-			                    <!-- new -->
-
-								<div class="col-md-12 mt-4">
-									<h5>File History</h5>
-										<div id="fileHistoryContainer" class="file-history-list">
-											<!-- File History will be dynamically loaded here -->
-									</div>
-								</div> 
-			                  		                    
-			                </div>
-			                <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-primary mx-2" id="submitbutton">Submit</button>
-					                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-					            </div>
-			            </div>
-			            
-			            <div  style="display :none" id="receivedcard">
-			                <div class="row">
-			            
-					            <div class="col-md-6">
-					                        <label for="sanctionalGISDate "  class="form-label fw-bold">Sanctional GIS Date<span class="text-danger">*</span></label>
-					                        <input type="date" id="sanctionalGISDate"  class="form-control" onclick="this.showPicker()">
-					               </div>
-					                    
-					            <div class="col-md-6">
-					                       <label for="sanctionalGisAmount "  class="form-label fw-bold">Total Sanctional GIS Amount <span class="text-danger">*</span></label>
-					                        <input type="number" id="sanctionalGisAmount"  class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-					               </div>
-					               <div class="col-md-6">
-					                       <label for="licDate "  class="form-label fw-bold">File Forward To LIC on<span class="text-danger">*</span></label>
-					                        <input type="date" id="licDate"  class="form-control" onclick="this.showPicker()">
-					               </div>
-					                <div class="col-md-6">
-					                       <label for="datefile "  class="form-label fw-bold">File Sent Date<span class="text-danger">*</span></label>
-					                        <input type="text" id="datefile"  class="form-control" readonly>
-					               </div>
-					                <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>
-					               </div>
-					               
-					               
-					           </div>
-					           <div class="row mb-2 mt-2">
-					            <div class="col-md-12 d-flex justify-content-center">
-					                <button type="button" class="btn btn-success" id="auditsubmit">Approved</button>
-					            </div>
-			            </div>
-					           
-					         </div> 
-			            
-			            </div>
-           
-			        </div>
-			    </div>
-			</div>
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-		
-		    // Initialize DataTable
-		    const table = $('#GISDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-		    
-		    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;
-
-		        
-		    });
-		  
-		  
-		function convertDateFormat(dateString) {
-		    if (!dateString) return '';
-		    let [day, month, year] = dateString.split('-');
-		    return `${year}-${month}-${day}`;
-		}
-		    
-		    
-		    
-		    document.getElementById("submitbutton").addEventListener("click", function () {
-			    // Clear the inputs in the receivedcard section
-			    //$('#datefile').val('');
-			    $('#remarks').val('');
-			    
-			    // Make the receivedcard section visible
-			    document.getElementById("receivedcard").style.display = "block";
-			
-			    // Scroll the receivedcard section into view
-			    document.getElementById("receivedcard").scrollIntoView({
-			        behavior: "smooth", // Smooth scrolling effect
-			        block: "center" // Aligns the element to the center of the viewport
-			    });
-			});
-		 
-		  //model function
-			 function fetchEmployeeDetails(tempId) {
-			 	    $.ajax({
-			 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-			 	        type: 'GET',
-			 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-			 	        success: function (response) {
-			 	            if (response && response.length > 0) {
-			 	            	
-			 	            	let employeeDetails = response[0]; // Access the first object in the array
-			 	            	console.log("response:",response);
-			 	            	
-			 	            	
-			 	                // Populate modal fields
-			 	                $('#employeenomodel').val(employeeDetails.emp_no);
-			 	                $('#employeename').val(employeeDetails.emp_name);
-			 	                $('#department').val(employeeDetails.dept_name);
-			 	                $('#designation').val(employeeDetails.designation);
-			 	               
-			 	               $('#classes').val(employeeDetails.relationship_deceased);
-			 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
-			 	               	$('#remarks_modal').val(employeeDetails.remarks);
-				 	             $('#retirementdate').val(employeeDetails.service_death);
-				 	             
-				 	             if(employeeDetails.gis_entry!=null && employeeDetails.gis_advance!=null){
-				 	            	 
-				 	            	 $('#gisentrycontainer').show();
-				 	            	 
-				 	            	$('#gisentry').val(employeeDetails.gis_entry);
-					 	            // Populate gis advance  Section based on response or data
-					                    if (employeeDetails.gis_advance === "yes") {
-					                        $('#gisyes').prop('checked', true); // Check Yes radio button
-					                        $('#gisno').prop('disabled', true); // Disable No radio button
-					                        $('#gisAmountInputContainer').show(); // Show CPS amount input field
-					                        $('#gisAmountInput').val(employeeDetails.gis_advance_amount || '').prop('readonly', true); // Set CPS amount and make readonly
-					                    } else if (employeeDetails.gis_advance === "no") {
-					                        $('#gisno').prop('checked', true); // Check No radio button
-					                        $('#gisyes').prop('disabled', true); // Disable Yes radio button
-					                        $('#gisAmountInputContainer').hide(); // Hide CPS amount input field
-					                    }
-				 	             }
-				 	             else{
-				 	            	$('#gisentrycontainer').hide();
-				 	             }
-				 	            
-							 	               
-			 	                // Update the modal title with the employee code
-			 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-			 	                // Show the modal
-			 	                $('#returnretrieddetailsModal').modal('show');
-			 	                
-			 	             	//additional card display function
-			 	               document.getElementById("submitbutton").addEventListener("click", function() {
-			 	          	       
-					 	            	 //$('#datefile').val('');
-					 	         	    //$('#remarks').val('');
-			 	          	            document.getElementById("receivedcard").style.display = "block";
-			 	          	        
-			 	          	    });
-			 	                
-			 	                document.getElementById('auditsubmit').addEventListener('click', function () {
-			 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-			 	                    // Trigger the save function and pass the value
-			 	                    saveEntryDetails(tempId,employeeNo);
-			 	        		});
-			 	                
-			 	             	
-			 	                
-			 	            } else {
-			 	                Swal.fire({
-			 	                    icon: 'info',
-			 	                    title: 'No Data',
-			 	                    text: 'No details found for the selected employee.',
-			 	                    confirmButtonText: 'OK',
-			 	                });
-			 	            }
-			 	        },
-			 	        error: function () {
-			 	            Swal.fire({
-			 	                icon: 'error',
-			 	                title: 'Error',
-			 	                text: 'Failed to fetch employee details. Please try again.',
-			 	                confirmButtonText: 'OK',
-			 	            });
-			 	        },
-			 	    });
-			 	}
-		  
-			 $(document).ready(function () {
-		    	 
-		    	 $(document).on('click', '.view-btn', function () {
-		    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-		    		    console.log("empCode====="+empCode);
-		    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-		    		    // Hide the receivedcard section before showing the modal
-		    	        $("#receivedcard").hide();
-		    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-		    		    loadFileHistory(tempId); // Load the file history for the selected employee
-		    		});
-
-
-			    // Initialize the modal with static backdrop and disabled keyboard closing
-			    $('#returnretrieddetailsModal').modal({
-			        backdrop: 'static',
-			        keyboard: false,
-			        show: false // Ensure it doesn't auto-show on page load
-			    });
-
-			   
-			    // Handle close button click
-			    $('#back').click(function () {
-			        $('#returnretrieddetailsModal').modal('hide');
-			    });
-			    
-			    $('.close').click(function () {
-			        $('#returnretrieddetailsModal').modal('hide');
-			    });
-			});
-			 
-			 
-			 function loadFileHistory(tempId) {
-				    $.ajax({
-				        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-				        type: 'GET',
-				        data: { tempId: tempId }, // Pass empCode as a parameter
-				        success: function (response) {
-				            if (response.length > 0) {
-				                let historyHtml = '';
-				                response.forEach(item => {
-				                    historyHtml += `
-				                        <div class="file-history-item">
-				                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-				                            <div class="file-history-content">
-				                                <div class="file-history-status">${item.fileStatusHistory}</div>
-				                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-				                            </div>
-				                        </div>
-				                    `;
-				                });
-
-
-
-				                $('#fileHistoryContainer').html(historyHtml);
-				            } else {
-				                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-				            }
-				        },
-				        error: function () {
-				            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-				        }
-				    });
-				}
-
-			 // Function to format date and time
-			function formatDateTime(dateString) {
-		 const options = {
-		     day: '2-digit',
-		     month: '2-digit',
-		     year: 'numeric',
-		 };
-		 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-		}
-			 
-			 function saveEntryDetails(tempId,empCode) {
-			       //console.log("emp_no inside=="+empCode);
-			       
-			       
-		  	    let entryDetails = {
-		  	        empNo: empCode, 
-		  	      	tempId: tempId,
-		  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-		  	        remarks: $('#remarks').val(),
-		  	        deptId:$('#deptId').text().trim(),
-		  	        sanctional_gis_date:$('#sanctionalGISDate').val(),
-		  	        sanctional_gis_amount:$('#sanctionalGisAmount').val(),
-		  	        lic_date:$('#licDate').val(),
-		  	        filemovedby:$('#userId').text().trim()
-		  	    };
-		  	    
-		  	    console.log("entryDetails:",entryDetails);
-		  	    
-		  	    
-		  	  if(!entryDetails.sanctional_gis_date){
-			  		 Swal.fire({
-				           icon: 'warning',
-				           title: 'Validation Error!',
-				           text: 'Sanctional GIS Date are required.',
-				           confirmButtonText: 'OK'
-				       });
-				       
-				       return;
-			  	  }    
-		  	  
-		  	  
-		  	 if(!entryDetails.sanctional_gis_amount){
-		  		 Swal.fire({
-			           icon: 'warning',
-			           title: 'Validation Error!',
-			           text: 'Sanctional GIS amount are required.',
-			           confirmButtonText: 'OK'
-			       });
-			       
-			       return;
-		  	  }    
-		  	    
-		  	  if(!entryDetails.lic_date){
-		  		 Swal.fire({
-			           icon: 'warning',
-			           title: 'Validation Error!',
-			           text: 'LIC Date are required.',
-			           confirmButtonText: 'OK'
-			       });
-			       
-			       return;
-		  	  }  
-		  	    
-		  	  if (!entryDetails.remarks) {
-			       Swal.fire({
-			           icon: 'warning',
-			           title: 'Validation Error!',
-			           text: 'Remarks are required.',
-			           confirmButtonText: 'OK'
-			       });
-			      
-			       return;
-			   }
-
-		  		// Disable the button to prevent multiple submissions
-		  	     $('#auditsubmit').prop('disabled', true).text('Processing...');
-		  	    
-		  	    $.ajax({
-		  	        url: '/gcc/api/department/received/updateEmployeeDetailsgis',
-		  	        type: 'POST',
-		  	        contentType: 'application/json',
-		  	        data: JSON.stringify(entryDetails),
-		  	        success: function (response) {
-		  	        	$('#auditsubmit').prop('disabled', false).text('Approved');	
-		  	            Swal.fire({
-		  	                icon: 'success',
-		  	                title: 'Success',
-		  	                text: response,
-		  	               	allowOutsideClick: false,
-		  	              	allowEscapeKey: false,
-		  	              	allowEnterKey: false,
-		  	                confirmButtonText: 'OK'
-		  	            }).then((result) => {
-			                        if (result.isConfirmed) {
-			                        	$('#auditsubmit').prop('disabled', false).text('Approved');
-			                        	window.location.href = "/gcc/pensioner/received/gis";
-			                            console.log("Continue clicked");
-			                        }
-		  	            });
-		  	        },
-		  	        error: function (xhr, status, error) {
-		  	        	$('#auditsubmit').prop('disabled', false).text('Approved');
-		  	            Swal.fire({
-		  	                icon: 'error',
-		  	                title: 'Error',
-		  	                text: 'Failed to save details. Please try again.',
-		  	                confirmButtonText: 'OK'
-		  	            });
-		  	            
-		  	        }
-		  	    });  
-		  	}
-		    
-			 
-
-				
-				//amount field validation
-				
-				function validatePositiveNumber(input) {
-					    if (input.value < 1) {
-					        input.value = "";
-					    }
-					}
-				
-				
-				// file forward lic date 
-				document.addEventListener("DOMContentLoaded", function () {
-	    	        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
-	    	        let servicedeathInput = document.getElementById("licDate");
-
-	    	        // Set max attribute to disable future dates
-	    	        servicedeathInput.setAttribute("max", today);
-	    	        // Set the max attribute to disable future dates
-	    	        document.getElementById("sanctionalGISDate").setAttribute("max", today);
-
-	    	        // Prevent manual future date entry
-	    	        servicedeathInput.addEventListener("change", function () {
-	    	            if (this.value > today) {
-	    	                Swal.fire({
-	    	                    icon: 'warning',
-	    	                    title: 'Invalid Date',
-	    	                    text: 'Future dates are not allowed.',
-	    	                    confirmButtonText: 'OK'
-	    	                });
-	    	                this.value = ""; // Clear the invalid input
-	    	            }
-	    	        });
-	    	    });
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/received/pendency.html b/src/main/resources/templates/modules/pensioner/pensioner/received/pendency.html
deleted file mode 100644
index 6dc1e1ea..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/received/pendency.html
+++ /dev/null
@@ -1,1415 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-   
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-12,.col-md-4,.col-md-6{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-.col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-    .form-check-label{
-    	padding-top: 4%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Pendency</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received from Dept</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Pendency</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">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">
-					                <table id="ReturnRetriedDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>					
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					               
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                       
-					                       <!-- Thymeleaf loop to populate data -->
-								            <tr th:each="forward, iterStat : ${forwardlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${forward['emp_no']}" class="text-center"></td>
-								                <td th:text="${forward['emp_name']}" class="text-center"></td>
-								                <td th:text="${forward['dept_name']}" class="text-center"></td>
-								                <td th:text="${forward['designation']}" class="text-center"></td>
-								                <td th:text="${forward['file_moved_date'] != null ? #dates.format(forward['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>								               
-								                <td th:text="${forward['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${forward['emp_no']}, data-temp-id=${forward['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                       
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-   
-<!--  Modal Box -->    
-<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="detailsModalLabel">
-                    Received From Department - Pendency (<span id="modalEmployeeCode"></span>)
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Employee No -->
-                    <div class="col-md-4">
-                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-                        <input type="number" id="employeenomodel" class="form-control" readonly>
-                    </div>
-
-                    <!-- Employee Name -->
-                    <div class="col-md-4">
-                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-                        <input type="text" id="employeename" class="form-control" readonly>
-                    </div>
-
-                    <!-- Department -->
-                    <div class="col-md-4">
-                        <label for="department" class="form-label fw-bold">Department </label>
-                        <input type="text" id="department" class="form-control" readonly>
-                    </div>
-
-                    <!-- Designation -->
-                    <div class="col-md-4">
-                        <label for="designation" class="form-label fw-bold">Designation </label>
-                        <input type="text" id="designation" class="form-control" readonly>
-                    </div>
-                    
-                    <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-4">
-	                        <label for="retirementdate" class="form-label fw-bold">Retirement Date </label>
-	                        <input type="date" id="retirementdate" class="form-control" readonly>
-	                    </div>
-					
-					<!-- Type of Retirement -->
-                    <div class="col-md-4">
-                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-                        <input type="text" id="typeofretirement" class="form-control" readonly>
-                    </div>
-                    
-                    
-                    <div class="col-md-4">
-					    <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="text" id="pendingDurationInputContainer" style="margin-top: 10px;">
-					        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control"  readonly>
-					    </div>
-					</div>
-                    
-                    
-                    </div>
-                    <div class="row mt-2">
-                    <div class="col-md-4">
-                    	<label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-                    </div>
-                    
-                     <div class="col-md-4">
-                     	<label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-                     </div>
-                     
-                     <div class="col-md-4">
-                     	<label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-                     </div>
-                     
-                    <div class="col-md-4">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" >
-					</div> 
-					
-					<div class="col-md-4">
-						<label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-					</div>
-					</div>
-					
-                    <div class="row mt-2">
-                    <!-- Date File Sent to Audit -->
-                    <div class="col-md-4">
-                        <label for="datefile_modal" class="form-label fw-bold">Date File sent to Pension </label>
-                        <input type="text" id="datefile_modal" class="form-control" readonly>
-                    </div>
-
-                    <!-- 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"  readonly></textarea>
-                    </div>
-                    </div>
-                    
-                    <!-- new -->
-
-								<div class="col-md-12 mt-4">
-									<h5>File History</h5>
-										<div id="fileHistoryContainer" class="file-history-list">
-											<!-- File History will be dynamically loaded here -->
-									</div>
-								</div> 
-                                                         
-                      
-            
-                 <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="benefitbutton">Add Pension Benefits</button>
-		                <button type="button" class="btn btn-info mx-2" id="returndisplaybutton">Return to Department</button>
-		                <button type="button" class="btn btn-secondary mx-2" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div>
-                  
-                   <div  style="display :none" id="commonbenefitcard">
-	                   
-	                   		<div class="col-md-6">
-							<label class="form-label fw-bold">File Pending<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="PendingYes" name="filepending" value="yes">
-						            <label class="form-check-label" for="PendingYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="PendingNo" name="filepending" value="no">
-						            <label class="form-check-label" for="PendingNo">No</label>
-						        </div>
-						    </div>
-					</div>	
-
-                   </div>
-                   
-                   <div  style="display :none" id="filependingContainer"> 
-	                    <div class="row">
-		                   	<div class="col-md-6">
-			                       <label for="datefileyes"  class="form-label fw-bold">Enter file received  Date<span class="text-danger">*</span></label>
-			                       <input type="text" id="datefileyes"  class="form-control" readonly>
-				             </div>
-				             
-				             <div class="col-md-12">
-			                       <label for="remarksyes" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
-			                       <textarea id="remarksyes" class="form-control"  rows="4" placeholder="Enter your remarks here"></textarea>
-				             </div>
-			             </div>
-			             <div class="row mb-2 mt-2">
-			            <div class="col-md-12 d-flex justify-content-center">
-			                <button type="button" class="btn btn-primary" id="pendingbutton">Submit</button>
-			            </div>
-	              </div>
-                   </div>
-                   
-                   
-                   <div  style="display :none" id="benefitContainer">
-	                   <div class="row">
-	                   		<div class="col-md-6">
-	                   			<label for="pensionNumber" class="form-label">Pension Number<span class="text-danger">*</span></label>
-						        <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number">
-	                   		</div>
-	                   		
-	                   		<div class="col-md-6">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		
-	                   		
-	                   		<div class="col-md-6  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-6  mb-2" id="dcrgCard" style="display: none;">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-6  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></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 class="col-md-6">
-			                       <label for="datefilereceived"  class="form-label fw-bold">File Received Date <span class="text-danger">*</span></label>
-			                       <input type="text" id="datefilereceived"  class="form-control" readonly>
-				             </div>
-		             
-		                    
-				             <div class="col-md-12">
-			                       <label for="remarksreceived" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
-			                       <textarea id="remarksreceived" class="form-control"  rows="4" placeholder="Enter your remarks here"></textarea>
-				             </div>
-	                   		
-	                   </div>
-	                   <div class="row mb-2 mt-2">
-				            <div class="col-md-12 d-flex justify-content-center">
-				                <button type="button" class="btn btn-primary" id="completedbutton">Mark as Completed</button>
-				            </div>
-	              		</div>
-                   </div>
-                   
-          
-				   <div  style="display :none" id="receivedcard">
-		             <div class="row">
-		             
-		             <!-- Date File Sent to Audit -->
-		             <div class="col-md-6">
-	                       <label for="datefile"  class="form-label fw-bold">Enter Date File Returned to Department <span class="text-danger">*</span></label>
-	                       <input type="text" id="datefile"  class="form-control" readonly>
-		             </div>
-		             
-		             
-		             <!-- Remarks -->       
-		             <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>
-		             </div>
-		                           
-		           </div>
-		           <div class="row mb-2 mt-2">
-			            <div class="col-md-12 d-flex justify-content-center">
-			                <button type="button" class="btn btn-primary" id="returnsubmit">Return</button>
-			            </div>
-			            
-	              </div>
-		           					          
-			    </div>
-				 
-			</div>         
-        </div>
-    </div>
-</div>
-
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	
-		$(document).ready(function () {
-		    // Initialize DataTable
-		    const table = $('#ReturnRetriedDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-
-		});		
-				
-		
-		 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("datefilereceived").value = formattedDateDisplay;
-		        document.getElementById("datefileyes").value = formattedDateDisplay;
-		        
-		    });
-		  
-		  
-		function convertDateFormat(dateString) {
-		    if (!dateString) return '';
-		    let [day, month, year] = dateString.split('-');
-		    return `${year}-${month}-${day}`;
-		}
-		
-		//model function
-		 function fetchEmployeeDetails(tempId) {
-		 	    $.ajax({
-		 	        url: '/gcc/api/department/audit/getfilependingbenefits', // API to fetch employee details
-		 	        type: 'GET',
-		 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-		 	        success: function (response) {
-		 	            if (response && response.length > 0) {
-		 	            	
-		 	            	let BenefitDetails = response[0]; // Access the first object in the array
-		 	            	console.log("response:",response);
-		 	            	
-		 	            	
-		 	                // Populate modal fields
-		 	                $('#employeenomodel').val(BenefitDetails.emp_no);
-		 	                $('#employeename').val(BenefitDetails.emp_name);
-		 	                $('#department').val(BenefitDetails.dept_name);
-		 	                $('#designation').val(BenefitDetails.designation);
-		 	                $('#typeofretirement').val(BenefitDetails.type_of_retirement);
-		 	                $('#classes').val(BenefitDetails.retirement_class);
-		 	                $('#datefile_modal').val(BenefitDetails.file_moved_date);
-		 	               	$('#remarks_modal').val(BenefitDetails.remarks);
-		 	               $('#retirementdate').val(BenefitDetails.retirement_date);
-			 	           
-		 	               // Show Pending Duration and Input based on the value
-		 	               	
-		 	                let pendingDuration = BenefitDetails.pending_duration; // Assuming this comes from the response
-		 	                let pendingReason = BenefitDetails.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);
-		 	                }
-			 	             
-			 	            let file_Pending=BenefitDetails.file_pending;
-		 	                console.log("file_pending=:"+file_Pending);
-			 	             
-			 	         // Populate GPF
-			                 if (BenefitDetails.gpf === 'yes') {
-			                     $('#gpfYes').prop('checked', true); // Disable radio
-			                     $('#gpfNo').prop('disabled', true);
-			                     $('#gpf50').prop('disabled', true);
-			                     $('#gpfAmountDiv').show();
-			                     $('#gpfAmount').val(BenefitDetails.gpf_amount).prop('readonly', true); // Make input readonly
-			                 } else if (BenefitDetails.gpf === 'no') {
-			                     $('#gpfNo').prop('checked', true);
-			                     $('#gpfYes').prop('disabled', true);
-			                     $('#gpf50').prop('disabled', true);
-			                     $('#gpfAmountDiv').hide();
-			                 } else if (BenefitDetails.gpf === '90') {
-			                     $('#gpf50').prop('checked', true);
-			                     $('#gpfYes').prop('disabled', true);
-			                     $('#gpfNo').prop('disabled', true);
-			                     $('#gpfAmountDiv').show();
-			                     $('#gpfAmount').val(BenefitDetails.gpf_amount).prop('readonly', true);
-			                 }
-
-			                 // Populate Earned Leave & Leave on Private Affairs
-			                 if (BenefitDetails.private_affairs === 'yes') {
-			                     $('#earnedleaveYes').prop('checked', true);
-			                     $('#earnedleaveNo').prop('disabled', true);
-			                     $('#earnedleaveAmountDiv').show();
-			                     $('#earnedleaveAmount').val(BenefitDetails.private_affairs_amount).prop('readonly', true);
-			                 } else if (BenefitDetails.private_affairs === 'no') {
-			                     $('#earnedleaveNo').prop('checked', true);
-			                     $('#earnedleaveYes').prop('disabled', true);
-			                     $('#earnedleaveAmountDiv').hide();
-			                 }
-
-			                 // Populate SPFGS
-			                 if (BenefitDetails.spfgs === 'yes') {
-			                     $('#spfgsYes').prop('checked', true);
-			                     $('#spfgsNo').prop('disabled', true);
-			                     $('#spfgsAmountDiv').show();
-			                     $('#spfgsAmount').val(BenefitDetails.spfgs_amount).prop('readonly', true);
-			                 } else if (BenefitDetails.spfgs === 'no') {
-			                     $('#spfgsNo').prop('checked', true);
-			                     $('#spfgsYes').prop('disabled', true);
-			                     $('#spfgsAmountDiv').hide();
-			                 }
-
-			                 // Populate Recovery From Employee
-			                 $('#recoveryemployeevalue')
-			                     .val(BenefitDetails.recovery_emp)
-			                     .prop('readonly', true); // Make input readonly
-
-			                 // Populate DCRG
-			                 if (BenefitDetails.dcrg === 'yes') {
-			                     $('#dcrgYes').prop('checked', true);
-			                     $('#dcrgNo').prop('disabled', true);
-			                     
-			                     /* $('#DcrgYes').prop('disabled', false);
-			                     $('#DcrgNo').prop('disabled', false); */
-			                     $('#dcrgCard').show();
-			                     
-			                 } if (BenefitDetails.dcrg === 'no') {
-			                     $('#dcrgNo').prop('checked', true);
-			                     $('#dcrgYes').prop('disabled', true);
-			                     
-			                     /* $('#DcrgYes').prop('disabled', true);
-			                     $('#DcrgNo').prop('disabled', true); */
-			                     
-			                     $('#dcrgCard').hide();
-			                     			                     
-			                 }		 	         	
-		 	                
-		 	               
-		 	                // Update the modal title with the employee code
-		 	                $('#modalEmployeeCode').text(BenefitDetails.emp_no);
-
-		 	                // Show the modal
-		 	                $('#returnretrieddetailsModal').modal('show');
-		 	                
-		 	             	//additional card display function
-		 	               document.getElementById("returndisplaybutton").addEventListener("click", function() {
-		 	          	       
-				 	            //$('#datefile').val('');
-				 	         	$('#remarks').val('');
-				 	         	document.getElementById("commonbenefitcard").style.display = "none";
-		 	          	        document.getElementById("receivedcard").style.display = "block";
-		 	          	     	document.getElementById("benefitContainer").style.display = "none";
-		 	          	  		document.getElementById("filependingContainer").style.display = "none";
-		 	          	  		
-		 	          	  		
-		 	          	  	 document.getElementById("returndisplaybutton").scrollIntoView({
-			 	        	        behavior: "smooth", // Smooth scrolling effect
-			 	        	        block: "center" // Aligns the element to the center of the viewport
-			 	        	    });
-		 	          	    });
-		 	             	
-		 	             /*  $('#benefitbutton').off('click').on('click', function() {
-		 	            	 document.getElementById("benefitbutton").scrollIntoView({
-			 	        	        behavior: "smooth", // Smooth scrolling effect
-			 	        	        block: "center" // Aligns the element to the center of the viewport
-			 	        	    });
-		 	            	if(file_Pending==='yes'){
-		 	            		 $('input[name="filepending"][value="' + BenefitDetails.file_pending + '"]').prop('checked', true);		 	            		
-		 	            		$('#commonbenefitcard').show();
-		 	            		 $('#filependingContainer').show();
-		 	            		$('#datefileyes').val(BenefitDetails.file_moved_date);
-			 	               	$('#remarksyes').val(BenefitDetails.remarks);
-			 	               	
-			 	               
-			 	               	 $('#pendingbutton').prop('disabled', true);
-			 	               	 
-			 	               	
-			 	              
-		 	            	}
-		 	            	else{
-		 	            		
-		 	            		$('input[name="filepending"]').prop('checked', false);
-	 	          	            document.getElementById("commonbenefitcard").style.display = "block";
-	 	          	         	document.getElementById("receivedcard").style.display = "none";
-	 	          	         $('#pendingbutton').prop('disabled', false);
-		 	            	}
-		 	            	  
-		 	              });		 	 */              
-		 	              
-		 	              
-		 	              
-		 	              
-		 	             $('#benefitbutton').off('click').on('click', function() {
-		 	                // Show the required elements first
-		 	                $('#commonbenefitcard').show();
-		 	                
-		 	                // Delay scroll to ensure elements are fully rendered
-		 	                setTimeout(() => {
-		 	                    document.getElementById("benefitbutton").scrollIntoView({
-		 	                        behavior: "smooth",
-		 	                        block: "center"
-		 	                    });
-		 	                }, 100); // Small delay
-
-		 	                if (file_Pending === 'yes') {
-		 	                    $('input[name="filepending"][value="' + BenefitDetails.file_pending + '"]').prop('checked', true);
-		 	                    $('#filependingContainer').show();
-		 	                    $('#datefileyes').val(BenefitDetails.file_moved_date);
-		 	                    $('#remarksyes').val(BenefitDetails.remarks);
-		 	                   $('#pendingbutton').prop('disabled', true);
-			 	                  $('#pendingbutton').hide();
-		 	                } else {
-		 	                    $('input[name="filepending"]').prop('checked', false);
-		 	                    document.getElementById("receivedcard").style.display = "none";
-		 	                    $('#pendingbutton').prop('disabled', false);
-		 	                }
-		 	            });
-
-		 	              
-		 	             // Function to scroll inside the modal
-		 	               function scrollToElement(targetElement) {
-		 	                   var modalBody = $('#returnretrieddetailsModal .modal-body');
-
-		 	                   // Ensure the modal content is fully loaded before scrolling
-		 	                   setTimeout(function () {
-		 	                       modalBody.animate({ 
-		 	                           scrollTop: $(targetElement).offset().top - modalBody.offset().top + modalBody.scrollTop() 
-		 	                       }, 'fast');
-		 	                   }, 200);
-		 	               }
-		 	              
-		 	              //Scroll when "PendingYes" is clicked
-		 	              $('input[name="filepending"]').on('change', function () {
-		 	                  if ($(this).val() === "yes") {
-		 	                      $("#filependingContainer").show(); // Show before scrolling
-		 	                      scrollToElement("#filependingContainer");
-		 	                  } else {
-		 	                      $("#filependingContainer").hide();
-		 	                      $("#benefitContainer").show(); // Ensure benefitContainer is visible
-		 	                      scrollToElement("#benefitContainer"); // Scroll to benefitContainer
-		 	                  }
-		 	              });
-		 	              
-		 	             /* document.getElementById("benefitbutton").addEventListener("click", function() {
-		 	          	       
-		 	            	$('input[name="filepending"]').prop('checked', false);
- 	          	            document.getElementById("commonbenefitcard").style.display = "block";
- 	          	         	document.getElementById("receivedcard").style.display = "none";
- 	          	        
- 	          	    	}); 
-		 	             
-		 	            document.getElementById('pendingbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-	 	                    
-	 	                    savePendingDetails(tempId,employeeNo);
-	 	        		}); */
-	 	        		
-	 	        		$('#pendingbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	   savePendingDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-		 	                 		 	                
-		 	                
- 	          	    	/* $(document).off('click', '#completedbutton').on('click', '#completedbutton', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-		 	                    
-		 	                    saveCompletedDetails(tempId,employeeNo);
-		 	        		}); */
-		 	        		
-		 	        		
-	 	        		$('#completedbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	   saveCompletedDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-		 	                
-		 	              /* document.getElementById('returnsubmit').addEventListener('click', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-		 	                    
-		 	                    saveReturnDetails(tempId,employeeNo);
-		 	        		}); */
-		 	        		
-	 	        		$('#returnsubmit').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	   saveReturnDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-		 	                
-		 	              
-		 	                
-		 	            } else {
-		 	                Swal.fire({
-		 	                    icon: 'info',
-		 	                    title: 'No Data',
-		 	                    text: 'No details found for the selected employee.',
-		 	                    confirmButtonText: 'OK',
-		 	                });
-		 	            }
-		 	        },
-		 	        error: function () {
-		 	            Swal.fire({
-		 	                icon: 'error',
-		 	                title: 'Error',
-		 	                text: 'Failed to fetch employee details. Please try again.',
-		 	                confirmButtonText: 'OK',
-		 	            });
-		 	        },
-		 	    });
-		 	}
-
-		 $(document).ready(function () {
-	    	 
-	    	 $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    	        $("#commonbenefitcard").hide();	    	        
-	    	        $("#filependingContainer").hide();
-	    	        $("#benefitContainer").hide()
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		    
-	    		});
-
-
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#returnretrieddetailsModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-		   
-		    // Handle close button click
-		    $('#back').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    $('.close').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    document.querySelectorAll('input[name="filepending"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const filependingContainer = document.getElementById('filependingContainer')
-		            const benefitContainer = document.getElementById('benefitContainer');
-		            if (this.value === 'yes') {
-		            	filependingContainer.style.display = 'block'; // Show the input field
-		            	//document.getElementById('datefileyes').value = ''; 
-		            	document.getElementById('remarksyes').value = '';
-		            	document.getElementById("benefitContainer").style.display = "none";
-		            	 
-		            }if (this.value === 'no') {
-		            	benefitContainer.style.display = 'block'; // Hide the input field
-		            	filependingContainer.style.display = 'none';
-		                // pensionNumber,ledgerNumber,benefit_pension,benefit_dcrg,benefit_commutation,datefilereceived,remarksreceived
-		                document.getElementById('pensionNumber').value = ''; 
-		                document.getElementById('ledgerNumber').value = ''; 
-		                $('input[name="benefit_pension"]').prop('checked', false);
-		                $('input[name="benefit_dcrg"]').prop('checked', false);
-		                $('input[name="benefit_commutation"]').prop('checked', false);
-		                document.getElementById('benefit_pension_amount').value = ''; 
-		                document.getElementById('benefit_dcrg_amount').value = ''; 
-		                document.getElementById('benefit_commutation_amount').value = ''; 
-		                
-		                //document.getElementById('datefilereceived').value = ''; 
-		                document.getElementById('remarksreceived').value = '';
-		                document.getElementById("filependingContainer").style.display = "none";
-		                document.getElementById("PbAmountDiv").style.display = "none";
-		                document.getElementById("dcrgAmountDiv").style.display = "none";
-		                document.getElementById("CommutationAmountDiv").style.display = "none";
-		            }
-		        });
-		    });
-		    
-		    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const PbAmountDiv = document.getElementById('PbAmountDiv');
-		            if (this.value === 'yes') {
-		            	PbAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	PbAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-		            if (this.value === 'yes') {
-		            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-		            if (this.value === 'yes') {
-		            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		});
-		 
-		 function loadFileHistory(tempId) {
-			    $.ajax({
-			        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-			        type: 'GET',
-			        data: { tempId: tempId }, // Pass empCode as a parameter
-			        success: function (response) {
-			            if (response.length > 0) {
-			                let historyHtml = '';
-			                response.forEach(item => {
-			                    historyHtml += `
-			                        <div class="file-history-item">
-			                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-			                            <div class="file-history-content">
-			                                <div class="file-history-status">${item.fileStatusHistory}</div>
-			                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-			                            </div>
-			                        </div>
-			                    `;
-			                });
-
-
-
-			                $('#fileHistoryContainer').html(historyHtml);
-			            } else {
-			                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-			            }
-			        },
-			        error: function () {
-			            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-			        }
-			    });
-			}
-
-		 // Function to format date and time
-	 function formatDateTime(dateString) {
-		 const options = {
-		     day: '2-digit',
-		     month: '2-digit',
-		     year: 'numeric',
-		 };
-		 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-		}
-		 
-		function saveCompletedDetails(tempId,empCode) {
-		       //console.log("emp_no inside=="+empCode);
-		       
-		       let selecteddcrg=null;
-		       let selbenefitdcrgamount=null;
-		       
-		       let selectedfilePending = $('input[name="filepending"]:checked').val();
-		       let selectedPd = $('input[name="benefit_pension"]:checked').val();
-		       let selectedPdAmount=null;
-		       if (selectedPd === 'yes') {
-		    	   selectedPdAmount = $('#benefit_pension_amount').val(); 
-		    	   if (!selectedPdAmount) {
-		                Swal.fire({
-		                    icon: 'warning',
-		                    title: 'Validation Error',
-		                    text: 'Please Enter Pension Benefit Amount',
-		                    confirmButtonText: 'OK'
-		                });
-			            return; // Stop further execution if validation fails
-			        }
-		       }
-		       let confirmDcrg=$('input[name="dcrg"]:checked').val();
-	    	   
-		       if(confirmDcrg == 'yes'){
-		    	   
-		    	    selecteddcrg = $('input[name="benefit_dcrg"]:checked').val();
-			        selbenefitdcrgamount=null;
-			       if(!selecteddcrg)
-		    	   {
-			    	   Swal.fire({
-		                    icon: 'warning',
-		                    title: 'Validation Error',
-		                    text: 'Please Select DCRG Pension Benefit',
-		                    confirmButtonText: 'OK'
-		                });
-			            return;
-		    	   }
-			       if(selecteddcrg ==='yes'){
-			    	   selbenefitdcrgamount=$('#benefit_dcrg_amount').val();
-			    	   if (!selbenefitdcrgamount) {
-			                Swal.fire({
-			                    icon: 'warning',
-			                    title: 'Validation Error',
-			                    text: 'Please Enter DCRG Benefit Amount',
-			                    confirmButtonText: 'OK'
-			                });
-				            return; // Stop further execution if validation fails
-				        }
-			       }
-			       
-		       }
-		       
-		       if(confirmDcrg == 'no'){
-		    	   
-		    	    selecteddcrg=null;
-		    	    selbenefitdcrgamount=null;
-		    	   
-		       }
-		       let selectedcom = $('input[name="benefit_commutation"]:checked').val();
-		       let selectedcomAmount=null;
-		       if (selectedcom === 'yes') {
-		    	   selectedcomAmount = $('#benefit_commutation_amount').val(); 
-		    	   if (!selectedcomAmount) {
-		                Swal.fire({
-		                    icon: 'warning',
-		                    title: 'Validation Error',
-		                    text: 'Please Enter Commutation Benefit Amount',
-		                    confirmButtonText: 'OK'
-		                });
-			            return; // Stop further execution if validation fails
-			        }
-		       }
-		       
-	  	    let entryDetails = {
-	  	        empNo: empCode, 
-	  	      	tempId: tempId,
-	  	      	file_pending:selectedfilePending,
-	  	      	pension_number:$('#pensionNumber').val(),
-	  	        ledger_number:$('#ledgerNumber').val(),
-	  	      	benefit_pension:selectedPd,
-	  	        benefit_dcrg:selecteddcrg || null,
-	  	    	benefit_commutation:selectedcom,
-	  	        benefit_pension_amount:selectedPdAmount,
-	  	        benefit_dcrg_amount:selbenefitdcrgamount || null,
-	  	        benefit_commutation_amount:selectedcomAmount,
-	  	        dateToAudit: convertDateFormat($('#datefilereceived').val()?.trim()),
-	  	        remarks: $('#remarksreceived').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-	  	    
-	  	  if(!entryDetails.benefit_pension){
-	    		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Benefit Pension are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	    	   }
-	    	   
-	    	   
-	    	 if(!entryDetails.file_pending){
-	    		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'File Pending are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	       
-	  	       return;
-	    	   }
-	    	 
-	    	if(!entryDetails.benefit_commutation){
-	   		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Benefit Commutation are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	   	   }
-	    	
-	    	if(!entryDetails.pension_number){
-	   		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Pension Number are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	   	   }
-	    	
-	    	if(!entryDetails.ledger_number){
-	   		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Ledger Number are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	     
-	  	       return;
-	   	   }
-	    	    
-	    	  if (!entryDetails.remarks) {
-	  	       Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Remarks are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	  	   }
-
-	  		// Disable the button to prevent multiple submissions
-	  	      $('#completedbutton').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/pension/received/updateforretirementcompleted',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#completedbutton').prop('disabled', false).text('Mark as Completed');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#completedbutton').prop('disabled', false).text('Mark as Completed');
-		                        	window.location.href = "/gcc/pensioner/received/pendency";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#completedbutton').prop('disabled', false).text('Mark as Completed');	
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });   
-	  	}
-		
-		//savePendingDetails
-		function savePendingDetails(tempId,empCode) {
-		       //console.log("emp_no inside=="+empCode);
-		       let selectedfilePending = $('input[name="filepending"]:checked').val();
-		       
-		       
-	  	    let entryDetails = {
-	  	        empNo: empCode, 
-	  	      	tempId: tempId,
-	  	      	file_pending:selectedfilePending,	  	      	
-	  	        dateToAudit: convertDateFormat($('#datefileyes').val()?.trim()),
-	  	        remarks: $('#remarksyes').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-	  	    
-	  	    
-	  	  if (!entryDetails.file_pending) {
-		       Swal.fire({
-		           icon: 'warning',
-		           title: 'Validation Error!',
-		           text: 'File Pending are required.',
-		           confirmButtonText: 'OK'
-		       });
-		     
-		       return;
-		   }
-	  	    
-	  	  if (!entryDetails.remarks) {
-		       Swal.fire({
-		           icon: 'warning',
-		           title: 'Validation Error!',
-		           text: 'Remarks are required.',
-		           confirmButtonText: 'OK'
-		       });
-		      
-		       return;
-		   }
-
-	  		// Disable the button to prevent multiple submissions  pendingbutton Submit
-	  	     $('#pendingbutton').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/pension/received/updateforretirementpending',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#pendingbutton').prop('disabled', false).text('Submit');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#pendingbutton').prop('disabled', false).text('Submit');	
-		                        	window.location.href = "/gcc/pensioner/received/pendency";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#pendingbutton').prop('disabled', false).text('Submit');		
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });  
-	  	} 
-		
-		//saveReturnDetails
-		//datefile  remarks
-		
-		function saveReturnDetails(tempId,empCode) {
-		       
-	  	    let entryDetails = {
-	  	        empNo: empCode, 
-	  	      	tempId: tempId,	  	      	  	      	
-	  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-	  	        remarks: $('#remarks').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-
-	  	  if (!entryDetails.remarks) {
-		       Swal.fire({
-		           icon: 'warning',
-		           title: 'Validation Error!',
-		           text: 'Remarks are required.',
-		           confirmButtonText: 'OK'
-		       });
-		      
-		       return;
-		   }
-
-	  	  //returnsubmit  Return
-	  		// Disable the button to prevent multiple submissions  pendingbutton Submit
-	  	     $('#returnsubmit').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/pension/received/updateforretirementreturn',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#returnsubmit').prop('disabled', false).text('Return');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#returnsubmit').prop('disabled', false).text('Return');	
-		                        	window.location.href = "/gcc/pensioner/received/pendency";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#returnsubmit').prop('disabled', false).text('Return');	
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });  
-	  	}
-		
-		
-		//amount field validation
-		
-		function validatePositiveNumber(input) {
-			    if (input.value < 1) {
-			        input.value = "";
-			    }
-			}
-		 
-		
-
-	</script>
-
-
-</body>
-</html>
-
-
-
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/received/provisionalretirement.html b/src/main/resources/templates/modules/pensioner/pensioner/received/provisionalretirement.html
deleted file mode 100644
index b449807d..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/received/provisionalretirement.html
+++ /dev/null
@@ -1,1000 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-.dropdown-menu {
-  max-height: 200px; /* Adjust this value as needed */
-  overflow-y: auto;
-}
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#receivedprovisionalModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Provisional Pension</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received from Dept</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Provisional Pension</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					          <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>Received From Department - Provisional Pension</h5>
-					        <span th:text="${userId}" id="userId" style="display:none"></span>
-					            <div  id="audittable">
-					                <table id="AuditDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>					                            
-					                     		 <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					                         </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                  		
-					                  		<!-- Thymeleaf loop to populate data -->
-								            <tr th:each="provisional, iterStat : ${provisionallist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${provisional['emp_no']}" class="text-center"></td>
-								                <td th:text="${provisional['emp_name']}" class="text-center"></td>
-								                <td th:text="${provisional['dept_name']}" class="text-center"></td>
-								                <td th:text="${provisional['designation']}" class="text-center"></td>
-								                <td th:text="${provisional['file_moved_date'] != null ? #dates.format(provisional['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-								                <td th:text="${provisional['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${provisional['emp_no']}, data-temp-id=${provisional['temp_id']}">
-												        View
-												    </button>
-												</td> 
-
-								            </tr>
-					                  				
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-    
-        <!--  Modal Box -->    
-		<div class="modal fade" id="receivedprovisionalModal" 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-content">
-		            <div class="modal-header">
-		                <h5 class="modal-title" id="detailsModalLabel">
-		                    Received From Department - Provisional Pension (<span id="modalEmployeeCode"></span>)
-		                </h5>
-		                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-		            </div>
-		            <div class="modal-body">
-		                <div class="row">
-		                    <!-- Employee No -->
-		                    <div class="col-md-6">
-		                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-		                        <input type="number" id="employeenomodel" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Employee Name -->
-		                    <div class="col-md-6">
-		                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-		                        <input type="text" id="employeename" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Department -->
-		                    <div class="col-md-6">
-		                        <label for="department" class="form-label fw-bold">Department </label>
-		                        <input type="text" id="department" class="form-control" readonly>
-		                    </div>
-		
-		                    <!-- Designation -->
-		                    <div class="col-md-6">
-		                        <label for="designation" class="form-label fw-bold">Designation </label>
-		                        <input type="text" id="designation" class="form-control" readonly>
-		                    </div>
-		                    
-		                    <!-- Class -->
-		                    <div class="col-md-6">
-							    <label for="classes" class="form-label fw-bold">Class</label>
-							     <input type="text" id="classes" class="form-control" readonly>
-							</div>
-							
-							<!-- Type Of Retirement -->
-							<div class="col-md-6">
-							    <label for="typeofretirement" class="form-label fw-bold">Type Of Retirement</label>
-							    <input type="text" id="typeofretirement" class="form-control" readonly>
-							</div>
-
-
-							<div class="col-md-6">
-		                        <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>
-		                    </div>
-		                    
-							<!-- Reason For Provisional Pension is given -->
-							<div class="col-md-6">
-							    <label for="provisionalreason" class="form-label fw-bold">Reason For Provisional Pension is given </label>
-		                        <input type="text" id="provisionalreason" class="form-control" readonly>
-		                      <div  id="otherReasonDiv" style="display: none; margin-top: 10px;">								
-							        <label for="otherReason" class="form-label">Please specify:</label>
-							        <input type="text" id="otherReason" class="form-control" placeholder="Enter reason" readonly>							    	
-						      </div>			
-		                        
-							</div>		
-							
-							
-		                    
-		                    <!-- Date File Sent to Pension Section -->
-		                    <div class="col-md-6">
-		                        <label for="datefile_modal" class="form-label fw-bold">Date File Sent to Pension Section </label>
-		                        <input type="date" id="datefile_modal" class="form-control" readonly onclick="this.showPicker()">
-		                    </div>
-		                    
-		                    <!-- Pending Duration -->
-							<div class="col-md-6">
-							    <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="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled>
-							            <label for="yespen" class="form-check-label">yes</label>
-							        </div>
-							        <div class="form-check">
-							            <input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" disabled>
-							            <label for="nopen" class="form-check-label">no</label>
-							        </div>
-							    </div>
-							    <div id="clickyesdiv" style="display: none; margin-top: 10px;">
-							        <label for="clickyes" class="form-label">Please specify:</label>
-							        <input type="text" id="Clickyes" class="form-control" placeholder="Enter reason">
-							    </div>
-							</div> 
-								
-							<!-- dp -->	
-							<div class="col-md-6">
-							    <label for="DP" class="form-label fw-bold">DP</label>
-							    <div class="d-flex align-items-center">
-							        <div class="form-check  " style="padding-right:10px;">
-							            <input type="radio" id="yes" name="DP" value="yes" class="form-check-input" disabled>
-							            <label for="yes" class="form-check-label">yes</label>
-							        </div>
-							        <br>
-							        <div class="form-check" >
-							            <input type="radio" id="no" name="DP" value="no" class="form-check-input" disabled>
-							            <label for="no" class="form-check-label">no</label>
-							        </div>
-							    </div>
-							</div>	
-							
-		                    <!-- 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"  readonly></textarea>
-		                    </div>
-		                    
-		                    <!-- new -->
-
-							<div class="col-md-12 mt-4">
-								<h5>File History</h5>
-									<div id="fileHistoryContainer" class="file-history-list">
-										<!-- File History will be dynamically loaded here -->
-								</div>
-							</div>            
-		                </div>
-		                
-		          <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="submitbutton" >Marked As Complete</button>
-		                  <button type="button" class="btn btn-primary mx-2" id="returndepartment" >Return to Department</button>
-		                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div> 
-                  <div  style="display :none" id="receivedcard">
-			          <div class="row">
-
-			       <!-- retirement amount -->	
-					<div class="col-md-6" id="provisionalRetirementDiv">
-					    <label for="RetirementAmount" class="form-label fw-bold">Provisional Retirement Amount<span class="text-danger">*</span></label>
-					    <div class="d-flex align-items-center">
-					        <div class="form-check" style="padding-right:10px;">
-					            <input type="radio" id="fifty" name="RetirementAmount" value="50" class="form-check-input">
-					            <label for="fifty" class="form-check-label">50%</label>
-					        </div>
-					        <div class="form-check" style="padding-right:10px;">
-					            <input type="radio" id="seventyfive" name="RetirementAmount" value="75" class="form-check-input">
-					            <label for="seventyfive" class="form-check-label">75%</label>
-					        </div>
-					        <div class="form-check" style="padding-right:10px;">
-					            <input type="radio" id="hundred" name="RetirementAmount" value="100" class="form-check-input">
-					            <label for="hundred" class="form-check-label">100%</label>
-					        </div>
-					    </div>
-
-					    <!-- Hidden Input Field -->
-					    <div class="mt-3" id="additionalInputDiv" style="display: none;">
-					       
-					        <input type="number" id="additionalInput" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-					    </div>
-					</div>
-			            
-			            <div class="col-md-6">
-			                        <label for="datefile "  class="form-label fw-bold">File Received date<span class="text-danger">*</span></label>
-			                        <input type="text" id="datefile"  class="form-control" readonly>
-			               </div>
-			                    
-			            <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>
-			               </div>
-			               
-			           </div>
-				          <div class="row mb-2 mt-2" id="auditSubmitDiv">
-				            <div class="col-md-12 d-flex justify-content-center">
-				                <button type="button" class="btn btn-primary" id="auditsubmit">Submit</button>
-				               
-				            </div>
-	                   </div>
-	                   
-	                   
-	                   <div class="row mb-2 mt-2" id="returnSubmitDiv">
-				            <div class="col-md-12 d-flex justify-content-center">
-				                 <button type="button" class="btn btn-primary" id="returnsubmit">Return</button>
-				               
-				            </div>
-	                   </div>
-			                   
-					           
-				 </div>
-                  
-		                
-		     </div>
-
-        </div>
-    </div>
-</div>
-
- 
-			
-						
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	
-	
-	// Initialize DataTable
-    const table = $('#AuditDatatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            { targets: 'no-sort', orderable: false }
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-	
-	
-    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;
-
-        
-    });
-  
-  
-		function convertDateFormat(dateString) {
-		    if (!dateString) return '';
-		    let [day, month, year] = dateString.split('-');
-		    return `${year}-${month}-${day}`;
-		}
-	
-
-    document.getElementById("submitbutton").addEventListener("click", function () {
-	    // Clear the inputs in the receivedcard section
-	    //$('#datefile').val('');
-	    $('#remarks').val('');
-	    
-	    // Make the receivedcard section visible
-	    document.getElementById("receivedcard").style.display = "block";
-	
-	    // Scroll the receivedcard section into view
-	    document.getElementById("receivedcard").scrollIntoView({
-	        behavior: "smooth", // Smooth scrolling effect
-	        block: "center" // Aligns the element to the center of the viewport
-	    });
-	});
-
-    
-    document.getElementById("returndepartment").addEventListener("click", function () {
-	    // Clear the inputs in the receivedcard section
-	    //$('#datefile').val('');
-	    $('#remarks').val('');
-	    
-	    // Make the receivedcard section visible
-	    document.getElementById("receivedcard").style.display = "block";
-	
-	    // Scroll the receivedcard section into view
-	    document.getElementById("receivedcard").scrollIntoView({
-	        behavior: "smooth", // Smooth scrolling effect
-	        block: "center" // Aligns the element to the center of the viewport
-	    });
-	});
-    
-    //returndepartment
-
-
-	  $(document).ready(function () {
-		  
-		  $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		});
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#receivedprovisionalModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-
-		    
-		 // Event Listeners for Buttons
-		    document.getElementById('submitbutton').addEventListener('click', function () {
-		        // Show the entire receivedcard section
-		        document.getElementById('receivedcard').style.display = 'block';
-		        document.getElementById('provisionalRetirementDiv').style.display = 'block'; // Show Provisional Retirement Amount
-		        document.getElementById('auditSubmitDiv').style.display = 'block'; // Show Audit Submit Button
-		        document.getElementById('returnSubmitDiv').style.display = 'none'; // hide return Submit Button
-
-		    
-		    });
-
-		    document.getElementById('returndepartment').addEventListener('click', function () {
-		        // Show only Remarks and Audit Certificate Received Date
-		        document.getElementById('receivedcard').style.display = 'block';
-		        document.getElementById('provisionalRetirementDiv').style.display = 'none'; // Hide Provisional Retirement Amount
-		        document.getElementById('returnSubmitDiv').style.display = 'block'; // show return Submit Button
-		        document.getElementById('auditSubmitDiv').style.display = 'none'; // hide Audit Submit Button
-		     
-		    });
-
-		    
-		 // Add event listeners to all radio buttons
-		    document.querySelectorAll('input[name="RetirementAmount"]').forEach(function (radio) {
-		        radio.addEventListener('change', function () {
-		            const additionalInputDiv = document.getElementById('additionalInputDiv');
-
-
-		            // Show the input field only if any radio button is selected
-		            if (this.checked) {
-		                additionalInputDiv.style.display = 'block';
-		            } 
-		        });
-		    });
-
-		 
-		 // Reusable function to clear and reset the form
-		    function clearReceivedCard() {
-		        // Hide the received card section (if visible)
-		        document.getElementById("receivedcard").style.display = "none";
-
-		        // Hide the additional input section (if visible)
-		        document.getElementById("additionalInputDiv").style.display = "none";
-
-		        // Clear all input fields in the form
-		        const inputs = document.querySelectorAll("#receivedcard input");
-		        inputs.forEach((input) => {
-		            if (input.type === "radio") {
-		                // Uncheck radio buttons
-		                input.checked = false;
-		            } else if (input.type === "text" || input.type === "date") {
-		                // Clear text or date fields
-		                input.value = "";
-		            }
-		        });
-
-		        // Clear textarea fields
-		        const textareas = document.querySelectorAll("#receivedcard textarea");
-		        textareas.forEach((textarea) => {
-		            textarea.value = "";
-		        });
-		    }
-
-		    // Handle Back button click
-		    document.getElementById("back").addEventListener("click", function () {
-		        clearReceivedCard(); // Call the reusable function
-		    });
-		    
-/* 		    document.getElementById("returndepartment").addEventListener("click",function(){
-		    	 clearReceivedCard(); // Call the reusable function
-		    }); */
-
-		    // Handle Close button click
-		    $('.close').click(function () {
-		        clearReceivedCard(); // Call the reusable function
-		        $('#receivedprovisionalModal').modal('hide'); // Hide the modal
-		    });
-
-		    
-		    // Handle close button click
-		    $('#back').click(function () {
-		        $('#receivedprovisionalModal').modal('hide');
-		    });
-		});
-
-	  
-	  
-		
-
-	  //model function
-		 function fetchEmployeeDetails(tempId) {
-		 	    $.ajax({
-		 	        url: '/gcc/api/department/audit/getemployeedetails', // API to fetch employee details
-		 	        type: 'GET',
-		 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-		 	        success: function (response) {
-		 	            if (response && response.length > 0) {
-		 	            	
-		 	            	let employeeDetails = response[0]; // Access the first object in the array
-		 	            	console.log("response:",response);
-		 	            	
-		 	            	
-		 	                // 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);
-		 	               $('#retirementdate').val(employeeDetails.retirement_date);
-
-		 	                $('#classes').val(employeeDetails.retirement_class);
-		 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
-		 	               	$('#remarks_modal').val(employeeDetails.remarks);
-			 	            $('#provisionalreason').val(employeeDetails.reason_for_provisional_pension);
-			 	           
-		 	                
-			 	        // Populate Pending Duration and Reason fields
-			                if (employeeDetails.pending_duration === "Yes") {
-			                    $('#yespen').prop('checked', true); // Check the Yes radio button
-			                    $('#clickyesdiv').show(); // Show the reason input
-			                    $('#Clickyes').val(employeeDetails.reason_for_pending || '').prop('readonly', true); // Set reason and make readonly
-			                } else if (employeeDetails.pending_duration === "No") {
-			                    $('#nopen').prop('checked', true); // Check the No radio button
-			                    $('#clickyesdiv').hide(); // Hide the reason input
-			                }
-			 	        //populate reason for provisional pension
-			                if (employeeDetails.reason_for_provisional_pension === "Others") {
-			                    $('#otherReasonDiv').show(); // Show the input field for 'Others'
-			                    $('#otherReason')
-			                        .val(employeeDetails.others_provisional_pension || '')
-			                        .prop('readonly', true); // Populate and make readonly
-			                } else {
-			                    $('#otherReasonDiv').hide(); // Hide the input field if reason is not 'Others'
-			                }
-		 	               
-			             // Handle DP value
-			                if (employeeDetails.dp === "yes") {
-			                    $('#yes').prop('checked', true); // Select 'yes' radio button
-			                } else if (employeeDetails.dp === "no") {
-			                    $('#no').prop('checked', true); // Select 'no' radio button
-			                }
-			 	        
-		 	                // Update the modal title with the employee code
-		 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
-
-		 	                // Show the modal
-		 	                $('#receivedprovisionalModal').modal('show');
-		 	                
-		 	             	//additional card display function
-		 	               document.getElementById("submitbutton").addEventListener("click", function() {
-		 	          	       
-				 	            	// $('#datefile').val('');
-				 	         	    //$('#remarks').val('');
-		 	          	            document.getElementById("receivedcard").style.display = "block";
-		 	          	        
-		 	          	    });
-		 	                
-		 	                document.getElementById('auditsubmit').addEventListener('click', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-		 	                    // Trigger the save function and pass the value
-		 	                    saveEntryDetails(tempId,employeeNo);
-		 	        		});
-		 	                
-		 	               document.getElementById('returnsubmit').addEventListener('click', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-
-		 	                    // Trigger the save function and pass the value
-		 	                	 returnToDepartment(tempId, employeeNo);
-		 	        		});
-     
-		 	            } else {
-		 	                Swal.fire({
-		 	                    icon: 'info',
-		 	                    title: 'No Data',
-		 	                    text: 'No details found for the selected employee.',
-		 	                    confirmButtonText: 'OK',
-		 	                });
-		 	            }
-		 	        },
-		 	        error: function () {
-		 	            Swal.fire({
-		 	                icon: 'error',
-		 	                title: 'Error',
-		 	                text: 'Failed to fetch employee details. Please try again.',
-		 	                confirmButtonText: 'OK',
-		 	            });
-		 	        },
-		 	    });
-		 	}
-			
-	  
-	  ///history function to show in modal
-		 function loadFileHistory(tempId) {
-			    $.ajax({
-			        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-			        type: 'GET',
-			        data: { tempId: tempId }, // Pass empCode as a parameter
-			        success: function (response) {
-			            if (response.length > 0) {
-			                let historyHtml = '';
-			                response.forEach(item => {
-			                    historyHtml += `
-			                        <div class="file-history-item">
-			                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-			                            <div class="file-history-content">
-			                                <div class="file-history-status">${item.fileStatusHistory}</div>
-			                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-			                            </div>
-			                        </div>
-			                    `;
-			                });
-
-
-
-			                $('#fileHistoryContainer').html(historyHtml);
-			            } else {
-			                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-			            }
-			        },
-			        error: function () {
-			            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-			        }
-			    });
-			}
-
-		 // Function to format date and time
-		function formatDateTime(dateString) {
-		 const options = {
-		     day: '2-digit',
-		     month: '2-digit',
-		     year: 'numeric',
-		 };
-		 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-		}
-	  
-		 
-		// sent to department functionality
-				 
-		 function returnToDepartment(tempId, empCode) {
-		    // Gather data for the return operation
-		    let returnDetails = {
-		        empNo: empCode,
-		        tempId: tempId,
-		        dateToAudit: convertDateFormat($('#datefile').val()?.trim()), // File sent date
-		        remarks: $('#remarks').val(),     // Remarks for the return
-		        deptId: $('#deptId').text().trim(), // Department ID
-		        filemovedby: $('#userId').text().trim() // User ID
-		    };
-		
-		    console.log("returnDetails:", returnDetails);
-		    
-		    if (!returnDetails.remarks) {
-			       Swal.fire({
-			           icon: 'warning',
-			           title: 'Validation Error!',
-			           text: 'Remarks are required.',
-			           confirmButtonText: 'OK'
-			       });
-			     
-			       return;
-			   }
-		
-		    // Disable the button to prevent multiple submissions
-		    $('#returnsubmit').prop('disabled', true).text('Processing...');
-		
-		    // AJAX call to the backend API
-		    $.ajax({
-		        url: '/gcc/api/pensioner/received/provisional/updateEmployeeDetailsReturn',
-		        type: 'POST',
-		        contentType: 'application/json',
-		        data: JSON.stringify(returnDetails),
-		        success: function (response) {
-		            $('#returnsubmit').prop('disabled', false).text('Return');
-		            Swal.fire({
-		                icon: 'success',
-		                title: 'Success',
-		                text: response,
-		                allowOutsideClick: false,
-		                allowEscapeKey: false,
-		                allowEnterKey: false,
-		                confirmButtonText: 'OK'
-		            }).then((result) => {
-		                if (result.isConfirmed) {
-		                    window.location.href = "/gcc/pensioner/received/provisionalretirement"; // Redirect to the desired page
-		                }
-		            });
-		        },
-		        error: function (xhr, status, error) {
-		            $('#returnsubmit').prop('disabled', false).text('Return');
-		            Swal.fire({
-		                icon: 'error',
-		                title: 'Error',
-		                text: 'Failed to return the file to the department. Please try again.',
-		                confirmButtonText: 'OK'
-		            });
-		            console.error('Error:', xhr.responseText);
-		        }
-		    });
-		}
- 
- 
-
-		 
-		 
-		 
-		 
-	  //update to completed functionality
-	  
-		function saveEntryDetails(tempId, empCode) {
-		    // Get selected radio button value for pramount
-		    const prpercentage = $('input[name="RetirementAmount"]:checked').val();
-		    
-		    if (!prpercentage || prpercentage.trim() === '') {
-		        Swal.fire({
-		            icon: 'warning',
-		            title: 'Missing Percentage',
-		            text: 'Please select the percentage to proceed.',
-		            confirmButtonText: 'OK',
-		            customClass: {
-		                confirmButton: 'btn btn-primary'
-		            }
-		        });
-		        return; // Exit the function
-		    }
-
-		    // Get input field value for prpercentage
-		    const pramount = $('#additionalInput').val();
-
-		    let entryDetails = {
-		        empNo: empCode,
-		        tempId: tempId,
-		        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-		        remarks: $('#remarks').val(),
-		        pramount: pramount,
-		        prpercentage: prpercentage,
-		        deptId: $('#deptId').text().trim(),
-		        filemovedby: $('#userId').text().trim()
-		    };
-
-		    console.log("entryDetails:", entryDetails);
-		    
-		    
-		    if (!entryDetails.pramount) {
-			       Swal.fire({
-			           icon: 'warning',
-			           title: 'Validation Error!',
-			           text: 'Provisional Retirement amount are required.',
-			           confirmButtonText: 'OK'
-			       });
-			      
-			       return;
-			   }
-		    
-		    if (!entryDetails.remarks) {
-			       Swal.fire({
-			           icon: 'warning',
-			           title: 'Validation Error!',
-			           text: 'Remarks are required.',
-			           confirmButtonText: 'OK'
-			       });
-			      
-			       return;
-			   }
-
-
-		  
-		    // Disable the button to prevent multiple submissions
-		    $('#auditsubmit').prop('disabled', true).text('Processing...');
-
-		    $.ajax({
-		        url: '/gcc/api/pensioner/received/provisional/updateEmployeeDetailsCompleted',
-		        type: 'POST',
-		        contentType: 'application/json',
-		        data: JSON.stringify(entryDetails),
-		        success: function (response) {
-		            $('#auditsubmit').prop('disabled', false).text('Submit');
-		            Swal.fire({
-		                icon: 'success',
-		                title: 'Success',
-		                text: response,
-		                allowOutsideClick: false,
-		                allowEscapeKey: false,
-		                allowEnterKey: false,
-		                confirmButtonText: 'OK'
-		            }).then((result) => {
-		                if (result.isConfirmed) {
-		                    $('#auditsubmit').prop('disabled', false).text('Submit');
-		                    window.location.href = "/gcc/pensioner/received/provisionalretirement";
-		                    console.log("Continue clicked");
-		                }
-		            });
-		        },
-		        error: function (xhr, status, error) {
-		            $('#auditsubmit').prop('disabled', false).text('Submit');
-		            Swal.fire({
-		                icon: 'error',
-		                title: 'Error',
-		                text: 'Failed to save details. Please try again.',
-		                confirmButtonText: 'OK'
-		            });
-		            console.error('Error:', xhr.responseText);
-		        }
-		    });
-		}
-		
-		//amount field validation
-		
-		function validatePositiveNumber(input) {
-			    if (input.value < 1) {
-			        input.value = "";
-			    }
-			}
-
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/received/retirement.html b/src/main/resources/templates/modules/pensioner/pensioner/received/retirement.html
deleted file mode 100644
index 8e784528..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/received/retirement.html
+++ /dev/null
@@ -1,1364 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    
-   
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#returnretrieddetailsModal .col-md-12,.col-md-4,.col-md-6{
-	padding-bottom: 10px;
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-.col-md-4 .form-check{
-    	width: 25%;
-    }
-.col-md-6 .form-check{
-    	width: 25%;
-    }
-    .form-check-label{
-    	padding-top: 4%;
-    }
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Retirement</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received from Dept</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Received From Department - Retirement</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">
-					                <table id="ReturnRetriedDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                    <thead class="thead-dark">
-					                        <tr role="row">
-					                            <th class="text-center">S.No</th>
-					                            <th class="text-center">Employee Code</th>
-												<th class="text-center">Name </th>					
-					                            <th class="text-center">Department</th>
-					                            <th class="text-center">Designation</th>
-					                            <th class="text-center">File Sent Date</th>
-					                            <th class="text-center">File Type</th>
-					                            <th class="text-center">View</th>
-					               
-					                        </tr>
-					                    </thead>
-					                    <tbody style="text-align:center;">
-					                       
-					                       <!-- Thymeleaf loop to populate data -->
-								            <tr th:each="forward, iterStat : ${forwardlist}">
-								                <td th:text="${iterStat.index + 1}" class="text-center"></td>
-								                <td th:text="${forward['emp_no']}" class="text-center"></td>
-								                <td th:text="${forward['emp_name']}" class="text-center"></td>
-								                <td th:text="${forward['dept_name']}" class="text-center"></td>
-								                <td th:text="${forward['designation']}" class="text-center"></td>
-								                <td th:text="${forward['file_moved_date'] != null ? #dates.format(forward['file_moved_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>								               
-								                <td th:text="${forward['file_entry_type']}" class="text-center"></td>
-								                <td class="text-center">
-												    <button class="btn btn-primary btn-sm view-btn" th:attr="data-id=${forward['emp_no']}, data-temp-id=${forward['temp_id']}">
-												        View
-												    </button>
-												</td>
-
-								            </tr>
-					                       
-					                    </tbody>
-					                    
-					                </table>
-					            </div>
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-   
-<!--  Modal Box -->    
-<div class="modal fade" id="returnretrieddetailsModal" 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-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="detailsModalLabel">
-                    Received From Department - Retirement (<span id="modalEmployeeCode"></span>)
-                </h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Employee No -->
-                    <div class="col-md-4">
-                        <label for="employeenomodel" class="form-label fw-bold">Employee No </label>
-                        <input type="number" id="employeenomodel" class="form-control" readonly>
-                    </div>
-
-                    <!-- Employee Name -->
-                    <div class="col-md-4">
-                        <label for="employeename" class="form-label fw-bold">Employee Name </label>
-                        <input type="text" id="employeename" class="form-control" readonly>
-                    </div>
-
-                    <!-- Department -->
-                    <div class="col-md-4">
-                        <label for="department" class="form-label fw-bold">Department </label>
-                        <input type="text" id="department" class="form-control" readonly>
-                    </div>
-
-                    <!-- Designation -->
-                    <div class="col-md-4">
-                        <label for="designation" class="form-label fw-bold">Designation </label>
-                        <input type="text" id="designation" class="form-control" readonly>
-                    </div>
-                    
-                    <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>
-                    
-                    <!-- Class -->
-                    <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>
-					
-					<!-- Type of Retirement -->
-                    <div class="col-md-4">
-                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
-                        <input type="text" id="typeofretirement" class="form-control" readonly>
-                    </div>
-                    </div>
-                    <div class="row mt-2">
-                    <div class="col-md-4">
-                    	<label class="form-label fw-bold">GPF</label>
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes">
-						            <label class="form-check-label" for="gpfYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpfNo" name="gpf" value="no">
-						            <label class="form-check-label" for="gpfNo">No</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="gpf50" name="gpf" value="90">
-						            <label class="form-check-label" for="gpf50">90%</label>
-						        </div>
-						    </div>
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="gpfAmountDiv" class="mt-3" style="display: none;">
-						        <label for="gpfAmount" class="form-label">GPF Amount</label>
-						        <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-                    </div>
-                    
-                     <div class="col-md-4">
-                     	<label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveYes" name="earnedleave" value="yes">
-						            <label class="form-check-label" for="earnedleaveYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="earnedleaveNo" name="earnedleave" value="no">
-						            <label class="form-check-label" for="earnedleaveNo">No</label>
-						        </div>						        
-						    </div>
-						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
-						        <label for="earnedleaveAmount" class="form-label">EL and LPA Amount</label>
-						        <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-                     </div>
-                     
-                     <div class="col-md-4">
-                     	<label class="form-label fw-bold">SPFGS</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsYes" name="spfgs" value="yes">
-						            <label class="form-check-label" for="spfgsYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="spfgsNo" name="spfgs" value="no">
-						            <label class="form-check-label" for="spfgsNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- Placeholder for dynamically added input -->
-						    <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
-						        <label for="spfgsAmount" class="form-label">SPFGS Amount</label>
-						        <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-                     </div>
-                     
-                    <div class="col-md-4">
-						    <label  for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
-						    <input type="text" id="recoveryemployeevalue" class="form-control" >
-					</div> 
-					
-					<div class="col-md-4">
-						<label class="form-label fw-bold">DCRG File is Ready</label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes">
-						            <label class="form-check-label" for="dcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="dcrgNo" name="dcrg" value="no">
-						            <label class="form-check-label" for="dcrgNo">No</label>
-						        </div>
-						    </div>
-					</div>
-					</div>
-					
-                    <div class="row mt-2">
-                    <!-- Date File Sent to Audit -->
-                    <div class="col-md-4">
-                        <label for="datefile_modal" class="form-label fw-bold">Date File sent to Pension </label>
-                        <input type="date" id="datefile_modal" class="form-control" readonly>
-                    </div>
-
-                    <!-- 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" s readonly></textarea>
-                    </div>
-                    </div>
-                    
-                    <!-- new -->
-
-					<div class="col-md-12 mt-4">
-						<h5>File History</h5>
-							<div id="fileHistoryContainer" class="file-history-list">
-								<!-- File History will be dynamically loaded here -->
-						</div>
-					</div> 
-                                                         
-                         
-            
-                 <div class="row mb-2 mt-2">
-		            <div class="col-md-12 d-flex justify-content-center">
-		                <button type="button" class="btn btn-primary mx-2" id="benefitbutton">Add Pension Benefits</button>
-		                <button type="button" class="btn btn-info mx-2" id="returndisplaybutton">Return to Department</button>
-		                <button type="button" class="btn btn-secondary mx-2" data-dismiss="modal" id="back">Back</button>
-		            </div>
-                  </div>
-                  
-                   <div  style="display :none" id="commonbenefitcard">
-	                   
-	                   		<div class="col-md-6">
-							<label class="form-label fw-bold">File Pending<span class="text-danger">*</span></label>							    
-							  	<div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="PendingYes" name="filepending" value="yes">
-						            <label class="form-check-label" for="PendingYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="PendingNo" name="filepending" value="no">
-						            <label class="form-check-label" for="PendingNo">No</label>
-						        </div>
-						    </div>
-					</div>	
-
-                   </div>
-                   
-                   <div  style="display :none" id="filependingContainer"> 
-	                    <div class="row">
-		                   	<div class="col-md-6">
-			                       <label for="datefileyes"  class="form-label fw-bold">Enter file received  Date<span class="text-danger">*</span></label>
-			                       <input type="text" id="datefileyes" readonly class="form-control">
-				             </div>
-				             
-				             <div class="col-md-12">
-			                       <label for="remarksyes" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
-			                       <textarea id="remarksyes" class="form-control"  rows="4" placeholder="Enter your remarks here"></textarea>
-				             </div>
-			             </div>
-			             <div class="row mb-2 mt-2">
-			            <div class="col-md-12 d-flex justify-content-center">
-			                <button type="button" class="btn btn-primary" id="pendingbutton">Submit</button>
-			            </div>
-	              </div>
-                </div>
-                   
-                   
-                   <div  style="display :none" id="benefitContainer">
-	                   <div class="row">
-	                   		<div class="col-md-6">
-	                   			<label for="pensionNumber" class="form-label">Pension Number<span class="text-danger">*</span></label>
-						        <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number">
-	                   		</div>
-	                   		
-	                   		<div class="col-md-6">
-	                   			<label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label>
-						        <input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
-	                   		</div>	
-	                   		
-	                   		
-	                   		<div class="col-md-6  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpYes" name="benefit_pension" value="yes">
-						            <label class="form-check-label" for="bpYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="bpNo" name="benefit_pension" value="no">
-						            <label class="form-check-label" for="bpNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						
-						<div class="col-md-6 mb-2" id="dcrgCard" style="display: none;">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgYes" name="benefit_dcrg" value="yes">
-						            <label class="form-check-label" for="DcrgYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="DcrgNo" name="benefit_dcrg" value="no">
-						            <label class="form-check-label" for="DcrgNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></label>
-						        <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" min="1" oninput="validatePositiveNumber(this)">
-						    </div>
-						</div>
-						
-						<div class="col-md-6  mb-2">
-						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation<span class="text-danger">*</span></label>
-						    
-						    <div class="d-flex align-items-center gap-5">
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationYes" name="benefit_commutation" value="yes">
-						            <label class="form-check-label" for="commutationYes">Yes</label>
-						        </div>
-						        <div class="form-check">
-						            <input class="form-check-input" type="radio" id="commutationNo" name="benefit_commutation" value="no">
-						            <label class="form-check-label" for="commutationNo">No</label>
-						        </div>						        
-						    </div>
-						    						    						    
-						    <!-- 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<span class="text-danger">*</span></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 class="col-md-6">
-			                       <label for="datefilereceived"  class="form-label fw-bold">File Received Date <span class="text-danger">*</span></label>
-			                       <input type="text" id="datefilereceived"  class="form-control" readonly>
-				             </div>
-		             
-		                    
-				             <div class="col-md-12">
-			                       <label for="remarksreceived" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
-			                       <textarea id="remarksreceived" class="form-control"  rows="4" placeholder="Enter your remarks here"></textarea>
-				             </div>
-	                   		
-	                   </div>
-	                   <div class="row mb-2 mt-2">
-				            <div class="col-md-12 d-flex justify-content-center">
-				                <button type="button" class="btn btn-primary" id="completedbutton">Mark as Completed</button>
-				            </div>
-	              		</div>
-                   </div>
-                   
-          
-				   <div  style="display :none" id="receivedcard">
-		             <div class="row">
-		             
-		             <!-- Date File Sent to Audit -->
-		             <div class="col-md-6">
-	                       <label for="datefile"  class="form-label fw-bold">Enter Date File Returned to Department <span class="text-danger">*</span></label>
-	                       <input type="text" id="datefile"  class="form-control" readonly>
-		             </div>
-		             
-		             
-		             <!-- Remarks -->       
-		             <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>
-		             </div>
-		                           
-		           </div>
-		           <div class="row mb-2 mt-2">
-			            <div class="col-md-12 d-flex justify-content-center">
-			                <button type="button" class="btn btn-primary" id="returnsubmit">Return</button>
-			            </div>
-			            
-	              </div>
-		           					          
-			    </div>
-				 
-			</div>         
-        </div>
-    </div>
-</div>
-
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script>
-
-	
-		$(document).ready(function () {
-		    // Initialize DataTable
-		    const table = $('#ReturnRetriedDatatable').DataTable({
-		        dom: 'Bftip',
-		        columnDefs: [
-		            { targets: 'no-sort', orderable: false }
-		        ],
-		        lengthMenu: [
-		            [50, 100, 200, 500, -1],
-		            ['50 rows', '100 rows', '200 rows', 'Show all']
-		        ],
-		        scrollY: '50vh',
-		        buttons: [
-		            { extend: 'pageLength', className: 'btn btn-warning' },
-		            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-		            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-		            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-		            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-		        ],
-		        fixedHeader: true,
-		        autoWidth: true,
-		        responsive: true,
-		        searching: true,
-		        select: false,
-		        processing: false
-		    });
-
-		});		
-		
-		
-		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("datefilereceived").value = formattedDateDisplay;
-	        document.getElementById("datefileyes").value = formattedDateDisplay;
-	        
-	    });
-	  
-	  
-	function convertDateFormat(dateString) {
-	    if (!dateString) return '';
-	    let [day, month, year] = dateString.split('-');
-	    return `${year}-${month}-${day}`;
-	}
-		
-		
-		//model function
-		 function fetchEmployeeDetails(tempId) {
-		 	    $.ajax({
-		 	        url: '/gcc/api/department/audit/getfilependingbenefits', // API to fetch employee details
-		 	        type: 'GET',
-		 	        data: { tempId: tempId }, // Pass EMPLOYEE_CODE as a parameter
-		 	        success: function (response) {
-		 	            if (response && response.length > 0) {
-		 	            	
-		 	            	let BenefitDetails = response[0]; // Access the first object in the array
-		 	            	console.log("response:",response);
-		 	            	
-		 	            	
-		 	                // Populate modal fields
-		 	                $('#employeenomodel').val(BenefitDetails.emp_no);
-		 	                $('#employeename').val(BenefitDetails.emp_name);
-		 	                $('#department').val(BenefitDetails.dept_name);
-		 	                $('#designation').val(BenefitDetails.designation);
-		 	                $('#typeofretirement').val(BenefitDetails.type_of_retirement);
-		 	                $('#classes').val(BenefitDetails.retirement_class);
-		 	                $('#datefile_modal').val(BenefitDetails.file_moved_date);
-		 	               	$('#remarks_modal').val(BenefitDetails.remarks);
-			 	            $('#retirementdate').val(BenefitDetails.retirement_date);
-			 	             
-			 	            let file_Pending=BenefitDetails.file_pending;
-		 	                console.log("file_pending=:"+file_Pending);
-			 	             
-			 	         // Populate GPF
-			                 if (BenefitDetails.gpf === 'yes') {
-			                     $('#gpfYes').prop('checked', true); // Disable radio
-			                     $('#gpfNo').prop('disabled', true);
-			                     $('#gpf50').prop('disabled', true);
-			                     $('#gpfAmountDiv').show();
-			                     $('#gpfAmount').val(BenefitDetails.gpf_amount).prop('readonly', true); // Make input readonly
-			                 } else if (BenefitDetails.gpf === 'no') {
-			                     $('#gpfNo').prop('checked', true);
-			                     $('#gpfYes').prop('disabled', true);
-			                     $('#gpf50').prop('disabled', true);
-			                     $('#gpfAmountDiv').hide();
-			                 } else if (BenefitDetails.gpf === '90') {
-			                     $('#gpf50').prop('checked', true);
-			                     $('#gpfYes').prop('disabled', true);
-			                     $('#gpfNo').prop('disabled', true);
-			                     $('#gpfAmountDiv').show();
-			                     $('#gpfAmount').val(BenefitDetails.gpf_amount).prop('readonly', true);
-			                 }
-
-			                 // Populate Earned Leave & Leave on Private Affairs
-			                 if (BenefitDetails.private_affairs === 'yes') {
-			                     $('#earnedleaveYes').prop('checked', true);
-			                     $('#earnedleaveNo').prop('disabled', true);
-			                     $('#earnedleaveAmountDiv').show();
-			                     $('#earnedleaveAmount').val(BenefitDetails.private_affairs_amount).prop('readonly', true);
-			                 } else if (BenefitDetails.private_affairs === 'no') {
-			                     $('#earnedleaveNo').prop('checked', true);
-			                     $('#earnedleaveYes').prop('disabled', true);
-			                     $('#earnedleaveAmountDiv').hide();
-			                 }
-
-			                 // Populate SPFGS
-			                 if (BenefitDetails.spfgs === 'yes') {
-			                     $('#spfgsYes').prop('checked', true);
-			                     $('#spfgsNo').prop('disabled', true);
-			                     $('#spfgsAmountDiv').show();
-			                     $('#spfgsAmount').val(BenefitDetails.spfgs_amount).prop('readonly', true);
-			                 } else if (BenefitDetails.spfgs === 'no') {
-			                     $('#spfgsNo').prop('checked', true);
-			                     $('#spfgsYes').prop('disabled', true);
-			                     $('#spfgsAmountDiv').hide();
-			                 }
-
-			                 // Populate Recovery From Employee
-			                 $('#recoveryemployeevalue')
-			                     .val(BenefitDetails.recovery_emp)
-			                     .prop('readonly', true); // Make input readonly
-
-			                 // Populate DCRG
-			                 if (BenefitDetails.dcrg === 'yes') {
-			                     $('#dcrgYes').prop('checked', true);
-			                     $('#dcrgNo').prop('disabled', true);
-			                     
-			                    /*  $('#DcrgYes').prop('disabled', false);
-			                     $('#DcrgNo').prop('disabled', false); */
-			                     $('#dcrgCard').show();
-			                     
-			                 } if (BenefitDetails.dcrg === 'no') {
-			                     $('#dcrgNo').prop('checked', true);
-			                     $('#dcrgYes').prop('disabled', true);
-			                     
-			                    /*  $('#DcrgYes').prop('disabled', true);
-			                     $('#DcrgNo').prop('disabled', true); */
-			                     $('#dcrgCard').hide();	
-			                    
-			                 }		 	         	
-		 	                
-		 	               
-		 	                // Update the modal title with the employee code
-		 	                $('#modalEmployeeCode').text(BenefitDetails.emp_no);
-
-		 	                // Show the modal
-		 	                $('#returnretrieddetailsModal').modal('show');
-		 	                
-		 	             	//additional card display function
-		 	               document.getElementById("returndisplaybutton").addEventListener("click", function() {
-		 	          	       
-				 	           // $('#datefile').val('');
-				 	         	$('#remarks').val('');
-				 	         	document.getElementById("commonbenefitcard").style.display = "none";
-		 	          	        document.getElementById("receivedcard").style.display = "block";
-		 	          	        document.getElementById("benefitContainer").style.display = "none";
-		 	          	        document.getElementById("filependingContainer").style.display = "none";
-		 	          	        
-			 	          	     document.getElementById("returndisplaybutton").scrollIntoView({
-				 	        	        behavior: "smooth", // Smooth scrolling effect
-				 	        	        block: "center" // Aligns the element to the center of the viewport
-				 	        	    });
-		 	          	      		 	          	        
-		 	          	    });
-		 	             	
-		 	             /*  $('#benefitbutton').off('click').on('click', function() {
-		 	            	if(file_Pending==='yes'){
-		 	            		 $('input[name="filepending"][value="' + BenefitDetails.file_pending + '"]').prop('checked', true);		 	            		
-		 	            		$('#commonbenefitcard').show();
-		 	            		 $('#filependingContainer').show();
-		 	            		$('#datefileyes').val(BenefitDetails.file_moved_date);
-			 	               	$('#remarksyes').val(BenefitDetails.remarks);
-			 	               				 	               
-			 	               	 $('#pendingbutton').prop('disabled', true);
-			 	              
-		 	            	}
-		 	            	else{
-		 	            		
-		 	            		$('input[name="filepending"]').prop('checked', false);
-	 	          	            document.getElementById("commonbenefitcard").style.display = "block";
-	 	          	         	document.getElementById("receivedcard").style.display = "none";
-	 	          	         $('#pendingbutton').prop('disabled', false);
-		 	            	}
-		 	            	  
-		 	              });	 */	 
-		 	              
-		 	              
-		 	              
-		 	             $('#benefitbutton').off('click').on('click', function() {
-			 	                // Show the required elements first
-			 	                $('#commonbenefitcard').show();
-			 	                
-			 	                // Delay scroll to ensure elements are fully rendered
-			 	                setTimeout(() => {
-			 	                    document.getElementById("benefitbutton").scrollIntoView({
-			 	                        behavior: "smooth",
-			 	                        block: "center"
-			 	                    });
-			 	                }, 100); // Small delay
-
-			 	                if (file_Pending === 'yes') {
-			 	                    $('input[name="filepending"][value="' + BenefitDetails.file_pending + '"]').prop('checked', true);
-			 	                    $('#filependingContainer').show();
-			 	                    $('#datefileyes').val(BenefitDetails.file_moved_date);
-			 	                    $('#remarksyes').val(BenefitDetails.remarks);
-			 	                   $('#pendingbutton').prop('disabled', true);
-				 	                  $('#pendingbutton').hide();
-			 	                } else {
-			 	                    $('input[name="filepending"]').prop('checked', false);
-			 	                    document.getElementById("receivedcard").style.display = "none";
-			 	                    $('#pendingbutton').prop('disabled', false);
-			 	                }
-			 	            });
-		 	              
-		 	          // Function to scroll inside the modal
-		 	               function scrollToElement(targetElement) {
-		 	                   var modalBody = $('#returnretrieddetailsModal .modal-body');
-
-		 	                   // Ensure the modal content is fully loaded before scrolling
-		 	                   setTimeout(function () {
-		 	                       modalBody.animate({ 
-		 	                           scrollTop: $(targetElement).offset().top - modalBody.offset().top + modalBody.scrollTop() 
-		 	                       }, 'fast');
-		 	                   }, 200);
-		 	               }
-		 	              
-		 	              //Scroll when "PendingYes" is clicked
-		 	              $('input[name="filepending"]').on('change', function () {
-		 	                  if ($(this).val() === "yes") {
-		 	                      $("#filependingContainer").show(); // Show before scrolling
-		 	                      scrollToElement("#filependingContainer");
-		 	                  } else {
-		 	                      $("#filependingContainer").hide();
-		 	                      $("#benefitContainer").show(); // Ensure benefitContainer is visible
-		 	                      scrollToElement("#benefitContainer"); // Scroll to benefitContainer
-		 	                  }
-		 	              });
-		 	              
-		 	              /* document.getElementById("benefitbutton").addEventListener("click", function() {
-		 	          	       
-		 	            	$('input[name="filepending"]').prop('checked', false);
- 	          	            document.getElementById("commonbenefitcard").style.display = "block";
- 	          	         	document.getElementById("receivedcard").style.display = "none";
- 	          	        
- 	          	    	}); */
-		 	             
-		 	            /* document.getElementById('pendingbutton').addEventListener('click', function () {
-	 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-	 	                    
-	 	                    savePendingDetails(tempId,employeeNo);
-	 	        		}); */
- 	          	    	
- 	          	    	$('#pendingbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	   savePendingDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
-		 	                 		 	                
-		 	                
- 	          	    	/* $(document).off('click', '#completedbutton').on('click', '#completedbutton', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-		 	                    
-		 	                    saveCompletedDetails(tempId,employeeNo);
-		 	        		}); */
- 	          	    	
- 	          	    	$('#completedbutton').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-	 	            	   saveCompletedDetails(tempId, employeeNo); // Call function with parameters
-	 	            	});
- 	          	    	
-		 	                
-		 	              /* document.getElementById('returnsubmit').addEventListener('click', function () {
-		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
-		 	                    
-		 	                    saveReturnDetails(tempId,employeeNo);
-		 	        		}); */
-		 	              
-		 	             $('#returnsubmit').off('click').on('click', function () {
-		 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
-		 	            	   saveReturnDetails(tempId, employeeNo); // Call function with parameters
-		 	            	});
-		 	                
-		 	              
-		 	                
-		 	            } else {
-		 	                Swal.fire({
-		 	                    icon: 'info',
-		 	                    title: 'No Data',
-		 	                    text: 'No details found for the selected employee.',
-		 	                    confirmButtonText: 'OK',
-		 	                });
-		 	            }
-		 	        },
-		 	        error: function () {
-		 	            Swal.fire({
-		 	                icon: 'error',
-		 	                title: 'Error',
-		 	                text: 'Failed to fetch employee details. Please try again.',
-		 	                confirmButtonText: 'OK',
-		 	            });
-		 	        },
-		 	    });
-		 	}
-
-		 $(document).ready(function () {
-	    	 
-	    	 $(document).on('click', '.view-btn', function () {
-	    		 const empCode = $(this).data('id'); // Fetch `data-id` value
-	    		    console.log("empCode====="+empCode);
-	    		    const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-	    		    // Hide the receivedcard section before showing the modal
-	    	        $("#receivedcard").hide();
-	    	        $("#commonbenefitcard").hide();	    	        
-	    	        $("#filependingContainer").hide();
-	    	        $("#benefitContainer").hide()
-	    		    fetchEmployeeDetails(tempId); // Call the function to fetch employee details
-	    		    loadFileHistory(tempId); // Load the file history for the selected employee
-	    		    
-	    		});
-
-
-		    // Initialize the modal with static backdrop and disabled keyboard closing
-		    $('#returnretrieddetailsModal').modal({
-		        backdrop: 'static',
-		        keyboard: false,
-		        show: false // Ensure it doesn't auto-show on page load
-		    });
-
-		   
-		    // Handle close button click
-		    $('#back').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    $('.close').click(function () {
-		        $('#returnretrieddetailsModal').modal('hide');
-		    });
-		    
-		    document.querySelectorAll('input[name="filepending"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const filependingContainer = document.getElementById('filependingContainer')
-		            const benefitContainer = document.getElementById('benefitContainer');
-		            if (this.value === 'yes') {
-		            	filependingContainer.style.display = 'block'; // Show the input field
-		            	//document.getElementById('datefileyes').value = ''; 
-		            	document.getElementById('remarksyes').value = '';
-		            	document.getElementById("benefitContainer").style.display = "none";
-		            	 
-		            }if (this.value === 'no') {
-		            	benefitContainer.style.display = 'block'; // Hide the input field
-		            	filependingContainer.style.display = 'none';
-		                // pensionNumber,ledgerNumber,benefit_pension,benefit_dcrg,benefit_commutation,datefilereceived,remarksreceived
-		                document.getElementById('pensionNumber').value = ''; 
-		                document.getElementById('ledgerNumber').value = ''; 
-		                $('input[name="benefit_pension"]').prop('checked', false);
-		                $('input[name="benefit_dcrg"]').prop('checked', false);
-		                $('input[name="benefit_commutation"]').prop('checked', false);
-		                document.getElementById('benefit_pension_amount').value = ''; 
-		                document.getElementById('benefit_dcrg_amount').value = ''; 
-		                document.getElementById('benefit_commutation_amount').value = ''; 
-		                
-		                //document.getElementById('datefilereceived').value = ''; 
-		                document.getElementById('remarksreceived').value = '';
-		                document.getElementById("filependingContainer").style.display = "none";
-		                document.getElementById("PbAmountDiv").style.display = "none";
-		                document.getElementById("dcrgAmountDiv").style.display = "none";
-		                document.getElementById("CommutationAmountDiv").style.display = "none";
-		            }
-		        });
-		    });
-		    
-		    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const PbAmountDiv = document.getElementById('PbAmountDiv');
-		            if (this.value === 'yes') {
-		            	PbAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	PbAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('benefit_pension_amount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		    document.querySelectorAll('input[name="benefit_dcrg"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const dcrgAmountDiv = document.getElementById('dcrgAmountDiv');
-		            if (this.value === 'yes') {
-		            	dcrgAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	dcrgAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('benefit_dcrg_amount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		    document.querySelectorAll('input[name="benefit_commutation"]').forEach(radio => {
-		        radio.addEventListener('change', function () {
-		            const CommutationAmountDiv = document.getElementById('CommutationAmountDiv');
-		            if (this.value === 'yes') {
-		            	CommutationAmountDiv.style.display = 'block'; // Show the input field
-		            } else {
-		            	CommutationAmountDiv.style.display = 'none'; // Hide the input field
-		                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
-		            }
-		        });
-		    });
-		});
-		 
-		 function loadFileHistory(tempId) {
-			    $.ajax({
-			        url: '/gcc/api/department/audit/fileMovementhistory', // API endpoint
-			        type: 'GET',
-			        data: { tempId: tempId }, // Pass empCode as a parameter
-			        success: function (response) {
-			            if (response.length > 0) {
-			                let historyHtml = '';
-			                response.forEach(item => {
-			                    historyHtml += `
-			                        <div class="file-history-item">
-			                            <div class="file-history-date">${formatDateTime(item.fileMovedDateHistory)}</div>
-			                            <div class="file-history-content">
-			                                <div class="file-history-status">${item.fileStatusHistory}</div>
-			                                <div class="file-history-remarks">Comments/Remarks: ${item.remarksHistory || 'N/A'}</div>
-			                            </div>
-			                        </div>
-			                    `;
-			                });
-
-
-
-			                $('#fileHistoryContainer').html(historyHtml);
-			            } else {
-			                $('#fileHistoryContainer').html('<p>No file history available.</p>');
-			            }
-			        },
-			        error: function () {
-			            $('#fileHistoryContainer').html('<p>Failed to load file history. Please try again later.</p>');
-			        }
-			    });
-			}
-
-		 // Function to format date and time
-		function formatDateTime(dateString) {
-	 const options = {
-	     day: '2-digit',
-	     month: '2-digit',
-	     year: 'numeric',
-	 };
-	 return new Date(dateString).toLocaleDateString('en-GB', options); // Formats as dd-mm-yyyy
-	}
-		 
-		function saveCompletedDetails(tempId,empCode) {
-		       //console.log("emp_no inside=="+empCode);
-		       
-		       let selecteddcrg=null;
-		       let selbenefitdcrgamount=null;
-		       
-		       let selectedfilePending = $('input[name="filepending"]:checked').val();
-		       let selectedPd = $('input[name="benefit_pension"]:checked').val();
-		       let selectedPdAmount=null;
-		       if (selectedPd === 'yes') {
-		    	   selectedPdAmount = $('#benefit_pension_amount').val(); 
-		    	   if (!selectedPdAmount) {
-		                Swal.fire({
-		                    icon: 'warning',
-		                    title: 'Validation Error',
-		                    text: 'Please Enter Pension Benefit Amount',
-		                    confirmButtonText: 'OK'
-		                });
-			            return; // Stop further execution if validation fails
-			        }
-		       }
-		       let confirmDcrg=$('input[name="dcrg"]:checked').val();
-		    	   
-		       if(confirmDcrg == 'yes'){
-		    	   
-		    	    selecteddcrg = $('input[name="benefit_dcrg"]:checked').val();
-			        selbenefitdcrgamount=null;
-			       if(!selecteddcrg)
-		    	   {
-			    	   Swal.fire({
-		                    icon: 'warning',
-		                    title: 'Validation Error',
-		                    text: 'Please Select DCRG Pension Benefit',
-		                    confirmButtonText: 'OK'
-		                });
-			            return;
-		    	   }
-			       if(selecteddcrg ==='yes'){
-			    	   selbenefitdcrgamount=$('#benefit_dcrg_amount').val();
-			    	   if (!selbenefitdcrgamount) {
-			                Swal.fire({
-			                    icon: 'warning',
-			                    title: 'Validation Error',
-			                    text: 'Please Enter DCRG Benefit Amount',
-			                    confirmButtonText: 'OK'
-			                });
-				            return; // Stop further execution if validation fails
-				        }
-			       }
-			       
-		       }
-		       
-		       if(confirmDcrg == 'no'){
-		    	   
-		    	    selecteddcrg=null;
-		    	    selbenefitdcrgamount=null;
-		    	   
-		       }
-		       
-		       let selectedcom = $('input[name="benefit_commutation"]:checked').val();
-		       let selectedcomAmount=null;
-		       if (selectedcom === 'yes') {
-		    	   selectedcomAmount = $('#benefit_commutation_amount').val(); 
-		    	   if (!selectedcomAmount) {
-		                Swal.fire({
-		                    icon: 'warning',
-		                    title: 'Validation Error',
-		                    text: 'Please Enter Commutation Benefit Amount',
-		                    confirmButtonText: 'OK'
-		                });
-			            return; // Stop further execution if validation fails
-			        }
-		       }
-		       
-	  	    let entryDetails = {
-	  	        empNo: empCode, 
-	  	      	tempId: tempId,
-	  	      	file_pending:selectedfilePending,
-	  	      	pension_number:$('#pensionNumber').val(),
-	  	        ledger_number:$('#ledgerNumber').val(),
-	  	      	benefit_pension:selectedPd,
-	  	      	benefit_dcrg:selecteddcrg || null,
-	  	    	benefit_commutation:selectedcom,
-	  	        benefit_pension_amount:selectedPdAmount,
-	  	        benefit_dcrg_amount:selbenefitdcrgamount || null,
-	  	        benefit_commutation_amount:selectedcomAmount,
-	  	        dateToAudit: convertDateFormat($('#datefilereceived').val()?.trim()),
-	  	        remarks: $('#remarksreceived').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-	  	    
-	  	    
-	  	  if(!entryDetails.benefit_pension){
-	    		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Benefit Pension are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	    	   }
-	    	   
-	    	   
-	    	 if(!entryDetails.file_pending){
-	    		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'File Pending are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	       
-	  	       return;
-	    	   }
-	    	 
-	    	if(!entryDetails.benefit_commutation){
-	   		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Benefit Commutation are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	   	   }
-	    	
-	    	if(!entryDetails.pension_number){
-	   		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Pension Number are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	   	   }
-	    	
-	    	if(!entryDetails.ledger_number){
-	   		 Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Ledger Number are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	     
-	  	       return;
-	   	   }
-	    	    
-	    	  if (!entryDetails.remarks) {
-	  	       Swal.fire({
-	  	           icon: 'warning',
-	  	           title: 'Validation Error!',
-	  	           text: 'Remarks are required.',
-	  	           confirmButtonText: 'OK'
-	  	       });
-	  	      
-	  	       return;
-	  	   }
-
-
-	  		// Disable the button to prevent multiple submissions
-	  	      $('#completedbutton').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/pension/received/updateforretirementcompleted',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#completedbutton').prop('disabled', false).text('Mark as Completed');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#completedbutton').prop('disabled', false).text('Mark as Completed');
-		                        	window.location.href = "/gcc/pensioner/received/retirement";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#completedbutton').prop('disabled', false).text('Mark as Completed');	
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });   
-	  	}
-		
-		//savePendingDetails
-		function savePendingDetails(tempId,empCode) {
-		       //console.log("emp_no inside=="+empCode);
-		       let selectedfilePending = $('input[name="filepending"]:checked').val();
-		       
-		       
-	  	    let entryDetails = {
-	  	        empNo: empCode, 
-	  	      	tempId: tempId,
-	  	      	file_pending:selectedfilePending,	  	      	
-	  	        dateToAudit: convertDateFormat($('#datefileyes').val()?.trim()),
-	  	        remarks: $('#remarksyes').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-
-	  	  if (!entryDetails.file_pending) {
-		       Swal.fire({
-		           icon: 'warning',
-		           title: 'Validation Error!',
-		           text: 'File Pending are required.',
-		           confirmButtonText: 'OK'
-		       });
-		       
-		       return;
-		   }
-	  	  
-	  	  
-	  	if (!entryDetails.remarks) {
-		       Swal.fire({
-		           icon: 'warning',
-		           title: 'Validation Error!',
-		           text: 'Remarks are required.',
-		           confirmButtonText: 'OK'
-		       });
-		       
-		       return;
-		   }
-
-	  		// Disable the button to prevent multiple submissions  pendingbutton Submit
-	  	     $('#pendingbutton').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/pension/received/updateforretirementpending',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#pendingbutton').prop('disabled', false).text('Submit');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#pendingbutton').prop('disabled', false).text('Submit');	
-		                        	window.location.href = "/gcc/pensioner/received/retirement";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#pendingbutton').prop('disabled', false).text('Submit');		
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });  
-	  	} 
-
-		
-		function saveReturnDetails(tempId,empCode) {
-		       
-	  	    let entryDetails = {
-	  	        empNo: empCode, 
-	  	      	tempId: tempId,	  	      	  	      	
-	  	        dateToAudit: convertDateFormat($('#datefile').val()?.trim()),
-	  	        remarks: $('#remarks').val(),
-	  	        deptId:$('#deptId').text().trim(),
-	  	        filemovedby:$('#userId').text().trim()
-	  	    };
-	  	    
-	  	    console.log("entryDetails:",entryDetails);
-	  	    
-	  		if (!entryDetails.remarks) {
-			       Swal.fire({
-			           icon: 'warning',
-			           title: 'Validation Error!',
-			           text: 'Remarks are required.',
-			           confirmButtonText: 'OK'
-			       });
-			       
-			       return;
-			   }
-
-	  		// Disable the button to prevent multiple submissions  pendingbutton Submit
-	  	     $('#returnsubmit').prop('disabled', true).text('Processing...');
-	  	    
-	  	    $.ajax({
-	  	        url: '/gcc/api/pension/received/updateforretirementreturn',
-	  	        type: 'POST',
-	  	        contentType: 'application/json',
-	  	        data: JSON.stringify(entryDetails),
-	  	        success: function (response) {
-	  	        	$('#returnsubmit').prop('disabled', false).text('Return');	
-	  	            Swal.fire({
-	  	                icon: 'success',
-	  	                title: 'Success',
-	  	                text: response,
-	  	               	allowOutsideClick: false,
-	  	              	allowEscapeKey: false,
-	  	              	allowEnterKey: false,
-	  	                confirmButtonText: 'OK'
-	  	            }).then((result) => {
-		                        if (result.isConfirmed) {
-		                        	$('#returnsubmit').prop('disabled', false).text('Return');	
-		                        	window.location.href = "/gcc/pensioner/received/retirement";
-		                            console.log("Continue clicked");
-		                        }
-	  	            });
-	  	        },
-	  	        error: function (xhr, status, error) {
-	  	        	$('#returnsubmit').prop('disabled', false).text('Return');	
-	  	            Swal.fire({
-	  	                icon: 'error',
-	  	                title: 'Error',
-	  	                text: 'Failed to save details. Please try again.',
-	  	                confirmButtonText: 'OK'
-	  	            });
-	  	            console.error('Error:', xhr.responseText);
-	  	        }
-	  	    });  
-	  	}
-		
-
-		//amount field validation
-		
-		function validatePositiveNumber(input) {
-			    if (input.value < 1) {
-			        input.value = "";
-			    }
-			}
-		 
-	</script>
-
-
-</body>
-</html>
-
-
-
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/reports.html b/src/main/resources/templates/modules/pensioner/pensioner/reports.html
deleted file mode 100644
index 34763113..00000000
--- a/src/main/resources/templates/modules/pensioner/pensioner/reports.html
+++ /dev/null
@@ -1,1820 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required{
-        color: red;
-    }
-    #modalBody h4 {
-        font-weight: bold;
-        margin-top: 15px;
-        margin-bottom: 10px;
-    }
-
-    #modalBody p {
-        margin: 5px 0;
-    }
-
-    #modalBody hr {
-        margin: 15px 0;
-    }
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-    
-    h5 {
-      
-       font-size: bold;
-    }
-    
-    /* Limit the height of the dropdown menu and make it scrollable */
-
-    
-
-    .col-4 {
-        font-weight: bold;
-        text-align: right;
-    }
-
-    .col-8 {
-        padding-left: 20px;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-
-    .comment .btn-link {
-        font-size: 0.9em;
-        text-decoration: underline;
-        color: #007bff;
-    }
-    /* Make the modal body scrollable */
-    #detailsModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-	
-	.card-box {
-		border-radius: 20px;
-       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-    }
-    
-        #followupCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
-}
-
-#followupCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
-
-#returnretrieddetailsModal .modal-body{
-
-	max-height:80vh;
-	overflow-y:auto; 
-}
-#returnretrieddreportetailsModals .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-/* Ensure consistent table borders */
-.table {
-    border-collapse: collapse !important;
-}
-
-.table thead th {
-    background-color: #343a40; /* Dark header background */
-    color: #ffffff; /* White text */
-    text-align: center;
-}
-
-.table-bordered td, .table-bordered th {
-    border: 1px solid #dee2e6 !important; /* Ensure borders are visible */
-}
-
-/* Ensure proper column width */
-#SecondFollowupDatatables, #FollowupDatatable, #reportFollowupDatatables {
-    table-layout: fixed;
-    width: 100%;
-}
-
-#SecondFollowupDatatables th, 
-#FollowupDatatable th, 
-#reportFollowupDatatables th {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-/* Add padding for better readability */
-td, th {
-    padding: 10px;
-    text-align: center;
-}
-
-
-
-</style>
-
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>Report</h5>
-                                        <span>Pensioner Entries</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Reports</li>
-                                      
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-
-                    <div class="col-md-12">
-					    <div class="card">
-					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Pensioner 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>
-								<div class="row mb-4">
-								
-									 <div class="col-md-3">
-			                        <label for="startdate" class="form-label fw-bold">Start Date<span class="text-danger">*</span></label>
-			                        <input type="date" id="startdate" class="form-control" onclick="this.showPicker()"   >
-			                    </div>
-			                     <div class="col-md-3">
-			                        <label for="enddate" class="form-label fw-bold">End Date<span class="text-danger">*</span></label>
-			                        <input type="date" id="enddate" class="form-control" onclick="this.showPicker()"  >
-			                    </div>
-			                    
-			                    
-			                    <div class="col-md-3">
-										    <label for="typeofreport" class="form-label fw-bold">Type of Report<span class="text-danger">*</span></label>
-										    <select id="typeofreport" class="form-control" style="width: 100%;" required>
-										        <option value="" selected>-- Select Option --</option>
-										        <option value="Abstract">Abstract</option>
-										        <option value="Detailed">Detailed</option>
-										    </select>
-										</div>
-									
-									<div class="col-md-3" id="categoryDiv1" style="display: none;">
-										    <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>
-										</div>
-									
-
-										
-
-
-										<!-- <div class="col-md-3" id="deptDiv" style="display: none;">
-										    <label for="departmentDropdown" class="form-label fw-bold">Department <span class="text-danger">*</span></label>										    
-										    <div class="form-control p-3 border rounded" style="height: 110px; overflow-y: auto; background-color: #f8f9fa;">
-										      										        										        
-										        <div id="departmentCheckboxContainer">										           
-										        </div>
-										    </div>
-										</div> -->
-										
-										<div class="col-md-3" id="deptDiv" style="display: none;">
-										    <label for="departmentDropdown" class="form-label fw-bold">Department <span class="text-danger">*</span></label> 
-										    <div class="dropdown">
-										        <button class="btn btn-light border rounded w-100 text-start" type="button" id="departmentDropdownBtn" data-bs-toggle="dropdown" aria-expanded="false">
-										            Select Department(s)
-										        </button>
-										        <ul class="dropdown-menu p-3" aria-labelledby="departmentDropdownBtn" style="max-height: 200px; overflow-y: auto; width: 100%;">
-										            <div id="departmentCheckboxContainer">
-										                <!-- Checkboxes will be loaded here -->
-										            </div>
-										        </ul>
-										    </div>
-										</div>
-										
-
-										
-										<!-- Type of Category (Initially Hidden) -->
-										<div class="col-md-3" id="categoryDiv" style="display: none;">
-										    <label for="typeofcategory" class="form-label fw-bold">Type of File Category<span class="text-danger">*</span></label>
-										    <select id="typeofcategory" class="form-control" style="width: 100%;">
-										        <option value="" selected>-- Select Category --</option>
-										    </select>
-										</div>
-										
-										<div class="col-md-3" id="statusDiv" style="display: none;">
-										    <label for="statusDropdown" class="form-label fw-bold">File Status</label>
-										    <select id="statusDropdown" class="form-control" style="width: 100%;">
-										        <option value="" selected>-- Select Status --</option>
-										        <option value="[1,3]">Audit Pending</option>
-										        <option value="[2,5,6,9]">Department Pending</option>
-										        <option value="[4,7,8,10]">Pension Pending</option>
-										        <option value="[11]">File Completed</option>
-										        <option value="[12]">File Closed</option>
-										    </select>
-										</div>
-
-
-										<div class="col-md-4 mt-20">
-									        <button id="searchButton" class="btn btn-primary mt-2 mx-2">Search</button>
-									        <button id="resetButton" class="btn btn-secondary mt-2">Reset</button>
-								        
-								    </div>
-								</div>
-
-
-					            <div class="page-header-title"></div>
-					            <div style= display:none id="audittable">
-					            <!-- <div style="visibility: hidden; height: 0; overflow: hidden;" id="audittable"> -->
-					                <table id="FileCategoryTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>										           
-										            <th class="text-center">Department</th>
-										          	<th class="text-center">Audit Pending</th>
-										            <th class="text-center">Department Pending</th>
-										            <th class="text-center">Pension Pending</th>
-										            <th class="text-center">Completed</th>
-										            <th class="text-center">Total count</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileCategoryTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            
-					             <div style= display:none  id="cpstable">
-					                <table id="FileDetailsTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Type of Retirement</th>
-										            <th class="text-center">Date of Retirement</th>
-										            <th class="text-center">Pending Duration</th>
-										           	<th class="text-center">File Status</th>
-										            <th class="text-center">File category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileDetailsTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            
-					            <!-- retirement datatable -->
-					            <div style= display:none  id="retiretable">
-					                <table id="FileRetirementTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Department</th>
-										            <th class="text-center">Type of Retirement</th>
-										            <th class="text-center">Date of Retirement</th>
-										            <th class="text-center">File Status</th>
-										            <th class="text-center">File Category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileRetireTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            
-					            <!-- Family pension datatable -->
-					            
-					            <div style= display:none  id="familypensiontable">
-					                <table id="FileFamilyPensionTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Department</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Service Death Date</th>
-										            <th class="text-center">Relationship Type</th>
-										            <th class="text-center">Pending Duration</th>
-										            <th class="text-center">File Status</th>
-										            <th class="text-center">File Category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileFamilyTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            <!-- Pendency datatable -->
-					            
-					            <div style= display:none  id="pendencytable">
-					                <table id="FilePendencyTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Department</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Type of Retirement</th>
-										            <th class="text-center">Date of Retirement</th>
-										            <th class="text-center">Pending Duration</th>
-										            <th class="text-center">File Status</th>
-										            <th class="text-center">File Category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="filePendencyTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            <!-- Gis datatable -->
-					            
-					            <div style= display:none  id="gistable">
-					                <table id="FileGisTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Department</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Service Death Date</th>
-										            <th class="text-center">Sanctioned Amount</th>
-										            <th class="text-center">File Status</th>
-										            <th class="text-center">File category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileGisTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					            <!-- provisonal datatable -->
-					            
-					            
-					            <div style= display:none  id="provisionaltable">
-					                <table id="FileProvisionalTable" class="table table-striped table-bordered dataTable">
-										    <thead class="thead-dark">
-										        <tr>
-										            <th class="text-center">S.No</th>
-										            <th class="text-center">Employee Code</th>
-										            <th class="text-center">Name</th>
-										            <th class="text-center">Department</th>
-										            <th class="text-center">Designation</th>
-										            <th class="text-center">Type of Retirement</th>
-										            <th class="text-center">Date of Retirement</th>
-										            <th class="text-center">File Status</th>
-										            <th class="text-center">File category</th>
-										            <th class="text-center">File Moved Date</th>
-										            <th class="text-center">Comments/Remarks</th>
-										        </tr>
-										    </thead>
-										    <tbody id="fileProvisionalTableBody" style="text-align:center;">
-										        <!-- Data will be inserted dynamically -->
-										    </tbody>
-									</table>
-
-					            </div>
-					            
-					        </div>
-					    </div>
-					</div>
-                    </div>
-                    </div>
-                </div>
-  
-  
-  <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-  
-							
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-	
-	
-							<!--  Modal Box -->   
-	 
-		
-			
-						
-
-   <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    
-
-	<script>
-	
-		
-		
-		
-		$(document).ready(function () {
-		    function loadFileCategories() {
-		        $.ajax({
-		            url: "/gcc/api/report/getFileCategories", // Ensure this is the correct endpoint
-		            type: "GET",
-		            dataType: "json",
-		            success: function (response) {
-		                console.log("File Categories Loaded:", response); // Debugging
-
-		                if (response.length === 0) {
-		                    console.warn("No categories found!");
-		                    return;
-		                }
-
-		                let $categoryDropdown = $("#typeofcategory");
-		                $categoryDropdown.empty().append('<option value="">-- Select Category --</option>');
-
-		                response.forEach(category => {
-		                    $categoryDropdown.append(`<option value="${category.id}">${category.file_name}</option>`);
-		                });
-		                
-		                
-		                let $categoryDropdown1 = $("#typeofcategory1");
-		                $categoryDropdown1.empty().append('<option value="">-- Select Category --</option>');
-
-		                response.forEach(category => {
-		                    $categoryDropdown1.append(`<option value="${category.id}">${category.file_name}</option>`);
-		                });
-		                
-		                
-		            },
-		            error: function (xhr, status, error) {
-		                console.error("Error fetching categories:", xhr.responseText);
-		                Swal.fire({
-		                    icon: "error",
-		                    title: "Error Fetching Data",
-		                    text: "Failed to load categories. Please try again later.",
-		                });
-		            }
-		        });
-		    }
-
-		    // Call function to load categories when the page is ready
-		    loadFileCategories();
-		});
-
-		$(document).ready(function () {
-					   		    
-/* 		    function loadDepartments() {
-		        $.ajax({
-		            url: "/gcc/api/report/getdepartment",
-		            type: "GET",
-		            dataType: "json",
-		            success: function (response) {
-		                console.log("Departments:", response);
-		                $("#departmentCheckboxContainer").empty(); // Clear previous checkboxes
-
-		                // Append "Select All" checkbox
-		                $("#departmentCheckboxContainer").append(`
-		                    <label>
-		                        <input type="checkbox" id="selectAllDept"> Select All
-		                    </label><br>
-		                `);
-
-		                // Append individual department checkboxes
-		                response.forEach(dept => {
-		                    $("#departmentCheckboxContainer").append(`
-		                        <label>
-		                            <input type="checkbox" class="deptCheckbox" value="${dept.dept_id}"> ${dept.dept_name}
-		                        </label><br>
-		                    `);
-		                });
-
-		                // Select All logic
-		                $("#selectAllDept").change(function () {
-		                    $(".deptCheckbox").prop("checked", this.checked); // Check/uncheck all
-		                });
-
-		                // If any individual checkbox is unchecked, uncheck "Select All"
-		                $(document).on("change", ".deptCheckbox", function () {
-		                    if ($(".deptCheckbox:checked").length === $(".deptCheckbox").length) {
-		                        $("#selectAllDept").prop("checked", true);
-		                    } else {
-		                        $("#selectAllDept").prop("checked", false);
-		                    }
-		                });
-		            },
-		            error: function (xhr) {
-		                console.error("AJAX Error:", xhr.status, xhr.responseText);
-		                Swal.fire({
-		                    icon: "error",
-		                    title: "Error Fetching Data",
-		                    text: "Failed to load departments. Please try again.",
-		                });
-		            }
-		        });
-		    } */
-		    
-		    
-		    function loadDepartments() {
-		        $.ajax({
-		            url: "/gcc/api/report/getdepartment",
-		            type: "GET",
-		            dataType: "json",
-		            success: function (response) {
-		                console.log("Departments:", response);
-		                $("#departmentCheckboxContainer").empty(); // Clear previous checkboxes
-
-		                // Append "Select All" checkbox
-		                $("#departmentCheckboxContainer").append(`
-		                    <li>
-		                        <label class="dropdown-item">
-		                            <input type="checkbox" id="selectAllDept"> Select All
-		                        </label>
-		                    </li>
-		                `);
-
-		                // Append individual department checkboxes
-		                response.forEach(dept => {
-		                    $("#departmentCheckboxContainer").append(`
-		                        <li>
-		                            <label class="dropdown-item">
-		                                <input type="checkbox" class="deptCheckbox" value="${dept.dept_id}"> ${dept.dept_name}
-		                            </label>
-		                        </li>
-		                    `);
-		                });
-
-		                // "Select All" logic
-		                $("#selectAllDept").change(function () {
-		                    $(".deptCheckbox").prop("checked", this.checked); // Check/uncheck all
-		                });
-
-		                // If any individual checkbox is unchecked, uncheck "Select All"
-		                $(document).on("change", ".deptCheckbox", function () {
-		                    if ($(".deptCheckbox:checked").length === $(".deptCheckbox").length) {
-		                        $("#selectAllDept").prop("checked", true);
-		                    } else {
-		                        $("#selectAllDept").prop("checked", false);
-		                    }
-		                });
-		            },
-		            error: function (xhr) {
-		                console.error("AJAX Error:", xhr.status, xhr.responseText);
-		                Swal.fire({
-		                    icon: "error",
-		                    title: "Error Fetching Data",
-		                    text: "Failed to load departments. Please try again.",
-		                });
-		            }
-		        });
-		    }
-
-
-		    loadDepartments();
-		});
-
-
-
-	
-		/*	$(document).ready(function () {
- 	    loadFileStatus(); // Load status on page load
-
-	    function loadFileStatus() {
-	        $.ajax({
-	            url: "/getstatus",  // ✅ API endpoint to fetch status data
-	            type: "GET",
-	            dataType: "json",
-	            success: function (response) {
-	                let statusDropdown = $("#statusDropdown");
-	                statusDropdown.empty().append('<option value="">Select Status</option>');
-
-	                $.each(response, function (index, status) {
-	                    statusDropdown.append('<option value="' + status.id + '">' + status.file_status + '</option>');
-	                });
-	            },
-	            error: function () {
-	                console.error("Error fetching status data");
-	                Swal.fire({
-	                    icon: "error",
-	                    title: "Error",
-	                    text: "Failed to load status options. Please try again.",
-	                    confirmButtonText: "OK"
-	                });
-	            }
-	        });
-	    } 
-	    		
-	}); */
-
-	 $('#resetButton').on('click', function () {
-	    	window.location.href = "/gcc/pensioner/reports";
-	    });
-	
-	$(document).ready(function () {
-		
-		
-		
-	    // Initialize DataTables
-	    
-	    // count datatable
-	    
-	    let fileCategoryTable = $("#FileCategoryTable").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', 
-                orientation: 'landscape', // Landscape Mode
-                pageSize: 'A4', // Set to A4 size
-                customize: function(doc) {
-                    doc.styles.tableHeader = {
-                        bold: true,
-                        fontSize: 10,
-                        color: 'black',
-                        fillColor: '#f5f5f5',
-                        alignment: 'center'
-                    };
-                    doc.styles.tableBodyEven = { alignment: 'center' };
-                    doc.styles.tableBodyOdd = { alignment: 'center' };
-                    doc.content[1].table.widths = Array(doc.content[1].table.body[0].length + 1).join('*').split('');
-                }
-            }
-        ],
-        fixedHeader: false,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false,
-        data: [],
-        columns: [
-            { title: "S.No", data: "index", className: "text-center" },
-            { title: "Department", data: "dept_name", className: "text-center" },
-            { title: "Audit Pending", data: "audit_pending", className: "text-center" },
-            { title: "Department Pending", data: "department_pending", className: "text-center" },
-            { title: "Pension Pending", data: "pension_pending", className: "text-center" },
-            { title: "Completed", data: "completed", className: "text-center" },
-            { title: "Total Count", data: "total_count", className: "text-center" }
-        ]
-	    });
-
-	    
-	    //cps datatable
-	    
-	    let fileDetailsTable = $("#FileDetailsTable").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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { 
-	                extend: 'pdfHtml5', 
-	                text: 'PDF', 
-	                className: 'btn btn-secondary', 
-	                orientation: 'landscape', // Landscape Mode
-	                pageSize: 'A4', // Set to A4 size
-	                customize: function(doc) {
-	                    // Set Table Header Style
-	                    doc.styles.tableHeader = {
-	                        bold: true,
-	                        fontSize: 10,
-	                        color: 'black',
-	                        fillColor: '#f5f5f5',
-	                        alignment: 'center'
-	                    };
-
-	                    // Align table body text to center
-	                    doc.styles.tableBodyEven = { alignment: 'center' };
-	                    doc.styles.tableBodyOdd = { alignment: 'center' };
-
-	                    // Adjust Column Widths (Set Last Column "Remarks" to wider space)
-	                    let colCount = doc.content[1].table.body[0].length;
-	                    let colWidths = Array(colCount - 1).fill("auto"); 
-	                    colWidths.push("30%"); // Last column (Remarks) should take 30% width
-
-	                    doc.content[1].table.widths = colWidths;
-
-	                    // Ensure long text wraps properly
-	                    doc.content[1].table.body.forEach(function(row) {
-	                        row.forEach(function(cell) {
-	                            cell.alignment = 'center'; // Center align all cells
-	                            cell.noWrap = false; // Allow text wrapping
-	                        });
-	                    });
-	                }
-	            }
-
-	        ],
-	        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: "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",
-		                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" },
-	            
-	        ]
-	    });
-	    
-	    // retirement datatable
-	    
-	    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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { 
-	                extend: 'pdfHtml5', 
-	                text: 'PDF', 
-	                className: 'btn btn-secondary', 
-	                orientation: 'landscape', // Landscape Mode
-	                pageSize: 'A4', // Set to A4 size
-	                customize: function(doc) {
-	                    // Set Table Header Style
-	                    doc.styles.tableHeader = {
-	                        bold: true,
-	                        fontSize: 10,
-	                        color: 'black',
-	                        fillColor: '#f5f5f5',
-	                        alignment: 'center'
-	                    };
-
-	                    // Align table body text to center
-	                    doc.styles.tableBodyEven = { alignment: 'center' };
-	                    doc.styles.tableBodyOdd = { alignment: 'center' };
-
-	                    // Adjust Column Widths (Set Last Column "Remarks" to wider space)
-	                    let colCount = doc.content[1].table.body[0].length;
-	                    let colWidths = Array(colCount - 1).fill("auto"); 
-	                    colWidths.push("30%"); // Last column (Remarks) should take 30% width
-
-	                    doc.content[1].table.widths = colWidths;
-
-	                    // Ensure long text wraps properly
-	                    doc.content[1].table.body.forEach(function(row) {
-	                        row.forEach(function(cell) {
-	                            cell.alignment = 'center'; // Center align all cells
-	                            cell.noWrap = false; // Allow text wrapping
-	                        });
-	                    });
-	                }
-	            }
-
-	        ],
-	        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: "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",
-		            	 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({
-	        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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { 
-	                extend: 'pdfHtml5', 
-	                text: 'PDF', 
-	                className: 'btn btn-secondary', 
-	                orientation: 'landscape', // Landscape Mode
-	                pageSize: 'A4', // Set to A4 size
-	                customize: function(doc) {
-	                    // Set Table Header Style
-	                    doc.styles.tableHeader = {
-	                        bold: true,
-	                        fontSize: 10,
-	                        color: 'black',
-	                        fillColor: '#f5f5f5',
-	                        alignment: 'center'
-	                    };
-
-	                    // Align table body text to center
-	                    doc.styles.tableBodyEven = { alignment: 'center' };
-	                    doc.styles.tableBodyOdd = { alignment: 'center' };
-
-	                    // Adjust Column Widths (Set Last Column "Remarks" to wider space)
-	                    let colCount = doc.content[1].table.body[0].length;
-	                    let colWidths = Array(colCount - 1).fill("auto"); 
-	                    colWidths.push("30%"); // Last column (Remarks) should take 30% width
-
-	                    doc.content[1].table.widths = colWidths;
-
-	                    // Ensure long text wraps properly
-	                    doc.content[1].table.body.forEach(function(row) {
-	                        row.forEach(function(cell) {
-	                            cell.alignment = 'center'; // Center align all cells
-	                            cell.noWrap = false; // Allow text wrapping
-	                        });
-	                    });
-	                }
-	            }
-
-	        ],
-	        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: "Department", data: "dept_name", className: "text-center" },
-		            { title: "Designation", data: "designation", 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",
-		                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" },
-	            
-	        ]
-	    });
-
-	    // pendency datatable
-	    
-	    let filePendencyTable = $("#FilePendencyTable").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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { 
-	                extend: 'pdfHtml5', 
-	                text: 'PDF', 
-	                className: 'btn btn-secondary', 
-	                orientation: 'landscape', // Landscape Mode
-	                pageSize: 'A4', // Set to A4 size
-	                customize: function(doc) {
-	                    // Set Table Header Style
-	                    doc.styles.tableHeader = {
-	                        bold: true,
-	                        fontSize: 10,
-	                        color: 'black',
-	                        fillColor: '#f5f5f5',
-	                        alignment: 'center'
-	                    };
-
-	                    // Align table body text to center
-	                    doc.styles.tableBodyEven = { alignment: 'center' };
-	                    doc.styles.tableBodyOdd = { alignment: 'center' };
-
-	                    // Adjust Column Widths (Set Last Column "Remarks" to wider space)
-	                    let colCount = doc.content[1].table.body[0].length;
-	                    let colWidths = Array(colCount - 1).fill("auto"); 
-	                    colWidths.push("30%"); // Last column (Remarks) should take 30% width
-
-	                    doc.content[1].table.widths = colWidths;
-
-	                    // Ensure long text wraps properly
-	                    doc.content[1].table.body.forEach(function(row) {
-	                        row.forEach(function(cell) {
-	                            cell.alignment = 'center'; // Center align all cells
-	                            cell.noWrap = false; // Allow text wrapping
-	                        });
-	                    });
-	                }
-	            }
-
-	        ],
-	        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: "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",
-		            	 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",
-		                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" },
-	            
-	        ]
-	    });
-	    
-	    // Gis datatable
-	    
-	    let fileGisTable = $("#FileGisTable").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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { 
-	                extend: 'pdfHtml5', 
-	                text: 'PDF', 
-	                className: 'btn btn-secondary', 
-	                orientation: 'landscape', // Landscape Mode
-	                pageSize: 'A4', // Set to A4 size
-	                customize: function(doc) {
-	                    // Set Table Header Style
-	                    doc.styles.tableHeader = {
-	                        bold: true,
-	                        fontSize: 10,
-	                        color: 'black',
-	                        fillColor: '#f5f5f5',
-	                        alignment: 'center'
-	                    };
-
-	                    // Align table body text to center
-	                    doc.styles.tableBodyEven = { alignment: 'center' };
-	                    doc.styles.tableBodyOdd = { alignment: 'center' };
-
-	                    // Adjust Column Widths (Set Last Column "Remarks" to wider space)
-	                    let colCount = doc.content[1].table.body[0].length;
-	                    let colWidths = Array(colCount - 1).fill("auto"); 
-	                    colWidths.push("30%"); // Last column (Remarks) should take 30% width
-
-	                    doc.content[1].table.widths = colWidths;
-
-	                    // Ensure long text wraps properly
-	                    doc.content[1].table.body.forEach(function(row) {
-	                        row.forEach(function(cell) {
-	                            cell.alignment = 'center'; // Center align all cells
-	                            cell.noWrap = false; // Allow text wrapping
-	                        });
-	                    });
-	                }
-	            }
-
-	        ],
-	        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: "Department", data: "dept_name", className: "text-center" },
-		            { title: "Designation", data: "designation", 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",
-		                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" },
-	            
-	        ]
-	    });
-	    
-	    // provisional datatable
-	    
-	    let fileProvisionalTable = $("#FileProvisionalTable").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 ' }, // GIS-style
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' }, // GIS-style
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' }, // GIS-style
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' }, // GIS-style
-	            { 
-	                extend: 'pdfHtml5', 
-	                text: 'PDF', 
-	                className: 'btn btn-secondary', 
-	                orientation: 'landscape', // Landscape Mode
-	                pageSize: 'A4', // Set to A4 size
-	                customize: function(doc) {
-	                    // Set Table Header Style
-	                    doc.styles.tableHeader = {
-	                        bold: true,
-	                        fontSize: 10,
-	                        color: 'black',
-	                        fillColor: '#f5f5f5',
-	                        alignment: 'center'
-	                    };
-
-	                    // Align table body text to center
-	                    doc.styles.tableBodyEven = { alignment: 'center' };
-	                    doc.styles.tableBodyOdd = { alignment: 'center' };
-
-	                    // Adjust Column Widths (Set Last Column "Remarks" to wider space)
-	                    let colCount = doc.content[1].table.body[0].length;
-	                    let colWidths = Array(colCount - 1).fill("auto"); 
-	                    colWidths.push("30%"); // Last column (Remarks) should take 30% width
-
-	                    doc.content[1].table.widths = colWidths;
-
-	                    // Ensure long text wraps properly
-	                    doc.content[1].table.body.forEach(function(row) {
-	                        row.forEach(function(cell) {
-	                            cell.alignment = 'center'; // Center align all cells
-	                            cell.noWrap = false; // Allow text wrapping
-	                        });
-	                    });
-	                }
-	            }
-
-	        ],
-	        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: "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",
-		            	 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",
-		                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" },
-	            
-	        ]
-	    });
-	    
-	    
-	    $(document).ready(function () {
-	    	
-	    	
-	    	
-	        $("#typeofreport").change(function () {
-	            let selectedValue = $(this).val();
-	            if (selectedValue === "Detailed") {
-	                $("#categoryDiv").show(); // Show File Category dropdown
-	                $("#deptDiv").show();
-	                
-	                $("#categoryDiv1").hide();
-	                $("#typeofcategory1").val(""); // Reset selection
-	            } else if(selectedValue === "Abstract") {
-	            	$("#categoryDiv1").show();
-	            	$("#categoryDiv").hide(); // Show File Category dropdown
-	                $("#deptDiv").hide();
-	                $("#statusDiv").hide();
-	                $("#statusDropdown").val("");
-	                $("#departmentDropdown").val("");
-	                $("#typeofcategory").val("");
-	            }
-	            else{
-	            	$("#categoryDiv").hide(); // Hide File Category dropdown
-	                $("#statusDiv").hide();   // ✅ Hide Status dropdown
-	                $("#deptDiv").hide();
-	                $("#categoryDiv1").hide();
-	                $("#statusDropdown").val("");
-	                $("#departmentDropdown").val("");
-	                $("#typeofcategory").val("");
-	                $("#typeofcategory1").val("");
-	            }
-	        });
-	        
-	        $("#typeofcategory").change(function () {
-	            let selectedCatValue = $(this).val();
-	            let statusDropdown = $("#statusDropdown");
-	            
-	            if(selectedCatValue==""){
-	            	$("#statusDiv").hide();
-	            	$("#statusDropdown").val("");
-	            }
-	            else{
-	            	$("#statusDiv").show();
-	            }
-
-	            // Backup of all options (only once)
-	            if (!statusDropdown.data("original-options")) {
-	                statusDropdown.data("original-options", statusDropdown.html());
-	            }
-
-	            if (selectedCatValue === "1") {
-	                // Restore all options
-	                statusDropdown.html(statusDropdown.data("original-options"));
-	            } else {
-	                // Remove the last two options ("File Completed" and "File Closed")
-	                statusDropdown.html(statusDropdown.data("original-options"));
-	                statusDropdown.find("option[value='[12]']").remove();
-	            }
-	            
-	            
-	        });
-	        
-	    });
-
-	    $('#startdate').on('change', function () {
-	        const fromDate = $(this).val();
-	        $('#enddate').attr('min', fromDate); // Update min attribute for To Date
-
-	        // If To Date is earlier than the new From Date, adjust it
-	        const toDate = $('#enddate').val();
-	        if (new Date(toDate) < new Date(fromDate)) {
-	            $('#enddate').val(fromDate);
-	        }
-	    });
-
-	    // Update From Date's max attribute when To Date changes
-	    $('#enddate').on('change', function () {
-	        const toDate = $(this).val();
-	        $('#startdate').attr('max', toDate); // Update max attribute for From Date
-
-	        // If From Date is later than the new To Date, adjust it
-	        const fromDate = $('#startdate').val();
-	        if (new Date(fromDate) > new Date(toDate)) {
-	            $('#startdate').val(toDate);
-	        }
-	    });
-	    
-	    $('#statusDropdown').on('change', function () {
-		    let selectedValue = $(this).val();
-		    let statusArray = selectedValue ? JSON.parse(selectedValue) : []; // Convert string to array
-		    console.log(statusArray); // Output: [1,3] or [2,5,6,9] etc.
-		});
-
-	    $("#searchButton").click(function () {
-	    	
-	        let startDate = $("#startdate").val();
-	        let endDate = $("#enddate").val();
-	        let typeOfReport = $("#typeofreport").val();
-	        let typeOfCategory1 = $("#typeofcategory1").val();	        
-	        let typeOfCategory = $("#typeofcategory").val();
-	        
-	        let selectedStatus = $("#statusDropdown").val();
-	        let statusArray = selectedStatus ? JSON.parse(selectedStatus) : [];
-
-	        console.log("startDate", startDate);
-	        console.log("endDate", endDate);
-	        console.log("typeOfReport", typeOfReport);
-	        console.log("typeOfCategory1", typeOfCategory1);
-	        console.log("typeOfCategory", typeOfCategory);
-	        
-	        
-	        // Ensure selectedDeptIds is defined inside the click event
-	        let selectedDeptIds = [];
-
-	        $(".deptCheckbox:checked").each(function () {
-	            selectedDeptIds.push($(this).val());
-	        });
-
-	        console.log("Selected Department IDs:", selectedDeptIds);
-	        
-	        console.log("statusArray", statusArray);
-	        
-
-	        if (!startDate || !endDate) {
-	            Swal.fire({
-	                icon: "warning",
-	                title: "Validation Error",
-	                text: "Please select Both Date before searching.",
-	                confirmButtonText: "OK"
-	            });
-	            return;
-	        }
-
-	        if (!typeOfReport) {
-	            Swal.fire({
-	                icon: "warning",
-	                title: "Validation Error",
-	                text: "Please select a Type of Report before searching.",
-	                confirmButtonText: "OK"
-	            });
-	            return;
-	        }
-	        
-	        
-	        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({
-	                icon: "warning",
-	                title: "Validation Error",
-	                text: "Please select a Category for Detailed report.",
-	                confirmButtonText: "OK"
-	            });
-	            return;
-	        }
-	        
-	        if (typeOfReport === "Detailed" && selectedDeptIds.length === 0) {
-	            Swal.fire({
-	                icon: "warning",
-	                title: "Validation Error",
-	                text: "Please select a Department for Detailed report.",
-	                confirmButtonText: "OK"
-	            });
-	            return;
-	        }
-
-	        
- 	        let url, data;
-	        if (typeOfReport === "Detailed") {
-	            url = "/gcc/api/report/getReportDetailspension";
-	            data = { startDate: startDate, endDate: endDate, deptIds: selectedDeptIds, fileCatId: typeOfCategory, fileStatus: statusArray };
-	            $("#audittable").hide();
-	            
-	            
-	        } else {
-	            url = "/gcc/api/report/getReportDatapension";
-	            data = { startDate: startDate, endDate: endDate, fileCategoryId: typeOfCategory1 };
-	            $("#audittable").show();	
-	            $("#cpstable").hide();
-	            $("#retiretable").hide();
-	           // $(".audittable").hide();
-	            $("#familypensiontable").hide();
-	            $("#pendencytable").hide();
-	            $("#gistable").hide();
-	            $("#provisionaltable").hide();
-	                         
-	            
-	        } 
-
- 	        $(".dataTables_wrapper").hide();
-	        $('#pageLoader').show();
-	        $.ajax({
-	            url: url,
-	            type: "GET",
-	            data: data,
-	            traditional: true,
-	            dataType: "json",
-	            success: function (response) {
-	            	$('#pageLoader').hide();
-	                if (response.length === 0) {
-	                    $('#FileDetailsTable').DataTable().clear().draw();
-	                    $('#FileCategoryTable').DataTable().clear().draw();
-	                    $('#FileRetirementTable').DataTable().clear().draw();
-	                    $('#FileFamilyPensionTable').DataTable().clear().draw();
-	                    $('#FilePendencyTable').DataTable().clear().draw();
-	                    $('#FileGisTable').DataTable().clear().draw();
-	                    $('#FileProvisionalTable').DataTable().clear().draw();
-	                    $(".dataTables_wrapper").hide();
-
-	                    Swal.fire({
-	                        icon: "info",
-	                        title: "No Data Found",
-	                        text: "No records match your selection.",
-	                        confirmButtonText: "OK"
-	                    });
-	                    return;
-	                } else {
-	                	$('#pageLoader').hide();
-	                    $(".dataTables_wrapper").show();
-
-	                    if (typeOfReport === "Detailed") {
-	                        if (typeOfCategory === '6') {
-	                            $("#cpstable").css("display", "block");
-	                            $("#audittable, #retiretable, #familypensiontable, #pendencytable, #gistable, #provisionaltable").hide();
-
-	                            let formattedData = response.map((row, index) => ({
-	                                index: index + 1,
-	                                emp_no: row.emp_no,
-	                                emp_name: row.emp_name,
-	                                dept_name: row.dept_name,
-	                                designation: row.designation,
-	                                type_of_retirement: row.type_of_retirement,
-	                                retirement_date: row.retirement_date,
-	                                reason_for_pending: row.reason_for_pending,
-	                                fst: row.fst,
-	                                file_category_name: row.file_category_name,
-	                                remarks: row.remarks,
-	                                created_date: row.created_date
-	                            }));
-	                            fileDetailsTable.clear().rows.add(formattedData).draw();
-	                        }
-
-	                        if (typeOfCategory === '1') {
-	                            $("#retiretable").css("display", "block");
-	                            $("#cpstable, #audittable, #familypensiontable, #pendencytable, #gistable, #provisionaltable").hide();
-
-	                            let formattedData = response.map((row, index) => ({
-	                                index: index + 1,
-	                                emp_no: row.emp_no,
-	                                emp_name: row.emp_name,
-	                                dept_name: row.dept_name,
-	                                designation: row.designation,
-	                                type_of_retirement: row.type_of_retirement,
-	                                retirement_date: row.retirement_date,
-	                                fst: row.fst,
-	                                file_category_name: row.file_category_name,
-	                                remarks: row.remarks,
-	                                file_moved_date: row.file_moved_date
-	                            }));
-	                            fileRetireTable.clear().rows.add(formattedData).draw();
-	                        }
-
-	                        if (typeOfCategory === '2') {
-	                            $("#familypensiontable").css("display", "block");
-	                            $("#cpstable, #audittable, #retiretable, #pendencytable, #gistable, #provisionaltable").hide();
-
-	                            let formattedData = response.map((row, index) => ({
-	                                index: index + 1,
-	                                emp_no: row.emp_no,
-	                                emp_name: row.emp_name,
-	                                dept_name: row.dept_name,
-	                                designation: row.designation,
-	                                service_death: row.service_death,
-	                                relationship_deceased: row.relationship_deceased,
-	                                reason_for_pending: row.reason_for_pending,
-	                                fst: row.fst,
-	                                file_category_name: row.file_category_name,
-	                                remarks: row.remarks,
-	                                file_moved_date: row.file_moved_date
-	                            }));
-	                            fileFamilyPensionTable.clear().rows.add(formattedData).draw();
-	                        }
-
-	                        if (typeOfCategory === '3') {
-	                            $("#pendencytable").css("display", "block");
-	                            $("#cpstable, #audittable, #retiretable, #familypensiontable, #gistable, #provisionaltable").hide();
-
-	                            let formattedData = response.map((row, index) => ({
-	                                index: index + 1,
-	                                emp_no: row.emp_no,
-	                                emp_name: row.emp_name,
-	                                dept_name: row.dept_name,
-	                                designation: row.designation,
-	                                type_of_retirement: row.type_of_retirement,
-	                                retirement_date: row.retirement_date,
-	                                reason_for_pending: row.reason_for_pending,
-	                                fst: row.fst,
-	                                file_category_name: row.file_category_name,
-	                                remarks: row.remarks,
-	                                file_moved_date: row.file_moved_date
-	                            }));
-	                            filePendencyTable.clear().rows.add(formattedData).draw();
-	                        }
-
-	                        if (typeOfCategory === '4') {
-	                            $("#gistable").css("display", "block");
-	                            $("#cpstable, #audittable, #retiretable, #familypensiontable, #pendencytable, #provisionaltable").hide();
-
-	                            let formattedData = response.map((row, index) => ({
-	                                index: index + 1,
-	                                emp_no: row.emp_no,
-	                                emp_name: row.emp_name,
-	                                dept_name: row.dept_name,
-	                                designation: row.designation,
-	                                service_death: row.service_death,
-	                                sanctional_gis_amount: row.sanctional_gis_amount,
-	                                fst: row.fst,
-	                                file_category_name: row.file_category_name,
-	                                remarks: row.remarks,
-	                                file_moved_date: row.file_moved_date
-	                            }));
-	                            fileGisTable.clear().rows.add(formattedData).draw();
-	                        }
-	                        if (typeOfCategory === '5') {
-	                            $("#retiretable").css("display", "block");
-	                            $("#cpstable, #audittable, #familypensiontable, #pendencytable, #gistable, #provisionaltable").hide();
-
-	                            let formattedData = response.map((row, index) => ({
-	                                index: index + 1,
-	                                emp_no: row.emp_no,
-	                                emp_name: row.emp_name,
-	                                dept_name: row.dept_name,
-	                                designation: row.designation,
-	                                type_of_retirement: row.type_of_retirement,
-	                                retirement_date: row.retirement_date,
-	                                fst: row.fst,
-	                                file_category_name: row.file_category_name,
-	                                remarks: row.remarks,
-	                                file_moved_date: row.file_moved_date
-	                            }));
-	                            fileRetireTable.clear().rows.add(formattedData).draw();
-	                        }
-	                    }
-
-	                    if (typeOfReport === "Abstract") {
-	                        $("#audittable").css("display", "block");
-
-	                        let formattedData = response.map((row, index) => ({
-	                            index: index + 1,
-	                            dept_name: row.dept_name || "N/A",
-	                            audit_pending: row.audit_pending || 0,
-	                            department_pending: row.department_pending || 0,
-	                            pension_pending: row.pension_pending || 0,
-	                            completed: row.completed || 0,
-	                            total_count:
-	                                (row.department_pending || 0) +
-	                                (row.audit_pending || 0) +
-	                                (row.pension_pending || 0) +
-	                                (row.completed || 0)
-	                        }));
-	                        fileCategoryTable.clear().rows.add(formattedData).draw();
-	                    }
-	                }
-	            },
-	            error: function (xhr, status, error) {
-	            	$('#pageLoader').hide();
-	                Swal.fire({
-	                    icon: "error",
-	                    title: "Error",
-	                    text: "Failed to load data. Please try again.",
-	                    confirmButtonText: "OK"
-	                });
-	            }
-	        });
-	        
-	        
-	    });
-	    
-	});
-	
-	
-	
-	//disable future dates
-	document.addEventListener("DOMContentLoaded", function () {
-        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
-        let startdateInput = document.getElementById("startdate");
-        let enddateInput = document.getElementById("enddate");
-
-        // Set max attribute to disable future dates
-        startdateInput.setAttribute("max", today);
-        enddateInput.setAttribute("max", today);
-        
-
-        // Prevent manual future date entry
-        startdateInput.addEventListener("change", function () {
-            if (this.value > today) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Invalid Date',
-                    text: 'Future dates are not allowed.',
-                    confirmButtonText: 'OK'
-                });
-                this.value = ""; // Clear the invalid input
-            }
-        });
-    });
-
-	</script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/petregistration/.DS_Store b/src/main/resources/templates/modules/petregistration/.DS_Store
deleted file mode 100644
index aa32ac3bbda2f93e5956d0ba69ed91f332ca4803..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!Ab)`41H58R7I$I@gmF*Snv<lQV*W}0qu6dm9<rC!Q<Zj7{AYxzGOnN+pb4Z
zNlNl&v&n>c6LvZP!f-J;1Ns1ZRKd;;%?6S8qHEGI&o(jW91nO#feB7gtwp=zH!>i5
zcZeJ0{1y1Re<kMJ%>iy{?@?V=vwU35#*AmPgcIW6Lq(UhixN}re1Vs?9Go|Dj@Tuo
z)}69e!LE^-b1bxn+A6;`X4%IR<L{`sbzfWNdn5BeGat2{tW~=9+g0POF#{i6oB?OR
z8Tf+?@XQwJ?Im>U3^)VMz>)#^K18ZuW>_cGPX~=&0f=3?RXCQrgyclS%&<<#H<XZ4
zi77SM6(gi{`lH2VhIPV}j$oIMV3mX2P=Z$H{87UZvV?A(0cT*9fvxn|m-GLk{r<n2
z<WJ6kGw`n%2;I@uXvihm*}AqkIcp>Jnkpi3b;4x|2YM7UR*vFhstWy42E@#;PDl^M
O{|G1zZk&N1W#AK@&0N?3

diff --git a/src/main/resources/templates/modules/petregistration/accepted-list.html b/src/main/resources/templates/modules/petregistration/accepted-list.html
deleted file mode 100644
index a3c70f7e..00000000
--- a/src/main/resources/templates/modules/petregistration/accepted-list.html
+++ /dev/null
@@ -1,638 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper"> 
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ===================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-4">
-                                    <div class="page-header-title">
-                                      <i class='fa fa-check-circle'  style='font-size:24px; color: #1aafd4'></i>
-                                        <div class="d-inline">
-                                            <h5>Accepted Info</h5>
-                                            <span>Pet Registration</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-5">
-                                    <div class="content">
-                                        <div class="block block-rounded">
-                                    <div class="block-header block-header-default" style="display: block;">
-                                        <form class="row" action="javascript:getbydate()">
-                                        
-                                                <div class="row">
-                                                    <div class="col-4">
-                                                      <input type="date" th:value="${fromDate}" class="form-control" name="FromDate" id="fromdate" data-date-format="yyyy-mm-dd" />
-                                                       </div>
-                                                    <div class="col-4">
-                                                       <input type="date" th:value="${toDate}" class="form-control" name="ToDate" id="todate" data-date-format="yyyy-mm-dd" />
-                                                     </div>
-                                                    <div class="col-2 p-0 text-center">
-                                                      <button type="submit" class="btn btn-sm btn-primary" name="submit" id="submit" onclick="getbydate()" >Submit</button>
-                                                     
-                                                   <br>
-                                                    </div>
-                                                    <div class="col-2 p-0 text-center">
-                                                      <button class="btn btn-danger" onclick="resetDate()" name="reset" type="reset">Reset</button>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                      
-                                        </form>
-                                    
-                                    </div>
-                                    </div>
-                                    
-                                </div>
-                                <div class="col-lg-3">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Pet Registration</li>
-                                            <li class="breadcrumb-item">Accepted</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                                
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                       
-                                    <div class="card-block">
-                                        <div> 
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%"> 
-                                                <thead class="thead-dark">
-                                                    <tr role="row">
-														<th>S.No</th>
-						                                <th>Name</th>
-						                                <th>Type</th>
-						                                <th>Breed</th>
-                                                        <th>sex</th>
-                                                        <th>pet photo</th>
-                                                        <th>Rabies certi</th>
-                                                        <th>Application photo</th>
-                                                        <th>Address Proof</th>
-                                                        <th class="text-center" width="10%">Status</th>
-                                                        <th class="text-center text-center no-sort" width="10%">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="list, i : ${petlist}" class="${petlist}" >
-                                                        <td th:text="${i.count}">0</td>
-                                                        <td class="text-center" th:text="${list.petname}"></td>
-                                                        <td th:text="${list.species}" ></td>
-                                                        <td th:text="${list.breed}"></td>
-                                                        <td th:text="${list.gender}"></td>
-                                                        <!--  <td th:text="${list.gender}"></td>-->
-                                                        <td class="text-center">
-                                                            <button type="button"  th:onclick="petimg([[${list.mobilenum}]],[[${list.uniqueid}]])" class="btn btn-primary">
-                                                                view
-                                                            </button>
-                                                        </td>
-                    
-                                                        <td class="text-center">
-                                                            <button type="button"  th:onclick="certificateimg([[${list.mobilenum}]],[[${list.uniqueid}]])" class="btn btn-primary">
-                                                                view
-                                                            </button>
-                                                        </td>
-                    
-                                                        <td class="text-center">
-                                                            <button type="button"  th:onclick="applicantimg([[${list.mobilenum}]],[[${list.uniqueid}]])" class="btn btn-primary">
-                                                                view
-                                                            </button>
-                                                        </td>
-                                                        <td class="text-center">
-                                                            <button type="button"  th:onclick="proofimg([[${list.mobilenum}]],[[${list.uniqueid}]])" class="btn btn-primary">
-                                                                view
-                                                            </button>
-                                                        </td>
-                    
-                                                        <td >
-                                                            <p >
-                                                                <!-- <span class="badge bg-success" th:onclick="accept([[${list.uniqueid}]])">Accept</span> -->
-                                                                <span class="badge bg-warning" style="cursor: pointer;" th:onclick="reject([[${list.uniqueid}]])">Accepted</span>
-                    
-                                                            </p>
-                                                        </td>
-                                                        <td class="text-center">
-                                                            <!-- <a th:href="@{#}" th:onclick="return callview( [[${list.status}]] );" data-bs-toggle="tooltip" data-bs-animation="true" data-bs-placement="top" title="View Pet info"><i class="far fa-bookmark" style="font-size: 18px;"></i></a> -->
-                                                            <a th:onclick="viewOwner( [[${list.mobilenum}]] );" data-bs-toggle="tooltip" data-bs-animation="true" data-bs-placement="top" title="View PetOwner info"><i class="fa-regular fa-user" style="font-size: 18px;"></i></a>
-                    
-                                                        </td>
-                                                    </tr>
-                                                 </tbody>
-                                                 <tfoot class="thead-dark">
-	                                                <tr>
-                                                        <th>S.No</th>
-						                                <th>Name</th>
-						                                <th>Type</th>
-						                                <th>Breed</th>
-                                                        <th>sex</th>
-                                                        <th>pet photo</th>
-                                                        <th>Rabies certi</th>
-                                                        <th>Application photo</th>
-                                                        <th>Address Proof</th>
-                                                        <th class="text-center" width="10%">Status</th>
-                                                        <th class="text-center text-center no-sort" width="10%">Action</th>
-						                                
-													</tr>
-                                                </tfoot>
-                                             </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                      
-
-                    </div>
-                </div>
-            </div>
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-
-        </div>
-
-<!-- Modal image -->
-<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="exampleModalCenterLabel">Photo</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            </div>
-            <div class="modal-body">
-                <img alt="" id="myImg" src="" style="width:100%">
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- end of modal image -->
-<!-- Pet Info Form -->
-<div class="modal fade" id="rejectForm" tabindex="-1" role="dialog" aria-labelledby="rejectFormCenterLabel" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="rejectFormCenterLabel">Pet Information</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <input type="hidden"   class="form-control text-center" name="uniqid" id="uniqid"  disabled />
-                    <div class="col-xl-6 col-md-12"> <strong>Pet Name</strong>
-                        <p class="text-muted form-control showInputValue" id="petna"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Pet Type</strong>
-                        <p class="text-muted form-control showInputValue"  id="speci" ></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Breed</strong>
-                        <p class="text-muted form-control showInputValue" id="bre" ></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Sex</strong>
-                        <p class="text-muted form-control showInputValue" id="gend" ></p>
-                    </div>
-                    
-                    <div class="col-xl-6 col-md-12"> <strong>Age</strong>
-                        <p class="text-muted form-control showInputValue" id="age"></p>
-                    </div>
-                    
-                    <div class="col-xl-6 col-md-12"> <strong>ARV Date</strong>
-                        <p class="text-muted form-control showInputValue" id="arvd"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Last Date Of De-Worming</strong>
-                        <p class="text-muted form-control showInputValue" id="dewormdate"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Other Vaccination Given</strong>
-                        <p class="text-muted form-control showInputValue" id="othervac"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Previous License No</strong>
-                        <p class="text-muted form-control showInputValue" id="previoslicenseNo"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Name of Veterinary doctor</strong>
-                        <p class="text-muted form-control showInputValue" id="VeterinaryConsultant"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Veterinary Council Number</strong>
-                        <p class="text-muted form-control showInputValue" id="TNVCNo"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Register Date</strong>
-                        <p class="text-muted form-control showInputValue" id="registerdate"></p>
-                    </div>
-                    
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- owner Info  -->
-<div class="modal fade" id="ownerForm" tabindex="-1" role="dialog" aria-labelledby="ownerFormCenterLabel" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="ownerFormCenterLabel">Pet Owner information</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <input type="hidden"   class="form-control text-center" name="uniqid" id="uniqid"  disabled />
-                    <div class="col-xl-6 col-md-12"> <strong>Tittle</strong>
-                        <p class="text-muted form-control showInputValue" id="title"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Pet Owner Name</strong>
-                        <p class="text-muted form-control showInputValue"  id="fname" ></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Door No</strong>
-                        <p class="text-muted form-control showInputValue" id="doornumber" ></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Street</strong>
-                        <p class="text-muted form-control showInputValue" id="street" ></p>
-                    </div>
-                    
-                    <div class="col-xl-6 col-md-12"> <strong>Area</strong>
-                        <p class="text-muted form-control showInputValue" id="area"></p>
-                    </div>
-                    
-                    <div class="col-xl-6 col-md-12"> <strong>City</strong>
-                        <p class="text-muted form-control showInputValue" id="city"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Pincode</strong>
-                        <p class="text-muted form-control showInputValue" id="pincode"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Zone</strong>
-                        <p class="text-muted form-control showInputValue" id="zone"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Ward</strong>
-                        <p class="text-muted form-control showInputValue" id="ward"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Contact No</strong>
-                        <p class="text-muted form-control showInputValue" id="phone"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Email Id</strong>
-                        <p class="text-muted form-control showInputValue" id="email"></p>
-                    </div>                    
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<!-- End owner Info  -->
-
-
-        <!-- Script -->
-        <!-- <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script> -->
-        <!-- <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> -->
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script type="text/javascript">
-             $(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: true,
-			        select: false,
-			        processing: false,
-			    } );
-                $('#searchInput').on('keyup', function() {
-                dataTable.search(this.value).draw();
-            });
-			} );
-            function petimg(mobno,uniqueid){
-                   $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/getpetimg',
-                       data: {
-                                   'mobno':mobno,
-                                   'uniqueid':uniqueid
-                               },
-                       success: function(x) {
-                           document.getElementById("myImg").src ="data:image/jpeg;base64,"+x;
-
-                       }
-                   });
-                    $('#exampleModal').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                     });
-                     $('#exampleModal').modal('show');
-                     return false;
-           }
-           function applicantimg(mobno,uniqueid){
-                   $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/getapplicantimg',
-                       data: {
-                                   'mobno':mobno,
-                                   'uniqueid':uniqueid
-                               },
-                       success: function(x) {
-                           document.getElementById("myImg").src ="data:image/jpeg;base64,"+x;
-                       }
-                   });
-                    $('#exampleModal').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                     });
-                     $('#exampleModal').modal('show');
-                   //document.getElementById("myImg").src ="data:image/jpeg;base64,"+x.applicantphoto;
-               }
-           function certificateimg(mobno,uniqueid){
-                $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/getvacimg',
-                       data: {
-                                   'mobno':mobno,
-                                   'uniqueid':uniqueid
-                               },
-                       success: function(x) {
-                           document.getElementById("myImg").src ="data:image/jpeg;base64,"+x;
-                       }
-                   });
-                    $('#exampleModal').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                     });
-                     $('#exampleModal').modal('show');
-                   //document.getElementById("myImg").src ="data:image/jpeg;base64,"+x.rabiesvacCerti;
-               }
-           function proofimg(mobno,uniqueid){
-                    $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/getaddproofimg',
-                       data: {
-                                   'mobno':mobno,
-                                   'uniqueid':uniqueid
-                               },
-                       success: function(x) {
-                           document.getElementById("myImg").src ="data:image/jpeg;base64,"+x;
-                       }
-                   });
-                    $('#exampleModal').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                     });
-                     $('#exampleModal').modal('show');
-                   //document.getElementById("myImg").src ="data:image/jpeg;base64,"+x.addressproof;
-           }
-           
-           function accept(){
-             let id = document.getElementById("uniqid").value;
-             Swal.fire({
-                 title: 'Do you want to Accept this Pet ?',
-                 showDenyButton: true,
-                 showCancelButton: true,
-                 confirmButtonText: 'YES',
-                 denyButtonText: `NO`,
-               }).then((result) => {
-                 /* Read more about isConfirmed, isDenied below */
-                     if (result.isConfirmed) {
-                       $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/accept',
-                       data: {'id':id},
-                       success: function(bodyMessage) {
-                         if(bodyMessage=="success"){
-                           Swal.fire(
-                                 'Done',
-                                 'Successfully Accepted to the ID:'+id,
-                                 'success'
-                               ).then(() => {
-                                   location.reload();
-                           });
-                     }
-                   }
-                 });
-                 } else if (result.isDenied) {
-                   Swal.fire('Changes are not saved', '', 'info')
-                 }
-               })
-               }
-       
-       
-       
-               function reject(uniqueid){
-               $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/getpetInfo',
-                       data: {
-                                  'petid':uniqueid
-                              },
-                       success: function(x) {
-                           showPetInfo(x)
-                       }
-                   });
-       
-                 }
-                 function showPetInfo(list){
-                    console.log(list);
-                   $('#rejectForm').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                     });
-                 $('#rejectForm').modal('show');
-                   document.getElementById("uniqid").innerHTML =list.uniqueid;
-                   document.getElementById("petna").innerHTML =list.petname;
-                   document.getElementById("speci").innerHTML =list.species;
-             document.getElementById("bre").innerHTML =list.breed;
-             document.getElementById("gend").innerHTML =list.gender;
-             document.getElementById("age").innerHTML =list.age;
-       
-             document.getElementById("arvd").innerHTML =list.arvdate;
-             document.getElementById("dewormdate").innerHTML =list.dewormdate;
-             document.getElementById("othervac").innerHTML =list.othervac;
-             document.getElementById("previoslicenseNo").innerHTML =list.previoslicenseNo;
-             document.getElementById("VeterinaryConsultant").innerHTML =list.veterinaryConsultant;
-             document.getElementById("TNVCNo").innerHTML =list.tnvcno;
-             document.getElementById("registerdate").innerHTML =list.registerdate;
-               }
-               function rejectsubmit(){
-                   var reason = $("#reason").val();
-                   var id = $("#uniqid").val();
-       
-                 Swal.fire({
-                 title: 'Do you want to Reject this Pet ?',
-                 showDenyButton: true,
-                 showCancelButton: true,
-                 confirmButtonText: 'YES',
-                 denyButtonText: `NO`,
-               }).then((result) => {
-                 /* Read more about isConfirmed, isDenied below */
-                     if (result.isConfirmed) {
-                     $.ajax({
-                     type: "GET",
-                     url: '/gcc/api/pet/reject',
-                     data: {'id':id,'reason':reason},
-                     success: function(bodyMessage) {
-                         if(bodyMessage=="success"){
-                           console.log("done");
-                         Swal.fire(
-                               'Done',
-                               'Successfully Rejected to the ID:'+id,
-                               'success'
-                             ).then(() => {
-                                       location.reload();
-                           });
-                       }
-       
-                       }
-       
-                   });
-       
-                     } else if (result.isDenied) {
-                   Swal.fire('Changes are not saved', '', 'info')
-                 }
-               })
-       
-                  return false;
-       
-               }
-       
-               function viewOwner(mobilenum){
-                
-                 $.ajax({
-                   type: "GET",
-                   url: '/gcc/api/pet/getpetOwner',
-                   data: {
-                               'mobilenum':mobilenum,
-                           },
-                   success: function(bodyMessage) {
-                             ownercall(bodyMessage);
-                   }
-                 });
-               }
-               function ownercall(list){
-                 $('#ownerForm').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                       });
-                    $('#ownerForm').modal('show');
-             document.getElementById("title").innerHTML =list.title;
-             document.getElementById("fname").innerHTML =list.fname;
-             document.getElementById("doornumber").innerHTML =list.doornumber;
-             document.getElementById("street").innerHTML =list.street;
-             document.getElementById("area").innerHTML =list.area;
-             document.getElementById("city").innerHTML =list.city;
-             document.getElementById("pincode").innerHTML =list.pincode;
-             document.getElementById("zone").innerHTML =list.zone;
-             document.getElementById("ward").innerHTML =list.ward;
-             document.getElementById("phone").innerHTML =list.phone;
-             document.getElementById("email").innerHTML =list.email;
-             document.getElementById("pancard").innerHTML =list.pancard;
-             document.getElementById("aadhar").innerHTML =list.aadhar;
-             document.getElementById("voterid").innerHTML =list.voterid;
-       
-               }
-               // Function to call modal for New pet registration
-               callAdd = function(){
-                   $('#addForm').modal({
-                       backdrop: 'static',
-                       keyboard: false
-                   })
-                   $('#addForm').modal('show');
-               }
-            //    $(document).ready(function () {
-            //         var today = new Date();
-            //         $('.datepicker').datepicker({
-            //             dateFormat: 'yy-mm-dd',
-            //             maxDate: '1'
-            //           })
-            //       $('.datepicker').keyup(function () {
-            //         if (this.value.match(/[^0-9]/g)) {
-            //                this.value = this.value.replace(/[^0-9^-]/g, '');
-            //          }
-            //        });
-            //    });
-       
-               function getbydate(){
-                   var x= document.getElementById("fromdate").value; 
-                   var y= document.getElementById("todate").value;
-                  
-                   var url= '/pet/acceptedPets?fromDate='+x+'&toDate='+y;
-                   window.location.href=url;  
-       
-               }
-               function resetDate(){
-                var url= '/pet/acceptedPets';
-                   window.location.href=url;  
-               }
-            
-           </script>
-
-
-
-
-
-
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/petregistration/index.html b/src/main/resources/templates/modules/petregistration/index.html
deleted file mode 100644
index 4b89b5a9..00000000
--- a/src/main/resources/templates/modules/petregistration/index.html
+++ /dev/null
@@ -1,845 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<style>
-    html {
-        -webkit-text-size-adjust: none;
-        /* Prevent font scaling in landscape */
-        width: 100%;
-        height: 100%;
-        -webkit-font-smoothing: antialiased;
-        -moz-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-    }
-
-    input[type="submit"] {
-        -webkit-appearance: none;
-    }
-
-    *,
-    *:after,
-    *:before {
-        box-sizing: border-box;
-        margin: 0;
-        padding: 0;
-    }
-
-    body {
-        margin: 0;
-        padding: 0;
-        -webkit-font-smoothing: antialiased;
-        font-family: 'Muli', sans-serif;
-        font-weight: 400;
-        width: 100%;
-        min-height: 100%;
-        color: #333333;
-        width: 100%;
-        height: 100%;
-        background: #ecf0f4;
-    }
-
-    a {
-        outline: none;
-        text-decoration: none;
-        color: #555;
-    }
-
-    a:hover,
-    a:focus {
-        outline: none;
-        text-decoration: none;
-    }
-
-    img {
-        border: 0;
-    }
-
-    input,
-    textarea,
-    select {
-        outline: none;
-        resize: none;
-        font-family: 'Muli', sans-serif;
-    }
-
-    a,
-    input,
-    button {
-        outline: none !important;
-    }
-
-    button::-moz-focus-inner {
-        border: 0;
-    }
-
-    h1,
-    h2,
-    h3,
-    h4,
-    h5,
-    h6 {
-        margin: 0;
-        padding: 0;
-        font-weight: 700;
-        color: #202342;
-        font-family: 'Muli', sans-serif;
-    }
-
-    img {
-        border: 0;
-        vertical-align: top;
-        max-width: 100%;
-        height: auto;
-    }
-
-    ul,
-    ol {
-        margin: 0;
-        padding: 0;
-        list-style: none;
-    }
-
-    p {
-        margin: 0 0 15px 0;
-        padding: 0;
-    }
-
-    .container-fluid {
-        max-width: 1900px;
-    }
-
-    /* Common Class */
-    .pd-5 {
-        padding: 5px;
-    }
-
-    .pd-10 {
-        padding: 10px;
-    }
-
-    .pd-20 {
-        padding: 20px;
-    }
-
-    .pd-30 {
-        padding: 30px;
-    }
-
-    .pb-10 {
-        padding-bottom: 10px;
-    }
-
-    .pb-20 {
-        padding-bottom: 20px;
-    }
-
-    .pb-30 {
-        padding-bottom: 30px;
-    }
-
-    .pt-10 {
-        padding-top: 10px;
-    }
-
-    .pt-20 {
-        padding-top: 20px;
-    }
-
-    .pt-30 {
-        padding-top: 30px;
-    }
-
-    .pr-10 {
-        padding-right: 10px;
-    }
-
-    .pr-20 {
-        padding-right: 20px;
-    }
-
-    .pr-30 {
-        padding-right: 30px;
-    }
-
-    .pl-10 {
-        padding-left: 10px;
-    }
-
-    .pl-20 {
-        padding-left: 20px;
-    }
-
-    .pl-30 {
-        padding-left: 30px;
-    }
-
-    .px-30 {
-        padding-left: 30px;
-        padding-right: 30px;
-    }
-
-    .px-20 {
-        padding-left: 20px;
-        padding-right: 20px;
-    }
-
-    .py-30 {
-        padding-top: 30px;
-        padding-bottom: 30px;
-    }
-
-    .py-20 {
-        padding-top: 20px;
-        padding-bottom: 20px;
-    }
-
-    .mb-30 {
-        margin-bottom: 30px;
-    }
-
-    .mb-50 {
-        margin-bottom: 50px;
-    }
-
-    .font-30 {
-        font-size: 30px;
-        line-height: 1.46em;
-    }
-
-    .font-24 {
-        font-size: 24px;
-        line-height: 1.5em;
-    }
-
-    .font-20 {
-        font-size: 20px;
-        line-height: 1.5em;
-    }
-
-    .font-18 {
-        font-size: 18px;
-        line-height: 1.6em;
-    }
-
-    .font-16 {
-        font-size: 16px;
-        line-height: 1.75em;
-    }
-
-    .font-14 {
-        font-size: 14px;
-        line-height: 1.85em;
-    }
-
-    .font-12 {
-        font-size: 12px;
-        line-height: 2em;
-    }
-
-    .weight-300 {
-        font-weight: 300;
-    }
-
-    .weight-400 {
-        font-weight: 400;
-    }
-
-    .weight-500 {
-        font-weight: 500;
-    }
-
-    .weight-600 {
-        font-weight: 600;
-    }
-
-    .weight-700 {
-        font-weight: 700;
-    }
-
-    .weight-800 {
-        font-weight: 800;
-    }
-
-    .text-blue {
-        color: #1b00ff;
-    }
-
-    .text-dark {
-        color: #000000;
-    }
-
-    .text-white {
-        color: #ffffff;
-    }
-
-    .height-100-p {
-        height: 100%;
-    }
-
-    .bg-white {
-        background: #ffffff;
-    }
-
-    .border-radius-10 {
-        -webkit-border-radius: 10px;
-        -moz-border-radius: 10px;
-        border-radius: 10px;
-    }
-
-    .border-radius-100 {
-        -webkit-border-radius: 100%;
-        -moz-border-radius: 100%;
-        border-radius: 100%;
-    }
-
-    .box-shadow {
-        -webkit-box-shadow: 0px 0px 28px rgba(0, 0, 0, .08);
-        -moz-box-shadow: 0px 0px 28px rgba(0, 0, 0, .08);
-        box-shadow: 0px 0px 28px rgba(0, 0, 0, .08);
-    }
-
-    .gradient-style1 {
-        background-image: linear-gradient(135deg, #43CBFF 10%, #9708CC 100%);
-    }
-
-    .gradient-style2 {
-        background-image: linear-gradient(135deg, #72EDF2 10%, #5151E5 100%);
-    }
-
-    .gradient-style3 {
-        background-image: radial-gradient(circle 732px at 96.2% 89.9%, rgba(70, 66, 159, 1) 0%, rgba(187, 43, 107, 1) 92%);
-    }
-
-    .gradient-style4 {
-        background-image: linear-gradient(135deg, #FF9D6C 10%, #BB4E75 100%);
-    }
-
-    /* widget style 1 */
-
-    .widget-style1 {
-        padding: 20px 10px;
-    }
-
-    .widget-style1 .circle-icon {
-        width: 60px;
-    }
-
-    .widget-style1 .circle-icon .icon {
-        width: 60px;
-        height: 60px;
-        background: #ecf0f4;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
-
-    .widget-style1 .widget-data {
-        width: calc(100% - 150px);
-        padding: 0 15px;
-    }
-
-    .widget-style1 .progress-data {
-        width: 90px;
-    }
-
-    .widget-style1 .progress-data .apexcharts-canvas {
-        margin: 0 auto;
-    }
-
-    .widget-style2 .widget-data {
-        padding: 20px;
-    }
-
-    .widget-style3 {
-        padding: 30px 20px;
-    }
-
-    .widget-style3 .widget-data {
-        width: calc(100% - 60px);
-    }
-
-    .widget-style3 .widget-icon {
-        width: 60px;
-        font-size: 45px;
-        line-height: 1;
-    }
-
-    .apexcharts-legend-marker {
-        margin-right: 6px !important;
-    }
-</style>
-    <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
- 
-    <div class="wrapper"> 
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ===================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-4">
-                                <div class="page-header-title">
-                                    <i class='fa fa-tachometer-alt' style='font-size:24px; color: #1aafd4'></i>
-                                    <div class="d-inline">
-                                        <h6>Pet Dashboard</h6>
-                                        <span>Pet Registration</span>
-                                    </div>
-                                </div>
-                            </div>
-
- 
-                                <div class="col-1">
-                                  <i class="fa fa-user" aria-hidden="true"><p id="UserCount"></p></i>
-                                </div>
-                                <!-- <div class="col-2">
-                                    <p class="block-title">Users</p>
-                                </div> -->
-                                <div class="col-2">
-                                    <select type="text" class="form-control text-center" name="zone" id="zone">
-                                        <option value="0">All Zone</option>
-                                        <option value="1" th:selected="${zone=='1'}">Zone 1</option>
-                                        <option value="2" th:selected="${zone=='2'}">Zone 2</option>
-                                        <option value="3" th:selected="${zone=='3'}">Zone 3</option>
-                                        <option value="4" th:selected="${zone=='4'}">Zone 4</option>
-                                        <option value="5" th:selected="${zone=='5'}">Zone 5</option>
-                                        <option value="6" th:selected="${zone=='6'}">Zone 6</option>
-                                        <option value="7" th:selected="${zone=='7'}">Zone 7</option>
-                                        <option value="8" th:selected="${zone=='8'}">Zone 8</option>
-                                        <option value="9" th:selected="${zone=='9'}">Zone 9</option>
-                                        <option value="10" th:selected="${zone=='10'}">Zone 10</option>
-                                        <option value="11" th:selected="${zone=='11'}">Zone 11</option>
-                                        <option value="12" th:selected="${zone=='12'}">Zone 12</option>
-                                        <option value="13" th:selected="${zone=='13'}">Zone 13</option>
-                                        <option value="14" th:selected="${zone=='14'}">Zone 14</option>
-                                        <option value="15" th:selected="${zone=='15'}">Zone 15</option>
-                                    </select>
-                                </div>
-                                <div class="col-2">
-                                    <button type="submit" class="btn btn-sm btn-primary" onclick="getByZone()"
-                                        id="submit">Submit</button>
-                                </div>
-                                <div class="col-lg-3">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Pet Registration</li>
-                                            <li class="breadcrumb-item">Dashboard</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-
-
-                        </div>
-                        <br>
-                        <br>
-                        <div class="content">
-                            <div class="block block-rounded">
-
-
-                            </div>
-                            <div class="block-content p-0">
-                                <div class="row">
-
-                                    <div class="col-sm-6 col-lg-6 mb-50">
-
-                                        <div class="row">
-                                            <div class="col-sm-12 col-lg-6 mb-50">
-                                                <div
-                                                    class="bg-white box-shadow border-radius-10 height-100-p widget-style1">
-                                                    <div class="d-flex flex-wrap align-items-center">
-                                                        <div class="circle-icon">
-                                                            <div class="icon border-radius-100 font-24 text-blue">
-                                                                <i class="far fa-file" aria-hidden="true"></i>
-                                                            </div>
-                                                        </div>
-                                                        <div class="widget-data">
-                                                            <div class="weight-800 font-18" id="totalRegPets"></div>
-                                                            <div class="weight-500">Reg Pets</div>
-                                                        </div>
-
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                            <div class="col-sm-12 col-lg-6 mb-50">
-                                                <div
-                                                    class="bg-white box-shadow border-radius-10 height-100-p widget-style1">
-                                                    <div class="d-flex flex-wrap align-items-center">
-                                                        <div class="circle-icon">
-                                                            <div class="icon border-radius-100 font-24 text-blue"><i
-                                                                    class='fas fa-calendar-minus'></i></div>
-                                                        </div>
-                                                        <div class="widget-data">
-                                                            <div class="weight-800 font-18" id="totalInprogcount"></div>
-                                                            <div class="weight-500">Review Pending</div>
-                                                        </div>
-
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                        </div>
-
-                                        <div class="row">
-
-                                            <div class="col-sm-6 col-lg-6 mb-50">
-                                                <div
-                                                    class="bg-white box-shadow border-radius-10 height-100-p widget-style1">
-                                                    <div class="d-flex flex-wrap align-items-center">
-                                                        <div class="circle-icon">
-                                                            <div class="icon border-radius-100 font-24 text-blue">
-                                                                <i class="fa fa-times-circle"></i>
-                                                            </div>
-                                                        </div>
-                                                        <div class="widget-data">
-                                                            <div class="weight-800 font-18" id="totalRejCount"></div>
-                                                            <div class="weight-500">Rejected Pets</div>
-                                                        </div>
-
-                                                    </div>
-                                                </div>
-                                            </div>
-
-
-                                            <div class="col-sm-6 col-lg-6 mb-50">
-                                                <div
-                                                    class="bg-white box-shadow border-radius-10 height-100-p widget-style1">
-                                                    <div class="d-flex flex-wrap align-items-center">
-                                                        <div class="circle-icon">
-                                                            <div class="icon border-radius-100 font-24 text-blue"><i
-                                                                    class="fa fa-paw" aria-hidden="true"></i>
-                                                            </div>
-                                                        </div>
-                                                        <div class="widget-data">
-                                                            <div class="weight-800 font-18" id="totalpets"></div>
-                                                            <div class="weight-500">Total Pets</div>
-                                                        </div>
-
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                        </div>
-
-
-                                        <div class="row">
-                                            <div class="col-sm-6 col-lg-6 mb-50" id="licIssuedHide">
-                                                <div
-                                                    class="bg-white box-shadow border-radius-10 height-100-p widget-style1">
-                                                    <div class="d-flex flex-wrap align-items-center">
-                                                        <div class="circle-icon">
-                                                            <div class="icon border-radius-100 font-24 text-blue"><i
-                                                                    class="fa fa-paper-plane" aria-hidden="true"></i>
-                                                            </div>
-                                                        </div>
-                                                        <div class="widget-data">
-                                                            <div class="weight-800 font-18" id="totallicCount"></div>
-                                                            <div class="weight-500">Licensed issued</div>
-                                                        </div>
-
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                            <div class="col-sm-6 col-lg-6 mb-50">
-                                                <div
-                                                    class="bg-white box-shadow border-radius-10 height-100-p widget-style1">
-                                                    <div class="d-flex flex-wrap align-items-center">
-                                                        <div class="circle-icon">
-                                                            <div class="icon border-radius-100 font-24 text-blue"><i
-                                                                    class="fas fa-file-excel"
-                                                                    aria-hidden="true"></i></div>
-                                                        </div>
-                                                        <div class="widget-data">
-                                                            <div class="weight-800 font-18" id="explicCount"></div>
-                                                            <div class="weight-500">License expired</div>
-                                                        </div>
-
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                        </div>
-
-                                    </div>
-                                    <div class="col-md-6 mb-4">
-                                        <div class="card">
-                                            <div class="card-body">
-                                                <div id="totalpetpiechart"></div>
-                                                <div class="weight-800 font-18" id="totalpet"></div>
-                                                <div class="weight-500">Total Pet Status count</div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-5">
-                                        <div class="card">
-                                            <div class="card-body">
-                                                <div id="Dogpiechart"></div>
-                                                <!-- <div class="weight-800 font-18" th:text="${dogTotalCount}"></div> -->
-                                                <div class="weight-800 font-18" id="dogTotal"></div>
-                                                <div class="weight-500">Total Dog count</div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-md-5">
-                                        <div class="card">
-                                            <div class="card-body">
-                                                <div id="Catpiechart"></div>
-                                                <!-- <div class="weight-800 font-18" th:text="${catTotalCount}" id="catTotal"></div> -->
-                                                <div class="weight-800 font-18" id="catTotal"></div>
-                                                <div class="weight-500">Total cat count</div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-
-                                </div>
-
-                            </div>
-
-
-
-                        </div>
-
-
-
-
-                    </div>
-                    <!-- END Page Content -->
-                    </main>
-                    <!-- END Main Container -->
-                    <!-- Footer -->
-
-
-                </div>
-            </div>
-        </div>
-    </div>
-    </div>
-
-
-</body>
-<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-<script th:replace="~{fragments/modules/base/script :: script}"></script>
-<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
-
-<script th:inline="javascript">
-
-    var x, y,userCount,licCount;
-    convert();
-    function convert() {
-    	var m =  /*[[${dash}]]*/ {};
-    	console.log(m);
-        x = /*[[${dash.dog}]]*/ {}; 
-        y = /*[[${dash.cat}]]*/ {};
-        userCount = /*[[${dash.userCount}]]*/ {};
-        licCount= /*[[${dash.licCount}]]*/ {};
-    }
-
-    var totalexpired = x['4'] + y['4'];
-    var totalrejected = x['3'] + y['3'];
-    var totalLicensed = x['2'] + y['2'];
-    var totalPayment = x['1'] + y['1'];
-    var totalinprog = x['0'] + y['0'];
-    document.getElementById("totalpet").innerHTML = x['200'] + y['200'];
-
-    var catexpired = y['4'];
-    var catrejected = y['3'];
-    var catLicensed = y['2'];
-    var catPayment = y['1'];
-    var catinprog = y['0'];
-    var catTotal = y['200'];
-    document.getElementById("catTotal").innerHTML = catTotal;
-
-    var dogexpired = x['4'];
-    var dogrejected = x['3'];
-    var dogLicensed = x['2'];
-    var dogPayment = x['1'];
-    var doginprog = x['0'];
-    var dogTotal = x['200'];
-    document.getElementById("dogTotal").innerHTML = dogTotal;
-
-    document.getElementById("UserCount").innerHTML = userCount;
-    document.getElementById("totalRegPets").innerHTML = x['200'] + y['200'];
-    document.getElementById("totalInprogcount").innerHTML = totalinprog;
-    document.getElementById("totalRejCount").innerHTML = totalrejected;
-    document.getElementById("totalpets").innerHTML =  totalLicensed;
-    document.getElementById("explicCount").innerHTML = totalexpired;
-    document.getElementById("totallicCount").innerHTML = licCount;
-
-
-    google.charts.load('current', { 'packages': ['corechart'] });
-    google.charts.setOnLoadCallback(drawChart2);
-
-    // Draw the chart and set the chart values
-    function drawChart2() {
-        var data = google.visualization.arrayToDataTable([
-            ['Total', 'Hours per Day'],
-            ['InProgress', totalinprog],
-            ['Payment', totalPayment],
-            ['License Issued', totalLicensed],
-            ['Rejected', totalrejected],
-            ['Expired', totalexpired],
-            //['Total Pets', totalInCount]
-        ]);
-        // Optional; add a title and set the width and height of the chart
-        var options = {
-            'title': 'OverAll pet Info', legend: 'bottom', 'height': 500,
-            colors: ['#f4ca47', '#0ebce0', '#aae00e', '#053a4c', '#0ee0ad'],
-
-        };
-        // Display the chart inside the <div> element with id="piechart"
-        var chart = new google.visualization.PieChart(document.getElementById('totalpetpiechart'));
-        chart.draw(data, options);
-    }
-
-
-
-    //total Dog count piechart
-
-    //console.log("dogTotal:"+dogTotal);
-
-    google.charts.load('current', { 'packages': ['corechart'] });
-    google.charts.setOnLoadCallback(drawChart);
-
-    // Draw the chart and set the chart values
-    function drawChart() {
-        var data = google.visualization.arrayToDataTable([
-            ['Dog Info', 'Hours per Day'],
-            ['InProgress', doginprog],
-            ['Payment', dogPayment],
-            ['License Issued', dogLicensed],
-            ['Rejected', dogrejected],
-            ['Expired', dogexpired]
-
-        ]);
-
-        // Optional; add a title and set the width and height of the chart
-        var options = {
-            'title': 'OverAll Dog Info', legend: 'bottom', 'height': 400,
-            colors: ['#f4ca47', '#0ebce0', '#aae00e', '#053a4c', '#0ee0ad'],
-        };
-
-        // Display the chart inside the <div> element with id="piechart"
-        var chart = new google.visualization.PieChart(document.getElementById('Dogpiechart'));
-        chart.draw(data, options);
-    }
-
-    //total cat  piechart
-
-    // $('#catTotal').val(catTotal);                                                                                        
-
-    google.charts.load('current', { 'packages': ['corechart'] });
-    google.charts.setOnLoadCallback(drawChart1);
-
-    // Draw the chart and set the chart values
-    function drawChart1() {
-        var data = google.visualization.arrayToDataTable([
-            ['Cat Info', 'Hours per Day'],
-            ['InProgress', catinprog],
-            ['Payment', catPayment],
-            ['License Issued', catLicensed],
-            ['Rejected', catrejected],
-            ['Expired', catexpired]
-        ]);
-
-        var options = {
-            'title': 'OverAll Cat Info',
-            legend: 'bottom',
-            'height': 400,
-            colors: ['#f4ca47', '#0ebce0', '#aae00e', '#053a4c', '#0ee0ad'],
-        };
-        var chart = new google.visualization.PieChart(document.getElementById('Catpiechart'));
-        chart.draw(data, options);
-    }
-    // total cat count piechar end
-    function getByZone() {
-
-        var zone = $("#zone").val()
-        if (zone == "0") {
-            window.location.href = "/petregistration/";
-            return false;
-        }
-        else{
-            window.location.href = "/petregistration/?zone="+zone;
-            return false;
-        }
-    }
-    function getPieChartByZone(x) {
-        console.log(x);
-        totalexpired = x.cat[4] + x.dog[4];
-        totalrejected = x.cat[3] + x.dog[3];
-        totalLicensed = x.cat[2] + x.dog[2];
-        totalPayment = x.cat[1] + x.dog[1];
-        totalinprog = x.cat[0] + x.dog[0];
-        document.getElementById("totalpet").innerHTML = x.cat[200] + x.dog[200];
-        drawChart2();
-
-        catexpired = x.cat[4];
-        catrejected = x.cat[3];
-        catLicensed = x.cat[2];
-        catPayment = x.cat[1];
-        catinprog = x.cat[0];
-        catTotal = x.cat[200];
-        document.getElementById("catTotal").innerHTML = catTotal;
-        drawChart1();
-        dogexpired = x.dog[4];
-        dogrejected = x.dog[3];
-        dogLicensed = x.dog[2];
-        dogPayment = x.dog[1];
-        doginprog = x.dog[0];
-        dogTotal = x.dog[200];
-        document.getElementById("dogTotal").innerHTML = dogTotal;
-
-        drawChart();
-
-        var UserCount = x.userCount;
-        //var zone=
-        var totalRegPets = x.dog[200] + x.cat[200];
-        var totalInprogcount = x.dog[0] + x.cat[0];
-        var totalRejCount = x.dog[3] + x.cat[3];
-        var totalpets = x.dog[2] + x.cat[2];
-        //var totallicCount
-        var explicCount = x.dog[4] + x.cat[4];
-
-        document.getElementById("UserCount").innerHTML = UserCount;
-        document.getElementById("totalRegPets").innerHTML = totalRegPets;
-        document.getElementById("totalInprogcount").innerHTML = totalInprogcount;
-        document.getElementById("totalRejCount").innerHTML = totalRejCount;
-        document.getElementById("totalpets").innerHTML = totalpets;
-        document.getElementById("explicCount").innerHTML = explicCount;
-
-    }
-
-    function resetDate() {
-        window.location.href = "/admin/home";
-    }
-
-    function getZoneDashboard() {
-        var z = $('#zone').val();
-        if (z == 0) {
-            window.location.href = "gcc/pet/dashboard";
-        }
-    }
-</script>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/petregistration/license-issued.html b/src/main/resources/templates/modules/petregistration/license-issued.html
deleted file mode 100644
index 28398da1..00000000
--- a/src/main/resources/templates/modules/petregistration/license-issued.html
+++ /dev/null
@@ -1,536 +0,0 @@
-	<!DOCTYPE html>
-	<html lang="en" dir="">
-	<html xmlns:th="http://www.thymeleaf.org">
-	
-	<head th:replace="~{fragments/modules/base/head :: head}"></head>
-	
-	<body>
-	    <!--[if lt IE 8]>
-	            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-	        <![endif]-->
-	
-	    <div class="wrapper"> 
-	        <!-- header top menu Start -->
-	        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-	        <!-- header top menu end -->
-	 
-	        <div class="page-wrap">
-	            <!--=============== Left Menu side Start ================-->
-	            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-	            <!--=============== Left side End ================-->
-	            <div class="main-content"> 
-	                <div class="container-fluid"> 
-	                    <div class="page-header">
-	                        <div class="row align-items-end">
-	                            <div class="col-lg-4">
-	                                <div class="page-header-title">
-	                                    <i class='fa fa-paper-plane'  style='font-size:24px; color: #1aafd4'></i>
-	                                    <div class="d-inline">
-	                                        <h5>License Issued Info</h5>
-	                                        <span>Pet Registration</span>
-	                                    </div>
-	                                </div>
-	                            </div>
-	                            <!-- <div class="col-lg-4">
-	                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-	                                        <ol class="breadcrumb">
-	                                            <li class="breadcrumb-item">
-	                                                <a href="/index"><i class="ik ik-home"></i></a>
-	                                            </li>
-	                                            <li class="breadcrumb-item">Asset QR Feedback</li>
-	                                            <li class="breadcrumb-item">Master</li>
-	                                            <li class="breadcrumb-item active" aria-current="page">Category</li>
-	                                        </ol>
-	                                    </nav>
-	                                </div> -->
-	                            <div class="col-lg-5">
-	                                <div class="content">
-	                                    <div class="block block-rounded">
-	                                        <div class="block-header block-header-default" style="display: block;">
-	                                            <form class="row" action="javascript:getbydate()">
-	
-	                                                <div class="row">
-	                                                    <div class="col-4">
-	                                                        <input type="date" th:value="${fromDate}" class="form-control"
-	                                                            name="FromDate" id="fromdate"
-	                                                            data-date-format="yyyy-mm-dd" />
-	                                                    </div>
-	                                                    <div class="col-4">
-	                                                        <input type="date" th:value="${toDate}" class="form-control"
-	                                                            name="ToDate" id="todate" data-date-format="yyyy-mm-dd" />
-	                                                    </div>
-	                                                    <div class="col-2 p-0 text-center">
-	                                                        <button type="submit" class="btn btn-sm btn-primary"
-	                                                            name="submit" id="submit"
-	                                                            onclick="getbydate()">Submit</button>
-	
-	                                                        <br>
-	                                                    </div>
-	                                                    <div class="col-2 p-0 text-center">
-	                                                        <button class="btn btn-danger" onclick="resetDate()"
-	                                                            name="reset" type="reset">Reset</button>
-	                                                    </div>
-	                                                </div>
-	                                        </div>
-	
-	                                        </form>
-	
-	                                    </div>
-	
-	                                </div>
-	                            </div>
-	
-                                <div class="col-lg-3">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Pet Registration</li>
-                                            <li class="breadcrumb-item">Lisense</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-	                        </div>
-	                    </div>
-	
-	                    <hr>
-	                    <div class="row">
-	                        <div class="col-md-12">
-	                            <div class="card">
-	
-	                                <div class="card-block">
-	                                    <div>
-	                                        <table id="assetDatatable"
-	                                            class="table table-striped table-bordered table-hover dataTable" role="grid"
-	                                            width="99.5%">
-	                                            <thead class="thead-dark">
-	                                                <tr role="row">
-	                                                    <th>S.No</th>
-	                                                    <th>Type</th>
-	                                                    <th>Issued By</th>
-	                                                    <th>UpDated Date</th>
-	                                                    <th>Pet Photo</th>
-	                                                    <th>Rabies certi</th>
-	                                                    <th>License Info</th>
-	                                                    <th class="text-center no-sort">Owner Info</th>
-	                                                </tr>
-	                                                </theadclass="thead-dark">
-	                                            <tbody>
-	                                                <tr th:each="list, i : ${petlist}" class="${petlist}">
-	                                                    <td th:text="${i.count}">0</td>
-	                                                    <td th:text="${list.species}"></td>
-	                                                    <td th:text="${list.updatedby}"></td>
-	                                                    <td th:text="${list.statusdate}"></td>
-	                                                    <td class="text-center">
-	                                                        <button type="button"
-	                                                            th:onclick="petimg([[${list.mobilenum}]],[[${list.uniqueid}]])"
-	                                                            class="btn btn-primary">
-	                                                            view
-	                                                        </button>
-	                                                    </td>
-	
-	                                                    <td class="text-center">
-	                                                        <button type="button"
-	                                                            th:onclick="certificateimg([[${list.mobilenum}]],[[${list.uniqueid}]])"
-	                                                            class="btn btn-primary">
-	                                                            view
-	                                                        </button>
-	                                                    </td>
-	                                                    <td>
-	                                                        <p>
-	                                                            <span class="badge bg-success"
-	                                                                th:onclick="licenceInfo([[${list.mobilenum}]],[[${list.uniqueid}]])"
-	                                                                style="cursor: pointer;">Info</span>
-	                                                        </p>
-	                                                    </td>
-	
-	                                                    <td class="text-center">
-	                                                        <a th:onclick="viewOwner( [[${list.mobilenum}]] );"
-	                                                            data-bs-toggle="tooltip" data-bs-animation="true"
-	                                                            data-bs-placement="top" title="View PetOwner info"><i
-	                                                                class="fa-regular fa-user"
-	                                                                style="font-size: 18px;cursor: pointer;"></i></a>
-	                                                    </td>
-	                                                </tr>
-	                                            </tbody>
-	                                            <tfoot class="thead-dark">
-	                                                <tr>
-	                                                    <th>S.No</th>
-	                                                    <th>Type</th>
-	                                                    <th>Issued By</th>
-	                                                    <th>UpDated Date</th>
-	                                                    <th>Pet Photo</th>
-	                                                    <th>Rabies certi</th>
-	                                                    <th>License Info</th>
-	                                                    <th>Owner Info</th>
-	
-	                                                </tr>
-	                                            </tfoot>
-	                                        </table>
-	                                    </div>
-	                                </div>
-	
-	
-	
-	
-	                                <!-- Modal -->
-	                                <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog"
-	                                    aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-	                                    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-	                                        <div class="modal-content">
-	                                            <div class="modal-header">
-	                                                <h5 class="modal-title" id="exampleModalCenterLabel">Photo</h5>
-	                                                <button type="button" class="close" data-dismiss="modal"
-	                                                    aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                                            </div>
-	                                            <div class="modal-body">
-	                                                <img alt="" id="myImg" src="" style="width:100%">
-	                                            </div>
-	                                            <div class="modal-footer">
-	                                                <button type="button" class="btn btn-secondary"
-	                                                    data-dismiss="modal">Close</button>
-	                                            </div>
-	                                        </div>
-	                                    </div>
-	                                </div>
-	
-	
-	                            </div>
-	                        </div>
-	                    </div>
-	
-	                </div>
-	            </div>
-	
-	            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-	        </div>
-	    </div>
-	
-	   <!--license info State  -->
-	   <div class="modal fade" id="licForm" tabindex="-1" role="dialog" aria-labelledby="licFormCenterLabel"
-	   aria-hidden="true">
-	   <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-	       <div class="modal-content">
-	           <div class="modal-header">
-	               <h5 class="modal-title" id="licFormCenterLabel">License information</h5>
-	               <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-	                       aria-hidden="true">&times;</span></button>
-	           </div>
-	           <div class="modal-body">
-	               <div class="row">
-	                   <input type="hidden" class="form-control text-center" name="uniqid" id="uniqid" disabled />
-	                   <div class="col-xl-6 col-md-12"> <strong>pet Id:</strong>
-	                       <p class="text-muted form-control showInputValue" id="uniqueid"></p>
-	                   </div>
-	                   <div class="col-xl-6 col-md-12"> <strong>License No:</strong>
-	                       <p class="text-muted form-control showInputValue" id="licno"></p>
-	                   </div>
-	                   <div class="col-xl-6 col-md-12"> <strong>Phone No:</strong>
-	                       <p class="text-muted form-control showInputValue" id="phonee"></p>
-	                   </div>
-	                   <div class="col-xl-6 col-md-12"> <strong>validity:</strong>
-	                       <p class="text-muted form-control showInputValue" id="valid"></p>
-	                   </div>
-	                   <!-- <div class="block-content block-content-full text-end bg-body" id="mbutton3">
-	                     <button type="button" class="btn btn-sm btn-alt-primary" onclick="viewfulllicense()">View</button>
-	                     <button type="button" class="btn btn-sm btn-alt-secondary" data-bs-dismiss="modal">Close</button>
-	                 </div> -->
-	                   </div>
-	               </div>
-	           </div>
-	       </div>
-	   </div>
-	 </div>
-	    <!-- owner Info  -->
-	    <div class="modal fade" id="ownerForm" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel"
-	        aria-hidden="true">
-	        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-	            <div class="modal-content">
-	                <div class="modal-header">
-	                    <h5 class="modal-title" id="exampleModalCenterLabel">Pet Owner information</h5>
-	                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-	                            aria-hidden="true">&times;</span></button>
-	                </div>
-	                <div class="modal-body">
-	                    <div class="row">
-	                        <input type="hidden" class="form-control text-center" name="uniqid" id="uniqid" disabled />
-	                        <div class="col-xl-6 col-md-12"> <strong>Tittle</strong>
-	                            <p class="text-muted form-control showInputValue" id="title"></p>
-	                        </div>
-	                        <div class="col-xl-6 col-md-12"> <strong>Pet Owner Name</strong>
-	                            <p class="text-muted form-control showInputValue" id="fname"></p>
-	                        </div>
-	                        <div class="col-xl-6 col-md-12"> <strong>Door No</strong>
-	                            <p class="text-muted form-control showInputValue" id="doornumber"></p>
-	                        </div>
-	                        <div class="col-xl-6 col-md-12"> <strong>Street</strong>
-	                            <p class="text-muted form-control showInputValue" id="street"></p>
-	                        </div>
-	
-	                        <div class="col-xl-6 col-md-12"> <strong>Area</strong>
-	                            <p class="text-muted form-control showInputValue" id="area"></p>
-	                        </div>
-	
-	                        <div class="col-xl-6 col-md-12"> <strong>City</strong>
-	                            <p class="text-muted form-control showInputValue" id="city"></p>
-	                        </div>
-	                        <div class="col-xl-6 col-md-12"> <strong>Pincode</strong>
-	                            <p class="text-muted form-control showInputValue" id="pincode"></p>
-	                        </div>
-	                        <div class="col-xl-6 col-md-12"> <strong>Zone</strong>
-	                            <p class="text-muted form-control showInputValue" id="zone"></p>
-	                        </div>
-	                        <div class="col-xl-6 col-md-12"> <strong>Ward</strong>
-	                            <p class="text-muted form-control showInputValue" id="ward"></p>
-	                        </div>
-	                        <div class="col-xl-6 col-md-12"> <strong>Contact No</strong>
-	                            <p class="text-muted form-control showInputValue" id="phone"></p>
-	                        </div>
-	                        <div class="col-xl-6 col-md-12"> <strong>Email Id</strong>
-	                            <p class="text-muted form-control showInputValue" id="email"></p>
-	                        </div>
-	                    </div>
-	                </div>
-	            </div>
-	        </div>
-	    </div>
-	    <!-- End owner Info  -->
-	    <!--	pet License -->
-	    <!-- <div class="modal fade backdrop" id="getpetlic" data-backdrop="static" tabindex="-1" role="dialog"
-	        aria-labelledby="staticBackdropLabel" aria-hidden="true">
-	        <div class="modal-dialog modal-xl" role="document">
-	            <div class="modal-content">
-	                <div class="block block-rounded block-themed block-transparent mb-0">
-	                    <div class="block-header bg-primary-dark">
-	                        <h3 class="block-title" id="lic">Download License</h3>
-	                        <button onclick="printme()" class="btn btn-sm btn-primary">Print</button>
-	                        <div class="block-options">
-	                            <button onclick="closeme()" class="btn-block-option">
-	                                <i class="fa fa-fw fa-times"></i>
-	                            </button>
-	                        </div>
-	                    </div>
-	                    <div id="htmldatatxt">
-	                    </div>
-	                </div>
-	            </div>
-	        </div>
-	    </div>
-	 -->
-	    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-	
-	    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-	    <script type="text/javascript">
-	        $(document).ready(function () {
-	
-	            // DataTables buttons configuration
-	            var buttons = [
-	                {
-	                    extend: 'pageLength',
-	                    className: 'btn btn-warning'
-	                },
-	                {
-	                    title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	
-	            ];
-	
-	            $('#assetDatatable').DataTable({
-	                dom: 'Bftip',
-	                columnDefs: [
-	                    { targets: 'no-sort', orderable: false }
-	                ],
-	                lengthMenu: [
-	                    [50, 100, 200, 500, -1],
-	                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-	                ],
-	                scrollY: '50vh',
-	                fixedColumns: {
-	                    left: 1,
-	                    right: 1
-	                },
-	                buttons: [buttons],
-	                responsive: true,
-	                searching: true,
-	                select: false,
-	                processing: false,
-	            });
-	            $('#searchInput').on('keyup', function () {
-	                dataTable.search(this.value).draw();
-	            });
-	        });
-	        function petimg(mobno, uniqueid) {
-	            $.ajax({
-	                type: "GET",
-	                url: '/gcc/api/pet/getpetimg',
-	                data: {
-	                    'mobno': mobno,
-	                    'uniqueid': uniqueid
-	                },
-	                success: function (x) {
-	                    document.getElementById("myImg").src = "data:image/jpeg;base64," + x;
-	                }
-	            });
-	            $('#exampleModal').modal({
-	                backdrop: 'static',
-	                keyboard: false
-	            });
-	            $('#exampleModal').modal('show');
-	        }
-	        function certificateimg(mobno, uniqueid) {
-	            $.ajax({
-	                type: "GET",
-	                url: '/gcc/api/pet/getvacimg',
-	                data: {
-	                    'mobno': mobno,
-	                    'uniqueid': uniqueid
-	                },
-	                success: function (x) {
-	                    document.getElementById("myImg").src = "data:image/jpeg;base64," + x;
-	                }
-	            });
-	            $('#exampleModal').modal({
-	                backdrop: 'static',
-	                keyboard: false
-	            });
-	            $('#exampleModal').modal('show');
-	            //document.getElementById("myImg").src ="data:image/jpeg;base64,"+x.rabiesvacCerti;
-	        }
-	
-	        function viewOwner(mobilenum) {
-	            let own;
-	            $.ajax({
-	                type: "GET",
-	                url: '/gcc/api/pet/getpetOwner',
-	                data: { 'mobilenum': mobilenum },
-	                success: function (bodyMessage) {
-	                    ownercall(bodyMessage);
-	                }
-	            });
-	        }
-	        function ownercall(list) {
-	            $('#ownerForm').modal({
-	                backdrop: 'static',
-	                keyboard: false
-	            });
-	            $('#ownerForm').modal('show');
-	            document.getElementById("title").innerHTML = list.title;
-	            document.getElementById("fname").innerHTML = list.fname;
-	            document.getElementById("doornumber").innerHTML = list.doornumber;
-	            document.getElementById("street").innerHTML = list.street;
-	            document.getElementById("area").innerHTML = list.area;
-	            document.getElementById("city").innerHTML = list.city;
-	            document.getElementById("pincode").innerHTML = list.pincode;
-	            document.getElementById("zone").innerHTML = list.zone;
-	            document.getElementById("ward").innerHTML = list.ward;
-	            document.getElementById("phone").innerHTML = list.phone;
-	            document.getElementById("email").innerHTML = list.email;
-	            document.getElementById("pancard").innerHTML = list.pancard;
-	            document.getElementById("aadhar").innerHTML = list.aadhar;
-	            document.getElementById("voterid").innerHTML = list.voterid;
-	
-	        }
-	        // Function to call modal for New pet registration
-	        callAdd = function () {
-	            $('#addForm').modal({
-	                backdrop: 'static',
-	                keyboard: false
-	            })
-	            $('#addForm').modal('show');
-	        }
-	        function licenceInfo(mobno, uniqueid) {
-	            $.ajax({
-	                type: "GET",
-	                url: '/gcc/api/pet/getlicenseinfo',
-	                data: {
-	                    'mobilenum': mobno,
-	                    'uniqueid': uniqueid
-	                },
-	                success: function (list) {
-	                    $('#licForm').modal({
-	                        backdrop: 'static',
-	                        keyboard: false
-	                    });
-	                    $('#licForm').modal('show');
-	                    document.getElementById("uniqueid").innerHTML = list.uniqueid;
-	                    document.getElementById("licno").innerHTML = list.licenseNo;
-	                    document.getElementById("phonee").innerHTML = list.phone;
-	                    document.getElementById("valid").innerHTML = list.validity;
-	
-	                }
-	
-	            });
-	        }
-	
-	
-	        function viewfulllicense() {
-	            var id = document.getElementById("uniqueid").value;;
-	            var phone = document.getElementById("phone").value;
-	            //window.open('/owners/getlicensebymobo/'+id+'/'+phone,'_blank');
-	            $.ajax({
-	                type: "GET",
-	                url: '/gcc/pet/owners/ /' + id + '/' + phone,
-	                success: function (bodyMessage) {
-	                    $("#htmldatatxt").html(bodyMessage);
-	                    $('#getpetlic').modal({
-	                        backdrop: 'static',
-	                        keyboard: false
-	                    });
-	                    $('#getpetlic').modal('show');
-	                }
-	            })
-	        }
-	        function closeme() {
-	            window.location.reload();
-	        }
-	        function printme() {
-	            var printContent = document.getElementById('htmldatatxt').innerHTML;
-	            var originalContent = document.body.innerHTML;
-	            document.body.innerHTML = printContent;
-	            window.print();
-	            document.body.innerHTML = originalContent;
-	        }
-	
-	
-	
-	
-	        function getbydate() {
-	            var x = document.getElementById("fromdate").value;
-	            var y = document.getElementById("todate").value;
-	
-	            var url = '/gcc/pet/licenseIssued?fromDate=' + x + '&toDate=' + y;
-	            window.location.href = url;
-	
-	        }
-	        function resetDate() {
-	            var url = '/gcc/pet/licenseIssued';
-	            window.location.href = url;
-	        }
-	
-	    </script>
-	</body>
-	
-	</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/petregistration/rejected.html b/src/main/resources/templates/modules/petregistration/rejected.html
deleted file mode 100644
index 844a452d..00000000
--- a/src/main/resources/templates/modules/petregistration/rejected.html
+++ /dev/null
@@ -1,607 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-   
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end --> 
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content"> 
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-4">
-                                    <div class="page-header-title">
-                                        <i class='fa fa-times-circle' style='font-size:24px; color: #1aafd4'></i>
-                                        <div class="d-inline">
-                                            <h5>Rejected Info</h5>
-                                            <span>Pet Registration</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-5">
-                                    <div class="content">
-                                        <div class="block block-rounded">
-                                    <div class="block-header block-header-default" style="display: block;">
-                                        <form class="row" action="javascript:getbydate()">
-                                        
-                                                <div class="row">
-                                                    <div class="col-4">
-                                                      <input type="date" th:value="${fromDate}" class="form-control" name="FromDate" id="fromdate" data-date-format="yyyy-mm-dd" />
-                                                       </div>
-                                                    <div class="col-4">
-                                                       <input type="date" th:value="${toDate}" class="form-control" name="ToDate" id="todate" data-date-format="yyyy-mm-dd" />
-                                                     </div>
-                                                    <div class="col-2 p-0 text-center">
-                                                      <button type="submit" class="btn btn-sm btn-primary" name="submit" id="submit" onclick="getbydate()" >Submit</button>
-                                                     
-                                                   <br>
-                                                    </div>
-                                                    <div class="col-2 p-0 text-center">
-                                                      <button class="btn btn-danger" onclick="resetDate()" name="reset" type="reset">Reset</button>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                      
-                                        </form>
-                                    
-                                    </div>
-                                        
-                                    </div>
-                                </div>
-                                <div class="col-lg-3">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Pet Registration</li>
-                                            <li class="breadcrumb-item">Rejected</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                           
-                        
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th>S.No</th>
-						                                <th>Name</th>
-						                                <th>Type</th>
-						                                <th>Breed</th>
-                                                        <th>sex</th>
-                                                        <th>pet photo</th>
-                                                        <th>Rabies certi</th>
-                                                        <th>Application photo</th>
-                                                        <th>Address Proof</th>
-                                                        <th class="text-center" width="10%">Status</th>
-                                                        <th class="text-center text-center no-sort" width="10%">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                
-                                                    <tbody>
-                                                        <tr th:each="list, i : ${petlist}" class="${petlist}">
-                                                            <td th:text="${i.count}">0</td>
-                                                            <td class="text-center" th:text="${list.petname}"></td>
-                                                            <td th:text="${list.species}"></td>
-                                                            <td th:text="${list.breed}"></td>
-                                                            <td th:text="${list.gender}"></td>
-                                                            <!--  <td th:text="${list.gender}"></td>-->
-                                                            <td class="text-center">
-                                                                <button type="button"  th:onclick="petimg([[${list.mobilenum}]],[[${list.uniqueid}]])" class="btn btn-primary">
-                                                                    view
-                                                                </button>
-                                                            </td>
-                        
-                                                            <td class="text-center">
-                                                                <button type="button"  th:onclick="certificateimg([[${list.mobilenum}]],[[${list.uniqueid}]])" class="btn btn-primary">
-                                                                    view
-                                                                </button>
-                                                            </td>
-                        
-                                                            <td class="text-center">
-                                                                <button type="button"  th:onclick="applicantimg([[${list.mobilenum}]],[[${list.uniqueid}]])" class="btn btn-primary">
-                                                                    view
-                                                                </button>
-                                                            </td>
-                                                            <td class="text-center">
-                                                                <button type="button"  th:onclick="proofimg([[${list.mobilenum}]],[[${list.uniqueid}]])" class="btn btn-primary">
-                                                                    view
-                                                                </button>
-                                                            </td>
-                                                            <td >
-                                                                <p >
-                                                                    <!-- <span class="badge bg-success" th:onclick="accept([[${list.uniqueid}]])">Accept</span> -->
-                                                                    <span class="badge bg-warning" style="cursor: pointer;" th:onclick="reject([[${list.uniqueid}]])">Rejected</span>
-                        
-                                                                </p>
-                                                            </td>
-                                                            <td class="text-center">
-                                                                <a th:onclick="viewOwner( [[${list.mobilenum}]] );" data-bs-toggle="tooltip" data-bs-animation="true"  data-bs-placement="top" title="View PetOwner info"><i class="fa-regular fa-user" style="font-size: 18px;cursor: pointer;"></i></a>
-                                                            </td>
-                                                        </tr>
-                                                    </tbody>
-                                                   
-                                          
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-                                                        <th>S.No</th>
-						                                <th>Name</th>
-						                                <th>Type</th>
-						                                <th>Breed</th>
-                                                        <th>sex</th>
-                                                        <th>pet photo</th>
-                                                        <th>Rabies certi</th>
-                                                        <th>Application photo</th>
-                                                        <th>Address Proof</th>
-                                                        <th class="text-center" width="10%">Status</th>
-                                                        <th class="text-center text-center no-sort" width="10%">Action</th>
-						                                
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>                
-                                  
-                        
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                        
-                </div>
-            </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-    
-
-<!-- Modal image -->
-<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="exampleModalCenterLabel">Photo</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            </div>
-            <div class="modal-body">
-                <img alt="" id="myImg" src="" style="width:100%">
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- end of modal image -->
-<!-- Pet Info Form -->
-<div class="modal fade" id="rejectForm" tabindex="-1" role="dialog" aria-labelledby="rejectFormCenterLabel" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="rejectFormCenterLabel">Pet Information</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <input type="hidden"   class="form-control text-center" name="uniqid" id="uniqid"  disabled />
-                    <div class="col-xl-6 col-md-12"> <strong>Pet Name</strong>
-                        <p class="text-muted form-control showInputValue" id="petna"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Pet Type</strong>
-                        <p class="text-muted form-control showInputValue"  id="speci" ></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Breed</strong>
-                        <p class="text-muted form-control showInputValue" id="bre" ></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Sex</strong>
-                        <p class="text-muted form-control showInputValue" id="gend" ></p>
-                    </div>
-                    
-                    <div class="col-xl-6 col-md-12"> <strong>Age</strong>
-                        <p class="text-muted form-control showInputValue" id="age"></p>
-                    </div>
-                    
-                    <div class="col-xl-6 col-md-12"> <strong>ARV Date</strong>
-                        <p class="text-muted form-control showInputValue" id="arvd"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Last Date Of De-Worming</strong>
-                        <p class="text-muted form-control showInputValue" id="dewormdate"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Other Vaccination Given</strong>
-                        <p class="text-muted form-control showInputValue" id="othervac"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Previous License No</strong>
-                        <p class="text-muted form-control showInputValue" id="previoslicenseNo"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Name of Veterinary doctor</strong>
-                        <p class="text-muted form-control showInputValue" id="VeterinaryConsultant"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Veterinary Council Number</strong>
-                        <p class="text-muted form-control showInputValue" id="TNVCNo"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Register Date</strong>
-                        <p class="text-muted form-control showInputValue" id="registerdate"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Rejected Reason</strong>
-                        <p class="text-muted form-control showInputValue" id="rejectedreason"></p>
-                    </div>
-                    
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- owner Info  -->
-<div class="modal fade" id="ownerForm" tabindex="-1" role="dialog" aria-labelledby="ownerFormCenterLabel" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="ownerFormCenterLabel">Pet Owner information</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <input type="hidden"   class="form-control text-center" name="uniqid" id="uniqid"  disabled />
-                    <div class="col-xl-6 col-md-12"> <strong>Tittle</strong>
-                        <p class="text-muted form-control showInputValue" id="title"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Pet Owner Name</strong>
-                        <p class="text-muted form-control showInputValue"  id="fname" ></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Door No</strong>
-                        <p class="text-muted form-control showInputValue" id="doornumber" ></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Street</strong>
-                        <p class="text-muted form-control showInputValue" id="street" ></p>
-                    </div>
-                    
-                    <div class="col-xl-6 col-md-12"> <strong>Area</strong>
-                        <p class="text-muted form-control showInputValue" id="area"></p>
-                    </div>
-                    
-                    <div class="col-xl-6 col-md-12"> <strong>City</strong>
-                        <p class="text-muted form-control showInputValue" id="city"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Pincode</strong>
-                        <p class="text-muted form-control showInputValue" id="pincode"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Zone</strong>
-                        <p class="text-muted form-control showInputValue" id="zone"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Ward</strong>
-                        <p class="text-muted form-control showInputValue" id="ward"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Contact No</strong>
-                        <p class="text-muted form-control showInputValue" id="phone"></p>
-                    </div>
-                    <div class="col-xl-6 col-md-12"> <strong>Email Id</strong>
-                        <p class="text-muted form-control showInputValue" id="email"></p>
-                    </div>                    
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End owner Info  -->
-
-
-
-                  
-
-
-
-
-        <!-- Script -->
-        <!-- <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script> -->
-        <!-- <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> -->
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script type="text/javascript">
-
-$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: true,
-			        select: false,
-			        processing: false,
-			    } );
-                $('#searchInput').on('keyup', function() {
-                dataTable.search(this.value).draw();
-            });
-			} );
-
-
-
-            function petimg(mobno,uniqueid){
-                   $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/getpetimg',
-                       data: {
-                                   'mobno':mobno,
-                                   'uniqueid':uniqueid
-                               },
-                       success: function(x) {
-                           document.getElementById("myImg").src ="data:image/jpeg;base64,"+x;
-
-                       }
-                   });
-                    $('#exampleModal').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                     });
-                     $('#exampleModal').modal('show');
-                     return false;
-           }
-           function applicantimg(mobno,uniqueid){
-                   $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/getapplicantimg',
-                       data: {
-                                   'mobno':mobno,
-                                   'uniqueid':uniqueid
-                               },
-                       success: function(x) {
-                           document.getElementById("myImg").src ="data:image/jpeg;base64,"+x;
-                       }
-                   });
-                    $('#exampleModal').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                     });
-                     $('#exampleModal').modal('show');
-                   //document.getElementById("myImg").src ="data:image/jpeg;base64,"+x.applicantphoto;
-               }
-           function certificateimg(mobno,uniqueid){
-                $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/getvacimg',
-                       data: {
-                                   'mobno':mobno,
-                                   'uniqueid':uniqueid
-                               },
-                       success: function(x) {
-                           document.getElementById("myImg").src ="data:image/jpeg;base64,"+x;
-                       }
-                   });
-                    $('#exampleModal').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                     });
-                     $('#exampleModal').modal('show');
-                   //document.getElementById("myImg").src ="data:image/jpeg;base64,"+x.rabiesvacCerti;
-               }
-           function proofimg(mobno,uniqueid){
-                    $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/getaddproofimg',
-                       data: {
-                                   'mobno':mobno,
-                                   'uniqueid':uniqueid
-                               },
-                       success: function(x) {
-                           document.getElementById("myImg").src ="data:image/jpeg;base64,"+x;
-                       }
-                   });
-                    $('#exampleModal').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                     });
-                     $('#exampleModal').modal('show');
-                   //document.getElementById("myImg").src ="data:image/jpeg;base64,"+x.addressproof;
-           }
-           
-           function accept(){
-             let id = document.getElementById("uniqid").value;
-             Swal.fire({
-                 title: 'Do you want to Accept this Pet ?',
-                 showDenyButton: true,
-                 showCancelButton: true,
-                 confirmButtonText: 'YES',
-                 denyButtonText: `NO`,
-               }).then((result) => {
-                 /* Read more about isConfirmed, isDenied below */
-                     if (result.isConfirmed) {
-                       $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/accept',
-                       data: {'id':id},
-                       success: function(bodyMessage) {
-                        
-                         if(bodyMessage=="success"){
-                           Swal.fire(
-                                 'Done',
-                                 'Successfully Accepted to the ID:'+id,
-                                 'success'
-                               ).then(() => {
-                                   location.reload();
-                           });
-                     }
-                   }
-                 });
-                 } else if (result.isDenied) {
-                   Swal.fire('Changes are not saved', '', 'info')
-                 }
-               })
-               }
-       
-       
-       
-               function reject(uniqueid){
-               $.ajax({
-                       type: "GET",
-                       url: '/gcc/api/pet/getpetInfo',
-                       data: {
-                                  'petid':uniqueid
-                              },
-                       success: function(x) {
-                           showPetInfo(x)
-                       }
-                   });
-       
-                 }
-                 function showPetInfo(list){
-                   $('#rejectForm').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                     });
-                 $('#rejectForm').modal('show');
-                   document.getElementById("uniqid").innerHTML =list.uniqueid;
-                   document.getElementById("petna").innerHTML =list.petname;
-                   document.getElementById("speci").innerHTML =list.species;
-             document.getElementById("bre").innerHTML =list.breed;
-             document.getElementById("gend").innerHTML =list.gender;
-             document.getElementById("age").innerHTML =list.age;
-       
-             document.getElementById("arvd").innerHTML =list.arvdate;
-             document.getElementById("dewormdate").innerHTML =list.dewormdate;
-             document.getElementById("othervac").innerHTML =list.othervac;
-             document.getElementById("previoslicenseNo").innerHTML =list.previoslicenseNo;
-             document.getElementById("VeterinaryConsultant").innerHTML =list.veterinaryConsultant;
-             document.getElementById("TNVCNo").innerHTML =list.tnvcno;
-             document.getElementById("registerdate").innerHTML =list.registerdate;
-             document.getElementById("rejectedreason").innerHTML=list.rejectreason;
-       
-       
-       
-               }
-              
-       
-    function viewOwner(mobilenum){
-          let own;
-          $.ajax({
-            type: "GET",
-            url: '/gcc/api/pet/getpetOwner',
-            data: {'mobilenum':mobilenum },
-            success: function(bodyMessage) {
-              ownercall(bodyMessage);
-            }
-	      });
-        }
-        function ownercall(list){
-                 $('#ownerForm').modal({
-                         backdrop: 'static',
-                         keyboard: false
-                       });
-                    $('#ownerForm').modal('show');
-             document.getElementById("title").innerHTML =list.title;
-             document.getElementById("fname").innerHTML =list.fname;
-             document.getElementById("doornumber").innerHTML =list.doornumber;
-             document.getElementById("street").innerHTML =list.street;
-             document.getElementById("area").innerHTML =list.area;
-             document.getElementById("city").innerHTML =list.city;
-             document.getElementById("pincode").innerHTML =list.pincode;
-             document.getElementById("zone").innerHTML =list.zone;
-             document.getElementById("ward").innerHTML =list.ward;
-             document.getElementById("phone").innerHTML =list.phone;
-             document.getElementById("email").innerHTML =list.email;
-             document.getElementById("pancard").innerHTML =list.pancard;
-             document.getElementById("aadhar").innerHTML =list.aadhar;
-             document.getElementById("voterid").innerHTML =list.voterid;
-       
-               }
-               // Function to call modal for New pet registration
-               callAdd = function(){
-                   $('#addForm').modal({
-                       backdrop: 'static',
-                       keyboard: false
-                   })
-                   $('#addForm').modal('show');
-               }
-            //    $(document).ready(function () {
-            //         var today = new Date();
-            //         $('.datepicker').datepicker({
-            //             dateFormat: 'yy-mm-dd',
-            //             maxDate: '1'
-            //           })
-            //       $('.datepicker').keyup(function () {
-            //         if (this.value.match(/[^0-9]/g)) {
-            //                this.value = this.value.replace(/[^0-9^-]/g, '');
-            //          }
-            //        });
-            //    });
-       
-            function getbydate(){
-                   var x= document.getElementById("fromdate").value; 
-                   var y= document.getElementById("todate").value;
-                  
-                   var url= '/gcc/pet/rejectedPets?fromDate='+x+'&toDate='+y;
-                   window.location.href=url;  
-       
-               }
-               function resetDate(){
-                var url= '/gcc/pet/rejectedPets';
-                   window.location.href=url;  
-               }
-           </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/petregistration/request-list.html b/src/main/resources/templates/modules/petregistration/request-list.html
deleted file mode 100644
index d3a76480..00000000
--- a/src/main/resources/templates/modules/petregistration/request-list.html
+++ /dev/null
@@ -1,687 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-    <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-   
-    <div class="wrapper"> 
-        <!-- header top menu Start -->  
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header">
-                        <div class="row align-items-end">
-                            <div class="col-lg-3">
-                                <div class="page-header-title">
-                                    <i class='fa fa-envelope'  style='font-size:24px; color: #1aafd4'></i>
-                                    <div class="d-inline">
-                                        <h5>Request Info</h5>
-                                        <span>Pet Registration</span>
-                                    </div>
-                                </div>
-                                
-                            </div>
-                            <div class="col-lg-5">
-                                <div class="content">
-                                    <div class="block block-rounded">
-                                        <div class="block-header block-header-default" style="display: block;">
-                                            <form class="row" action="javascript:getbydate()">
-
-                                                <div class="row">
-                                                    <div class="col-4">
-                                                        <input type="date" th:value="${fromDate}" class="form-control"
-                                                            name="FromDate" id="fromdate"
-                                                            data-date-format="yyyy-mm-dd" />
-                                                    </div>
-                                                    <div class="col-4">
-                                                        <input type="date" th:value="${toDate}" class="form-control"
-                                                            name="ToDate" id="todate" data-date-format="yyyy-mm-dd" />
-                                                    </div>
-                                                    <div class="col-2 p-0 text-center">
-                                                        <button type="submit" class="btn btn-sm btn-primary"
-                                                            name="submit" id="submit"
-                                                            onclick="getbydate()">Submit</button>
-
-                                                        <br>
-                                                    </div> 
-                                                    <div class="col-2 p-0 text-center">
-                                                        <button class="btn btn-danger" onclick="resetDate()"
-                                                            name="reset" type="reset">Reset</button>
-                                                    </div>
-                                                   
-                                                </div>
-                                        </div>
-
-                                        </form>
-
-                                    </div>
-
-                                </div>
-                            </div>
-                            <div class="col-lg-3">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item">
-                                            <a href="/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item">Pet Registration</li>
-                                        <li class="breadcrumb-item">Request</li>
-                                    </ol>
-                                </nav>
-                            </div>
-
-                            
-                        </div>
-                    </div>
-
-
-     
-
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="card">
-                                <div class="card-block">
-                                    <div>
-                                        <table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                            <thead class="thead-dark">
-                                                <tr role="row">
-                                                    <th>S.No</th>
-                                                    <th>Name</th>
-                                                    <th>Type</th>
-                                                    <th>Breed</th>
-                                                    <th>sex</th>
-                                                    <th>pet photo</th>
-                                                    <th>Rabies certi</th>
-                                                    <th>Application photo</th>
-                                                    <th>Address Proof</th>
-                                                    <th class="text-center">Status</th>
-                                                    <th class="text-center text-center no-sort">Action</th>
-                                                </tr>
-                                                </theadclass="thead-dark">
-
-                                            <tbody>
-                                                <tr th:each="list, i : ${petlist}">
-                                                    <td th:text="${i.count}">0</td>
-                                                    <td class="text-center" th:text="${list.petname}"></td>
-                                                    <td th:text="${list.species}"></td>
-                                                    <td th:text="${list.breed}"></td>
-                                                    <td th:text="${list.gender}"></td>
-                                                    <!--  <td th:text="${list.gender}"></td>-->
-                                                    <td class="text-center">
-                                                        <button type="button"
-                                                            th:onclick="petimg([[${list.mobilenum}]],[[${list.uniqueid}]])"
-                                                            class="btn btn-primary">
-                                                            view
-                                                        </button>
-                                                    </td>
-
-                                                    <td class="text-center">
-                                                        <button type="button"
-                                                            th:onclick="certificateimg([[${list.mobilenum}]],[[${list.uniqueid}]])"
-                                                            class="btn btn-primary">
-                                                            view
-                                                        </button>
-                                                    </td>
-
-                                                    <td class="text-center">
-                                                        <button type="button"
-                                                            th:onclick="applicantimg([[${list.mobilenum}]],[[${list.uniqueid}]])"
-                                                            class="btn btn-primary">
-                                                            view
-                                                        </button>
-                                                    </td>
-                                                    <td class="text-center">
-                                                        <button type="button"
-                                                            th:onclick="proofimg([[${list.mobilenum}]],[[${list.uniqueid}]])"
-                                                            class="btn btn-primary">
-                                                            view
-                                                        </button>
-                                                    </td>
-
-
-                                                    <!--<td th:if="${list.status}"><span class="badge bg-success">Active</span></td>
-                                                      <td th:unless="${list.status}"><span class="badge bg-warning">InActive</span></td>-->
-                                                    <td>
-                                                        <p>
-                                                            <!-- <span class="badge bg-success" th:onclick="accept([[${list.uniqueid}]])">Accept</span> -->
-                                                            <span class="badge bg-warning" style="cursor: pointer;"
-                                                                th:onclick="reject([[${list.uniqueid}]])">pending</span>
-
-                                                        </p>
-
-
-                                                    </td>
-                                                    <td class="text-center">
-                                                        <a th:onclick="viewOwner( [[${list.mobilenum}]] );"
-                                                            data-bs-toggle="tooltip" data-bs-animation="true"
-                                                            data-bs-placement="top" title="View PetOwner info"><i
-                                                                class="fa-regular fa-user"
-                                                                style="font-size: 18px;cursor: pointer;"></i></a>
-                                                    </td>
-
-                                                </tr>
-                                            </tbody>
-                                            <tfoot class="thead-dark">
-                                                <tr>
-                                                    <th>S.No</th>
-                                                    <th>Name</th>
-                                                    <th>Type</th>
-                                                    <th>Breed</th>
-                                                    <th>sex</th>
-                                                    <th>pet photo</th>
-                                                    <th>Rabies certi</th>
-                                                    <th>Application photo</th>
-                                                    <th>Address Proof</th>
-                                                    <th class="text-center">Status</th>
-                                                    <th class="text-center text-center no-sort">Action</th>
-                                                </tr>
-                                            </tfoot>
-                                        </table>
-                                    </div>
-                                </div>
-
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-
-    <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-
-
-    <!-- Modal image -->
-    <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel"
-        aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="exampleModalCenterLabel">Photo</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span></button>
-                </div>
-                <div class="modal-body">
-                    <img alt="" id="myImg" src="" style="width:100%">
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- end of modal image -->
-    <!-- Pet Info Form -->
-    <div class="modal fade" id="rejectForm" tabindex="-1" role="dialog" aria-labelledby="rejectFormCenterLabel"
-        aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-            <div class="modal-content">
-                <form id="petform" onsubmit="return rejectsubmit();">
-
-                <div class="modal-header">
-                    <h5 class="modal-title" id="rejectFormCenterLabel">Pet Information</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span></button>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-                        <input type="hidden" class="form-control text-center" name="uniqid" id="uniqid" disabled />
-                        <input type="hidden" class="form-control text-center" name="Mobii" id="Mobii" disabled />
-
-                        <div class="col-xl-6 col-md-12"> <strong>Pet Name</strong>
-                            <p class="text-muted form-control showInputValue" id="petna"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Pet Type</strong>
-                            <p class="text-muted form-control showInputValue" id="speci"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Breed</strong>
-                            <p class="text-muted form-control showInputValue" id="bre"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Sex</strong>
-                            <p class="text-muted form-control showInputValue" id="gend"></p>
-                        </div>
-
-                        <div class="col-xl-6 col-md-12"> <strong>Age</strong>
-                            <p class="text-muted form-control showInputValue" id="age"></p>
-                        </div>
-
-                        <div class="col-xl-6 col-md-12"> <strong>ARV Date</strong>
-                            <p class="text-muted form-control showInputValue" id="arvd"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Last Date Of De-Worming</strong>
-                            <p class="text-muted form-control showInputValue" id="dewormdate"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Other Vaccination Given</strong>
-                            <p class="text-muted form-control showInputValue" id="othervac"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Previous License No</strong>
-                            <p class="text-muted form-control showInputValue" id="previoslicenseNo"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Name of Veterinary doctor</strong>
-                            <p class="text-muted form-control showInputValue" id="VeterinaryConsultant"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Veterinary Council Number</strong>
-                            <p class="text-muted form-control showInputValue" id="TNVCNo"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Register Date</strong>
-                            <p class="text-muted form-control showInputValue" id="registerdate"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12">
-                            <label class="form-label" for="reason">Reason:<span class="text-danger"></span></label>
-                            <textarea class="form-control " name="reason" id="reason" required></textarea>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-success" onclick="accept()">Accept</button>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    <button type="submit" class="btn btn-primary">Reject</button>
-                </div>
-            </form>
-
-            </div>
-        </div>
-    </div>
-    <!-- owner Info  -->
-    <div class="modal fade" id="ownerForm" tabindex="-1" role="dialog" aria-labelledby="ownerFormCenterLabel"
-        aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="ownerFormCenterLabel">Pet Owner information</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-                        <!-- <input type="hidden" class="form-control text-center" name="uniqid" id="uniqid" disabled /> -->
-                        <div class="col-xl-6 col-md-12"> <strong>Tittle</strong>
-                            <p class="text-muted form-control showInputValue" id="title"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Pet Owner Name</strong>
-                            <p class="text-muted form-control showInputValue" id="fname"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Door No</strong>
-                            <p class="text-muted form-control showInputValue" id="doornumber"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Street</strong>
-                            <p class="text-muted form-control showInputValue" id="street"></p>
-                        </div>
-
-                        <div class="col-xl-6 col-md-12"> <strong>Area</strong>
-                            <p class="text-muted form-control showInputValue" id="area"></p>
-                        </div>
-
-                        <div class="col-xl-6 col-md-12"> <strong>City</strong>
-                            <p class="text-muted form-control showInputValue" id="city"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Pincode</strong>
-                            <p class="text-muted form-control showInputValue" id="pincode"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Zone</strong>
-                            <p class="text-muted form-control showInputValue" id="zone"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Ward</strong>
-                            <p class="text-muted form-control showInputValue" id="ward"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Contact No</strong>
-                            <p class="text-muted form-control showInputValue" id="phone"></p>
-                        </div>
-                        <div class="col-xl-6 col-md-12"> <strong>Email Id</strong>
-                            <p class="text-muted form-control showInputValue" id="email"></p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script type="text/javascript">
-
-        $(document).ready(function () {
-
-            // DataTables buttons configuration
-            var buttons = [
-                {
-                    extend: 'pageLength',
-                    className: 'btn btn-warning'
-                },
-                {
-                    title: 'Data export',
-                    extend: 'copyHtml5',
-                    text: 'Copy',
-                    className: 'btn btn-secondary',
-                    id: 'copyBtn'
-                },
-                {
-                    extend: 'excelHtml5',
-                    text: 'Excel',
-                    className: 'btn btn-secondary',
-                    id: 'excelBtn'
-                },
-                {
-                    extend: 'csvHtml5',
-                    text: 'CSV',
-                    className: 'btn btn-secondary',
-                    id: 'csvBtn'
-                },
-                {
-                    extend: 'pdfHtml5',
-                    text: 'PDF',
-                    className: 'btn btn-secondary',
-                    id: 'pdfBtn'
-                },
-
-            ];
-
-            $('#assetDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { targets: 'no-sort', orderable: false }
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-                ],
-                scrollY: '50vh',
-                fixedColumns: {
-                    left: 1,
-                    right: 1
-                },
-                buttons: [buttons],
-                responsive: true,
-                searching: true,
-                select: false,
-                processing: false,
-            });
-            $('#searchInput').on('keyup', function () {
-                dataTable.search(this.value).draw();
-            });
-        });
-
-        function petimg(mobno, uniqueid) {
-			alert(mobno + "  "+uniqueid);
-            $.ajax({
-                type: "GET",
-                url: '/gcc/api/petregistration/getpetimg',
-                data: {
-                    'mobno': mobno,
-                    'uniqueid': uniqueid
-                },
-                success: function (x) {
-                    document.getElementById("myImg").src = "data:image/jpeg;base64," + x;
-
-                }
-            });
-            $('#exampleModal').modal({
-                backdrop: 'static',
-                keyboard: false
-            });
-            $('#exampleModal').modal('show');
-            return false;
-        }
-
-        function applicantimg(mobno, uniqueid) {
-            $.ajax({
-                type: "GET",
-                url: '/gcc/api/petregistration/getapplicantimg',
-                data: {
-                    'mobno': mobno,
-                    'uniqueid': uniqueid
-                },
-                success: function (x) {
-                    document.getElementById("myImg").src = "data:image/jpeg;base64," + x;
-                }
-            });
-            //document.getElementById("myImg").src ="data:image/jpeg;base64,"+x.applicantphoto;
-            $('#exampleModal').modal({
-                backdrop: 'static',
-                keyboard: false
-            });
-            $('#exampleModal').modal('show');
-        }
-        function certificateimg(mobno, uniqueid) {
-            $.ajax({
-                type: "GET",
-                url: '/gcc/api/petregistration/getvaccineimg',
-                data: {
-                    'mobno': mobno,
-                    'uniqueid': uniqueid
-                },
-                success: function (x) {
-                    document.getElementById("myImg").src = "data:image/jpeg;base64," + x;
-                }
-            });
-            //document.getElementById("myImg").src ="data:image/jpeg;base64,"+x.rabiesvacCerti;
-            $('#exampleModal').modal({
-                backdrop: 'static',
-                keyboard: false
-            });
-            $('#exampleModal').modal('show');
-        }
-        function proofimg(mobno, uniqueid) {
-            $.ajax({
-                type: "GET",
-                url: '/gcc/api/petregistration/getaddressproofimg',
-                data: {
-                    'mobno': mobno,
-                    'uniqueid': uniqueid
-                },
-                success: function (x) {
-                    document.getElementById("myImg").src = "data:image/jpeg;base64," + x;
-                }
-            });
-            //document.getElementById("myImg").src ="data:image/jpeg;base64,"+x.addressproof;
-            $('#exampleModal').modal({
-                backdrop: 'static',
-                keyboard: false
-            });
-            $('#exampleModal').modal('show');
-        }
-        function accept() {
-            let id = document.getElementById("uniqid").value;
-            let mobileNo = document.getElementById("Mobii").value;
-            Swal.fire({
-                title: 'Do you want to Accept this Pet ?',
-                showDenyButton: true,
-                showCancelButton: true,
-                confirmButtonText: 'YES',
-                denyButtonText: `NO`,
-            }).then((result) => {
-                /* Read more about isConfirmed, isDenied below */
-                if (result.isConfirmed) {
-                    $.ajax({
-                        type: "GET",
-                        url: '/gcc/api/pet/accept',
-                        data: { 'id': id, 'mobileNo': mobileNo },
-                        success: function (bodyMessage) {
-                            if (bodyMessage == "success") {
-                                Swal.fire(
-                                    'Done',
-                                    'Successfully Accepted to the ID:' + id,
-                                    'success'
-                                ).then(() => {
-                                    location.reload();
-                                });
-                            }
-                        }
-                    });
-                } else if (result.isDenied) {
-                    Swal.fire('Changes are not saved', '', 'info')
-                }
-            })
-        }
-
-
-        function reject(uniqueid) {
-            $.ajax({
-                type: "GET",
-                url: '/gcc/api/pet/getpetInfo',
-                data: {
-                    'petid': uniqueid
-                },
-                success: function (x) {
-                    showPetInfo(x)
-                }
-            });
-
-        }
-
-        function showPetInfo(list) {
-            $('#rejectForm').modal({
-                backdrop: 'static',
-                keyboard: false
-            });
-            $('#rejectForm').modal('show');
-            console.log(list);
-            document.getElementById("Mobii").value = list.mobilenum;
-            document.getElementById("uniqid").value = list.uniqueid;
-            document.getElementById("petna").innerHTML = list.petname;
-            document.getElementById("speci").innerHTML = list.species;
-            document.getElementById("bre").innerHTML = list.breed;
-            document.getElementById("gend").innerHTML = list.gender;
-            document.getElementById("age").innerHTML = list.age;
-            document.getElementById("arvd").innerHTML = list.arvdate;
-            document.getElementById("dewormdate").innerHTML = list.dewormdate;
-            document.getElementById("othervac").innerHTML = list.othervac;
-            document.getElementById("previoslicenseNo").innerHTML = list.previoslicenseNo;
-            document.getElementById("VeterinaryConsultant").innerHTML = list.veterinaryConsultant;
-            document.getElementById("TNVCNo").innerHTML = list.tnvcno;
-            document.getElementById("registerdate").innerHTML = list.registerdate;
-        }
-
-        function rejectsubmit() {
-            var reason = $("#reason").val();
-            var id = $("#uniqid").val();
-            var mobileNo = $("#Mobii").val();
-
-            // alert(reason+" "+id+" "+mobileNo);
-            Swal.fire({
-                title: 'Do you want to Reject this Pet ?',
-                showDenyButton: true,
-                showCancelButton: true,
-                confirmButtonText: 'YES',
-                denyButtonText: `NO`,
-            }).then((result) => {
-                /* Read more about isConfirmed, isDenied below */
-                if (result.isConfirmed) {
-                    $.ajax({
-                        type: "GET",
-                        url: '/api/pet/reject',
-                        data: { 'id': id, 'reason': reason, 'mobileNo': mobileNo },
-                        success: function (bodyMessage) {
-                            if (bodyMessage == "success") {
-                                console.log("done");
-                                Swal.fire(
-                                    'Done',
-                                    'Successfully Rejected to the ID:' + id,
-                                    'success'
-                                ).then(() => {
-                                    location.reload();
-                                });
-                            }
-
-                        }
-
-                    });
-
-                } else if (result.isDenied) {
-                    Swal.fire('Changes are not saved', '', 'info')
-                }
-            })
-
-            return false;
-
-        }
-
-        function viewOwner(mobilenum) {
-            let own;
-            $.ajax({
-                type: "GET",
-                url: '/gcc/api/pet/getpetOwner',
-                data: { 'mobilenum': mobilenum },
-                success: function (bodyMessage) {
-                    ownercall(bodyMessage);
-                }
-            });
-        }
-        function ownercall(list) {
-            $('#ownerForm').modal({
-                backdrop: 'static',
-                keyboard: false
-            });
-            $('#ownerForm').modal('show');
-            document.getElementById("title").innerHTML = list.title;
-            document.getElementById("fname").innerHTML = list.fname;
-            document.getElementById("doornumber").innerHTML = list.doornumber;
-            document.getElementById("street").innerHTML = list.street;
-            document.getElementById("area").innerHTML = list.area;
-            document.getElementById("city").innerHTML = list.city;
-            document.getElementById("pincode").innerHTML = list.pincode;
-            document.getElementById("zone").innerHTML = list.zone;
-            document.getElementById("ward").innerHTML = list.ward;
-            document.getElementById("phone").innerHTML = list.phone;
-            document.getElementById("email").innerHTML = list.email;
-            document.getElementById("pancard").innerHTML = list.pancard;
-            document.getElementById("aadhar").innerHTML = list.aadhar;
-            document.getElementById("voterid").innerHTML = list.voterid;
-
-        }
-        // Function to call modal for New pet registration
-        callAdd = function () {
-            $('#addForm').modal({
-                backdrop: 'static',
-                keyboard: false
-            })
-            $('#addForm').modal('show');
-        }
-        // $(document).ready(function () {
-        //     var today = new Date();
-        //     $('.datepicker').datepicker({
-        //         dateFormat: 'yy-mm-dd',
-        //         maxDate: '1'
-        //     })
-        //     $('.datepicker').keyup(function () {
-        //         if (this.value.match(/[^0-9]/g)) {
-        //             this.value = this.value.replace(/[^0-9^-]/g, '');
-        //         }
-        //     });
-        // });
-
-
-
-
-        function getbydate() {
-            var x = document.getElementById("fromdate").value;
-            var y = document.getElementById("todate").value;
-
-            var url = '/gcc/pet/petregistration/requestlist?fromDate=' + x + '&toDate=' + y;
-            window.location.href = url;
-
-        }
-        function resetDate() {
-            var url = '/gcc/pet/petregistration/requestlist';
-            window.location.href = url;
-        }
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/pgr/all-list.html b/src/main/resources/templates/modules/pgr/all-list.html
deleted file mode 100644
index f027ba85..00000000
--- a/src/main/resources/templates/modules/pgr/all-list.html
+++ /dev/null
@@ -1,290 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>PGR - All Reports</h5>
-                                            <span>Public Grievance Redressal Reports</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item active" aria-current="page">All Reports</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/pgr/search_form :: div}"></div>
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="complaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Zone No.</th>
-						 								<th class="text-center">Div No.</th>
-						 								<th class="text-center">User Name</th>
-						 								<th class="text-center">Complaint No.</th>
-														<th class="text-center">Complaint Type</th>
-						                                <th class="text-center">Location</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Time</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center">Mode</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Zone No.</th>
-						 								<th class="text-center">Div No.</th>
-						 								<th class="text-center">User Name</th>
-						 								<th class="text-center">Complaint No.</th>
-														<th class="text-center">Complaint Type</th>
-						                                <th class="text-center">Location</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Time</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center">Mode</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-        <script th:inline="javascript">
-        	
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List'
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-	        	$("#filter_reset_btn").prop("disabled", true);
-	        	$("#filter_search_btn").prop("disabled", true);
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				$("#filter_reset_btn").prop("disabled", false);
-				$("#filter_search_btn").prop("disabled", false);
-				loading.html("");
-			}
-			
-	        /* Get Department Data */
-	        function get_department_data(){
-	
-	    		get_department_list().then(function(departments) {
-	    		    // Handle the department list
-	    		    departmentlist = departments;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(departmentlist, function(index, department) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: department.ID_DEPT, // case-sensitive as per object
-	    	                text: department.DEPT_NAME
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#search_department_id').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-	        
-	        /* Get Complaints Data */
-	        function get_complaints_data(){
-	        	var apiUrl = '/gcc/api/pgr/getComplaintsList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_complaints_list(){
-	        	get_complaints_data().then(function(complaintList) {
-	    		    // Handle the department list
-	    		    generate_table(complaintList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#complaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', orderable: false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                    row['ZONE_NAME'],
-	                    row['DIVISION_NAME'],
-	                    row['USER_NAME'],
-	                    "<a href=\"#\" onclick=\"return viewComplaintDetails('"+row['COMPLAINTNUMBER']+"')\" class=\"link\">"+row['COMPLAINTNUMBER']+"</a>",
-	                    row['COMPLAINTTYPENAME'],
-	                    row['LOCATION'],
-	                    row['COMPDATE'],
-	                    row['TIME'],
-	                    row['STATUS'],
-	                    row['DEPT_NAME'],
-	                    row['MODE']
-	                ]).draw(false);
-	            });
-	            
-	            // Now call for Filter
-	            get_department_data();
-	            
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-	            get_complaints_list();
-	            
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/pgr/index.html b/src/main/resources/templates/modules/pgr/index.html
deleted file mode 100644
index 08bbd905..00000000
--- a/src/main/resources/templates/modules/pgr/index.html
+++ /dev/null
@@ -1,788 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-		<link rel="stylesheet" href="node_modules/amcharts3/amcharts/plugins/export/export.css" type="text/css" media="all" />
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-bar-chart-2 bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>PGR</h5>
-                                            <span>Public Grievance Redressal Reports</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <!-- <h4 class="h4 text-right text-mute" style="font-size: 12px;">Auot refresh in <font id="refresh-countdown">00</font> seconds</h4> -->
-                        <div class="row">
-			                <div class="col-md-12">
-				                <div class="card sale-card">
-		                            <div class="card-header">
-		                                <i class="fas fa-chart-pie pr-2"></i><h3>OverAll Complaint Age Analysis</h3>
-		                                <div class="card-header-right">
-                                            <i id="update_pie_loading"></i>
-                                        </div>
-		                            </div>
-		                            <div class="card-block text-center" id="">
-		                            	<h3 id="pie_card" style="font-size:12px"></h3>
-		                            	<div id="pie_content_html">
-		                            		
-			                            	<h6>OverAll Pending</h6>
-			                                <h3 id="pie_pending" class="chart-shadow" style="height:350px; font-size:12px;border-bottom: 1px solid #dee2e6;">0</h3>
-			                                
-			                                <h6>OverAll Reopen</h6>
-			                                <h3 id="pie_reopen_pending" class="chart-shadow" style="height:350px; font-size:12px">0</h3>
-		                                </div>
-		                            </div>
-		                        </div>    
-	                        </div> 
-	                        
-			                <div class="col-md-12">
-				                <div class="card sale-card">
-		                            <div class="card-header">
-		                                <i class="fas fa-chart-bar pr-2"></i><h3>Complaint`s Type Wise Pending Count`s</h3>
-		                            </div>
-		                            <div class="card-block">
-		                                <div id="deal-analytic-chart" class="chart-shadow" style="height:300px"></div>
-		                            </div>
-		                        </div>    
-	                        </div>    
-	                        
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		       
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-        
-        <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="node_modules/amcharts3/amcharts/plugins/export/export.min.js"></script>
-        <script src="node_modules/amcharts3/amcharts/pie.js"></script>
-        <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <!-- <script src="node_modules/fullcalendar/dist/fullcalendar.min.js"></script>-->
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        
-        <script>
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	const loading = $("#pie_card");
-        	var pie_data = "";
-        	var departmentlist = "";
-        	
-        	function callPieFilter(){
-            	var filter = $("#search_id").val();
-            	pass_pie_data(filter);
-            	pass_bar_data(filter);
-    		}
-            
-            function callReSetPieFilter(){
-            	var filter = 0;
-            	$("#search_id").val(filter);
-            	pass_pie_data(filter);
-            	pass_bar_data(filter);
-    		}
-            
-            
-        	function get_department_data(){
-
-        		get_department_list().then(function(departments) {
-        		    // Handle the department list
-        		    //console.log('Department list:', departmentlist);
-        		    departmentlist = departments;
-        		    fetchPie_Data(0); // Dropdown fileter value
-					fetchData_Bar(0); // Dropdown fileter value
-        		}).catch(function(error) {
-        		    // Handle errors
-        		    console.error('Error fetching department list:', error.message);
-        		    //alert('Failed to fetch department list. Please try again later.');
-        		    Swal.fire({
-        				title: 'Failed to fetch data from ERP. Please try again later.',
-        				customClass: {
-        			        title: 'swal-title-custom' // Add a custom class for the title
-        			    },
-        				//text: "Error",
-        				icon: 'error',
-        				showCancelButton: false,
-        				confirmButtonColor: '#3085d6',
-        				cancelButtonColor: '#d33',
-        				confirmButtonText: 'Ok',
-        				}).then(function(result) {
-        				if (result.isConfirmed) {
-        					// Handle after confirmed button (Ok) click
-        				}
-        			});
-        		});
-			}
-        	
-			function fetchPie_Data(deptid){
-				
-				var pie_option = "";
-				
-				for (var i = 0; i < departmentlist.length; i++) {
-					pie_option +='<option value="'+departmentlist[i]["ID_DEPT"]+'">'+departmentlist[i]["DEPT_NAME"]+'</option>';
-				}
-				
-				call_loading('update_pie_loading','start');
-						
-				var apiUrl = '/gcc/api/pgr/getPendingComplaintCount';
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						
-						pie_data = jsonResponse;
-						
-						$("#pie_content_html").html('' +
-							    '<div class="row">' +
-							        '<div class="col-12 mb-2">' +
-							            '<div class="input-group mb-0">' +
-							                '<span class="input-group-prepend">' +
-							                    '<button type="button" class="btn btn-success" onclick="callReSetPieFilter(0);" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Reset" title="Reset">' +
-							                        '<i class="ik ik-refresh-ccw"></i>' +
-							                    '</button>' +
-							                '</span>' +
-							                '<select class="form-control" id="search_id" name="search_id">' +
-							                    '<option value="0">All Departments</option>' +
-							                    '' + pie_option +
-							                '</select>' +
-							                '<span class="input-group-append">' +
-							                    '<button type="button" class="btn btn-success" onclick="callPieFilter();" data-toggle="tooltip" data-animation="true" data-placement="top" data-original-title="Search" title="Search">' +
-							                        '<i class="ik ik-search me-1"></i> Search' +
-							                    '</button>' +
-							                '</span>' +
-							            '</div>' +
-							        '</div>' +
-							    '</div>' +
-							    '<h3 id="pie_pending" class="chart-shadow" style="height:350px; font-size:12px;border-bottom: 1px solid #dee2e6;">0</h3>' +
-							    '<h3 id="pie_reopen_pending" class="chart-shadow" style="height:350px; font-size:12px">0</h3>'
-							);
-
-						pass_pie_data(0);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-			/*
-			let refreshInterval;
-			let remainingTime = 60; // Initial countdown time in seconds
-			
-			function updateCountdown() {
-			 let remainingTimetxt = remainingTime;
-				if(remainingTime<10){
-					remainingTimetxt = "0"+remainingTime;
-				}
-			  document.getElementById("refresh-countdown").textContent = remainingTimetxt;
-			  remainingTime--;
-			
-			  if (remainingTime < 0) {
-			    clearInterval(refreshInterval);
-			    remainingTime = 60;
-			    fetchDashboardSummary_Pie();
-			    refreshInterval = setInterval(updateCountdown, 1000);
-			  }
-			}
-			*/
-		</script>
-		
-        <script>
-		
-        function pass_pie_data(filter){
-			
-        	jsonResponse = pie_data;
-        	
-        	// Initialize variables to store sums
-        	var pending_title = "OverAll Pending Without Reopen";
-			var pending_reoprn_title = "OverAll Reopen Pending";
-			
-			var DAYS_90_PEN = 0;
-			var DAYS_90_REOPEN = 0;
-			var DAYS_61_90_PEN = 0;
-			var DAYS_61_90_REOPEN = 0;
-			var DAYS_31_60_PEN = 0;
-			var DAYS_31_60_REOPEN = 0;
-			var DAYS_16_30_PEN = 0;
-			var DAYS_16_30_REOPEN = 0;
-			var DAYS_0_15_PEN = 0;
-			var DAYS_0_15_REOPEN = 0;
-			
-			var filterSearch = [];
-        	// Loop through the jsonResponse array
-			for (var i = 0; i < jsonResponse.length; i++) {
-			    // Accumulate values for each data
-			    if(filter>0){
-					/*
-			    	if(filter==48){ // Regional Office North (48)
-						//Zones Under 48: NA-THIRUVOTTIYR ID -32 || NB-MANALI ID- 33 || NC-MADHAVARAM ID- 34 || ND-TONDIARPET ID- 35 || NE-ROYAPURAM ID- 36
-						filterSearch = [32, 33, 34, 35, 36];
-					}
-					
-			    	else if(filter==50){ //Regional Office Central (50)
-						//Zones Under 50: NF-THIRU-VI-KA-NAGAR ID- 37 || NG-AMBATTUR ID- 38 || NH-ANNA NAGAR ID- 39 || NJ-TEYNAMPET ID- 40 || NK-KODAMBAKKAM ID- 41
-						filterSearch = [37, 38, 39, 40, 41];
-					
-					}
-
-			    	else if(filter==49){ //Regional Office South (49)
-						//Zones Under 49: NA-VALASARAVAKKAM ID - 42 || NM-ALANDUR ID- 43 || NN-ADYAR ID - 44 || NP-PERUNGUDI ID- 45 || NQ-SHOZHINGANALLUR - 46 
-						filterSearch = [42, 43, 44, 45, 46];	
-					}
-			    	else{
-			    		filterSearch =[filter];
-					}
-					
-			    	console.log(filterSearch);
-			    	*/
-					//if (filterSearch.includes(jsonResponse[i]["DEPTID"])) { // Only Seleted Departments or Zone
-					if(jsonResponse[i]["DEPTID"]==filter){ 
-						//alert(filter);
-						pending_title = "OverAll Pending Witout Reopen of "+jsonResponse[i]["DEPT_NAME"];
-						pending_reoprn_title = "OverAll Reopen Pending of "+jsonResponse[i]["DEPT_NAME"];
-						
-						DAYS_90_PEN += jsonResponse[i]["DAYS_90_PEN"];
-					    DAYS_90_REOPEN += jsonResponse[i]["DAYS_90_REOPEN"];
-					    DAYS_61_90_PEN += jsonResponse[i]["DAYS_61_90_PEN"];
-					    DAYS_61_90_REOPEN += jsonResponse[i]["DAYS_61_90_REOPEN"];
-					    DAYS_31_60_PEN += jsonResponse[i]["DAYS_31_60_PEN"];
-					    DAYS_31_60_REOPEN += jsonResponse[i]["DAYS_31_60_REOPEN"];
-					    DAYS_16_30_PEN += jsonResponse[i]["DAYS_16_30_PEN"];
-					    DAYS_16_30_REOPEN += jsonResponse[i]["DAYS_16_30_REOPEN"];
-					    DAYS_0_15_PEN += jsonResponse[i]["DAYS_0_15_PEN"];
-					    DAYS_0_15_REOPEN += jsonResponse[i]["DAYS_0_15_REOPEN"];
-					}
-				}
-			    else{
-				// All data
-			    	DAYS_90_PEN += jsonResponse[i]["DAYS_90_PEN"];
-				    DAYS_90_REOPEN += jsonResponse[i]["DAYS_90_REOPEN"];
-				    DAYS_61_90_PEN += jsonResponse[i]["DAYS_61_90_PEN"];
-				    DAYS_61_90_REOPEN += jsonResponse[i]["DAYS_61_90_REOPEN"];
-				    DAYS_31_60_PEN += jsonResponse[i]["DAYS_31_60_PEN"];
-				    DAYS_31_60_REOPEN += jsonResponse[i]["DAYS_31_60_REOPEN"];
-				    DAYS_16_30_PEN += jsonResponse[i]["DAYS_16_30_PEN"];
-				    DAYS_16_30_REOPEN += jsonResponse[i]["DAYS_16_30_REOPEN"];
-				    DAYS_0_15_PEN += jsonResponse[i]["DAYS_0_15_PEN"];
-				    DAYS_0_15_REOPEN += jsonResponse[i]["DAYS_0_15_REOPEN"];
-				}
-			    
-			}
-			
-			var pieData = [
-			    { "title":"Above 90 Days", "color": "#F22613", "value": DAYS_90_PEN },
-			    { "title":"61 - 90 Days", "color": "#F29D13", "value": DAYS_61_90_PEN },
-			    { "title":"31 - 60 Days", "color": "#F2BA13", "value": DAYS_31_60_PEN },
-			    { "title":"16 - 30 Days", "color": "#F2EB13", "value": DAYS_16_30_PEN },
-			    { "title":"0 - 15 Days", "color": "#91F213", "value": DAYS_0_15_PEN }
-			];
-			
-			var pieData_reoprn = [
-			    { "title":"Above 90 Days", "color": "#F22613", "value": DAYS_90_REOPEN },
-			    { "title":"61 - 90 Days", "color": "#F29D13", "value": DAYS_61_90_REOPEN },
-			    { "title":"31 - 60 Days", "color": "#F2BA13", "value": DAYS_31_60_REOPEN },
-			    { "title":"16 - 30 Days", "color": "#F2EB13", "value": DAYS_16_30_REOPEN },
-			    { "title":"0 - 15 Days", "color": "#91F213", "value": DAYS_0_15_REOPEN }
-			];
-			
-			
-			call_pending_pie(pieData,pending_title);
-			call_pending_reopen_pie(pieData_reoprn,pending_reoprn_title);
-			
-			loading.html("");
-			
-			$("#update_pie_loading").html("");
-		}
-        
-		function call_pending_pie(pieData,title){
-			
-			var chart = AmCharts.makeChart("pie_pending", {
-                "type": "pie",
-                "theme": "light",
-                "dataProvider": pieData,
-                "valueField": "value",
-                "titleField": "title",
-                "colorField": "color",
-                "alpha": 0.8,
-                "outlineAlpha": 0.5,
-                //"depth3D": 25,
-                "balloonText": "[[[[title]]]]<br><span style='font-size:14px'><b>[[[[value]]]]</b> ([[[[percents]]]]%)</span>",
-                "angle": 45,
-                "export": {
-                    "enabled": true,
-                    "fileName": title
-                },
-                "legend": {
-		            "position": "right"
-		        },
-		        "titles": [{
-		            "text": title,
-		            "size": 15,
-		            "marginBottom": 20
-		        }]
-            });
-		}
-		
-		function call_pending_reopen_pie(pieData,title){
-			
-			var chart = AmCharts.makeChart("pie_reopen_pending", {
-                "type": "pie",
-                "theme": "light",
-                "dataProvider": pieData,
-                "valueField": "value",
-                "titleField": "title",
-                "colorField": "color",
-                "alpha": 0.8,
-                "outlineAlpha": 0.5,
-                //"depth3D": 25,
-                "balloonText": "[[[[title]]]]<br><span style='font-size:14px'><b>[[[[value]]]]</b> ([[[[percents]]]]%)</span>",
-                "angle": 45,
-                "export": {
-                    "enabled": true,
-                    "fileName": title
-                },
-                "legend": {
-		            "position": "right"
-		        },
-		        "titles": [{
-		            "text": title,
-		            "size": 15,
-		            "marginBottom": 20
-		        }]
-            });
-		}
-        </script>   
-        
-        <script>
-		var bar_data_1 = "";
-		var bar_data_2 = "";
-		var chart = "";
-		
-		var pending_title = "OverAll Pending By Complaint`s Type";
-		var pending_reopen_title = "OverAll Reopen By Complaint`s Type";
-		
-        function fetchData_Bar(deptid){
-			
-			call_loading('update_bar_loading','start');
-					
-			var apiUrl = '/gcc/api/pgr/getZoneWisePendingComplaintCount';
-			$.ajax({
-			    url: apiUrl,
-			    type: 'GET',
-			    dataType: 'json',
-			    success: function(jsonResponse) {
-					// Handle the API response data here
-					console.log('Data from API:', jsonResponse);
-					
-					bar_data_1 = jsonResponse;
-					
-					fetch2Data_Bar(0);
-					
-					//loading.html("");
-					
-					//$("#update_pie_loading").html("");
-			    },
-			    error: function(xhr, status, error) {
-			      // Handle errors here
-			      console.error('Error fetching data:', status, error);
-			    }
-			});
-		}
-        
-function fetch2Data_Bar(deptid){	
-			var apiUrl = '/gcc/api/pgr/getZoneWiseReopenComplaintCount';
-			$.ajax({
-			    url: apiUrl,
-			    type: 'GET',
-			    dataType: 'json',
-			    success: function(jsonResponse) {
-					// Handle the API response data here
-					console.log('Data from API:', jsonResponse);
-					
-					bar_data_2 = jsonResponse;
-					
-					pass_bar_data(0);
-					
-					//loading.html("");
-					
-					//$("#update_pie_loading").html("");
-			    },
-			    error: function(xhr, status, error) {
-			      // Handle errors here
-			      console.error('Error fetching data:', status, error);
-			    }
-			});
-		}
-        
-		function pass_bar_data(filter){
-			
-        	jsonResponse = bar_data_1;
-        	jsonResponse2 = bar_data_2;
-        	
-        	// Initialize variables to store sums
-        	
-			var NONBURSTLT = 0;
-			var REOFGAR = 0;
-			var ROAD = 0;
-			var MOSQUITE = 0;
-			var WATER = 0;
-			var REOFDEB = 0;
-			var TREE = 0;
-			var DOGS = 0;
-			var ENCMTN = 0;
-			var POT = 0;
-			var PTAX = 0;
-			var OTHERS = 0;
-			
-			var NONBURSTLT_REOPEN = 0;
-			var REOFGAR_REOPEN = 0;
-			var ROAD_REOPEN = 0;
-			var MOSQUITE_REOPEN = 0;
-			var WATER_REOPEN = 0;
-			var REOFDEB_REOPEN = 0;
-			var TREE_REOPEN = 0;
-			var DOGS_REOPEN = 0;
-			var ENCMTN_REOPEN = 0;
-			var POT_REOPEN = 0;
-			var PTAX_REOPEN = 0;
-			var OTHERS_REOPEN = 0;
-			
-			var filterSearch = [];
-        	// Loop through the jsonResponse array
-			for (var i = 0; i < jsonResponse.length; i++) {
-			    // Accumulate values for each data
-				if(filter>0){
-					if(filter==48){ // Regional Office North (48)
-						//Zones Under 48: NA-THIRUVOTTIYR ID -32 || NB-MANALI ID- 33 || NC-MADHAVARAM ID- 34 || ND-TONDIARPET ID- 35 || NE-ROYAPURAM ID- 36
-						filterSearch = [32, 33, 34, 35, 36];
-					}
-					
-					else if(filter==50){ //Regional Office Central (50)
-						//Zones Under 50: NF-THIRU-VI-KA-NAGAR ID- 37 || NG-AMBATTUR ID- 38 || NH-ANNA NAGAR ID- 39 || NJ-TEYNAMPET ID- 40 || NK-KODAMBAKKAM ID- 41
-						filterSearch = [37, 38, 39, 40, 41];
-					
-					}
-
-					else if(filter==49){ //Regional Office South (49)
-						//Zones Under 49: NA-VALASARAVAKKAM ID - 42 || NM-ALANDUR ID- 43 || NN-ADYAR ID - 44 || NP-PERUNGUDI ID- 45 || NQ-SHOZHINGANALLUR - 46 
-						filterSearch = [42, 43, 44, 45, 46];	
-					}
-					else{
-			    		filterSearch =[filter];
-					}
-					
-					if (filterSearch.includes(jsonResponse[i]["DEPTID"])) { // Only Seleted Departments or Zone
-						
-						pending_title = "OverAll Pending of "+jsonResponse[i]["DEPT_NAME"]+" By Complaint`s Type";
-						pending_reopen_title = "OverAll Reopen of "+jsonResponse[i]["DEPT_NAME"]+" By Complaint`s Type";
-						
-						NONBURSTLT += jsonResponse[i]["NONBURSTLT"];
-						REOFGAR += jsonResponse[i]["REOFGAR"];
-						ROAD += jsonResponse[i]["ROAD"];
-						MOSQUITE += jsonResponse[i]["MOSQUITE"];
-						WATER += jsonResponse[i]["WATER"];
-						REOFDEB += jsonResponse[i]["REOFDEB"];
-						TREE += jsonResponse[i]["TREE"];
-						DOGS += jsonResponse[i]["DOGS"];
-						ENCMTN += jsonResponse[i]["ENCMTN"];
-						POT += jsonResponse[i]["POT"];
-						PTAX += jsonResponse[i]["PTAX"];
-						OTHERS += jsonResponse[i]["OTHERS"];
-					}
-				}
-			    else{
-				// All data
-			    		NONBURSTLT += jsonResponse[i]["NONBURSTLT"];
-						REOFGAR += jsonResponse[i]["REOFGAR"];
-						ROAD += jsonResponse[i]["ROAD"];
-						MOSQUITE += jsonResponse[i]["MOSQUITE"];
-						WATER += jsonResponse[i]["WATER"];
-						REOFDEB += jsonResponse[i]["REOFDEB"];
-						TREE += jsonResponse[i]["TREE"];
-						DOGS += jsonResponse[i]["DOGS"];
-						ENCMTN += jsonResponse[i]["ENCMTN"];
-						POT += jsonResponse[i]["POT"];
-						PTAX += jsonResponse[i]["PTAX"];
-						OTHERS += jsonResponse[i]["OTHERS"];
-				}
-			    
-			}
-        	
-			// Loop through the jsonResponse array
-			for (var i = 0; i < jsonResponse2.length; i++) {
-			    // Accumulate values for each data
-			    if(filter>0){
-					if(jsonResponse2[i]["DEPTID"]==filter){ // Only Seleted Departments or Zone
-						
-						pending_title = "OverAll Pending of "+jsonResponse2[i]["DEPT_NAME"]+" By Complaint`s Type";
-						pending_reoprn_title = "OverAll Reopen of "+jsonResponse2[i]["DEPT_NAME"]+" By Complaint`s Type";
-						
-						NONBURSTLT_REOPEN += jsonResponse2[i]["NONBURSTLT"];
-						REOFGAR_REOPEN += jsonResponse2[i]["REOFGAR"];
-						ROAD_REOPEN += jsonResponse2[i]["ROAD"];
-						MOSQUITE_REOPEN += jsonResponse2[i]["MOSQUITE"];
-						WATER_REOPEN += jsonResponse2[i]["WATER"];
-						REOFDEB_REOPEN += jsonResponse2[i]["REOFDEB"];
-						TREE_REOPEN += jsonResponse2[i]["TREE"];
-						DOGS_REOPEN += jsonResponse2[i]["DOGS"];
-						ENCMTN_REOPEN += jsonResponse2[i]["ENCMTN"];
-						POT_REOPEN += jsonResponse2[i]["POT"];
-						PTAX_REOPEN += jsonResponse2[i]["PTAX"];
-						OTHERS_REOPEN += jsonResponse2[i]["OTHERS"];
-					}
-				}
-			    else{
-					// All data
-						NONBURSTLT_REOPEN += jsonResponse2[i]["NONBURSTLT"];
-						REOFGAR_REOPEN += jsonResponse2[i]["REOFGAR"];
-						ROAD_REOPEN += jsonResponse2[i]["ROAD"];
-						MOSQUITE_REOPEN += jsonResponse2[i]["MOSQUITE"];
-						WATER_REOPEN += jsonResponse2[i]["WATER"];
-						REOFDEB_REOPEN += jsonResponse2[i]["REOFDEB"];
-						TREE_REOPEN += jsonResponse2[i]["TREE"];
-						DOGS_REOPEN += jsonResponse2[i]["DOGS"];
-						ENCMTN_REOPEN += jsonResponse2[i]["ENCMTN"];
-						POT_REOPEN += jsonResponse2[i]["POT"];
-						PTAX_REOPEN += jsonResponse2[i]["PTAX"];
-						OTHERS_REOPEN += jsonResponse2[i]["OTHERS"];
-				}
-			    
-			}
-			
-			var barData = [
-				{
-		            "issueCategory": "Street Light<br>not burning",
-		            "AllPendingwithReopen": NONBURSTLT,
-		            "onlyReopen": NONBURSTLT_REOPEN
-		        },
-		        {
-		            "issueCategory": "Removal of<br>Garbage",
-		            "AllPendingwithReopen": REOFGAR,
-		            "onlyReopen": REOFGAR_REOPEN
-		        },
-		        {
-		            "issueCategory": "Road<br>Damaged",
-		            "AllPendingwithReopen": ROAD,
-		            "onlyReopen": ROAD_REOPEN
-		        },
-		        {
-		            "issueCategory": "Mosquito<br>Nuisance",
-		            "AllPendingwithReopen": MOSQUITE,
-		            "onlyReopen": MOSQUITE_REOPEN
-		        },
-		        
-		        {
-		            "issueCategory": "Water<br>Stagnation",
-		            "AllPendingwithReopen": WATER,
-		            "onlyReopen": WATER_REOPEN
-		        },
-		        {
-		            "issueCategory": "Removal of<br>Debries",
-		            "AllPendingwithReopen": REOFDEB,
-		            "onlyReopen": REOFDEB_REOPEN
-		        },
-		        {
-		            "issueCategory": "Tree<br>Fallen",
-		            "AllPendingwithReopen": TREE,
-		            "onlyReopen": TREE_REOPEN
-		        },
-		        {
-		            "issueCategory": "Dog<br>Menace",
-		            "AllPendingwithReopen": DOGS,
-		            "onlyReopen": DOGS_REOPEN
-		        },
-		        {
-		            "issueCategory": "Encroachment",
-		            "AllPendingwithReopen": ENCMTN,
-		            "onlyReopen": ENCMTN_REOPEN
-		        },
-		        {
-		            "issueCategory": "Potshole",
-		            "AllPendingwithReopen": POT,
-		            "onlyReopen": POT_REOPEN
-		        },
-		        {
-		            "issueCategory": "Property Tax",
-		            "AllPendingwithReopen": PTAX,
-		            "onlyReopen": PTAX_REOPEN
-		        },
-		        {
-		            "issueCategory": "Others",
-		            "AllPendingwithReopen": OTHERS,
-		            "onlyReopen": OTHERS_REOPEN
-		        },
-		       
-			];
-			
-			call_zonewise_pending_bar(barData);
-		}
-		
-		function call_zonewise_pending_bar(chartData){
-		
-			/*
-			var chartData = [];
-		    var currentDate = new Date();
-		    var currentMonth = currentDate.getMonth() + 1;
-		    var currentYear = currentDate.getFullYear();
-		    var daysInMonth = new Date(currentYear, currentMonth, 0).getDate();
-		
-		    // Generate random data for each date in the current month
-		    for (var i = 1; i <= daysInMonth; i++) {
-		        var randomValue1 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		        var randomValue2 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		
-		        var issueCategory = currentYear + '-' + (currentMonth < 10 ? '0' : '') + currentMonth + '-' + (i < 10 ? '0' : '') + i;
-		        
-		        var dataPoint = {
-		            "issueCategory": issueCategory,
-		            "AllPendingwithReopen": randomValue1,
-		            "onlyReopen": randomValue2
-		        };
-		        chartData.push(dataPoint);
-		    }
-		    */
-		    
-			// deal-analytic-chart
-		    chart = AmCharts.makeChart("deal-analytic-chart", {
-		        "type": "serial",
-		        "theme": "light",
-		        //"dataDateFormat": "YYYY-MM-DD",
-		        //"precision": 2,
-		        "valueAxes": [{
-		            "id": "v1",
-		            "position": "left",
-		            "autoGridCount": false,
-		            "labelFunction": function(value) {
-		                return "$" + Math.round(value) + "M";
-		            }
-		        }, {
-		            "id": "v2",
-		            "gridAlpha": 0,
-		            "autoGridCount": false
-		        }],
-		        "graphs": [{
-		            "id": "g1",
-		            "valueAxis": "v2",
-		            /*"bullet": "round",
-		            "bulletBorderAlpha": 1,
-		            "bulletColor": "#FFFFFF",
-		            "bulletSize": 8,
-		            "hideBulletsCount": 50,
-		            "lineThickness": 3,
-		            "lineColor": "#2ed8b6",*/
-		            "lineColor": "#2ed8b6",
-		            "fillColors": "#2ed8b6",
-		            "type": "column",
-		            "fillAlphas": 0.3,
-		            "columnWidth": 0.5,
-		            "title": pending_title,
-		            "useLineColorForBulletBorder": true,
-		            "valueField": "AllPendingwithReopen",
-		            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-		        }, {
-		            "id": "g2",
-		            "valueAxis": "v2",
-		            //"bullet": "round",
-		            //"bulletBorderAlpha": 1,
-		            //"bulletColor": "#FFFFFF",
-		            //"bulletSize": 8,
-		            //"hideBulletsCount": 50,
-		            //"lineThickness": 3,
-		            //"lineColor": "#e95753",
-		            "lineColor": "#F22613",
-		            "fillColors": "#F22613",
-		            "type": "column",
-		            "fillAlphas": 0.3,
-		            "columnWidth": 0.5,
-		            "title": pending_reopen_title,
-		            "useLineColorForBulletBorder": true,
-		            "valueField": "onlyReopen",
-		            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-		        }],
-		        "chartCursor": {
-		            "pan": true,
-		            "valueLineEnabled": true,
-		            "valueLineBalloonEnabled": true,
-		            "cursorAlpha": 0,
-		            "valueLineAlpha": 0.2
-		        },
-		        "categoryField": "issueCategory",
-		        "categoryAxis": {
-		            //"parseDates": true,
-		            "dashLength": 1,
-		            "minorGridEnabled": true
-		        },
-		        "legend": {
-		            "useGraphSettings": true,
-		            "position": "top"
-		        },
-		        "balloon": {
-		            "borderThickness": 1,
-		            "shadowAlpha": 0
-		        },
-		        "export": {
-		            "enabled": true,
-		            "fileName": "Complaint`s Type Wise Pending Count`s"
-		        },
-		        "dataProvider": chartData,
-		    });
-		}
-		</script>
-		
-		<script>
-		$(document).ready(function() {
-			
-				//loading.html(searchinfo("<b>Please wait as I'm trying to fetch the data. It will take less than 30 seconds.</b>"));
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-				call_loading('deal-analytic-chart','start');
-				
-				$("#pie_content_html").html("");
-				
-				// Initial fetch and countdown start
-				get_department_data(); // Dropdown fileter value
-				
-				//refreshInterval = setInterval(updateCountdown, 1000);
-		});
-		</script>
-	
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/pgr/qa-qc-list.html b/src/main/resources/templates/modules/pgr/qa-qc-list.html
deleted file mode 100644
index b0173346..00000000
--- a/src/main/resources/templates/modules/pgr/qa-qc-list.html
+++ /dev/null
@@ -1,299 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-thumbs-up bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>QA AND QC Report</h5>
-                                            <span>Public Grievance Redressal Reports</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item active" aria-current="page">All Reports</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/pgr/search_form :: div}"></div>
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="complaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-						 								<th class="text-center">Complaint No.</th>
-						 								<th class="text-center">Department</th>
-														<th class="text-center">Complaint Type</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Time</th>
-						                                <th class="text-center">Complaint Details</th>
-						                                <th class="text-center">Reporter Name</th>
-						 								<th class="text-center">Reporter Mobile</th>
-						 								<th class="text-center">Officer ID</th>
-						 								<th class="text-center">Officer Mobile</th>
-						 								<th class="text-center">Completion Date</th>
-						                                <th class="text-center">Status</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-						 								<th class="text-center">Complaint No.</th>
-						 								<th class="text-center">Department</th>
-														<th class="text-center">Complaint Type</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Time</th>
-						                                <th class="text-center">Complaint Details</th>
-						                                <th class="text-center">Reporter Name</th>
-						 								<th class="text-center">Reporter Mobile</th>
-						 								<th class="text-center">Officer ID</th>
-						 								<th class="text-center">Officer Mobile</th>
-						 								<th class="text-center">Completion Date</th>
-						                                <th class="text-center">Status</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-        <script th:inline="javascript">
-        	
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List'
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-	        	$("#filter_reset_btn").prop("disabled", true);
-	        	$("#filter_search_btn").prop("disabled", true);
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				$("#filter_reset_btn").prop("disabled", false);
-				$("#filter_search_btn").prop("disabled", false);
-				loading.html("");
-			}
-			
-	        /* Get Department Data */
-	        function get_department_data(){
-	
-	    		get_department_list().then(function(departments) {
-	    		    // Handle the department list
-	    		    departmentlist = departments;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(departmentlist, function(index, department) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: department.ID_DEPT, // case-sensitive as per object
-	    	                text: department.DEPT_NAME
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#search_department_id').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-	        
-	        /* Get QaQc Data */
-	        function get_qaqc_data(){
-	        	var apiUrl = '/gcc/api/pgr/getQaQcList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                console.log('Response list:', jsonResponse);
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_qaqc_list(){
-	        	get_qaqc_data().then(function(complaintList) {
-	    		    // Handle the department list
-	    		    generate_table(complaintList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	        	// Check for mobile 
-	        	var isMobile = window.innerWidth <= 768; // Adjust the breakpoint as needed
-	        	
-	        	
-	            var table = $('#complaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', orderable: false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        scrollX: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: isMobile, // Set responsive option based on device width
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                	"<a href=\"#\" onclick=\"return viewComplaintDetails('"+row['COMPLAINTNUMBER']+"')\" class=\"link\">"+row['COMPLAINTNUMBER']+"</a>",
-	                    row['DEPT_NAME'],
-	                    row['COMPLAINTTYPENAME'],
-	                    row['COMPLAINTDATE'],
-	                    row['COMPLAINTTIME'],
-	                    row['COMPLAINTDETAILS'],
-	                    row['COMPLAINANTFIRSTNAME'],
-	                    row['COMPLAINANTMOBILENUMBER'],
-	                    row['USER_NAME'],
-	                    row['MOBILE_NUMBER'],
-	                    row['COMPLAINTCOMPLETIONDATE'],
-	                    row['STATUS']
-	                ]).draw(false);
-	            });
-	            
-	            // Now call for Filter
-	            get_department_data();
-	            
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-				get_qaqc_list();
-	            
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/pgr/zone-wise-with-reopen.html b/src/main/resources/templates/modules/pgr/zone-wise-with-reopen.html
deleted file mode 100644
index fbe56a53..00000000
--- a/src/main/resources/templates/modules/pgr/zone-wise-with-reopen.html
+++ /dev/null
@@ -1,648 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-street-view bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Zone Wise With Reopen Report</h5>
-                                            <span>Public Grievance Redressal Reports</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Zone Wise Report</li>
-                                            <li class="breadcrumb-item active" aria-current="page">With Reopen</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/pgr/search_form :: div}"></div>
-										<div id="tableLoading"></div>
-                                        <div id="tableBody"></div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-        <script th:inline="javascript">
-        	
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-        	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List'
-	            }
-	        ];
-			
-        	// Complaint Config Array (See script page)
-        	var complaintIds = complaintTypeId();
-        	
-        ///////////////////////////// End ///////////////////////////
-        
-        
-	        function call_loading(){
-	        	loading_text_msg = getLoadingMessage();
-	        	$("#filter_reset_btn").prop("disabled", true);
-	        	$("#filter_search_btn").prop("disabled", true);
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				$("#filter_reset_btn").prop("disabled", false);
-				$("#filter_search_btn").prop("disabled", false);
-				loading.html("");
-			}
-			
-	        /* Get Department Data */
-	        function get_department_data(){
-	
-	    		get_department_list().then(function(departments) {
-	    		    // Handle the department list
-	    		    departmentlist = departments;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(departmentlist, function(index, department) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: department.ID_DEPT, // case-sensitive as per object
-	    	                text: department.DEPT_NAME
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#search_department_id').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-	        
-	        /* Get Data of Main Page 1 */
-	        function get_table_data(){
-	        	var apiUrl = '/gcc/api/pgr/getZoneWiseComplaintCountList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                console.log('Response list:', jsonResponse);
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_table_list(){
-	        	get_table_data().then(function(complaintList) {
-	        		$('#tableBody').html(getPageTableBody()); // Call Table Html
-	    		    // Handle the department list
-	    		    generate_table(complaintList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	        	// Check for mobile 
-	        	var isMobile = window.innerWidth <= 768; // Adjust the breakpoint as needed
-	        	
-	        	
-	            var table = $('#complaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', orderable: false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        scrollX: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: isMobile, // Set responsive option based on device width
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	          
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", 'all','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['DEPT_NAME']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["NonBURSTLT"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['NonBURSTLT']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["REOFGAR"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['REOFGAR']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["ROAD"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['ROAD']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["MOSQUITE"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['MOSQUITE']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["WATER"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['WATER']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["REOFDEB"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['REOFDEB']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["TREE"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['TREE']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["DOGS"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['DOGS']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["ENCMTN"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['ENCMTN']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["POT"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['POT']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["PTAX"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['PTAX']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["OTHERS"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['OTHERS']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", 'all','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['TOTAL']+"</a>",
-	                    row['DAYS_90_PEN'],
-	                    row['DAYS_61_90_PEN'],
-	                    row['DAYS_31_60_PEN'],
-	                    row['DAYS_16_30_PEN'],
-	                    row['DAYS_0_15_PEN']
-	                ]).draw(false);
-	            });
-	            
-	            // Now call for Filter
-	            get_department_data();
-	            
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-				get_table_list();
-	            
-			});
-				
-			function getPageTableBody(){
-				var tableBodyHTML = "";
-				
-				tableBodyHTML = `<table id="complaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-					                    <thead class="thead-dark">
-					                    <tr class="table-bordered">
-					                        <th class="text-center no-sort">S.No</th>
-												<th class="text-center">Zone Name</th>
-												<th class="text-center">Street Light not burning</th>
-											<th class="text-center">Removal of Garbage</th>
-					                        <th class="text-center">Road Damaged</th>
-					                        <th class="text-center">Mosquito Nuisance</th>
-					                        <th class="text-center">Water Stagnation</th>
-					                        <th class="text-center">Removal of Debries</th>
-												<th class="text-center">Tree Fallen</th>
-												<th class="text-center">Dog Menace</th>
-												<th class="text-center">Encroachment</th>
-												<th class="text-center">Potshole</th>
-					                        <th class="text-center">Property Tax</th>
-					                        <th class="text-center">Others</th>
-					                        <th class="text-center">Total</th>
-					                        <th class="text-center">&gt; 90 Days</th>
-					                        <th class="text-center">61 - 90 Days</th>
-					                        <th class="text-center">31-60 days</th>
-					                        <th class="text-center">16-30 days</th>
-					                        <th class="text-center">0-15 days</th>
-					                     </tr>
-					                </thead>
-					                <tbody>
-					                    	
-					                </tbody>
-					                <tfoot class="thead-dark">
-					                    <tr>
-					                        <th class="text-center no-sort">S.No</th>
-												<th class="text-center">Zone Name</th>
-												<th class="text-center">Street Light not burning</th>
-											<th class="text-center">Removal of Garbage</th>
-					                        <th class="text-center">Road Damaged</th>
-					                        <th class="text-center">Mosquito Nuisance</th>
-					                        <th class="text-center">Water Stagnation</th>
-					                        <th class="text-center">Removal of Debries</th>
-												<th class="text-center">Tree Fallen</th>
-												<th class="text-center">Dog Menace</th>
-												<th class="text-center">Encroachment</th>
-												<th class="text-center">Potshole</th>
-					                        <th class="text-center">Property Tax</th>
-					                        <th class="text-center">Others</th>
-					                        <th class="text-center">Total</th>
-					                        <th class="text-center">&gt; 90 Days</th>
-					                        <th class="text-center">61 - 90 Days</th>
-					                        <th class="text-center">31-60 days</th>
-					                        <th class="text-center">16-30 days</th>
-					                        <th class="text-center">0-15 days</th>
-										</tr>
-					                </tfoot>
-					            </table>`;
-					            
-				return tableBodyHTML;
-			}
-
-/////////////////////////////////////// Modal Box -1   ///////////////////////////////////////
-			
-			var model_box_1 = "#pgrModalBox";
-			
-			function viewZoneWiseOfficerComplaintCountList(deptid, complainttype, dept_name)
-			{
-				get_table_list_modal_box_1(deptid, complainttype);
-				
-				var dept_name_txt = dept_name.split("-");
-				
-				if(dept_name_txt.length<=1){
-					dept_name_txt[0] = "-";
-				}
-		
-				dept_name_txt[1] = dept_name_txt[1].charAt(0).toUpperCase() + dept_name_txt[1].slice(1).toLowerCase();
-					
-				$('#modalTitle').html("Officer`s Pending Report Of "+dept_name_txt[1]+" Zone ("+dept_name_txt[0]+")"); // Box title
-	  			
-				loading_text_msg = getLoadingMessage(); // get Loading random text
-				
-				$('#modalBody').html(searchinfo("<b>"+loading_text_msg+"</b>")); // Box content (Body)
-	  			
-				$(model_box_1).modal({
-	  			    backdrop: 'static',
-	  			    keyboard: false
-	  			}); // Show Modal Box
-				
-				//$(model_box_1).modal('show'); // Show Modal Box
-				
-				return false;
-			}
-			
-			/* Get Data of Main Page 1 */
-	        function get_modal_box_1_table_data(deptid, complainttype){
-	        	var apiUrl = '/gcc/api/pgr/getZoneWiseOfficerComplaintCountList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            data: {
-					        'deptid': deptid,
-					        'complainttype': complainttype,
-					    },
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                //console.log('Response list:', jsonResponse);
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_table_list_modal_box_1(deptid, complainttype){
-	        	get_modal_box_1_table_data(deptid, complainttype).then(function(complaintList) {
-	    		    // Handle the data list
-	        		//console.log('Response list:', complaintList);
-	        		$('#modalBody').html(get_modal_box_1_table_html()); // Box content (Body)
-	        		
-	        		generate_table_modal_box_1(complaintList,complainttype);
-	        		
-	        		$(model_box_1).modal('show'); // Show Modal Box
-	        		
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table_modal_box_1(data,complainttype){
-	        	
-	        	// Check for mobile 
-	        	var isMobile = window.innerWidth <= 768; // Adjust the breakpoint as needed
-	        	
-	        	
-	            var table = $('#modal_1_ComplaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', orderable: false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        scrollX: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: isMobile, // Set responsive option based on device width
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	          
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                    row['DEPT_NAME'],
-	                    row['USER_NAME'],
-	                    row['MOBILENO'],
-	                    "<a href=\"#\" onclick=\"return viewOfficerBasedPendidngComplaintList("+row['DEPTID']+", '"+complainttype+"','"+row["IDUSER"]+"')\" class=\"link\">"+row['NOS']+"</a>"
-	                ]).draw(false);
-	            });
-	            
-			}
-	        
-	        function get_modal_box_1_table_html(){
-				var modal_box_1_html=`<table id="modal_1_ComplaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-						 								<th class="text-center">Department</th>
-						 								<th class="text-center">Officer ID</th>
-														<th class="text-center">Mobile Number</th>
-						                                <th class="text-center">No\`s</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-	                                                <th class="text-center no-sort">S.No</th>
-					 								<th class="text-center">Department</th>
-					 								<th class="text-center">Officer ID</th>
-													<th class="text-center">Mobile Number</th>
-					                                <th class="text-center">No\`s</th>
-													</tr>
-                                                </tfoot>
-                                            </table>`;
-                                            
-                                            return modal_box_1_html
-			}
-	        
-/////////////////////////////////////// Modal Box - 2   ///////////////////////////////////////
-			
-			var model_box_2 = "#pgrModalBox_2";
-			
-			function viewOfficerBasedPendidngComplaintList(deptid, complainttype, iduser)
-			{
-				
-				get_table_list_modal_box_2(deptid, complainttype, iduser);
-				/*
-				var dept_name_txt = dept_name.split("-");
-				
-				if(dept_name_txt.length<=1){
-					dept_name_txt[0] = "-";
-				}
-		
-				dept_name_txt[1] = dept_name_txt[1].charAt(0).toUpperCase() + dept_name_txt[1].slice(1).toLowerCase();
-					
-				$('#modalTitle_2').html("Officer`s Pending Report Of "+dept_name_txt[1]+" Zone ("+dept_name_txt[0]+")"); // Box title
-	  			*/
-				loading_text_msg = getLoadingMessage(); // get Loading random text
-				
-				$('#modalBody_2').html(searchinfo("<b>"+loading_text_msg+"</b>")); // Box content (Body)
-	  			
-				$(model_box_2).modal({
-	  			    backdrop: 'static',
-	  			    keyboard: false
-	  			}); // Show Modal Box
-				
-				//$(model_box_2).modal('show'); // Show Modal Box
-				
-				return false;
-			}
-			
-			/* Get Data of Main Page 1 */
-	        function get_modal_box_2_table_data(deptid, complainttype, iduser){
-	        	var apiUrl = '/gcc/api/pgr/getZoneWiseOfficerComplaintList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            data: {
-					        'deptid': deptid,
-					        'complainttype': complainttype,
-					        'iduser': iduser,
-					    },
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                //console.log('Response list:', jsonResponse);
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_table_list_modal_box_2(deptid, complainttype, iduser){
-	        	get_modal_box_2_table_data(deptid, complainttype, iduser).then(function(complaintList) {
-	    		    // Handle the data list
-	        		//console.log('Response list:', complaintList);
-	        		$('#modalBody_2').html(get_modal_box_2_table_html()); // Box content (Body)
-	        		
-	        		generate_table_modal_box_2(complaintList);
-	        		
-	        		//$(model_box_2).modal('show'); // Show Modal Box
-	        		
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table_modal_box_2(data){
-	        	
-	        	// Check for mobile 
-	        	var isMobile = window.innerWidth <= 768; // Adjust the breakpoint as needed
-	        	
-	        	
-	            var table = $('#modal_2_ComplaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', orderable: false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        scrollX: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: isMobile, // Set responsive option based on device width
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	          
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                	"<a href=\"#\" onclick=\"return viewComplaintDetails('"+row['COMPLAINTNUMBER']+"')\" class=\"link\">"+row['COMPLAINTNUMBER']+"</a>",
-	                    row['DEPT_NAME'],
-	                    row['COMPLAINTTYPENAME'],
-	                    row['COMPDATE'],
-	                    row['COMPLAINTDETAILS'],
-	                    row['COMPLAINANTFIRSTNAME'],
-	                    row['USER_NAME']
-	                ]).draw(false);
-	            });
-	            
-			}
-	        
-	        function get_modal_box_2_table_html(){
-				var modal_box_2_html=`<table id="modal_2_ComplaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-						 								<th class="text-center">Complaint No.</th>
-						 								<th class="text-center">Department</th>
-														<th class="text-center">Complaint Type</th>
-						                                <th class="text-center">Complaint Date</th>
-						                                <th class="text-center">Complaint Details</th>
-						                                <th class="text-center">Person Name</th>
-						                                <th class="text-center">Officer ID</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-	                                                <th class="text-center no-sort">S.No</th>
-					 								<th class="text-center">Complaint No.</th>
-					 								<th class="text-center">Department</th>
-													<th class="text-center">Complaint Type</th>
-					                                <th class="text-center">Complaint Date</th>
-					                                <th class="text-center">Complaint Details</th>
-					                                <th class="text-center">Person Name</th>
-					                                <th class="text-center">Officer ID</th>
-													</tr>
-                                                </tfoot>
-                                            </table>`;
-                                            
-            	return modal_box_2_html
-			}
-	        
-/////////////////////////////////////// Modal Box - 3   ///////////////////////////////////////
-			
-			<!-- See Common Script page -->
-			
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/pgr/zone-wise-without-reopen.html b/src/main/resources/templates/modules/pgr/zone-wise-without-reopen.html
deleted file mode 100644
index 21f3a3fb..00000000
--- a/src/main/resources/templates/modules/pgr/zone-wise-without-reopen.html
+++ /dev/null
@@ -1,646 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-map-pin bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Zone Wise Without Reopen Report</h5>
-                                            <span>Public Grievance Redressal Reports</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Zone Wise Report</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Without Reopen</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div th:replace="~{fragments/modules/pgr/search_form :: div}"></div>
-										<div id="tableLoading"></div>
-                                        <div id="tableBody"></div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/pgr/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/pgr/script :: script}"></script>
-        <script th:inline="javascript">
-        	
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-        	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List'
-	            }
-	        ];
-			
-        	// Complaint Config Array (See script page)
-        	var complaintIds = complaintTypeId();
-        	
-        ///////////////////////////// End ///////////////////////////
-        
-        
-	        function call_loading(){
-	        	loading_text_msg = getLoadingMessage();
-	        	$("#filter_reset_btn").prop("disabled", true);
-	        	$("#filter_search_btn").prop("disabled", true);
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				$("#filter_reset_btn").prop("disabled", false);
-				$("#filter_search_btn").prop("disabled", false);
-				loading.html("");
-			}
-			
-	        /* Get Department Data */
-	        function get_department_data(){
-	
-	    		get_department_list().then(function(departments) {
-	    		    // Handle the department list
-	    		    departmentlist = departments;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(departmentlist, function(index, department) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: department.ID_DEPT, // case-sensitive as per object
-	    	                text: department.DEPT_NAME
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#search_department_id').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-	        
-	        /* Get Data of Main Page 1 */
-	        function get_table_data(){
-	        	var apiUrl = '/gcc/api/pgr/getZoneWiseWithoutReopenComplaintList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                console.log('Response list:', jsonResponse);
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_table_list(){
-	        	get_table_data().then(function(complaintList) {
-	        		$('#tableBody').html(getPageTableBody()); // Call Table Html
-	    		    // Handle the department list
-	    		    generate_table(complaintList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	        	// Check for mobile 
-	        	var isMobile = window.innerWidth <= 768; // Adjust the breakpoint as needed
-	        	
-	        	
-	            var table = $('#complaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', orderable: false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        scrollX: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: isMobile, // Set responsive option based on device width
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	          
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", 'all','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['DEPT_NAME']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["NonBURSTLT"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['NonBURSTLT']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["REOFGAR"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['REOFGAR']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["ROAD"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['ROAD']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["MOSQUITE"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['MOSQUITE']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["WATER"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['WATER']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["REOFDEB"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['REOFDEB']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["TREE"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['TREE']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["DOGS"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['DOGS']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["ENCMTN"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['ENCMTN']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["POT"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['POT']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["PTAX"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['PTAX']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", '"+complaintIds["OTHERS"]+"','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['OTHERS']+"</a>",
-	                    "<a href=\"#\" onclick=\"return viewZoneWiseOfficerComplaintCountList("+row['DEPTID']+", 'all','"+row["DEPT_NAME"]+"')\" class=\"link\">"+row['TOTAL']+"</a>",
-	                    row['DAYS_90_PEN'],
-	                    row['DAYS_61_90_PEN'],
-	                    row['DAYS_31_60_PEN'],
-	                    row['DAYS_16_30_PEN'],
-	                    row['DAYS_0_15_PEN']
-	                ]).draw(false);
-	            });
-	            
-	            // Now call for Filter
-	            get_department_data();
-	            
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-				get_table_list();
-	            
-			});
-				
-			function getPageTableBody(){
-				var tableBodyHTML = "";
-				
-				tableBodyHTML = `<table id="complaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-					                    <thead class="thead-dark">
-					                    <tr class="table-bordered">
-					                        <th class="text-center no-sort">S.No</th>
-												<th class="text-center">Zone Name</th>
-												<th class="text-center">Street Light not burning</th>
-											<th class="text-center">Removal of Garbage</th>
-					                        <th class="text-center">Road Damaged</th>
-					                        <th class="text-center">Mosquito Nuisance</th>
-					                        <th class="text-center">Water Stagnation</th>
-					                        <th class="text-center">Removal of Debries</th>
-												<th class="text-center">Tree Fallen</th>
-												<th class="text-center">Dog Menace</th>
-												<th class="text-center">Encroachment</th>
-												<th class="text-center">Potshole</th>
-					                        <th class="text-center">Property Tax</th>
-					                        <th class="text-center">Others</th>
-					                        <th class="text-center">Total</th>
-					                        <th class="text-center">&gt; 90 Days</th>
-					                        <th class="text-center">61 - 90 Days</th>
-					                        <th class="text-center">31-60 days</th>
-					                        <th class="text-center">16-30 days</th>
-					                        <th class="text-center">0-15 days</th>
-					                     </tr>
-					                </thead>
-					                <tbody>
-					                    	
-					                </tbody>
-					                <tfoot class="thead-dark">
-					                    <tr>
-					                        <th class="text-center no-sort">S.No</th>
-												<th class="text-center">Zone Name</th>
-												<th class="text-center">Street Light not burning</th>
-											<th class="text-center">Removal of Garbage</th>
-					                        <th class="text-center">Road Damaged</th>
-					                        <th class="text-center">Mosquito Nuisance</th>
-					                        <th class="text-center">Water Stagnation</th>
-					                        <th class="text-center">Removal of Debries</th>
-												<th class="text-center">Tree Fallen</th>
-												<th class="text-center">Dog Menace</th>
-												<th class="text-center">Encroachment</th>
-												<th class="text-center">Potshole</th>
-					                        <th class="text-center">Property Tax</th>
-					                        <th class="text-center">Others</th>
-					                        <th class="text-center">Total</th>
-					                        <th class="text-center">&gt; 90 Days</th>
-					                        <th class="text-center">61 - 90 Days</th>
-					                        <th class="text-center">31-60 days</th>
-					                        <th class="text-center">16-30 days</th>
-					                        <th class="text-center">0-15 days</th>
-										</tr>
-					                </tfoot>
-					            </table>`;
-					            
-				return tableBodyHTML;
-			}
-
-/////////////////////////////////////// Modal Box -1   ///////////////////////////////////////
-			
-			var model_box_1 = "#pgrModalBox";
-			
-			function viewZoneWiseOfficerComplaintCountList(deptid, complainttype, dept_name)
-			{
-				get_table_list_modal_box_1(deptid, complainttype);
-				
-				var dept_name_txt = dept_name.split("-");
-				
-				if(dept_name_txt.length<=1){
-					dept_name_txt[0] = "-";
-				}
-		
-				dept_name_txt[1] = dept_name_txt[1].charAt(0).toUpperCase() + dept_name_txt[1].slice(1).toLowerCase();
-					
-				$('#modalTitle').html("Officer`s Pending Report Of "+dept_name_txt[1]+" Zone ("+dept_name_txt[0]+")"); // Box title
-	  			
-				loading_text_msg = getLoadingMessage(); // get Loading random text
-				
-				$('#modalBody').html(searchinfo("<b>"+loading_text_msg+"</b>")); // Box content (Body)
-	  			
-				$(model_box_1).modal({
-	  			    backdrop: 'static',
-	  			    keyboard: false
-	  			}); // Show Modal Box
-				
-				//$(model_box_1).modal('show'); // Show Modal Box
-				
-				return false;
-			}
-			
-			/* Get Data of Main Page 1 */
-	        function get_modal_box_1_table_data(deptid, complainttype){
-	        	var apiUrl = '/gcc/api/pgr/getZoneWiseOfficerWithoutReopenComplaintCountList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            data: {
-					        'deptid': deptid,
-					        'complainttype': complainttype,
-					    },
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                //console.log('Response list:', jsonResponse);
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_table_list_modal_box_1(deptid, complainttype){
-	        	get_modal_box_1_table_data(deptid, complainttype).then(function(complaintList) {
-	    		    // Handle the data list
-	        		//console.log('Response list:', complaintList);
-	        		$('#modalBody').html(get_modal_box_1_table_html()); // Box content (Body)
-	        		
-	        		generate_table_modal_box_1(complaintList,complainttype);
-	        		
-	        		$(model_box_1).modal('show'); // Show Modal Box
-	        		
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table_modal_box_1(data,complainttype){
-	        	
-	        	// Check for mobile 
-	        	var isMobile = window.innerWidth <= 768; // Adjust the breakpoint as needed
-	        	
-	        	
-	            var table = $('#modal_1_ComplaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', orderable: false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        scrollX: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: isMobile, // Set responsive option based on device width
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	          
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                    row['DEPT_NAME'],
-	                    row['USER_NAME'],
-	                    row['MOBILENO'],
-	                    "<a href=\"#\" onclick=\"return viewOfficerBasedPendidngComplaintList("+row['DEPTID']+", '"+complainttype+"','"+row["IDUSER"]+"')\" class=\"link\">"+row['NOS']+"</a>"
-	                ]).draw(false);
-	            });
-	            
-			}
-	        
-	        function get_modal_box_1_table_html(){
-				var modal_box_1_html=`<table id="modal_1_ComplaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-						 								<th class="text-center">Department</th>
-						 								<th class="text-center">Officer ID</th>
-														<th class="text-center">Mobile Number</th>
-						                                <th class="text-center">No\`s</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-	                                                <th class="text-center no-sort">S.No</th>
-					 								<th class="text-center">Department</th>
-					 								<th class="text-center">Officer ID</th>
-													<th class="text-center">Mobile Number</th>
-					                                <th class="text-center">No\`s</th>
-													</tr>
-                                                </tfoot>
-                                            </table>`;
-                                            
-                                            return modal_box_1_html
-			}
-	        
-/////////////////////////////////////// Modal Box - 2   ///////////////////////////////////////
-			
-			var model_box_2 = "#pgrModalBox_2";
-			
-			function viewOfficerBasedPendidngComplaintList(deptid, complainttype, iduser)
-			{
-				
-				get_table_list_modal_box_2(deptid, complainttype, iduser);
-				/*
-				var dept_name_txt = dept_name.split("-");
-				
-				if(dept_name_txt.length<=1){
-					dept_name_txt[0] = "-";
-				}
-		
-				dept_name_txt[1] = dept_name_txt[1].charAt(0).toUpperCase() + dept_name_txt[1].slice(1).toLowerCase();
-					
-				$('#modalTitle_2').html("Officer`s Pending Report Of "+dept_name_txt[1]+" Zone ("+dept_name_txt[0]+")"); // Box title
-	  			*/
-				loading_text_msg = getLoadingMessage(); // get Loading random text
-				
-				$('#modalBody_2').html(searchinfo("<b>"+loading_text_msg+"</b>")); // Box content (Body)
-	  			
-				$(model_box_2).modal({
-	  			    backdrop: 'static',
-	  			    keyboard: false
-	  			}); // Show Modal Box
-				
-				//$(model_box_2).modal('show'); // Show Modal Box
-				
-				return false;
-			}
-			
-			/* Get Data of Main Page 1 */
-	        function get_modal_box_2_table_data(deptid, complainttype, iduser){
-	        	var apiUrl = '/gcc/api/pgr/getZoneWiseOfficerWithoutReopenComplaintList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            data: {
-					        'deptid': deptid,
-					        'complainttype': complainttype,
-					        'iduser': iduser,
-					    },
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                //console.log('Response list:', jsonResponse);
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_table_list_modal_box_2(deptid, complainttype, iduser){
-	        	get_modal_box_2_table_data(deptid, complainttype, iduser).then(function(complaintList) {
-	    		    // Handle the data list
-	        		//console.log('Response list:', complaintList);
-	        		$('#modalBody_2').html(get_modal_box_2_table_html()); // Box content (Body)
-	        		
-	        		generate_table_modal_box_2(complaintList);
-	        		
-	        		//$(model_box_2).modal('show'); // Show Modal Box
-	        		
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching department list:', error);
-	    		});
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table_modal_box_2(data){
-	        	
-	        	// Check for mobile 
-	        	var isMobile = window.innerWidth <= 768; // Adjust the breakpoint as needed
-	        	
-	        	
-	            var table = $('#modal_2_ComplaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', orderable: false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        scrollY: '50vh',
-				        scrollX: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: isMobile, // Set responsive option based on device width
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	          
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                	"<a href=\"#\" onclick=\"return viewComplaintDetails('"+row['COMPLAINTNUMBER']+"')\" class=\"link\">"+row['COMPLAINTNUMBER']+"</a>",
-	                    row['DEPT_NAME'],
-	                    row['COMPLAINTTYPENAME'],
-	                    row['COMPDATE'],
-	                    row['COMPLAINTDETAILS'],
-	                    row['COMPLAINANTFIRSTNAME'],
-	                    row['USER_NAME']
-	                ]).draw(false);
-	            });
-	            
-			}
-	        
-	        function get_modal_box_2_table_html(){
-				var modal_box_2_html=`<table id="modal_2_ComplaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-						 								<th class="text-center">Complaint No.</th>
-						 								<th class="text-center">Department</th>
-														<th class="text-center">Complaint Type</th>
-						                                <th class="text-center">Complaint Date</th>
-						                                <th class="text-center">Complaint Details</th>
-						                                <th class="text-center">Person Name</th>
-						                                <th class="text-center">Officer ID</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-	                                                <th class="text-center no-sort">S.No</th>
-					 								<th class="text-center">Complaint No.</th>
-					 								<th class="text-center">Department</th>
-													<th class="text-center">Complaint Type</th>
-					                                <th class="text-center">Complaint Date</th>
-					                                <th class="text-center">Complaint Details</th>
-					                                <th class="text-center">Person Name</th>
-					                                <th class="text-center">Officer ID</th>
-													</tr>
-                                                </tfoot>
-                                            </table>`;
-                                            
-            	return modal_box_2_html
-			}
-	        
-/////////////////////////////////////// Modal Box - 3   ///////////////////////////////////////
-			<!-- See Common Script page -->
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/qrfeedback/.DS_Store b/src/main/resources/templates/modules/qrfeedback/.DS_Store
deleted file mode 100644
index 1e941f57a4cbf5e3e4c4c5f6878fe23d8136b397..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKL2uJA6n@@Hmuy1n0VXb!EOD($5d(&}gfb3X34#Nlk}QFRrEy8p6;xHq5yX$-
z#!unDaDwmIp0u_@hzmlMU-kUi&+l{UFNqx!kr+&pn?xNV^5BfEZ4?(6_p`6qhK+0i
zg&w1(>T#});#|cm*)HG|a0>iy3h=wzrid#1Qd)d}c~N)(@BP%K|GH0ake5<IF<3`*
zvhc<;<LjRp@w6J-HR4-5&a<lS_rHsc&DN#%mgjjp-mCCfO~X2>C)FS-UvTTGQh9t<
zkK$)pIvsYdJXA#;Wkp(QLYAaRdHFmm5;YyDNs&~V8=4N!_x)jKcQ(7#-|x!)yent-
z_V0A%!QI>Qx$j-Qe&ha=;YmI!)F(Yx5?Ix=UAA}zpHaC$iPNwwa#g%VFEh6(qXJ5$
z^nrSG40T78pIaZHme@nyd42cj9lfUsI3;}qD}l;2S~bQR0mndAo%?%;@D+N9;QlR*
z{AFq6HnRCX^JwK#?vJHhG@Y%z0`}?lcGiBTZh}q$r@-GT!0UsAGX@qLgL>&ep^pH-
z7Q)(4=Z^s9NQ;5R#vpoN!cc*RD(n$M7&_w8<^>iTgN9DR9zKM<valx<p|6hdrA{Xi
z7<8pmz$vh(z@}+-c>jO&`}6-I$+esUPJy*jK(r3S!vUsb_turk@m?$8ui<Q**BI0k
k6m~n-72b-k!L^}Jas?PzYz!g-a~}d)23I%*{;2}L0C;4VwEzGB

diff --git a/src/main/resources/templates/modules/qrfeedback/assets/asset-list.html b/src/main/resources/templates/modules/qrfeedback/assets/asset-list.html
deleted file mode 100644
index bab75ef2..00000000
--- a/src/main/resources/templates/modules/qrfeedback/assets/asset-list.html
+++ /dev/null
@@ -1,278 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-layers bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Asset List</h5>
-                                            <span>QR Asset Feedback Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Asset QR Feedback</li>
-                                            <li class="breadcrumb-item">Assets</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Asset List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center" width="20%">Category</th>
-														<th class="text-center" width="10%">Zone</th>
-														<th class="text-center" width="10%">Div</th>
-														<th class="text-center" width="20%">Asset Name</th>
-														<th class="text-center" width="20%">Address</th>
-														<th class="text-center" width="20%">QRcode</th>
-						                                <th class="text-center" width="10%">IsActive</th>
-						                                <th class="text-center no-sort" style="width:50px;">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="asset, i : ${assetlist}" class="assetlist">
-						                                <td th:text="${i.count}">0</td>
-														<td class="text-center" th:text="${asset.assetCategory.catName}"></td>
-														<td class="text-center" th:text="${asset.zoneId}"></td>
-						                                <td class="text-center" th:text="${asset.divId}"></td>
-						                                <td th:text="${asset.assetName}"></td>
-														<td th:text="${asset.assetAddress}"></td>
-														<td th:text="${asset.assetCode}"></td>
-						                                <td class="text-center" th:if="${asset.isActive}"><span class="badge bg-success">Active</span></td>
-						                                <td class="text-center" th:unless="${asset.isActive}"><span class="badge bg-warning">InActive</span></td>
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callEdit([[${asset.assetId}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Edit" data-original-title="Edit"><i class="ik ik-edit f-16 text-green"></i></a>&nbsp;&nbsp;
-						                                    <a th:href="@{#}" th:onclick="return callDelete([[${asset.assetName}]], [[${asset.assetId}]] );" data-animation="true" data-toggle="tooltip" data-placement="top" title="Delete" data-original-title="Delete"><i class="ik ik-trash-2 f-16 text-red"></i></a>
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-						                                <th class="text-center">Category</th>
-														<th class="text-center">Zone</th>
-														<th class="text-center">Div</th>
-														<th class="text-center">Asset Name</th>
-														<th class="text-center">Address</th>
-														<th class="text-center">QRcode</th>
-						                                <th class="text-center">IsActive</th>
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="addForm" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Master Category Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="form-group row">
-                            <label for="catName" class="col-sm-12 col-form-label">Asset Category Name</label>
-                            <div class="col-sm-12">
-                                <input type="text" class="form-control" name="catName" id="catName" placeholder="Category Name" required>
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="isActive" class="col-sm-12 col-form-label">IsActive</label>
-                            <div class="col-sm-12">
-                                <select class="form-control" id="isActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-                        </div>
-                    	
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        <button type="button" class="btn btn-primary">Save changes</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-                        
-		<div class="modal fade" id="addForm2" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <form action="#" th:action="@{/saveCategory}" method="post">
-                    
-	                <div class="block block-rounded block-themed block-transparent mb-0">
-	                  <div class="block-header bg-primary-dark">
-	                    <h3 class="block-title">Master Category Form</h3>
-	                    <div class="block-options">
-	                      <button type="button" class="btn-block-option" data-bs-dismiss="modal" aria-label="Close">
-	                        <i class="fa fa-fw fa-times"></i>
-	                      </button>
-	                    </div>
-	                  </div>
-                    <div class="block-content">
-						<div class="form-group row">
-                            <label for="exampleInputUsername2" class="col-sm-3 col-form-label">Username</label>
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control" id="exampleInputUsername2" placeholder="Username">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="exampleInputEmail2" class="col-sm-3 col-form-label">Email</label>
-                            <div class="col-sm-9">
-                                <input type="email" class="form-control" id="exampleInputEmail2" placeholder="Email">
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="mb-3">
-                                <label for="catName">Asset Category Name</label>
-                                <input type="text" class="form-control" name="catName" id="catName" placeholder="Category Name" required>
-                                <!--<small id="emailHelp" class="form-text text-muted">Set of assets grouped under this unique category</small>-->
-                            </div>
-                            <div class="mb-3">
-                                <label class="form-check-label">IsActive</label>
-                                <select class="form-select" id="isActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-
-                        </div><!--end row-->
-                    </div><!--end modal-body-->
-					</div>
-                    <div class="block-content block-content-full text-end bg-body">
-                        <button type="button" class="btn btn-de-secondary btn-sm" data-bs-dismiss="modal">Close</button>
-                        <button type="submit" class="btn btn-primary btn-sm">Save</button>
-                    </div><!--end modal-footer-->
-                </form>
-                </div><!--end modal-content-->
-            </div><!--end modal-dialog-->
-        </div><!--end modal-->
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                // Additional button
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callAdd(){
-			$('#addForm').modal({
-			    backdrop: 'static',
-			    keyboard: false
-			})
-			$('#addForm').modal('show');
-		}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/qrfeedback/assets/asset-questions.html b/src/main/resources/templates/modules/qrfeedback/assets/asset-questions.html
deleted file mode 100644
index 2743eff8..00000000
--- a/src/main/resources/templates/modules/qrfeedback/assets/asset-questions.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-question-circle bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Asset Questions</h5>
-                                            <span>QR Asset Feedback Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Asset QR Feedback</li>
-                                            <li class="breadcrumb-item">Assets</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Asset Questions</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center" width="20%">Asset</th>
-														<th class="text-center">English Question</th>
-														<th class="text-center">Tamil Question</th >
-						                                <th class="text-center" width="10%">IsActive</th>
-						                                <th class="text-center no-sort" width="10%">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="assetquestions, i : ${assetquestionslist}" class="${assetquestionslist}">
-						                                <td th:text="${i.count}">0</td>
-														<td class="text-center" th:text="${assetquestions.assetDetails.assetName}"></td>
-						                                <td th:text="${assetquestions.engQuestion}"></td>
-														<td th:text="${assetquestions.tamilQuestion}"></td>
-														<td class="text-center" th:if="${assetquestions.isActive}"><span class="badge bg-success">Active</span></td>
-														<td class="text-center" th:unless="${assetquestions.isActive}"><span class="badge bg-warning">InActive</span></td>
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callEdit([[${assetquestions.aqId}]])" data-toggle="tooltip" data-animation="true" data-placement="top" title="Edit" data-original-title="Edit"><i class="ik ik-edit f-16 mr-15 text-green"></i></a>
-						                                    <a th:href="@{#}" th:onclick="return callDelete( [[${assetquestions.engQuestion}]], [[${assetquestions.aqId}]] );" data-animation="true" data-toggle="tooltip" data-placement="top" title="Delete" data-original-title="Delete"><i class="ik ik-trash-2 f-16 mr-15 text-red"></i></a>
-															<a th:href="@{#}" th:onclick="return callComplaints( [[${assetquestions.engQuestion}]], [[${assetquestions.aqId}]] );" data-animation="true" data-toggle="tooltip" data-placement="top" title="Complaint Assignment" data-original-title="Complaint Assignment"><i class="ik ik-tag f-16 text-purple"></i></a>
-						                                </td>
-						                             </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-														<th class="text-center">Parameter</th>
-														<th class="text-center">English Question</th>
-														<th class="text-center">Tamil Question</th>
-						                                <th class="text-center">IsActive</th>
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                         </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="addForm" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Master Category Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="form-group row">
-                            <label for="catName" class="col-sm-12 col-form-label">Asset Category Name</label>
-                            <div class="col-sm-12">
-                                <input type="text" class="form-control" name="catName" id="catName" placeholder="Category Name" required>
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="isActive" class="col-sm-12 col-form-label">IsActive</label>
-                            <div class="col-sm-12">
-                                <select class="form-control" id="isActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-                        </div>
-                    	
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        <button type="button" class="btn btn-primary">Save changes</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-                        
-		<div class="modal fade" id="addForm2" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <form action="#" th:action="@{/saveCategory}" method="post">
-                    
-	                <div class="block block-rounded block-themed block-transparent mb-0">
-	                  <div class="block-header bg-primary-dark">
-	                    <h3 class="block-title">Master Category Form</h3>
-	                    <div class="block-options">
-	                      <button type="button" class="btn-block-option" data-bs-dismiss="modal" aria-label="Close">
-	                        <i class="fa fa-fw fa-times"></i>
-	                      </button>
-	                    </div>
-	                  </div>
-                    <div class="block-content">
-						<div class="form-group row">
-                            <label for="exampleInputUsername2" class="col-sm-3 col-form-label">Username</label>
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control" id="exampleInputUsername2" placeholder="Username">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="exampleInputEmail2" class="col-sm-3 col-form-label">Email</label>
-                            <div class="col-sm-9">
-                                <input type="email" class="form-control" id="exampleInputEmail2" placeholder="Email">
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="mb-3">
-                                <label for="catName">Asset Category Name</label>
-                                <input type="text" class="form-control" name="catName" id="catName" placeholder="Category Name" required>
-                                <!--<small id="emailHelp" class="form-text text-muted">Set of assets grouped under this unique category</small>-->
-                            </div>
-                            <div class="mb-3">
-                                <label class="form-check-label">IsActive</label>
-                                <select class="form-select" id="isActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-
-                        </div><!--end row-->
-                    </div><!--end modal-body-->
-					</div>
-                    <div class="block-content block-content-full text-end bg-body">
-                        <button type="button" class="btn btn-de-secondary btn-sm" data-bs-dismiss="modal">Close</button>
-                        <button type="submit" class="btn btn-primary btn-sm">Save</button>
-                    </div><!--end modal-footer-->
-                </form>
-                </div><!--end modal-content-->
-            </div><!--end modal-dialog-->
-        </div><!--end modal-->
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                // Additional button
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset Question',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        buttons: [buttons],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callAdd(){
-			$('#addForm').modal({
-			    backdrop: 'static',
-			    keyboard: false
-			})
-			$('#addForm').modal('show');
-		}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list-no.html b/src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list-no.html
deleted file mode 100644
index beae05b9..00000000
--- a/src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list-no.html
+++ /dev/null
@@ -1,358 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-frown bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Negative Feedback List</h5>
-                                            <span>QR Asset Feedback</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Asset QR Feedback</li>
-                                            <li class="breadcrumb-item">Feedbacks</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Negative Feedbacks</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center" width="20%">Category</th>
-														<th class="text-center" width="10%">Asset Name</th>
-														<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="20%">Div</th>
-														<th class="text-center" width="20%">Public Name</th>
-														<th class="text-center" width="20%">Mobile</th>
-						                                <th class="text-center" width="10%">Rating</th>
-						                                <th class="text-center no-sort" style="width:50px;">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="feedbacklist, i : ${feedbacklist}" class="feedbacklist">
-						                                <td th:text="${i.count}">0</td>
-														<td th:text="${feedbacklist.assetDetails.assetCategory.catName}"></td>
-														<td th:text="${feedbacklist.assetDetails.assetName}"></td>
-						                                <td th:text="${feedbacklist.assetDetails.areaName}"></td>
-						                                <td th:text="${feedbacklist.assetDetails.divId}"></td>
-														<td th:text="${feedbacklist.paramName}"></td>
-														<td th:text="${feedbacklist.mobileNo}"></td>
-						                                <td class="text-center" th:text="${feedbacklist.ratingVal}"></td>
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callView([[${feedbacklist.fbId}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Feedback Details" data-original-title="View Feedback Details"><i class="ik ik-eye f-16 text-blue"></i></a>&nbsp;&nbsp;
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-						                                <th class="text-center">Category</th>
-														<th class="text-center">Asset Name</th>
-														<th class="text-center">Area</th>
-														<th class="text-center">Div</th>
-														<th class="text-center">Public Name</th>
-														<th class="text-center">Mobile</th>
-						                                <th class="text-center">Rating</th>
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="feedbackView" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Asset Feedback Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-							      
-                            <div class="col-xl-6 col-md-6" id="assetdetails">
-								
-                            </div>
-                            <div class="col-xl-6 col-md-6" style="border-left: 1px solid #dee2e6;" id="feedbackdetails">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                // Additional button
-	                /*
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }*/
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callView(fbId){
-				$('#feedbackView').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#feedbackView').modal('show');
-				
-				call_loading('assetdetails','start');
-				getFeedbackAssetdetails(fbId);
-				call_loading('feedbackdetails','start');
-				getFeedbackData(fbId);
-				
-				return false;
-			}
-			
-			function getFeedbackAssetdetails(fbId){
-				var apiUrl = '/gcc/api/qrfeedback/getFeedbackAssetdetails?fbId='+fbId;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse[0];
-						var assetCategory = data.assetDetails.assetCategory.catName;
-						var assetParametersparam = data.assetDetails.paramId;
-						var assetName = data.assetDetails.assetName;
-						var assetAddress =data.assetDetails.assetAddress;
-						var zoneId = data.assetDetails.zoneId;
-						var divId = data.assetDetails.divId;
-						var areaName = data.assetDetails.areaName;
-						var locName = data.assetDetails.locName;
-						var streetName = data.assetDetails.streetName;
-						// HTML content
-						var assetdetails = `<div class="row">
-							
-										<div class="col-xl-12 col-md-12"> <strong>Asset Catergory</strong>
-				                            <p class="text-muted form-control showInputValue">${assetCategory}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Asset Parameters</strong>
-				                            <p class="text-muted form-control showInputValue">${assetParametersparam}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Name of the Asset</strong>
-				                            <p class="text-muted form-control showInputValue">${assetName}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Address of the Asset</strong>
-				                            <p class="text-muted form-control showInputValue">${assetAddress}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Zone</strong>
-				                            <p class="text-muted form-control showInputValue">${zoneId}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Division</strong>
-				                            <p class="text-muted form-control showInputValue">${divId}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Area</strong>
-				                            <p class="text-muted form-control showInputValue">${areaName}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Location</strong>
-				                            <p class="text-muted form-control showInputValue">${locName}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Street</strong>
-				                            <p class="text-muted form-control showInputValue">${streetName}</p>
-				                        </div>
-				                    </div>`;
-						$("#assetdetails").html(assetdetails);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-			
-			function getFeedbackData(fbId){
-				var apiUrl = '/gcc/api/qrfeedback/getFeedbackData?fbId='+fbId;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						//var data = jsonResponse[0];
-						//var dataLength = Object.keys(data).length;
-						
-						//alert(dataLength);//(number of properties in the object)
-						var assetdetails ='';
-						var feedbackUserInfo ='';
-						var ratingtxt ='<i class="ik ik-star-on text-warning"></i>';
-						var ratingHTMl='';
-						for (var i = 0; i < jsonResponse.length; i++) {
-							var sno = i+1;
-							var data = jsonResponse[i];
-							var eQuestion = data.assetCategoryQuestion.engQuestion;
-							var tQuestion = data.assetCategoryQuestion.tamilQuestion;
-							var ans = data.feedbackAns;//[yes] or [no]
-							ans = ans.replace(/\[|\]/g, ''); // Using a regular expression to match [ or ] globally
-							
-							if(ans=='yes')
-							{
-								var userinput =`<span class="badge badge-success text-capitalize"><strong>${ans}</strong></span>`;
-							}
-							else{
-								var userinput =`<span class="badge badge-danger text-capitalize"><strong>${ans}</strong></span>`;
-							}
-							
-							if(i==0){
-								var raringvalue = data.publicFeedback.ratingVal;
-								for(var r=0; r < raringvalue;r++){
-									ratingHTMl+=ratingtxt;
-								}
-								feedbackUserInfo += `<div class="row text-center pb-0">
-														
-	                                                    <div class="col-md-4 col-6"> <strong>Name</strong>
-	                                                        <br>
-	                                                        <p class="text-muted">${data.publicFeedback.paramName}</p>
-	                                                    </div>
-	                                                    <div class="col-md-4 col-6"> <strong>Mobile</strong>
-	                                                        <br>
-	                                                        <p class="text-muted">${data.publicFeedback.mobileNo}</p>
-	                                                    </div>
-	                                                    <div class="col-md-4 col-6"> <strong>Rating</strong>
-	                                                        <br>
-	                                                        <p class="">${ratingHTMl} (${raringvalue} / 5)</p>
-	                                                    </div>
-	                                                    
-	                                                </div>`;
-							}
-							// HTML content
-							assetdetails += `<hr class="text-muted>
-											 	<div class="row">
-													<div class="col-xl-12 col-md-12"><span class="badge badge-light">${sno}</span><strong>${eQuestion}</strong>
-							                            ${userinput}
-							                        </div>
-							                    </div>`;
-						}
-						$("#feedbackdetails").html(feedbackUserInfo + assetdetails);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list-yes.html b/src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list-yes.html
deleted file mode 100644
index 2d99f3cd..00000000
--- a/src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list-yes.html
+++ /dev/null
@@ -1,358 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-smile-beam bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Positive Feedback List</h5>
-                                            <span>QR Asset Feedback</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Asset QR Feedback</li>
-                                            <li class="breadcrumb-item">Feedbacks</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Positive Feedbacks</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center" width="20%">Category</th>
-														<th class="text-center" width="10%">Asset Name</th>
-														<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="20%">Div</th>
-														<th class="text-center" width="20%">Public Name</th>
-														<th class="text-center" width="20%">Mobile</th>
-						                                <th class="text-center" width="10%">Rating</th>
-						                                <th class="text-center no-sort" style="width:50px;">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="feedbacklist, i : ${feedbacklist}" class="feedbacklist">
-						                                <td th:text="${i.count}">0</td>
-														<td th:text="${feedbacklist.assetDetails.assetCategory.catName}"></td>
-														<td th:text="${feedbacklist.assetDetails.assetName}"></td>
-						                                <td th:text="${feedbacklist.assetDetails.areaName}"></td>
-						                                <td th:text="${feedbacklist.assetDetails.divId}"></td>
-														<td th:text="${feedbacklist.paramName}"></td>
-														<td th:text="${feedbacklist.mobileNo}"></td>
-						                                <td class="text-center" th:text="${feedbacklist.ratingVal}"></td>
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callView([[${feedbacklist.fbId}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Feedback Details" data-original-title="View Feedback Details"><i class="ik ik-eye f-16 text-blue"></i></a>&nbsp;&nbsp;
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-						                                <th class="text-center">Category</th>
-														<th class="text-center">Asset Name</th>
-														<th class="text-center">Area</th>
-														<th class="text-center">Div</th>
-														<th class="text-center">Public Name</th>
-														<th class="text-center">Mobile</th>
-						                                <th class="text-center">Rating</th>
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="feedbackView" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Asset Feedback Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-							      
-                            <div class="col-xl-6 col-md-6" id="assetdetails">
-								
-                            </div>
-                            <div class="col-xl-6 col-md-6" style="border-left: 1px solid #dee2e6;" id="feedbackdetails">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                // Additional button
-	                /*
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }*/
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callView(fbId){
-				$('#feedbackView').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#feedbackView').modal('show');
-				
-				call_loading('assetdetails','start');
-				getFeedbackAssetdetails(fbId);
-				call_loading('feedbackdetails','start');
-				getFeedbackData(fbId);
-				
-				return false;
-			}
-			
-			function getFeedbackAssetdetails(fbId){
-				var apiUrl = '/gcc/api/qrfeedback/getFeedbackAssetdetails?fbId='+fbId;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse[0];
-						var assetCategory = data.assetDetails.assetCategory.catName;
-						var assetParametersparam = data.assetDetails.paramId;
-						var assetName = data.assetDetails.assetName;
-						var assetAddress =data.assetDetails.assetAddress;
-						var zoneId = data.assetDetails.zoneId;
-						var divId = data.assetDetails.divId;
-						var areaName = data.assetDetails.areaName;
-						var locName = data.assetDetails.locName;
-						var streetName = data.assetDetails.streetName;
-						// HTML content
-						var assetdetails = `<div class="row">
-							
-										<div class="col-xl-12 col-md-12"> <strong>Asset Catergory</strong>
-				                            <p class="text-muted form-control showInputValue">${assetCategory}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Asset Parameters</strong>
-				                            <p class="text-muted form-control showInputValue">${assetParametersparam}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Name of the Asset</strong>
-				                            <p class="text-muted form-control showInputValue">${assetName}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Address of the Asset</strong>
-				                            <p class="text-muted form-control showInputValue">${assetAddress}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Zone</strong>
-				                            <p class="text-muted form-control showInputValue">${zoneId}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Division</strong>
-				                            <p class="text-muted form-control showInputValue">${divId}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Area</strong>
-				                            <p class="text-muted form-control showInputValue">${areaName}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Location</strong>
-				                            <p class="text-muted form-control showInputValue">${locName}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Street</strong>
-				                            <p class="text-muted form-control showInputValue">${streetName}</p>
-				                        </div>
-				                    </div>`;
-						$("#assetdetails").html(assetdetails);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-			
-			function getFeedbackData(fbId){
-				var apiUrl = '/gcc/api/qrfeedback/getFeedbackData?fbId='+fbId;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						//var data = jsonResponse[0];
-						//var dataLength = Object.keys(data).length;
-						
-						//alert(dataLength);//(number of properties in the object)
-						var assetdetails ='';
-						var feedbackUserInfo ='';
-						var ratingtxt ='<i class="ik ik-star-on text-warning"></i>';
-						var ratingHTMl='';
-						for (var i = 0; i < jsonResponse.length; i++) {
-							var sno = i+1;
-							var data = jsonResponse[i];
-							var eQuestion = data.assetCategoryQuestion.engQuestion;
-							var tQuestion = data.assetCategoryQuestion.tamilQuestion;
-							var ans = data.feedbackAns;//[yes] or [no]
-							ans = ans.replace(/\[|\]/g, ''); // Using a regular expression to match [ or ] globally
-							
-							if(ans=='yes')
-							{
-								var userinput =`<span class="badge badge-success text-capitalize"><strong>${ans}</strong></span>`;
-							}
-							else{
-								var userinput =`<span class="badge badge-danger text-capitalize"><strong>${ans}</strong></span>`;
-							}
-							
-							if(i==0){
-								var raringvalue = data.publicFeedback.ratingVal;
-								for(var r=0; r < raringvalue;r++){
-									ratingHTMl+=ratingtxt;
-								}
-								feedbackUserInfo += `<div class="row text-center pb-0">
-														
-	                                                    <div class="col-md-4 col-6"> <strong>Name</strong>
-	                                                        <br>
-	                                                        <p class="text-muted">${data.publicFeedback.paramName}</p>
-	                                                    </div>
-	                                                    <div class="col-md-4 col-6"> <strong>Mobile</strong>
-	                                                        <br>
-	                                                        <p class="text-muted">${data.publicFeedback.mobileNo}</p>
-	                                                    </div>
-	                                                    <div class="col-md-4 col-6"> <strong>Rating</strong>
-	                                                        <br>
-	                                                        <p class="">${ratingHTMl} (${raringvalue} / 5)</p>
-	                                                    </div>
-	                                                    
-	                                                </div>`;
-							}
-							// HTML content
-							assetdetails += `<hr class="text-muted>
-											 	<div class="row">
-													<div class="col-xl-12 col-md-12"><span class="badge badge-light">${sno}</span><strong>${eQuestion}</strong>
-							                            ${userinput}
-							                        </div>
-							                    </div>`;
-						}
-						$("#feedbackdetails").html(feedbackUserInfo + assetdetails);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list.html b/src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list.html
deleted file mode 100644
index 7d19f7b3..00000000
--- a/src/main/resources/templates/modules/qrfeedback/feedbacks/feedback-list.html
+++ /dev/null
@@ -1,358 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-envelope-open-text bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Feedback List</h5>
-                                            <span>QR Asset Feedback</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Asset QR Feedback</li>
-                                            <li class="breadcrumb-item">Feedbacks</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Public Feedbacks</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center" width="20%">Category</th>
-														<th class="text-center" width="10%">Asset Name</th>
-														<th class="text-center" width="10%">Area</th>
-														<th class="text-center" width="20%">Div</th>
-														<th class="text-center" width="20%">Public Name</th>
-														<th class="text-center" width="20%">Mobile</th>
-						                                <th class="text-center" width="10%">Rating</th>
-						                                <th class="text-center no-sort" style="width:50px;">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="feedbacklist, i : ${feedbacklist}" class="feedbacklist">
-						                                <td th:text="${i.count}">0</td>
-														<td th:text="${feedbacklist.assetDetails.assetCategory.catName}"></td>
-														<td th:text="${feedbacklist.assetDetails.assetName}"></td>
-						                                <td th:text="${feedbacklist.assetDetails.areaName}"></td>
-						                                <td th:text="${feedbacklist.assetDetails.divId}"></td>
-														<td th:text="${feedbacklist.paramName}"></td>
-														<td th:text="${feedbacklist.mobileNo}"></td>
-						                                <td class="text-center" th:text="${feedbacklist.ratingVal}"></td>
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callView([[${feedbacklist.fbId}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Feedback Details" data-original-title="View Feedback Details"><i class="ik ik-eye f-16 text-blue"></i></a>&nbsp;&nbsp;
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-						                                <th class="text-center">Category</th>
-														<th class="text-center">Asset Name</th>
-														<th class="text-center">Area</th>
-														<th class="text-center">Div</th>
-														<th class="text-center">Public Name</th>
-														<th class="text-center">Mobile</th>
-						                                <th class="text-center">Rating</th>
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="feedbackView" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Asset Feedback Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-							      
-                            <div class="col-xl-6 col-md-6" id="assetdetails">
-								
-                            </div>
-                            <div class="col-xl-6 col-md-6" style="border-left: 1px solid #dee2e6;" id="feedbackdetails">
-                                &nbsp;
-                            </div>
-                                        
-						</div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                // Additional button
-	                /*
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }*/
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callView(fbId){
-				$('#feedbackView').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#feedbackView').modal('show');
-				
-				call_loading('assetdetails','start');
-				getFeedbackAssetdetails(fbId);
-				call_loading('feedbackdetails','start');
-				getFeedbackData(fbId);
-				
-				return false;
-			}
-			
-			function getFeedbackAssetdetails(fbId){
-				var apiUrl = '/gcc/api/qrfeedback/getFeedbackAssetdetails?fbId='+fbId;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse[0];
-						var assetCategory = data.assetDetails.assetCategory.catName;
-						var assetParametersparam = data.assetDetails.paramId;
-						var assetName = data.assetDetails.assetName;
-						var assetAddress =data.assetDetails.assetAddress;
-						var zoneId = data.assetDetails.zoneId;
-						var divId = data.assetDetails.divId;
-						var areaName = data.assetDetails.areaName;
-						var locName = data.assetDetails.locName;
-						var streetName = data.assetDetails.streetName;
-						// HTML content
-						var assetdetails = `<div class="row">
-							
-										<div class="col-xl-12 col-md-12"> <strong>Asset Catergory</strong>
-				                            <p class="text-muted form-control showInputValue">${assetCategory}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Asset Parameters</strong>
-				                            <p class="text-muted form-control showInputValue">${assetParametersparam}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Name of the Asset</strong>
-				                            <p class="text-muted form-control showInputValue">${assetName}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Address of the Asset</strong>
-				                            <p class="text-muted form-control showInputValue">${assetAddress}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Zone</strong>
-				                            <p class="text-muted form-control showInputValue">${zoneId}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Division</strong>
-				                            <p class="text-muted form-control showInputValue">${divId}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Area</strong>
-				                            <p class="text-muted form-control showInputValue">${areaName}</p>
-				                        </div>
-				                        <div class="col-xl-6 col-md-6"> <strong>Location</strong>
-				                            <p class="text-muted form-control showInputValue">${locName}</p>
-				                        </div>
-				                        <div class="col-xl-12 col-md-12"> <strong>Street</strong>
-				                            <p class="text-muted form-control showInputValue">${streetName}</p>
-				                        </div>
-				                    </div>`;
-						$("#assetdetails").html(assetdetails);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-			
-			function getFeedbackData(fbId){
-				var apiUrl = '/gcc/api/qrfeedback/getFeedbackData?fbId='+fbId;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						//var data = jsonResponse[0];
-						//var dataLength = Object.keys(data).length;
-						
-						//alert(dataLength);//(number of properties in the object)
-						var assetdetails ='';
-						var feedbackUserInfo ='';
-						var ratingtxt ='<i class="ik ik-star-on text-warning"></i>';
-						var ratingHTMl='';
-						for (var i = 0; i < jsonResponse.length; i++) {
-							var sno = i+1;
-							var data = jsonResponse[i];
-							var eQuestion = data.assetCategoryQuestion.engQuestion;
-							var tQuestion = data.assetCategoryQuestion.tamilQuestion;
-							var ans = data.feedbackAns;//[yes] or [no]
-							ans = ans.replace(/\[|\]/g, ''); // Using a regular expression to match [ or ] globally
-							
-							if(ans=='yes')
-							{
-								var userinput =`<span class="badge badge-success text-capitalize"><strong>${ans}</strong></span>`;
-							}
-							else{
-								var userinput =`<span class="badge badge-danger text-capitalize"><strong>${ans}</strong></span>`;
-							}
-							
-							if(i==0){
-								var raringvalue = data.publicFeedback.ratingVal;
-								for(var r=0; r < raringvalue;r++){
-									ratingHTMl+=ratingtxt;
-								}
-								feedbackUserInfo += `<div class="row text-center pb-0">
-														
-	                                                    <div class="col-md-4 col-6"> <strong>Name</strong>
-	                                                        <br>
-	                                                        <p class="text-muted">${data.publicFeedback.paramName}</p>
-	                                                    </div>
-	                                                    <div class="col-md-4 col-6"> <strong>Mobile</strong>
-	                                                        <br>
-	                                                        <p class="text-muted">${data.publicFeedback.mobileNo}</p>
-	                                                    </div>
-	                                                    <div class="col-md-4 col-6"> <strong>Rating</strong>
-	                                                        <br>
-	                                                        <p class="">${ratingHTMl} (${raringvalue} / 5)</p>
-	                                                    </div>
-	                                                    
-	                                                </div>`;
-							}
-							// HTML content
-							assetdetails += `<hr class="text-muted>
-											 	<div class="row">
-													<div class="col-xl-12 col-md-12"><span class="badge badge-light">${sno}</span><strong>${eQuestion}</strong>
-							                            ${userinput}
-							                        </div>
-							                    </div>`;
-						}
-						$("#feedbackdetails").html(feedbackUserInfo + assetdetails);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/qrfeedback/index.html b/src/main/resources/templates/modules/qrfeedback/index.html
deleted file mode 100644
index 05ac9ec4..00000000
--- a/src/main/resources/templates/modules/qrfeedback/index.html
+++ /dev/null
@@ -1,578 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-bar-chart-2 bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>QR Asset Feedback Module</h5>
-                                            <span>Public asset QR feedback application</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <h4 class="h4 text-right text-mute" style="font-size: 12px;">Auot refresh in <font id="refresh-countdown">00</font> seconds</h4>
-                        <div class="row">
-							
-							<!-- analytic card start - First Tile Start -->
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-facebook mb-20"><i class="ik ik-layers"></i></h2>
-                                        <h3 class="text-facebook fw-700" id="assetcount">0</h3>
-                                        <p>Assets</p>
-                                        <p class="mb-0 mt-15">View Assets List<i class="fas fa-arrow-right ml-5 f-10 text-facebook"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-twitter mb-20"><i class="fas fa-comments"></i></h2>
-                                        <h3 class="text-twitter fw-700" id="feedbackcount">0</h3>
-                                        <p>Feedbacks</p>
-                                        <p class="mb-0 mt-15">View Feedbacks List<i class="fas fa-arrow-right ml-5 f-10 text-twitter"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-green mb-20"><i class="far fa-smile-beam"></i></h2>
-                                        <h3 class="text-green fw-700" id="positivecount">0</h3>
-                                        <p>Positive Feedbacks</p>
-                                        <p class="mb-0 mt-15">View Positive Feedbacks<i class="fas fa-arrow-right ml-5 f-10 text-green"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-red mb-20"><i class="far fa-frown"></i></h2>
-                                        <h3 class="text-red fw-700" id="negativecount">0</h3>
-                                        <p>Negative Feedbacks</p>
-                                        <p class="mb-0 mt-15">View Negative Feedbacks<i class="fas fa-arrow-right ml-5 f-10 text-red"></i></p>
-                                    </div>
-                                </div>
-								</a>
-                            </div>
-                            <!-- First Tile End -->
-			                
-			                <div class="col-md-12">
-				                <div class="card sale-card">
-		                            <div class="card-header">
-		                                <h3>Deals Analytics</h3>
-		                            </div>
-		                            <div class="card-block">
-		                                <div id="deal-analytic-chart" class="chart-shadow" style="height:300px"></div>
-		                            </div>
-		                        </div>    
-	                        </div>    
-	                        <!-- 
-	                        <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>Calander</h3>
-                                    </div>
-                                    <div class="card-block">
-                                        <div id="calendar"></div>
-                                    </div>
-                                </div>
-                            </div>
-                            
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>Page Title</h3>
-                                    </div>
-                                    <div class="card-block">
-                                        
-                                    </div>
-                                </div>
-                            </div>
-                             -->
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<!-- Model Box -->
-			<div class="modal" id="editEvent" tabindex="-1" role="dialog" aria-labelledby="editEventLabel" aria-hidden="true">
-                <div class="modal-dialog" role="document">
-                    <form class="editEventForm">
-                        <div class="modal-content">
-                            <div class="modal-header">
-                                <h5 class="modal-title" id="editEventLabel">Edit Event</h5>
-                                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                            </div>
-                            <div class="modal-body">
-                                <div class="form-group">
-                                    <label for="editEname">Event Title</label>
-                                    <input type="text" class="form-control" id="editEname" name="editEname" placeholder="Please enter event title">
-                                </div>
-                                <div class="form-group">
-                                    <label for="editStarts">Start</label>
-                                    <input type="text" class="form-control datetimepicker-input" id="editStarts" name="editStarts" data-toggle="datetimepicker" data-target="#editStarts">
-                                </div>
-                            </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                                <button class="btn btn-danger delete-event" type="submit">Delete</button>
-                                <button class="btn btn-success save-event" type="submit">Save</button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-            
-            <div class="modal" id="addEvent" tabindex="-1" role="dialog" aria-labelledby="addEventLabel" aria-hidden="true">
-                <div class="modal-dialog" role="document">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title" id="addEventLabel">Add New Event</h5>
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        </div>
-                        <div class="modal-body">
-                            <form id="addEventForm">
-                                <div class="form-group">
-                                    <label for="eventName">Event Title</label>
-                                    <input type="text" class="form-control" id="eventName" name="eventName" placeholder="Please enter event title">
-                                </div>
-                                <div class="form-group">
-                                    <label for="eventStarts">Starts</label>
-                                    <input type="text" class="form-control datetimepicker-input" id="eventStarts" name="eventStarts" data-toggle="datetimepicker" data-target="#eventStarts">
-                                </div>
-                                <div class="form-group mb-0" id="addColor">
-                                    <label for="colors">Choose Color</label>
-                                    <ul class="color-selector">
-                                        <li class="bg-aqua">
-                                            <input type="radio" data-color="bg-aqua" checked name="colorChosen" id="addColorAqua">
-                                            <label for="addColorAqua"></label>
-                                        </li>
-                                        <li class="bg-blue">
-                                            <input type="radio" data-color="bg-blue" name="colorChosen" id="addColorBlue">
-                                            <label for="addColorBlue"></label>
-                                        </li>
-                                        <li class="bg-light-blue">
-                                            <input type="radio" data-color="bg-light-blue" name="colorChosen" id="addColorLightblue">
-                                            <label for="addColorLightblue"></label>
-                                        </li>
-                                        <li class="bg-teal">
-                                            <input type="radio" data-color="bg-teal" name="colorChosen" id="addColorTeal">
-                                            <label for="addColorTeal"></label>
-                                        </li>
-                                        <li class="bg-yellow">
-                                            <input type="radio" data-color="bg-yellow" name="colorChosen" id="addColorYellow">
-                                            <label for="addColorYellow"></label>
-                                        </li>
-                                        <li class="bg-orange">
-                                            <input type="radio" data-color="bg-orange" name="colorChosen" id="addColorOrange">
-                                            <label for="addColorOrange"></label>
-                                        </li>
-                                        <li class="bg-green">
-                                            <input type="radio" data-color="bg-green" name="colorChosen" id="addColorGreen">
-                                            <label for="addColorGreen"></label>
-                                        </li>
-                                        <li class="bg-lime">
-                                            <input type="radio" data-color="bg-lime" name="colorChosen" id="addColorLime">
-                                            <label for="addColorLime"></label>
-                                        </li>
-                                        <li class="bg-red">
-                                            <input type="radio" data-color="bg-red" name="colorChosen" id="addColorRed">
-                                            <label for="addColorRed"></label>
-                                        </li>
-                                        <li class="bg-purple">
-                                            <input type="radio" data-color="bg-purple" name="colorChosen" id="addColorPurple">
-                                            <label for="addColorPurple"></label>
-                                        </li>
-                                        <li class="bg-fuchsia">
-                                            <input type="radio" data-color="bg-fuchsia" name="colorChosen" id="addColorFuchsia">
-                                            <label for="addColorFuchsia"></label>
-                                        </li>
-                                        <li class="bg-muted">
-                                            <input type="radio" data-color="bg-muted" name="colorChosen" id="addColorMuted">
-                                            <label for="addColorMuted"></label>
-                                        </li>
-                                        <li class="bg-navy">
-                                            <input type="radio" data-color="bg-navy" name="colorChosen" id="addColorNavy">
-                                            <label for="addColorNavy"></label>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </form>
-                        </div>
-                        <div class="modal-footer">
-                            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                            <button type="button" class="btn btn-success save-event">Save</button>
-                            <button type="button" class="btn btn-danger delete-event" data-dismiss="modal">Delete</button>
-                        </div>
-                    </div>
-                </div>
-                      
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <script src="node_modules/fullcalendar/dist/fullcalendar.min.js"></script>
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        
-        <script>
-			function fetchDashboardSummary(){
-				
-				call_loading('assetcount','start');
-				call_loading('feedbackcount','start');
-				call_loading('positivecount','start');
-				call_loading('negativecount','start');
-						
-				var apiUrl = '/gcc/api/qrfeedback/dashboard-summary';
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						
-						//for (var i = 0; i < jsonResponse.length; i++) {
-							//var data = jsonResponse[i];
-							var assetcount = jsonResponse.totalAssets;
-							var feedbackcount = jsonResponse.totalFeedbacks;
-							var positivecount = jsonResponse.totalYesFeedbacks;
-							var negativecount = jsonResponse.totalNoFeedbacks;
-						//}
-						$("#assetcount").html(assetcount);
-						$("#feedbackcount").html(feedbackcount);
-						$("#positivecount").html(positivecount);
-						$("#negativecount").html(negativecount);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				    }
-				});
-			}
-			
-			let refreshInterval;
-			let remainingTime = 60; // Initial countdown time in seconds
-			
-			function updateCountdown() {
-			 let remainingTimetxt = remainingTime;
-				if(remainingTime<10){
-					remainingTimetxt = "0"+remainingTime;
-				}
-			  document.getElementById("refresh-countdown").textContent = remainingTimetxt;
-			  remainingTime--;
-			
-			  if (remainingTime < 0) {
-			    clearInterval(refreshInterval);
-			    remainingTime = 60;
-			    fetchDashboardSummary();
-			    refreshInterval = setInterval(updateCountdown, 1000);
-			  }
-			}
-			
-			// Initial fetch and countdown start
-			fetchDashboardSummary();
-			refreshInterval = setInterval(updateCountdown, 1000);
-		</script>
-		
-        <script>
-			
-			var chartData = [];
-		    var currentDate = new Date();
-		    var currentMonth = currentDate.getMonth() + 1;
-		    var currentYear = currentDate.getFullYear();
-		    var daysInMonth = new Date(currentYear, currentMonth, 0).getDate();
-		
-		    // Generate random data for each date in the current month
-		    for (var i = 1; i <= daysInMonth; i++) {
-		        var randomValue1 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		        var randomValue2 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		
-		        var dateString = currentYear + '-' + (currentMonth < 10 ? '0' : '') + currentMonth + '-' + (i < 10 ? '0' : '') + i;
-		        var dataPoint = {
-		            "date": dateString,
-		            "market1": randomValue1,
-		            "market2": randomValue2
-		        };
-		        chartData.push(dataPoint);
-		    }
-			// deal-analytic-chart
-    var chart = AmCharts.makeChart("deal-analytic-chart", {
-        "type": "serial",
-        "theme": "light",
-        "dataDateFormat": "YYYY-MM-DD",
-        "precision": 2,
-        "valueAxes": [{
-            "id": "v1",
-            "position": "left",
-            "autoGridCount": false,
-            "labelFunction": function(value) {
-                return "$" + Math.round(value) + "M";
-            }
-        }, {
-            "id": "v2",
-            "gridAlpha": 0,
-            "autoGridCount": false
-        }],
-        "graphs": [{
-            "id": "g1",
-            "valueAxis": "v2",
-            /*"bullet": "round",
-            "bulletBorderAlpha": 1,
-            "bulletColor": "#FFFFFF",
-            "bulletSize": 8,
-            "hideBulletsCount": 50,
-            "lineThickness": 3,
-            "lineColor": "#2ed8b6",*/
-            "lineColor": "#2ed8b6",
-            "fillColors": "#2ed8b6",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Positive Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market1",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }, {
-            "id": "g2",
-            "valueAxis": "v2",
-            //"bullet": "round",
-            //"bulletBorderAlpha": 1,
-            //"bulletColor": "#FFFFFF",
-            //"bulletSize": 8,
-            //"hideBulletsCount": 50,
-            //"lineThickness": 3,
-            //"lineColor": "#e95753",
-            "lineColor": "#F22613",
-            "fillColors": "#F22613",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Negative Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market2",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }],
-        "chartCursor": {
-            "pan": true,
-            "valueLineEnabled": true,
-            "valueLineBalloonEnabled": true,
-            "cursorAlpha": 0,
-            "valueLineAlpha": 0.2
-        },
-        "categoryField": "date",
-        "categoryAxis": {
-            "parseDates": true,
-            "dashLength": 1,
-            "minorGridEnabled": true
-        },
-        "legend": {
-            "useGraphSettings": true,
-            "position": "top"
-        },
-        "balloon": {
-            "borderThickness": 1,
-            "shadowAlpha": 0
-        },
-        "dataProvider": chartData,
-    });
-		</script>
-		
-		<script>
-		/*
-		// For Calendar
-		$(document).ready(function(t, e, i) {
-		    function t(t) {
-		        t.each(function() {
-		            var t = {
-		                title: $.trim($(this).text())
-		            };
-		            $(this).data("eventObject", t), $(this).draggable({
-		                zIndex: 1070,
-		                revert: !0,
-		                revertDuration: 0
-		            })
-		        })
-		    }
-		    t($("#external-events div.external-event"));
-		    var e = new Date,
-		        i = e.getDate(),
-		        n = e.getMonth(),
-		        r = e.getFullYear();
-		    $("#calendar").fullCalendar({
-		        header: {
-		            left: "prev,next today",
-		            center: "title",
-		            right: "month,agendaWeek,agendaDay"
-		        },
-		        buttonText: {
-		            today: "today",
-		            month: "month",
-		            week: "week",
-		            day: "day"
-		        },
-		        events: [{
-		            title: "All Day Event",
-		            start: new Date(r, n, 1),
-		            className: "bg-purple"
-		        }, {
-		            title: "Long Event",
-		            start: new Date(r, n, i - 5),
-		            end: new Date(r, n, i - 2),
-		            className: "bg-yellow"
-		        }, {
-		            title: "Meeting",
-		            start: new Date(r, n, i, 10, 30),
-		            allDay: !1,
-		            className: "bg-red"
-		        }, {
-		            title: "Lunch",
-		            start: new Date(r, n, i, 12, 0),
-		            end: new Date(r, n, i, 14, 0),
-		            allDay: !1,
-		            className: "bg-navy"
-		        }, {
-		            title: "Birthday Party",
-		            start: new Date(r, n, i + 1, 19, 0),
-		            end: new Date(r, n, i + 1, 22, 30),
-		            allDay: !1,
-		            className: "bg-green"
-		        }, {
-		            title: "Click for Google",
-		            start: new Date(r, n, 28),
-		            end: new Date(r, n, 29),
-		            url: "http://google.com/",
-		            className: "bg-lime"
-		        }],
-		        editable: !0,
-		        selectable: !0,
-		        droppable: !0,
-		        drop: function(t, e) {
-		            var i = $(this).data("eventObject"),
-		                n = $.extend({}, i);
-		            n.start = t, n.allDay = e, n.backgroundColor = $(this).css("background-color"), n.borderColor = $(this).css("border-color"), $("#calendar").fullCalendar("renderEvent", n, !0), $("#drop-remove").is(":checked") && $(this).remove()
-		        },
-		        eventClick: function(calEvent, jsEvent, view) {
-		            var $this = this;
-		            $("#editEname").val(calEvent.title)
-		            $("#editStarts").datetimepicker("date", calEvent.start._d)
-		            $("#editEvent").modal({
-		                backdrop: 'static'
-		            });
-		            $("#editEvent").find('.delete-event').show().end().find('.delete-event').unbind('click').click(function() {
-		                $("#calendar").fullCalendar('removeEvents', function(ev) {
-		                    return (ev._id == calEvent._id);
-		                });
-		                $("#editEvent").modal('hide');
-		            });
-		            $("#editEvent").find('form').on('submit', function() {
-		                calEvent.title = $("#editEname").val();
-		                calEvent.start = new Date($("#editStarts").data("datetimepicker").date())
-		                $("#calendar").fullCalendar('updateEvent', calEvent);
-		                $("#editEvent").modal('hide');
-		                return false;
-		            });
-		        },
-		
-		        select: function(start, end, allDay) {
-		            var $this = this;
-		            $("#addEvent").modal({
-		                backdrop: 'static'
-		            });
-		            $("#eventStarts").datetimepicker("date", start)
-		            var form = $("#addEventForm");
-		            $("#addEvent").find('.delete-event').hide().end().find('.save-event').show().end().find('.save-event').unbind('click').click(function() {
-		                form.submit();
-		            });
-		
-		            $("#addEvent").find('form').on('submit', function() {
-		                var title = form.find("#eventName").val();
-		                var start = form.find("#eventStarts").val();
-		                var end = form.find("input[name='ending']").val();
-		                var categoryClass = form.find("#addColor [type=radio]:checked").data("color");
-		                if (title !== null && title.length != 0) {
-		                    $("#calendar").fullCalendar('renderEvent', {
-		                        title: title,
-		                        start: start,
-		                        end: end,
-		                        allDay: false,
-		                        className: categoryClass
-		                    }, true);
-		                    $("#addEvent").modal('hide');
-		                } else {
-		                    alert('You have to give a title to your event');
-		                }
-		                return false;
-		            });
-		            $("#calendar").fullCalendar('unselect');
-		
-		        }
-		    });
-		    var a = "#3c8dbc";
-		    $("#color-chooser-btn");
-		    $("#color-chooser > li > a").on("click", function(t) {
-		        t.preventDefault(), a = $(this).css("color"), $("#add-new-event").css({
-		            "background-color": a,
-		            "border-color": a
-		        })
-		    }), $("#add-new-event").on("click", function(e) {
-		        e.preventDefault();
-		        var i = $("#new-event").val();
-		        if (0 != i.length) {
-		            var n = $("<div />");
-		            n.css({
-		                "background-color": a,
-		                "border-color": a,
-		                color: "#fff"
-		            }).addClass("external-event"), n.html(i), $("#external-events").prepend(n), t(n), $("#new-event").val("")
-		        }
-		    });
-		
-		})*/
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/qrfeedback/jquery.datetimepicker.min.css b/src/main/resources/templates/modules/qrfeedback/jquery.datetimepicker.min.css
deleted file mode 100644
index e3e02e2b..00000000
--- a/src/main/resources/templates/modules/qrfeedback/jquery.datetimepicker.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.xdsoft_datetimepicker{box-shadow:0 5px 15px -5px rgba(0,0,0,0.506);background:#fff;border-bottom:1px solid #bbb;border-left:1px solid #ccc;border-right:1px solid #ccc;border-top:1px solid #ccc;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;padding:8px;padding-left:0;padding-top:2px;position:absolute;z-index:9999;-moz-box-sizing:border-box;box-sizing:border-box;display:none}.xdsoft_datetimepicker.xdsoft_rtl{padding:8px 0 8px 8px}.xdsoft_datetimepicker iframe{position:absolute;left:0;top:0;width:75px;height:210px;background:transparent;border:0}.xdsoft_datetimepicker button{border:none !important}.xdsoft_noselect{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.xdsoft_noselect::selection{background:transparent}.xdsoft_noselect::-moz-selection{background:transparent}.xdsoft_datetimepicker.xdsoft_inline{display:inline-block;position:static;box-shadow:none}.xdsoft_datetimepicker *{-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin:0}.xdsoft_datetimepicker .xdsoft_datepicker,.xdsoft_datetimepicker .xdsoft_timepicker{display:none}.xdsoft_datetimepicker .xdsoft_datepicker.active,.xdsoft_datetimepicker .xdsoft_timepicker.active{display:block}.xdsoft_datetimepicker .xdsoft_datepicker{width:224px;float:left;margin-left:8px}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_datepicker{float:right;margin-right:8px;margin-left:0}.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_datepicker{width:256px}.xdsoft_datetimepicker .xdsoft_timepicker{width:58px;float:left;text-align:center;margin-left:8px;margin-top:0}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_timepicker{float:right;margin-right:8px;margin-left:0}.xdsoft_datetimepicker .xdsoft_datepicker.active+.xdsoft_timepicker{margin-top:8px;margin-bottom:3px}.xdsoft_datetimepicker .xdsoft_monthpicker{position:relative;text-align:center}.xdsoft_datetimepicker .xdsoft_label i,.xdsoft_datetimepicker .xdsoft_prev,.xdsoft_datetimepicker .xdsoft_next,.xdsoft_datetimepicker .xdsoft_today_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAeCAYAAADaW7vzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Q0NBRjI1NjM0M0UwMTFFNDk4NkFGMzJFQkQzQjEwRUIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Q0NBRjI1NjQ0M0UwMTFFNDk4NkFGMzJFQkQzQjEwRUIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDQ0FGMjU2MTQzRTAxMUU0OTg2QUYzMkVCRDNCMTBFQiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDQ0FGMjU2MjQzRTAxMUU0OTg2QUYzMkVCRDNCMTBFQiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PoNEP54AAAIOSURBVHja7Jq9TsMwEMcxrZD4WpBYeKUCe+kTMCACHZh4BFfHO/AAIHZGFhYkBBsSEqxsLCAgXKhbXYOTxh9pfJVP+qutnZ5s/5Lz2Y5I03QhWji2GIcgAokWgfCxNvcOCCGKqiSqhUp0laHOne05vdEyGMfkdxJDVjgwDlEQgYQBgx+ULJaWSXXS6r/ER5FBVR8VfGftTKcITNs+a1XpcFoExREIDF14AVIFxgQUS+h520cdud6wNkC0UBw6BCO/HoCYwBhD8QCkQ/x1mwDyD4plh4D6DDV0TAGyo4HcawLIBBSLDkHeH0Mg2yVP3l4TQMZQDDsEOl/MgHQqhMNuE0D+oBh0CIr8MAKyazBH9WyBuKxDWgbXfjNf32TZ1KWm/Ap1oSk/R53UtQ5xTh3LUlMmT8gt6g51Q9p+SobxgJQ/qmsfZhWywGFSl0yBjCLJCMgXail3b7+rumdVJ2YRss4cN+r6qAHDkPWjPjdJCF4n9RmAD/V9A/Wp4NQassDjwlB6XBiCxcJQWmZZb8THFilfy/lfrTvLghq2TqTHrRMTKNJ0sIhdo15RT+RpyWwFdY96UZ/LdQKBGjcXpcc1AlSFEfLmouD+1knuxBDUVrvOBmoOC/rEcN7OQxKVeJTCiAdUzUJhA2Oez9QTkp72OTVcxDcXY8iKNkxGAJXmJCOQwOa6dhyXsOa6XwEGAKdeb5ET3rQdAAAAAElFTkSuQmCC)}.xdsoft_datetimepicker .xdsoft_label i{opacity:.5;background-position:-92px -19px;display:inline-block;width:9px;height:20px;vertical-align:middle}.xdsoft_datetimepicker .xdsoft_prev{float:left;background-position:-20px 0}.xdsoft_datetimepicker .xdsoft_today_button{float:left;background-position:-70px 0;margin-left:5px}.xdsoft_datetimepicker .xdsoft_next{float:right;background-position:0 0}.xdsoft_datetimepicker .xdsoft_next,.xdsoft_datetimepicker .xdsoft_prev,.xdsoft_datetimepicker .xdsoft_today_button{background-color:transparent;background-repeat:no-repeat;border:0 none;cursor:pointer;display:block;height:30px;opacity:.5;-ms-filter:"alpha(opacity=50)";outline:medium none;overflow:hidden;padding:0;position:relative;text-indent:100%;white-space:nowrap;width:20px;min-width:0}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_prev,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_next{float:none;background-position:-40px -15px;height:15px;width:30px;display:block;margin-left:14px;margin-top:7px}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_timepicker .xdsoft_prev,.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_timepicker .xdsoft_next{float:none;margin-left:0;margin-right:14px}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_prev{background-position:-40px 0;margin-bottom:7px;margin-top:0}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box{height:151px;overflow:hidden;border-bottom:1px solid #ddd}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div{background:#f5f5f5;border-top:1px solid #ddd;color:#666;font-size:12px;text-align:center;border-collapse:collapse;cursor:pointer;border-bottom-width:0;height:25px;line-height:25px}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div:first-child{border-top-width:0}.xdsoft_datetimepicker .xdsoft_today_button:hover,.xdsoft_datetimepicker .xdsoft_next:hover,.xdsoft_datetimepicker .xdsoft_prev:hover{opacity:1;-ms-filter:"alpha(opacity=100)"}.xdsoft_datetimepicker .xdsoft_label{display:inline;position:relative;z-index:9999;margin:0;padding:5px 3px;font-size:14px;line-height:20px;font-weight:bold;background-color:#fff;float:left;width:182px;text-align:center;cursor:pointer}.xdsoft_datetimepicker .xdsoft_label:hover>span{text-decoration:underline}.xdsoft_datetimepicker .xdsoft_label:hover i{opacity:1.0}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select{border:1px solid #ccc;position:absolute;right:0;top:30px;z-index:101;display:none;background:#fff;max-height:160px;overflow-y:hidden}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select.xdsoft_monthselect{right:-7px}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select.xdsoft_yearselect{right:2px}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option:hover{color:#fff;background:#ff8000}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option{padding:2px 10px 2px 5px;text-decoration:none !important}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option.xdsoft_current{background:#3af;box-shadow:#178fe5 0 1px 3px 0 inset;color:#fff;font-weight:700}.xdsoft_datetimepicker .xdsoft_month{width:100px;text-align:right}.xdsoft_datetimepicker .xdsoft_calendar{clear:both}.xdsoft_datetimepicker .xdsoft_year{width:48px;margin-left:5px}.xdsoft_datetimepicker .xdsoft_calendar table{border-collapse:collapse;width:100%}.xdsoft_datetimepicker .xdsoft_calendar td>div{padding-right:5px}.xdsoft_datetimepicker .xdsoft_calendar th{height:25px}.xdsoft_datetimepicker .xdsoft_calendar td,.xdsoft_datetimepicker .xdsoft_calendar th{width:14.2857142%;background:#f5f5f5;border:1px solid #ddd;color:#666;font-size:12px;text-align:right;vertical-align:middle;padding:0;border-collapse:collapse;cursor:pointer;height:25px}.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_calendar td,.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_calendar th{width:12.5%}.xdsoft_datetimepicker .xdsoft_calendar th{background:#f1f1f1}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_today{color:#3af}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_highlighted_default{background:#ffe9d2;box-shadow:#ffb871 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_highlighted_mint{background:#c1ffc9;box-shadow:#00dd1c 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_default,.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_current,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current{background:#3af;box-shadow:#178fe5 0 1px 3px 0 inset;color:#fff;font-weight:700}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_other_month,.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_disabled,.xdsoft_datetimepicker .xdsoft_time_box>div>div.xdsoft_disabled{opacity:.5;-ms-filter:"alpha(opacity=50)";cursor:default}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_other_month.xdsoft_disabled{opacity:.2;-ms-filter:"alpha(opacity=20)"}.xdsoft_datetimepicker .xdsoft_calendar td:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div:hover{color:#fff !important;background:#ff8000 !important;box-shadow:none !important}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_current.xdsoft_disabled:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current.xdsoft_disabled:hover{background:#3af !important;box-shadow:#178fe5 0 1px 3px 0 inset !important;color:#fff !important}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_disabled:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_disabled:hover{color:inherit !important;background:inherit !important;box-shadow:inherit !important}.xdsoft_datetimepicker .xdsoft_calendar th{font-weight:700;text-align:center;color:#999;cursor:default}.xdsoft_datetimepicker .xdsoft_copyright{color:#ccc !important;font-size:10px;clear:both;float:none;margin-left:8px}.xdsoft_datetimepicker .xdsoft_copyright a{color:#eee !important}.xdsoft_datetimepicker .xdsoft_copyright a:hover{color:#aaa !important}.xdsoft_time_box{position:relative;border:1px solid #ccc}.xdsoft_scrollbar>.xdsoft_scroller{background:#ccc !important;height:20px;border-radius:3px}.xdsoft_scrollbar{position:absolute;width:7px;right:0;top:0;bottom:0;cursor:pointer}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_scrollbar{left:0;right:auto}.xdsoft_scroller_box{position:relative}.xdsoft_datetimepicker.xdsoft_dark{box-shadow:0 5px 15px -5px rgba(255,255,255,0.506);background:#000;border-bottom:1px solid #444;border-left:1px solid #333;border-right:1px solid #333;border-top:1px solid #333;color:#ccc}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box{border-bottom:1px solid #222}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div{background:#0a0a0a;border-top:1px solid #222;color:#999}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label{background-color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select{border:1px solid #333;background:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select>div>.xdsoft_option:hover{color:#000;background:#007fff}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select>div>.xdsoft_option.xdsoft_current{background:#c50;box-shadow:#b03e00 0 1px 3px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label i,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_prev,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_next,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_today_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAeCAYAAADaW7vzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUExQUUzOTA0M0UyMTFFNDlBM0FFQTJENTExRDVBODYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QUExQUUzOTE0M0UyMTFFNDlBM0FFQTJENTExRDVBODYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpBQTFBRTM4RTQzRTIxMUU0OUEzQUVBMkQ1MTFENUE4NiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQTFBRTM4RjQzRTIxMUU0OUEzQUVBMkQ1MTFENUE4NiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pp0VxGEAAAIASURBVHja7JrNSgMxEMebtgh+3MSLr1T1Xn2CHoSKB08+QmR8Bx9A8e7RixdB9CKCoNdexIugxFlJa7rNZneTbLIpM/CnNLsdMvNjM8l0mRCiQ9Ye61IKCAgZAUnH+mU3MMZaHYChBnJUDzWOFZdVfc5+ZFLbrWDeXPwbxIqrLLfaeS0hEBVGIRQCEiZoHQwtlGSByCCdYBl8g8egTTAWoKQMRBRBcZxYlhzhKegqMOageErsCHVkk3hXIFooDgHB1KkHIHVgzKB4ADJQ/A1jAFmAYhkQqA5TOBtocrKrgXwQA8gcFIuAIO8sQSA7hidvPwaQGZSaAYHOUWJABhWWw2EMIH9QagQERU4SArJXo0ZZL18uvaxejXt/Em8xjVBXmvFr1KVm/AJ10tRe2XnraNqaJvKE3KHuUbfK1E+VHB0q40/y3sdQSxY4FHWeKJCunP8UyDdqJZenT3ntVV5jIYCAh20vT7ioP8tpf6E2lfEMwERe+whV1MHjwZB7PBiCxcGQWwKZKD62lfGNnP/1poFAA60T7rF1UgcKd2id3KDeUS+oLWV8DfWAepOfq00CgQabi9zjcgJVYVD7PVzQUAUGAQkbNJTBICDhgwYTjDYD6XeW08ZKh+A4pYkzenOxXUbvZcWz7E8ykRMnIHGX1XPl+1m2vPYpL+2qdb8CDAARlKFEz/ZVkAAAAABJRU5ErkJggg==)}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{background:#0a0a0a;border:1px solid #222;color:#999}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{background:#0e0e0e}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_today{color:#c50}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_highlighted_default{background:#ffe9d2;box-shadow:#ffb871 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_highlighted_mint{background:#c1ffc9;box-shadow:#00dd1c 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_default,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_current,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current{background:#c50;box-shadow:#b03e00 0 1px 3px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td:hover,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div:hover{color:#000 !important;background:#007fff !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{color:#666}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright{color:#333 !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright a{color:#111 !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright a:hover{color:#555 !important}.xdsoft_dark .xdsoft_time_box{border:1px solid #333}.xdsoft_dark .xdsoft_scrollbar>.xdsoft_scroller{background:#333 !important}.xdsoft_datetimepicker .xdsoft_save_selected{display:block;border:1px solid #ddd !important;margin-top:5px;width:100%;color:#454551;font-size:13px}.xdsoft_datetimepicker .blue-gradient-button{font-family:"museo-sans","Book Antiqua",sans-serif;font-size:12px;font-weight:300;color:#82878c;height:28px;position:relative;padding:4px 17px 4px 33px;border:1px solid #d7d8da;background:-moz-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(73%,#f4f8fa));background:-webkit-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-o-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-ms-linear-gradient(top,#fff 0,#f4f8fa 73%);background:linear-gradient(to bottom,#fff 0,#f4f8fa 73%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff',endColorstr='#f4f8fa',GradientType=0)}.xdsoft_datetimepicker .blue-gradient-button:hover,.xdsoft_datetimepicker .blue-gradient-button:focus,.xdsoft_datetimepicker .blue-gradient-button:hover span,.xdsoft_datetimepicker .blue-gradient-button:focus span{color:#454551;background:-moz-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f4f8fa),color-stop(73%,#FFF));background:-webkit-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-o-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-ms-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:linear-gradient(to bottom,#f4f8fa 0,#FFF 73%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f8fa',endColorstr='#FFF',GradientType=0)}
diff --git a/src/main/resources/templates/modules/qrfeedback/master/asset-category-questions.html b/src/main/resources/templates/modules/qrfeedback/master/asset-category-questions.html
deleted file mode 100644
index 71d83195..00000000
--- a/src/main/resources/templates/modules/qrfeedback/master/asset-category-questions.html
+++ /dev/null
@@ -1,700 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-question-circle bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Asset Category Question</h5>
-                                            <span>QR Asset Feedback Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Asset QR Feedback</li>
-                                            <li class="breadcrumb-item">Master</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Category Question</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort">S.No</th>
-														<th class="text-center" width="20%">Category</th>
-														<th class="text-center">English Question</th>
-														<th class="text-center">Tamil Question</th>
-						                                <th class="text-center" width="10%">IsActive</th>
-						                                <th class="text-center no-sort" width="10%">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="categoryquestiontxt, i : ${assetcategoryquestionlist}" class="${assetcategoryquestionlist}">
-						                                <td th:text="${i.count}">0</td>
-						 								<td th:text="${categoryquestiontxt.assetCategory.catName}" class="text-center"></td>
-						                                <td th:text="${categoryquestiontxt.engQuestion}"></td>
-						 								<td th:text="${categoryquestiontxt.tamilQuestion}"></td>
-						                                <td th:if="${categoryquestiontxt.isActive}" class="text-center"><span class="badge bg-success">Active</span></td>
-						                                <td th:unless="${categoryquestiontxt.isActive}" class="text-center"><span class="badge bg-warning">InActive</span></td>
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callEdit([[${categoryquestiontxt.cmqId}]])" data-toggle="tooltip" data-animation="true" data-placement="top" title="Edit" data-original-title="Edit"><i class="ik ik-edit f-16 mr-15 text-green"></i></a>
-						                                    <a th:href="@{#}" th:onclick="return callDelete( [[${categoryquestiontxt.engQuestion}]], [[${categoryquestiontxt.cmqId}]] );" data-animation="true" data-toggle="tooltip" data-placement="top" title="Delete" data-original-title="Delete"><i class="ik ik-trash-2 f-16 mr-15 text-red"></i></a>
-															<a th:href="@{#}" th:onclick="return callComplaints( [[${categoryquestiontxt.engQuestion}]], [[${categoryquestiontxt.cmqId}]] );" data-animation="true" data-toggle="tooltip" data-placement="top" title="Complaint Assignment" data-original-title="Complaint Assignment"><i class="ik ik-tag f-16 text-purple"></i></a>
-						                                </td>
-						                             </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-														<th class="text-center">Category</th>
-														<th class="text-center">English Question</th>
-														<th class="text-center">Tamil Question</th>
-						                                <th class="text-center">IsActive</th>
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="addForm" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-lg mt-0 mb-0" role="document">
-                <div class="modal-content">
-					<form name="addCategoryQuestionForm" id="addCategoryQuestionForm" onsubmit="return saveCategoryQuestion();">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Master Category Question Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div id="saveFormError" class="text-danger text-center"></div>
-						<div class="form-group row">
-                            <label for="assetCategory" class="col-sm-12 col-form-label">Select Asset Master Category</label>
-                            <div class="col-sm-12">
-								<select class="form-control" name="assetCategory" id="assetCategory" required>
-                                    <option value="">Select</option>
-                                    <option th:each="category: ${assetcategorylist}" th:value="${category.cId}" th:text="${category.catName}">-</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="engQuestion" class="col-sm-12 col-form-label">English Question</label>
-                            <div class="col-sm-12">
-                                <input type="text" class="form-control" name="engQuestion" id="engQuestion" placeholder="English Question" required />
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="tamilQuestion" class="col-sm-12 col-form-label">Tamil Question</label>
-                            <div class="col-sm-12">
-                                <input type="text" class="form-control" name="tamilQuestion" id="tamilQuestion" placeholder="Tamil Question" required />
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="isActive" class="col-sm-12 col-form-label">IsActive</label>
-                            <div class="col-sm-12">
-                                <select class="form-control" id="isActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-                        </div>
-                    	
-                    </div>
-                    <div class="modal-footer">
-                        <button type="reset" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="return closeModel();"><i class="ik ik-x-square"></i>Close</button>
-                        <button type="submit" class="btn btn-success btn-sm" id="savebtn"><i class="ik ik-save"></i>Save</button>
-                    </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-                        
-		<div class="modal fade" id="editForm" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-lg mt-0 mb-0" role="document">
-                <div class="modal-content">
-					<form name="editCategoryQuestionForm" id="editCategoryQuestionForm" onsubmit="return updateCategoryQuestion();">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Master Category Question Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div id="editFormError" class="text-danger text-center"></div>
-						<div class="form-group row">
-                            <label for="editassetCategory" class="col-sm-12 col-form-label">Select Asset Master Category</label>
-                            <div class="col-sm-12">
-								<select class="form-control" name="editassetCategory" id="editassetCategory" required>
-                                    <option value="">Select</option>
-                                    <option th:each="category: ${assetcategorylist}" th:value="${category.cId}" th:text="${category.catName}">-</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="editEngQuestion" class="col-sm-12 col-form-label">English Question</label>
-                            <div class="col-sm-12">
-                                <input type="text" class="form-control" name="editEngQuestion" id="editEngQuestion" placeholder="English Question" required />
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="editTamilQuestion" class="col-sm-12 col-form-label">Tamil Question</label>
-                            <div class="col-sm-12">
-                                <input type="text" class="form-control" name="editTamilQuestion" id="editTamilQuestion" placeholder="Tamil Question" required />
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="editIsActive" class="col-sm-12 col-form-label">IsActive</label>
-                            <div class="col-sm-12">
-                                <select class="form-control" id="editIsActive" name="editIsActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-						<input type="hidden" name="cmqId" id="cmqId" value="0">
-                        <button type="reset" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="return closeModel();"><i class="ik ik-x-square"></i>Close</button>
-                        <button type="submit" class="btn btn-success btn-sm" id="editbtn"><i class="ik ik-save"></i>Update</button>
-                    </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="viewComplaint" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-lg mt-0 mb-0" role="document">
-                <div class="modal-content">
-					<form name="editCategoryQuestionForm" id="editCategoryQuestionForm" onsubmit="return updateCategoryQuestion();">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Map Question with Complaint Group</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="form-group row">
-                            <label class="col-sm-12 col-form-label" >Complaint Question</label>
-							<div id="comQuestionTxt" class="col-sm-12 text-warning" style="font-size: 15px;"></div>
-							<div id="comTxt"></div>
-                        </div>
-                        <div class="mb-12"><h3 class="text-center">Add / Edit<h3></div>
-                        <div class="form-group row">
-                            <label for="comGroupId" class="col-sm-12 col-form-label">Select Complaint Group</label>
-                            <div class="col-sm-12">
-                                <select class="form-control" name="comGroupId" id="comGroupId" required onchange="getcomSubGroup(this);">
-                                	<option value="">Select</option>
-                            	</select>
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="comSubGroupId" class="col-sm-12 col-form-label">Select Complaint Sub-Group</label>
-                            <div class="col-sm-12">
-                                <select class="form-control" id="comSubGroupId" name="comSubGroupId" required onchange="setSubGroupName(this);">
-                                    <option value="">Select</option>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-						<input type="hidden" name="cmqId" id="cmqId" value="" >
-						<input type="hidden" name="comSubGroupName" id="comSubGroupName" value="" >
-                        <button type="reset" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="return closeModel();"><i class="ik ik-x-square"></i>Close</button>
-                        <button type="submit" class="btn btn-success btn-sm" id="editbtn"><i class="ik ik-save"></i>Update</button>
-                    </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                // Additional button
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset Category Question',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callAdd(){
-				$('#addForm').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#addForm').modal('show');
-			}
-			
-			function callEdit(id){
-				// Form reste
-				formReset();
-				//Fetch data by id
-				getEditdata(id);
-				$('#editForm').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#editForm').modal('show');
-				return false;
-			}
-		
-			function saveCategoryQuestion(){
-				// Disable the button to prevent multiple clicks
-				$("#savebtn").prop("disabled", true);
-				
-				// Show the loading icon on the button
-				$("#savebtn").html('<i class="fas fa-spinner fa-spin"></i>Save');
-					
-				// Get form data
-			    var formData = {
-			      assetCategory: $('#assetCategory').val(),
-			      engQuestion: $('#engQuestion').val(),
-			      tamilQuestion: $('#tamilQuestion').val(),
-			      isActive: $('#isActive').val()
-			    };	
-				callSaveCategoryQuestionAPI();
-				/*
-				if(formData.assetCategory>0){
-					$.ajax({
-					  type: "POST",
-					  dataType: 'json',
-					  url: "/gcc/api/qrfeedback/category/checkbyname",
-					  //contentType: 'application/json',
-	      			  data: formData,
-					  success: function(data){
-					      if(data==0){
-							  $('#addFormError').html("");
-							  callSaveCategoryQuestionAPI();
-						  }
-						  else{
-							  $('#addFormError').html("<i class='ik ik-alert-triangle'></i> Asset Category Name `"+formData.catName+"` already exists!.");
-							  $("#savebtn").prop("disabled", false);
-		    				  $("#savebtn").html('<i class="ik ik-save"></i>Save');
-						  }
-					  },
-					  error: function(xhr, status, error) {
-				        console.error('Form submission error:', error);
-				        $("#savebtn").prop("disabled", false);
-			    		$("#savebtn").html('<i class="ik ik-save"></i>Save');
-				        // Handle errors here
-				      }
-					})
-				}
-				*/
-	    		return false;
-			}
-		
-			function callSaveCategoryQuestionAPI(){
-			
-				// Get form data
-			    var formData = {
-			      assetCategory: $('#assetCategory').val(),
-			      engQuestion: $('#engQuestion').val(),
-			      tamilQuestion: $('#tamilQuestion').val(),
-			      isActive: $('#isActive').val()
-			    };
-			    
-				if (formData.assetCategory>0) {
-					$.ajax({
-					  type: "POST",
-					  dataType: 'json',
-					  url: "/gcc/api/qrfeedback/saveCategoryQuestion",
-					  //contentType: 'application/json',
-	      			  data: formData,
-					  success: function(data){
-					     
-							  $('#addFormError').html("");
-							  Swal.fire(
-						        'Add Category Question!',
-						        'Category Question added successfully.',
-						        'success'
-						      ).then(() => {
-									  		formReset();
-									  		$('#addForm').modal('hide');
-										    $("#savebtn").prop("disabled", false);
-			    							$("#savebtn").html('<i class="ik ik-save"></i>Save');
-			    							location.reload();
-										   });
-					  },
-					  error: function(xhr, status, error) {
-				        console.error('Form submission error:', error);
-				        $("#savebtn").prop("disabled", false);
-			    		$("#savebtn").html('<i class="ik ik-save"></i>Save');
-				        // Handle errors here
-				      }  
-					})
-				}
-				
-	    		return false;
-			}
-			
-			function getEditdata(id){
-				$.ajax({
-					  type: "POST",
-					  dataType: 'json',
-					  url: "/gcc/api/qrfeedback/category/question/"+id,
-	      			  //data: formData,
-					  success: function(data){
-						  console.log(data);
-						  
-						  $("#cmqId").val(data[0]["cmqId"]);
-						  
-						  $("#editassetCategory").val(data[0]["assetCategory"]["cId"]);
-						  $("#editEngQuestion").val(data[0]["engQuestion"]);
-						  $("#editTamilQuestion").val(data[0]["tamilQuestion"]);
-						  
-						  if(data[0]["isActive"]==true){
-							  $("#editIsActive").val(1); // True (Yes)
-						  }
-						  else{
-							  $("#editIsActive").val(0); // False (No)
-						  }
-					  },
-					  error: function(xhr, status, error) {
-				        console.error('Get Data(category) error:', error);
-				        $("#editbtn").prop("disabled", false);
-			    		$("#editbtn").html('<i class="ik ik-save"></i>Update');
-				        // Handle errors here
-				      }  
-					})
-			}
-			
-			function updateCategoryQuestion(){
-				// Disable the button to prevent multiple clicks
-				$("#editbtn").prop("disabled", true);
-				
-				// Show the loading icon on the button
-				$("#editbtn").html('<i class="fas fa-spinner fa-spin"></i>Update');
-					
-				// Get form data
-			    var formData = {
-					cmqId:$('#cmqId').val(),
-					assetCategory: $('#editassetCategory').val(),
-			      	engQuestion: $('#editEngQuestion').val(),
-			      	tamilQuestion: $('#editTamilQuestion').val(),
-					isActive: $('#editIsActive').val()
-			    };	
-				
-				if (formData.cmqId>0) {
-					callUpadteCategoryQuestionAPI();
-					/*
-					$.ajax({
-					  type: "POST",
-					  dataType: 'json',
-					  url: "/gcc/api/qrfeedback/category/edit/checkbyname",
-					  //contentType: 'application/json',
-	      			  data: formData,
-					  success: function(data){
-					      if(data==0){
-							  $('#editFormError').html("");
-							  callUpadteCategoryQuestionAPI();
-						  }
-						  else{
-							  $('#editFormError').html("<i class='ik ik-alert-triangle'></i> Asset Category Name `"+formData.catName+"` already exists!.");
-							  $("#editbtn").prop("disabled", false);
-		    				  $("#editbtn").html('<i class="ik ik-save"></i>Update');
-						  }
-					  },
-					  error: function(xhr, status, error) {
-				        console.error('Form submission error:', error);
-				        $("#editbtn").prop("disabled", false);
-			    		$("#editbtn").html('<i class="ik ik-save"></i>Update');
-				        // Handle errors here
-				      }
-					})
-					*/
-				}
-				
-	    		return false;
-			}
-		
-			function callUpadteCategoryQuestionAPI(){
-			
-				// Get form data
-			    var formData = {
-					cmqId:$('#cmqId').val(),
-					assetCategory: $('#editassetCategory').val(),
-			      	engQuestion: $('#editEngQuestion').val(),
-			      	tamilQuestion: $('#editTamilQuestion').val(),
-					isActive: $('#editIsActive').val()
-			    };
-			    
-				if (formData.cmqId>0) {
-					//alert(qrAssetFeedbackApiUrl);
-					$.ajax({
-					  type: "POST",
-					  dataType: 'json',
-					  url: "/gcc/api/qrfeedback/updateCategoryQuestion",
-					  //contentType: 'application/json',
-	      			  data: formData,
-					  success: function(data){
-							  $('#editFormError').html("");
-							  Swal.fire(
-						        'Update Category Question!',
-						        'Category question updated successfully.',
-						        'success'
-						      ).then(() => {
-									  		formReset();
-									  		$('#editForm').modal('hide');
-										    $("#editbtn").prop("disabled", false);
-			    							$("#editbtn").html('<i class="ik ik-save"></i>Update');
-			    							location.reload();
-										   });
-					  },
-					  error: function(xhr, status, error) {
-				        console.error('Update form submission error:', error);
-				        $("#editbtn").prop("disabled", false);
-			    		$("#editbtn").html('<i class="ik ik-save"></i>Update');
-				        // Handle errors here
-				      }  
-					})
-				}
-				
-	    		return false;
-			}
-			
-			function callDelete(text,id){
-				Swal.fire({
-					title: 'Are you sure you want to delete the category question?`<br>'+text+'`',
-					text: "You won't be able to revert this!",
-					icon: 'warning',
-					showCancelButton: true,
-					confirmButtonColor: '#3085d6',
-					cancelButtonColor: '#d33',
-					confirmButtonText: 'Yes, delete it!',
-					}).then(function(result) {
-					if (result.isConfirmed) {
-		
-						$.ajax({
-						  type: "GET",
-						  dataType: 'json',
-						  url: "/gcc/api/qrfeedback/category/question/"+id+"/delete",
-						  //data: "id=" + id + "&name=" + name,
-						  success: function(data){
-						      Swal.fire(
-						        'Deleted!',
-						        'Category Question `'+text+'` has been deleted.',
-						        'success'
-						      ).then(() => {
-									    location.reload();
-									  });
-						  }  
-						})
-					}
-				})
-				return false;
-			}
-			
-			
-			function callComplaints(question,id){
-			
-				$("#cmqId").val(id);
-				$("#comQuestionTxt").html(question);
-				
-				
-				// For getting Complaints Details from Question 
-	   	     	$.ajax({
-	   	          type: "POST",
-	   			  dataType: 'json',
-	   	          url: "/gcc/api/qrfeedback/category/question/"+id,
-	   	          //data: "id=" + id + "&name=" + name,
-	   	          success: function(data){
-		  				var comgroupid=data[0].comGroupId;
-		  				var comsubgroupid=data[0].comSubGroupId;
-		  				var comsubgroupname=data[0].comSubGroupName;
-						if(comsubgroupid!=null){
-							$("#comTxt").html('<div class="block-content bg-body-light text-center">Complaint Group ID:<h3 class="fs-4 fw-bold mb-1 text-info">'+comgroupid+'</h3>Complaint Sub-Group:<h4 class="fs-6 text-info mb-3">'+comsubgroupname+'</h4></div>');
-						}else{
-							$("#comTxt").html('');
-						}
-	   		          }
-	   		     });
-			 
-			 	// Clear Dynamic Option Values 
-			 	$('#comGroupId option:not(:first)').remove();
-			 	$('#comSubGroupId option:not(:first)').remove();
-				// Get Complaints Category from Complaints 
-		     	$.ajax({
-		          type: "GET",
-				  dataType: 'json',
-		          url: "/gcc/api/qrfeedback/getComplaintCategory",
-		          //data: "id=" + id + "&name=" + name,
-		          success: function(bodyMessage){
-					  	/*
-					  	// Remove all existing options
-						$('#comGroupId').empty();
-						// Add a new option
-					    $('#comGroupId').prepend("<option value=''>Select</option>");
-					    */
-						var tempJson = bodyMessage['ComplaintCategoryListResult'];
-						for (var i = 0; i < tempJson.length; i++) {
-							var tempJsonValue = tempJson[i]['groupid'];
-							var tempJsonLabel = tempJson[i]['groupname'];
-							// Add a new option
-							$('#comGroupId').append("<option value='" + tempJsonValue + "'>" + tempJsonValue + " - " + tempJsonLabel + "</option>");
-						}
-					
-			          }
-			     });
-				 
-	 			$("#viewComplaint").modal({
-	 				backdrop: 'static',
-	 				ketboard: false
-	 			});
-				$("#viewComplaint").modal('show');
-				return false;
-			}
-			
-			//Getting Complaints Sub Group
-			function getcomSubGroup($this) {
-	
-				$('#comSubGroupId option:not(:first)').remove();
-				var comGroupId = $this.value;
-				alert(comGroupId);
-					$.ajax({
-						type: "POST",
-						url: "/gcc/api/qrfeedback/getComplaintCategoryById",
-						data: {'comGroupId':comGroupId},
-						dataType: 'json',
-						success: function(bodyMessage) {
-							console.log(bodyMessage);
-							var jsondata = bodyMessage['ComplaintCategoryListResult'];
-							var tempJson = jsondata[0]['group'];
-							for (var i = 0; i < tempJson.length; i++) {
-								var tempJsonValue = tempJson[i]['id'];
-								var tempJsonLabel = tempJson[i]['complaintname'];
-								
-								$('#comSubGroupId').append("<option value='" + tempJsonValue + "'>" + tempJsonValue + " - " + tempJsonLabel + "</option>");
-							}
-						}, error: function(e, ts, et) 
-						{ 
-							//alert(ts);
-						}
-		
-					});
-			}
-		
-			function setSubGroupName(element){
-				const selectedOptionText = element.options[element.selectedIndex].text;
-				$("#comSubGroupName").val(selectedOptionText);
-			}
-		
-			function closeModel(){
-				formReset();
-				$('#addForm').modal('hide');
-				$('#editForm').modal('hide');
-			}
-			
-			function formReset(){
-				// For add form
-				document.getElementById('addCategoryQuestionForm').reset();
-				$('#addFormError').html("");
-				$("#savebtn").prop("disabled", false);
-			    $("#savebtn").html('<i class="ik ik-save"></i>Save');
-				// For edit form
-				document.getElementById('editCategoryQuestionForm').reset();
-				$('#editFormError').html("");
-				$("#editbtn").prop("disabled", false);
-			    $("#editbtn").html('<i class="ik ik-save"></i>Update');
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/qrfeedback/master/asset-category.html b/src/main/resources/templates/modules/qrfeedback/master/asset-category.html
deleted file mode 100644
index a6e6ca1e..00000000
--- a/src/main/resources/templates/modules/qrfeedback/master/asset-category.html
+++ /dev/null
@@ -1,521 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-th-large bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Asset Catergory</h5>
-                                            <span>QR Asset Feedback Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Asset QR Feedback</li>
-                                            <li class="breadcrumb-item">Master</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Category</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th>S.No</th>
-						                                <th>Master ID</th>
-						                                <th>Category Name</th>
-						                                <th>IsActive</th>
-						                                <th class="text-center no-sort" width="%2">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="category, i : ${assetcategorylist}" class="assetcategorylist">
-						                                <td th:text="${i.count}">0</td>
-						                                <td th:text="${category.cId}"></td>
-						                                <td th:text="${category.catName}"></td>
-						                                <td th:if="${category.isActive}" class="text-center"><label class="badge badge-success mb-0">Active</label></td>
-						                                <td th:unless="${category.isActive}" class="text-center"><label class="badge badge-danger mb-0">InActive</label></td>
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callEdit([[${category.cId}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Edit" data-original-title="Edit"><i class="ik ik-edit f-16 mr-15 text-green"></i></a>
-						                                    <a th:href="@{#}" th:onclick="return callDelete([[${category.catName}]], [[${category.cId}]] );" data-animation="true" data-toggle="tooltip" data-placement="top" title="Delete" data-original-title="Delete"><i class="ik ik-trash-2 f-16 text-red"></i></a>
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th>S.No</th>
-						                                <th>Master ID</th>
-						                                <th>Category Name</th>
-						                                <th>IsActive</th>
-						                                <th class="text-center" width="%2">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="addForm" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-					<form name="addCategoryForm" id="addCategoryForm" onsubmit="return saveCategory();">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Master Category Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div id="addFormError" class="text-danger text-center"></div>
-						<div class="form-group row">
-                            <label for="catName" class="col-sm-12 col-form-label">Asset Category Name</label>
-                            <div class="col-sm-12">
-                                <input type="text" class="form-control" name="catName" id="catName" placeholder="Category Name" required>
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="isActive" class="col-sm-12 col-form-label">IsActive</label>
-                            <div class="col-sm-12">
-                                <select class="form-control" id="isActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-                        </div>
-                    	
-                    </div>
-                    <div class="modal-footer">
-                        <button type="reset" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="return closeModel();"><i class="ik ik-x-square"></i>Close</button>
-                        <button type="submit" class="btn btn-success btn-sm" id="savebtn"><i class="ik ik-save"></i>Save</button>
-                    </div>
-                    </form>
-                </div>
-                
-            </div>
-        </div>
-                        
-		<div class="modal fade" id="editForm" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-				
-                <div class="modal-content">
-					<form name="editCategoryForm" id="editCategoryForm" onsubmit="return updateCategory();">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Master Category Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div id="editFormError" class="text-danger text-center"></div>
-						<div class="form-group row">
-                            <label for="catName" class="col-sm-12 col-form-label">Asset Category Name</label>
-                            <div class="col-sm-12">
-                                <input type="text" class="form-control" name="catName" id="editCatName" placeholder="Category Name" required>
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="isActive" class="col-sm-12 col-form-label">IsActive</label>
-                            <div class="col-sm-12">
-                                <select class="form-control" id="editIsActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-                        </div>
-                    	
-                    </div>
-                    <div class="modal-footer">
-						<input type="hidden" name="cId" id="cId" value="0">
-                        <button type="reset" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="return closeModel();"><i class="ik ik-x-square"></i>Close</button>
-                        <button type="submit" class="btn btn-success btn-sm" id="editbtn"><i class="ik ik-save"></i>Update</button>
-                    </div>
-                    </form>
-                </div>
-            </div>
-        </div><!--end modal-->
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script type="text/javascript">
-			var qrAssetFeedbackApiUrl = "[[${qrAssetFeedbackApiUrl}]]";
-		   
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                // Additional button
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset Category',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-		function callAdd(){
-			formReset();
-			$('#addForm').modal({
-			    backdrop: 'static',
-			    keyboard: false
-			})
-			$('#addForm').modal('show');
-		}
-		
-		function callEdit(id){
-			// Form reste
-			formReset();
-			//Fetch data by id
-			getEditdata(id);
-			$('#editForm').modal({
-			    backdrop: 'static',
-			    keyboard: false
-			})
-			$('#editForm').modal('show');
-			return false;
-		}
-		
-		function callDelete(name,id){
-			Swal.fire({
-				title: 'Are you sure you want to delete the category?`<br>'+name+'`',
-				text: "You won't be able to revert this!",
-				icon: 'warning',
-				showCancelButton: true,
-				confirmButtonColor: '#3085d6',
-				cancelButtonColor: '#d33',
-				confirmButtonText: 'Yes, delete it!',
-				}).then(function(result) {
-				if (result.isConfirmed) {
-	
-				$.ajax({
-				  type: "GET",
-				  dataType: 'json',
-				  url: "/gcc/api/qrfeedback/category/"+id+"/delete",
-				  //data: "id=" + id + "&name=" + name,
-				  success: function(data){
-				      Swal.fire(
-				        'Deleted!',
-				        'Category `'+name+'` has been deleted.',
-				        'success'
-				      ).then(() => {
-							    location.reload();
-							  });
-				  }  
-				})
-				}
-			})  
-		return false;
-		}
-		
-		function saveCategory(){
-			// Disable the button to prevent multiple clicks
-			$("#savebtn").prop("disabled", true);
-			
-			// Show the loading icon on the button
-			$("#savebtn").html('<i class="fas fa-spinner fa-spin"></i>Save');
-				
-			// Get form data
-		    var formData = {
-		      catName: $('#catName').val(),
-		      isActive: $('#isActive').val()
-		    };	
-			
-			if(formData.catName!=''){
-				//alert(qrAssetFeedbackApiUrl);
-				$.ajax({
-				  type: "POST",
-				  dataType: 'json',
-				  url: "/gcc/api/qrfeedback/category/checkbyname",
-				  //contentType: 'application/json',
-      			  data: formData,
-				  success: function(data){
-				      if(data==0){
-						  $('#addFormError').html("");
-						  callSaveCategoryAPI();
-					  }
-					  else{
-						  $('#addFormError').html("<i class='ik ik-alert-triangle'></i> Asset Category Name `"+formData.catName+"` already exists!.");
-						  $("#savebtn").prop("disabled", false);
-	    				  $("#savebtn").html('<i class="ik ik-save"></i>Save');
-					  }
-				  },
-				  error: function(xhr, status, error) {
-			        console.error('Form submission error:', error);
-			        $("#savebtn").prop("disabled", false);
-		    		$("#savebtn").html('<i class="ik ik-save"></i>Save');
-			        // Handle errors here
-			      }
-				})
-			}
-			
-    		return false;
-		}
-		
-		function callSaveCategoryAPI(){
-		
-			// Get form data
-		    var formData = {
-		      catName: $('#catName').val(),
-		      isActive: $('#isActive').val()
-		    };
-		    
-			if (formData.catName.trim() !== '') {
-				//alert(qrAssetFeedbackApiUrl);
-				$.ajax({
-				  type: "POST",
-				  dataType: 'json',
-				  url: "/gcc/api/qrfeedback/saveCategory",
-				  //contentType: 'application/json',
-      			  data: formData,
-				  success: function(data){
-				     
-						  $('#addFormError').html("");
-						  Swal.fire(
-					        'Add Category!',
-					        'Category `'+formData.catName+'` added successfully.',
-					        'success'
-					      ).then(() => {
-								  		formReset();
-								  		$('#addForm').modal('hide');
-									    $("#savebtn").prop("disabled", false);
-		    							$("#savebtn").html('<i class="ik ik-save"></i>Save');
-		    							location.reload();
-									   });
-				  },
-				  error: function(xhr, status, error) {
-			        console.error('Form submission error:', error);
-			        $("#savebtn").prop("disabled", false);
-		    		$("#savebtn").html('<i class="ik ik-save"></i>Save');
-			        // Handle errors here
-			      }  
-				})
-			}
-			
-    		return false;
-		}
-		
-		function getEditdata(id){
-			$.ajax({
-				  type: "POST",
-				  dataType: 'json',
-				  url: "/gcc/api/qrfeedback/category/"+id,
-      			  //data: formData,
-				  success: function(data){
-					  //console.log(data);
-					  $("#cId").val(data[0]["cId"]);
-					  $("#editCatName").val(data[0]["catName"]);
-					  if(data[0]["isActive"]==true){
-						  $("#editIsActive").val(1); // True (Yes)
-					  }
-					  else{
-						  $("#editIsActive").val(0); // False (No)
-					  }
-				  },
-				  error: function(xhr, status, error) {
-			        console.error('Get Data(category) error:', error);
-			        $("#editbtn").prop("disabled", false);
-		    		$("#editbtn").html('<i class="ik ik-save"></i>Update');
-			        // Handle errors here
-			      }  
-				})
-		}
-		
-		function updateCategory(){
-			// Disable the button to prevent multiple clicks
-			$("#editbtn").prop("disabled", true);
-			
-			// Show the loading icon on the button
-			$("#editbtn").html('<i class="fas fa-spinner fa-spin"></i>Update');
-				
-			// Get form data
-		    var formData = {
-				cId: $('#cId').val(),
-				catName: $('#editCatName').val(),
-				isActive: $('#editIsActive').val()
-		    };	
-			
-			if (formData.catName.trim() !== '') {
-				//alert(qrAssetFeedbackApiUrl);
-				$.ajax({
-				  type: "POST",
-				  dataType: 'json',
-				  url: "/gcc/api/qrfeedback/category/edit/checkbyname",
-				  //contentType: 'application/json',
-      			  data: formData,
-				  success: function(data){
-				      if(data==0){
-						  $('#editFormError').html("");
-						  callUpadteCategoryAPI();
-					  }
-					  else{
-						  $('#editFormError').html("<i class='ik ik-alert-triangle'></i> Asset Category Name `"+formData.catName+"` already exists!.");
-						  $("#editbtn").prop("disabled", false);
-	    				  $("#editbtn").html('<i class="ik ik-save"></i>Update');
-					  }
-				  },
-				  error: function(xhr, status, error) {
-			        console.error('Form submission error:', error);
-			        $("#editbtn").prop("disabled", false);
-		    		$("#editbtn").html('<i class="ik ik-save"></i>Update');
-			        // Handle errors here
-			      }
-				})
-			}
-			
-    		return false;
-		}
-		
-		function callUpadteCategoryAPI(){
-		
-			// Get form data
-		    var formData = {
-				cId: $('#cId').val(),
-				catName: $('#editCatName').val(),
-				isActive: $('#editIsActive').val()
-		    };
-		    
-			if (formData.catName.trim() !== '') {
-				//alert(qrAssetFeedbackApiUrl);
-				$.ajax({
-				  type: "POST",
-				  dataType: 'json',
-				  url: "/gcc/api/qrfeedback/updateCategory",
-				  //contentType: 'application/json',
-      			  data: formData,
-				  success: function(data){
-						  $('#editFormError').html("");
-						  Swal.fire(
-					        'Update Category!',
-					        'Category `'+formData.catName+'` updated successfully.',
-					        'success'
-					      ).then(() => {
-								  		formReset();
-								  		$('#editForm').modal('hide');
-									    $("#editbtn").prop("disabled", false);
-		    							$("#editbtn").html('<i class="ik ik-save"></i>Update');
-		    							location.reload();
-									   });
-				  },
-				  error: function(xhr, status, error) {
-			        console.error('Update form submission error:', error);
-			        $("#editbtn").prop("disabled", false);
-		    		$("#editbtn").html('<i class="ik ik-save"></i>Update');
-			        // Handle errors here
-			      }  
-				})
-			}
-			
-    		return false;
-		}
-		
-		function closeModel(){
-			formReset();
-			$('#addForm').modal('hide');
-			$('#editForm').modal('hide');
-		}
-		
-		function formReset(){
-			// For add form
-			document.getElementById('addCategoryForm').reset();
-			$('#addFormError').html("");
-			$("#savebtn").prop("disabled", false);
-		    $("#savebtn").html('<i class="ik ik-save"></i>Save');
-			// For edit form
-			document.getElementById('editCategoryForm').reset();
-			$('#editFormError').html("");
-			$("#editbtn").prop("disabled", false);
-		    $("#editbtn").html('<i class="ik ik-save"></i>Update');
-		}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/qrfeedback/master/asset-parameter-questions.html b/src/main/resources/templates/modules/qrfeedback/master/asset-parameter-questions.html
deleted file mode 100644
index 56b9b94f..00000000
--- a/src/main/resources/templates/modules/qrfeedback/master/asset-parameter-questions.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-question-circle bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Asset Parameter Questions</h5>
-                                            <span>QR Asset Feedback Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Asset QR Feedback</li>
-                                            <li class="breadcrumb-item">Master</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Parameter Questions</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort" width="1%">S.No</th>
-														<th class="text-center" width="20%">Parameter</th>
-														<th class="text-center">English Question</th>
-														<th class="text-center">Tamil Question</th >
-						                                <th class="text-center" width="10%">IsActive</th>
-						                                <th class="text-center no-sort" width="10%">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="parameterquestion, i : ${assetparameterquestionslist}" class="${assetparameterquestionslist}">
-						                                <td th:text="${i.count}">0</td>
-														<td class="text-center" th:text="${parameterquestion.assetParameter.paramName}"></td>
-						                                <td th:text="${parameterquestion.engQuestion}"></td>
-														<td th:text="${parameterquestion.tamilQuestion}"></td>
-														<td class="text-center" th:if="${parameterquestion.isActive}"><span class="badge bg-success">Active</span></td>
-														<td class="text-center" th:unless="${parameterquestion.isActive}"><span class="badge bg-warning">InActive</span></td>
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callEdit([[${parameterquestion.apqId}]])" data-toggle="tooltip" data-animation="true" data-placement="top" title="Edit" data-original-title="Edit"><i class="ik ik-edit f-16 mr-15 text-green"></i></a>
-						                                    <a th:href="@{#}" th:onclick="return callDelete( [[${parameterquestion.engQuestion}]], [[${parameterquestion.apqId}]] );" data-animation="true" data-toggle="tooltip" data-placement="top" title="Delete" data-original-title="Delete"><i class="ik ik-trash-2 f-16 mr-15 text-red"></i></a>
-															<a th:href="@{#}" th:onclick="return callComplaints( [[${parameterquestion.engQuestion}]], [[${parameterquestion.apqId}]] );" data-animation="true" data-toggle="tooltip" data-placement="top" title="Complaint Assignment" data-original-title="Complaint Assignment"><i class="ik ik-tag f-16 text-purple"></i></a>
-						                                </td>
-						                             </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-														<th class="text-center">Parameter</th>
-														<th class="text-center">English Question</th>
-														<th class="text-center">Tamil Question</th>
-						                                <th class="text-center">IsActive</th>
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                         </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="addForm" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Master Category Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="form-group row">
-                            <label for="catName" class="col-sm-12 col-form-label">Asset Category Name</label>
-                            <div class="col-sm-12">
-                                <input type="text" class="form-control" name="catName" id="catName" placeholder="Category Name" required>
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="isActive" class="col-sm-12 col-form-label">IsActive</label>
-                            <div class="col-sm-12">
-                                <select class="form-control" id="isActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-                        </div>
-                    	
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        <button type="button" class="btn btn-primary">Save changes</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-                        
-		<div class="modal fade" id="addForm2" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <form action="#" th:action="@{/saveCategory}" method="post">
-                    
-	                <div class="block block-rounded block-themed block-transparent mb-0">
-	                  <div class="block-header bg-primary-dark">
-	                    <h3 class="block-title">Master Category Form</h3>
-	                    <div class="block-options">
-	                      <button type="button" class="btn-block-option" data-bs-dismiss="modal" aria-label="Close">
-	                        <i class="fa fa-fw fa-times"></i>
-	                      </button>
-	                    </div>
-	                  </div>
-                    <div class="block-content">
-						<div class="form-group row">
-                            <label for="exampleInputUsername2" class="col-sm-3 col-form-label">Username</label>
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control" id="exampleInputUsername2" placeholder="Username">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="exampleInputEmail2" class="col-sm-3 col-form-label">Email</label>
-                            <div class="col-sm-9">
-                                <input type="email" class="form-control" id="exampleInputEmail2" placeholder="Email">
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="mb-3">
-                                <label for="catName">Asset Category Name</label>
-                                <input type="text" class="form-control" name="catName" id="catName" placeholder="Category Name" required>
-                                <!--<small id="emailHelp" class="form-text text-muted">Set of assets grouped under this unique category</small>-->
-                            </div>
-                            <div class="mb-3">
-                                <label class="form-check-label">IsActive</label>
-                                <select class="form-select" id="isActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-
-                        </div><!--end row-->
-                    </div><!--end modal-body-->
-					</div>
-                    <div class="block-content block-content-full text-end bg-body">
-                        <button type="button" class="btn btn-de-secondary btn-sm" data-bs-dismiss="modal">Close</button>
-                        <button type="submit" class="btn btn-primary btn-sm">Save</button>
-                    </div><!--end modal-footer-->
-                </form>
-                </div><!--end modal-content-->
-            </div><!--end modal-dialog-->
-        </div><!--end modal-->
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                // Additional button
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset Parameter Question',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callAdd(){
-			$('#addForm').modal({
-			    backdrop: 'static',
-			    keyboard: false
-			})
-			$('#addForm').modal('show');
-		}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/qrfeedback/master/asset-parameter.html b/src/main/resources/templates/modules/qrfeedback/master/asset-parameter.html
deleted file mode 100644
index c9d634ef..00000000
--- a/src/main/resources/templates/modules/qrfeedback/master/asset-parameter.html
+++ /dev/null
@@ -1,264 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-dice-d20 bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Asset Parameter</h5>
-                                            <span>QR Asset Feedback Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">Asset QR Feedback</li>
-                                            <li class="breadcrumb-item">Master</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Parameter</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                        <div>
-											<table id="assetDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
-                                                <thead class="thead-dark">
-	                                                <tr role="row">
-														<th class="text-center no-sort">S.No</th>
-														<th class="text-center" width="20%">Category</th>
-														<th class="text-center">Parameter</th>
-						                                <th class="text-center" width="10%">IsActive</th>
-						                                <th class="text-center no-sort" width="10%">Action</th>
-													</tr>
-                                                </theadclass="thead-dark">
-                                                <tbody>
-	                                                <tr th:each="parameter, i : ${assetparameterlist}" class="${assetparameterlist}">
-						                                <td class="text-center" th:text="${i.count}">0</td>
-						                                <td class="text-center" th:text="${parameter.assetCategory.catName}"></td>
-						                                <td th:text="${parameter.paramName}"></td>
-						                                <td class="text-center" th:if="${parameter.isActive}"><span class="badge bg-success">Active</span></td>
-						                                <td class="text-center" th:unless="${parameter.isActive}"><span class="badge bg-warning">InActive</span></td>
-						                                <td class="text-center">
-						                                    <a th:href="@{#}" th:onclick="return callEdit([[${parameter.paramId}]])" data-toggle="tooltip" data-placement="top" title="Edit" data-original-title="Edit"><i class="ik ik-edit f-16 mr-15 text-green"></i></a>
-						                                    <a th:href="@{#}" th:onclick="return callDelete([[${parameter.paramName}]], [[${parameter.paramId}]] );" data-animation="true" data-toggle="tooltip" data-placement="top" title="Delete" data-original-title="Delete"><i class="ik ik-trash-2 f-16 text-red"></i></a>
-						                                </td>
-						                            </tr>
-                                                 </tbody>
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-														<th class="text-center">S.No</th>
-														<th class="text-center">Category</th>
-														<th class="text-center">Parameter</th>
-						                                <th class="text-center">IsActive</th>
-						                                <th class="text-center">Action</th>
-													</tr>
-                                                </tfoot>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-		<div class="modal fade" id="addForm" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterLabel">Master Category Form</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="form-group row">
-                            <label for="catName" class="col-sm-12 col-form-label">Asset Category Name</label>
-                            <div class="col-sm-12">
-                                <input type="text" class="form-control" name="catName" id="catName" placeholder="Category Name" required>
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="isActive" class="col-sm-12 col-form-label">IsActive</label>
-                            <div class="col-sm-12">
-                                <select class="form-control" id="isActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-                        </div>
-                    	
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                        <button type="button" class="btn btn-primary">Save changes</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-                        
-		<div class="modal fade" id="addForm2" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <form action="#" th:action="@{/saveCategory}" method="post">
-                    
-	                <div class="block block-rounded block-themed block-transparent mb-0">
-	                  <div class="block-header bg-primary-dark">
-	                    <h3 class="block-title">Master Category Form</h3>
-	                    <div class="block-options">
-	                      <button type="button" class="btn-block-option" data-bs-dismiss="modal" aria-label="Close">
-	                        <i class="fa fa-fw fa-times"></i>
-	                      </button>
-	                    </div>
-	                  </div>
-                    <div class="block-content">
-						<div class="form-group row">
-                            <label for="exampleInputUsername2" class="col-sm-3 col-form-label">Username</label>
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control" id="exampleInputUsername2" placeholder="Username">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="exampleInputEmail2" class="col-sm-3 col-form-label">Email</label>
-                            <div class="col-sm-9">
-                                <input type="email" class="form-control" id="exampleInputEmail2" placeholder="Email">
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="mb-3">
-                                <label for="catName">Asset Category Name</label>
-                                <input type="text" class="form-control" name="catName" id="catName" placeholder="Category Name" required>
-                                <!--<small id="emailHelp" class="form-text text-muted">Set of assets grouped under this unique category</small>-->
-                            </div>
-                            <div class="mb-3">
-                                <label class="form-check-label">IsActive</label>
-                                <select class="form-select" id="isActive" name="isActive" >
-                                    <option value=1>Yes</option>
-                                    <option value=0>No</option>
-                                </select>
-                            </div>
-
-                        </div><!--end row-->
-                    </div><!--end modal-body-->
-					</div>
-                    <div class="block-content block-content-full text-end bg-body">
-                        <button type="button" class="btn btn-de-secondary btn-sm" data-bs-dismiss="modal">Close</button>
-                        <button type="submit" class="btn btn-primary btn-sm">Save</button>
-                    </div><!--end modal-footer-->
-                </form>
-                </div><!--end modal-content-->
-            </div><!--end modal-dialog-->
-        </div><!--end modal-->
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                // Additional button
-	                {
-		                text: '<i class="far fa-plus-square"></i> Add New Asset Parameter',
-		                className: 'btn btn-warning',
-		                action: function () {
-		                    callAdd();
-		                }
-		            }
-	            ];
-				
-			    $('#assetDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-			        scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callAdd(){
-			$('#addForm').modal({
-			    backdrop: 'static',
-			    keyboard: false
-			})
-			$('#addForm').modal('show');
-		}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/roadwar/regform.html b/src/main/resources/templates/modules/roadwar/regform.html
deleted file mode 100644
index 7770d624..00000000
--- a/src/main/resources/templates/modules/roadwar/regform.html
+++ /dev/null
@@ -1,2427 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-
-</style>
-
-<body>
-
-
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Register Form</h5>
-										<span>Road War</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item" aria-current="page">Road War</li>
-										<li class="breadcrumb-item active" aria-current="page">Register Form</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<div class="row mt-3">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-body">
-									<h5 class="card-title">Road Details</h5>
-									<span th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span>
-									<span th:text="${Loginzone}" id="zoneSpan" style="display: none;"></span>
-									<span th:text="${Loginward}" id="wardSpan" style="display: none;"></span>
-									
-									<div class="card-block">
-
-										<div class="row">
-
-
-
-
-											<div class="col-md-3 mb-3">
-												<label for="zoneDropdown" class="form-label"> Select
-													Zone <span class="text-danger">*</span>
-												</label> <select id="zoneDropdown" class="form-control">
-													<option value="">Select Zone</option>
-													<!-- Zones will be loaded dynamically -->
-												</select>
-
-											</div>
-
-											<div class="col-md-3 mb-3">
-
-												<label for="wardDropdown" class="form-label"> Select
-													Ward <span class="text-danger">*</span>
-												</label> <select id="wardDropdown" class="form-control">
-													<option value="">Select Ward</option>
-													<!-- Wards will be loaded based on selected zone -->
-												</select>
-											</div>
-
-
-											<div class="col-md-6 mb-3">
-												<label for="roadDropdown" class="form-label">
-													Name of the Road <span class="text-danger">*</span>
-												</label>
-
-												<select id="roadDropdown" class="form-control">
-													<option value="">Select Road</option>
-												</select>
-											</div>
-											
-											
-											<div class="col-md-3 mb-3">
-												<label for="areaname" class="form-label">Area Name<span
-														class="text-danger">*</span></label>
-												<input type="text" class="form-control" id="areaname"
-													name="areaname" required="required">
-											</div>
-											
-											<div class="col-md-3 mb-3">
-												<label for="localityname" class="form-label">Locality Name<span
-														class="text-danger">*</span></label>
-												<input type="text" class="form-control" id="localityname"
-													name="localityname" required="required">
-											</div>
-
-
-											<div class="col-md-3 mb-3">
-												<label for="roadTypeDropdown" class="form-label">
-													Road Type <span class="text-danger">*</span>
-												</label>
-
-												<select id="roadTypeDropdown" class="form-control">
-													<option value="">Select Road Type</option>
-												</select>
-											</div>
-											
-											<div class="col-md-3 mb-3">
-												<label for="roadTypeMaterialDropdown" class="form-label">
-													Roadtype Material <span class="text-danger">*</span>
-												</label>
-
-												<select id="roadTypeMaterialDropdown" class="form-control">
-													<option value="">Select Roadtype Material</option>
-												</select>
-											</div>
-
-											<div class="col-md-3 mb-3">
-												<label for="length" class="form-label">Length of Road (m)<span
-														class="text-danger">*</span></label>
-												<input type="text" class="form-control decimal-only" id="length"
-													name="length" required="required" placeholder="e.g. 200.5">
-											</div>
-											
-											<div class="col-md-3 mb-3">
-												<label for="row_width" class="form-label">Right of Way(ROW) Width of Road (m)</label>
-												<input type="text" class="form-control decimal-only" id="row_width"
-													name="row_width"  placeholder="e.g. 200.5">
-											</div>
-											
-											<div class="col-md-3 mb-3">
-												<label for="averageWidth" class="form-label">Average Carriageway Width of Road (m)</label>
-												<input type="text" class="form-control decimal-only" id="averageWidth"
-													name="averageWidth"  placeholder="e.g. 6.5">
-											</div>
-
-											<div class="col-md-3 mb-3">
-												<label for="area" class="form-label">Area of Road (m<sup>2</sup>)<span
-														class="text-danger">*</span></label>
-												<input type="text" class="form-control decimal-only" id="area"
-													name="area" required="required" placeholder="e.g. 1200.0">
-											</div>
-
-																					
-											<div class="col-md-3 mb-3">
-												<label for="minWidth" class="form-label">Min Width of Road (m)</label>
-												<input type="text" class="form-control decimal-only" id="minWidth"
-													name="minWidth" placeholder="e.g. 1.5">
-											</div>
-											
-											<div class="col-md-3 mb-3">
-												<label for="maxWidth" class="form-label">Max Width of Road (m)</label>
-												<input type="text" class="form-control decimal-only" id="maxWidth"
-													name="maxWidth"  placeholder="e.g. 8.5">
-											</div>
-											
-											<div class="col-md-12 mb-3">
-												<label class="form-label">Road Location</label>
-												<div class="row">
-													<div class="col-md-6">
-														<label for="roadFrom">From</label>
-														<input type="text" class="form-control" id="roadFrom"
-															name="roadFrom">
-													</div>
-
-													<div class="col-md-6">
-														<label for="roadTo">To</label>
-														<input type="text" class="form-control" id="roadTo"
-															name="roadTo">
-													</div>
-												</div>
-												
-											</div>
-											
-											<div class="col-md-4 mb-3">
-											
-												<label class="form-label">Footpath available or Not ?</label>
-												<div>
-													<label class="mr-3">
-														<input type="radio" name="fpAvailable" value="yes">
-														Yes
-													</label>
-
-													<label>
-														<input type="radio" name="fpAvailable" value="no">
-														No
-													</label>
-												</div>
-											
-											</div>
-											</div>
-											
-											<div class="row" id="fpSection" style="display:none;">
-													
-											<div class="col-md-12 mb-3">
-												<label class="form-label">
-													Footpath Location
-												</label>
-
-												<div class="row">
-													<div class="col-md-6">
-														<label for="footPathFrom">From</label>
-														<input type="text" class="form-control" id="footPathFrom"
-															name="footPathFrom">
-													</div>
-
-													<div class="col-md-6">
-														<label for="footPathTo">To</label>
-														<input type="text" class="form-control" id="footPathTo"
-															name="footPathTo">
-													</div>
-												</div>
-											</div>		
-											
-											<div class="col-md-4 mb-3">
-												<label for="fpat" class="form-label">Footpath Present at ?</label>
-												<select class="form-control" id="fpat" name="fpat">
-													<option value="">Select</option>													
-												</select>
-											</div>
-											
-											</div>
-																						
-											<div id="lhs_section" style="display: none;">
-											
-												<div class="row">
-												
-													<div class="col-md-4 mb-3">
-												<label for="footpathDropdown" class="form-label">
-													LHS Footpath Material Type<span class="text-danger">*</span>
-												</label>
-
-												<select id="footpathDropdown" class="form-control">
-													<option value="">Select Material</option>												
-												</select>
-											</div>
-
-											<div class="col-md-4 mb-3">
-												<label for="fplength" class="form-label">LHS Length of Footpath (m)<span class="text-danger">*</span> </label>
-												<input type="text" class="form-control decimal-only" id="fplength"
-													name="fplength" required="required" placeholder="e.g. 180.0">
-											</div>
-
-											<div class="col-md-4 mb-3">
-												<label for="fpwidth" class="form-label">LHS Average Width of Footpath (m)<span class="text-danger">*</span> </label>
-												<input type="text" class="form-control decimal-only" id="fpwidth"
-													name="fpwidth" required="required" placeholder="e.g. 1.5">
-											</div>
-												
-												</div>
-											
-											</div>
-																								
-											<div id="rhs_section" style="display: none;">
-											
-												<div class="row">
-												
-													<div class="col-md-4 mb-3">
-												<label for="rhs_footpathDropdown" class="form-label">
-													RHS Footpath Material Type<span class="text-danger">*</span>
-												</label>
-
-												<select id="rhs_footpathDropdown" class="form-control">
-													<option value="">Select Material</option>												
-												</select>
-											</div>
-
-											<div class="col-md-4 mb-3">
-												<label for="rhs_fplength" class="form-label">RHS Length of Footpath (m)<span class="text-danger">*</span> </label>
-												<input type="text" class="form-control decimal-only" id="rhs_fplength"
-													name="rhs_fplength" required="required" placeholder="e.g. 180.0">
-											</div>
-
-											<div class="col-md-4 mb-3">
-												<label for="rhs_fpwidth" class="form-label">RHS Average Width of Footpath (m)<span class="text-danger">*</span> </label>
-												<input type="text" class="form-control decimal-only" id="rhs_fpwidth"
-													name="rhs_fpwidth" required="required" placeholder="e.g. 1.5">
-											</div>
-												
-												</div>
-											
-											</div>
-
-										</div>
-
-									
-
-									<hr>
-
-
-									<h5 class="card-title">SWD Details</h5>
-									<div class="card-block">
-
-										<div class="row">
-											<div class="col-md-6 mb-3">
-												<label class="form-label">SWD available or Not ?</label>
-
-												<div>
-													<label class="mr-3">
-														<input type="radio" name="swdAvailable" value="yes">
-														Yes
-													</label>
-
-													<label>
-														<input type="radio" name="swdAvailable" value="no">
-														No
-													</label>
-												</div>
-											</div>
-
-											<div id="swdSection" class="col-md-12" style="display:none;">
-												<div class="row">
-
-													<div class="col-md-3 mb-3">
-														<label for="fromswd">From </label>
-														<input type="text" class="form-control" id="fromswd">
-													</div>
-
-													<div class="col-md-3 mb-3">
-														<label for="toswd">To</label>
-														<input type="text" class="form-control" id="toswd">
-													</div>
-													
-													<div class="col-md-6 mb-3">
-														<label for="swd_at"> SWD Present at ?</label>
-														<select class="form-control" id="swd_at" name="swd_at">
-															<option value="">Select </option>
-														</select>
-													</div>
-
-													<div class="col-md-6 mb-3" id="lhs_swd" style="display: none;">
-														<div class="row">
-														<div class="col-md-6 mb-3">
-															<label for="swdlength">LHS SWD Length (m)<span class="text-danger">*</span></label>
-															<input type="text" class="form-control decimal-only" id="swdlength">
-														</div>
-	
-														<div class="col-md-6 mb-3">
-															<label for="swdsize">LHS SWD Size (m)<span class="text-danger">*</span></label>
-															<input type="text" class="form-control decimal-only" id="size">
-														</div>
-														</div>
-													</div>
-													
-													<div class="col-md-6 mb-3" id="rhs_swd" style="display: none;">
-														<div class="row">
-														<div class="col-md-6 mb-3">
-															<label for="rhs_swdlength">RHS SWD Length (m)<span class="text-danger">*</span></label>
-															<input type="text" class="form-control decimal-only" id="rhs_swdlength">
-														</div>
-	
-														<div class="col-md-6 mb-3">
-															<label for="rhs_swdsize">RHS SWD Size (m)<span class="text-danger">*</span></label>
-															<input type="text" class="form-control decimal-only" id="rhs_swdsize">
-														</div>
-														</div>
-													</div>
-													
-
-												</div>
-											</div>
-
-
-											<!-- ═══ SWD-dependent fields — shown only when SWD = yes ═══ -->
-											<div id="swdDependentFields" class="col-md-12" style="display:none;">
-												<div class="row">
-
-													<div class="col-md-6 mb-4">
-														<label class="form-label">
-															Slit catch pit Available or Not?
-															
-														</label>
-														<div>
-															<label class="mr-3">
-																<input type="radio" name="scpAvailable" value="yes"> Yes
-															</label>
-															<label>
-																<input type="radio" name="scpAvailable" value="no"> No
-															</label>
-														</div>
-														<div id="scpSection" style="display:none; margin-top:15px;">
-														<div class="row">
-														<div class="col-md-6">
-															<label for="scp_at"> Slit catch pit Present at ?</label>
-															<select class="form-control" id="scp_at" name="scp_at">
-																<option value="">Select </option>
-															</select>
-														</div>
-														<div class="col-md-3" id="lhs_scp" style="display: none;">
-															<label for="scpCount"> LHS Count<span class="text-danger">*</span></label>
-															<input type="text" class="form-control integer-only" id="scpCount">
-														</div>
-														<div class="col-md-3" id="rhs_scp" style="display: none;">
-															<label for="rhs_scpCount"> RHS Count<span class="text-danger">*</span></label>
-															<input type="text" class="form-control integer-only" id="rhs_scpCount">
-														</div>
-														
-														</div>
-																																												
-														</div>
-													</div>
-
-													<div class="col-md-6 mb-4">
-														<label class="form-label">
-															Manhole / Machine hole Available or Not? 
-														</label>
-														<div>
-															<label class="mr-3">
-																<input type="radio" name="mhAvailable" value="yes"> Yes
-															</label>
-															<label>
-																<input type="radio" name="mhAvailable" value="no"> No
-															</label>
-														</div>
-														<div id="mhSection" style="display:none; margin-top:15px;">
-															<div class="row">
-																<div class="col-md-6">
-																	<label for="mhType">Manhole / Machine hole present at?</label>
-																	<select class="form-control" id="mhType" name="mhType">
-																		<option value="">Select </option>
-																	</select>
-																</div>
-															
-																<div class="col-md-3" id="lhs_mh" style="display: none;">
-																	<label for="mhCount">LHS Count<span class="text-danger">*</span></label>
-																	<input type="text" class="form-control integer-only" id="mhCount" name="mhCount">
-																</div>
-																
-																<div class="col-md-3" id="rhs_mh" style="display: none;">
-																	<label for="r_mhCount">RHS Count<span class="text-danger">*</span></label>
-																	<input type="text" class="form-control integer-only" id="r_mhCount" name="r_mhCount">
-																</div>
-																
-															</div>
-														</div>
-													</div>
-
-													<div class="col-md-6 mb-4">
-														<label class="form-label">
-															ChutPipe Available or Not? 
-														</label>
-														<div>
-															<label class="mr-3">
-																<input type="radio" name="cpAvailable" value="yes"> Yes
-															</label>
-															<label>
-																<input type="radio" name="cpAvailable" value="no"> No
-															</label>
-														</div>
-														<div id="cpSection" style="display:none; margin-top:15px;">
-															<div class="row">
-														
-																<div class="col-md-6">
-																	<label for="cp_at">ChutPipe present at?</label>
-																	<select class="form-control" id="cp_at" name="cp_at">
-																		<option value="">Select </option>
-																	</select>
-																</div>
-																<div class="col-md-3" id="lhs_cp" style="display: none;">
-																	<label for="cpCount">LHS Count<span class="text-danger">*</span></label>
-																	<input type="text" class="form-control integer-only" id="cpCount">															
-																</div>
-																<div class="col-md-3" id="rhs_cp" style="display: none;">
-																	<label for="r_cpCount">RHS Count<span class="text-danger">*</span></label>
-																	<input type="text" class="form-control integer-only" id="r_cpCount">															
-																</div>
-															
-															</div>
-														</div>
-													</div>
-
-													<div class="col-md-6 mb-4">
-														<label class="form-label">
-															Rain Water Harvesting Available or Not?</label>
-														<div>
-															<label class="mr-3">
-																<input type="radio" name="rwAvailable" value="yes"> Yes
-															</label>
-															<label>
-																<input type="radio" name="rwAvailable" value="no"> No
-															</label>
-														</div>
-														<div id="rwSection" style="display:none; margin-top:15px;">
-														<div class="row">
-															
-															<div class="col-md-6">
-																	<label for="rwh_at">RWH present at?</label>
-																	<select class="form-control" id="rwh_at" name="rwh_at">
-																		<option value="">Select </option>
-																	</select>
-															</div>
-															<div class="col-md-3" id="lhs_rwh" style="display: none;">
-																<label for="rwCount">LHS Count<span class="text-danger">*</span></label>
-																<input type="text" class="form-control integer-only" id="rwCount">
-															</div>
-															<div class="col-md-3" id="rhs_rwh" style="display: none;">
-																<label for="r_rwCount">RHS Count<span class="text-danger">*</span></label>
-																<input type="text" class="form-control integer-only" id="r_rwCount">
-															</div>
-														</div>	
-														</div>
-													</div>
-													
-												</div>
-											</div>
-
-											</div>
-											<div class="row">
-												
-													<div class="col-md-4 mb-4">
-														<label class="form-label">
-															Electricity Poles / Pillar Box Available or Not? (TNEB)
-														</label>
-														<div>
-															<label class="mr-3">
-																<input type="radio" name="epAvailable" value="yes"> Yes
-															</label>
-															<label>
-																<input type="radio" name="epAvailable" value="no"> No
-															</label>
-														</div>
-														<div id="epSection" style="display:none; margin-top:15px;">
-															<label for="epCount">Count<span class="text-danger">*</span></label>
-															<input type="text" class="form-control integer-only" id="epCount">
-														</div>
-													</div>
-													
-													
-													<div class="col-md-4 mb-4">
-														<label class="form-label">
-															Bus Shelter Available or Not?
-														</label>
-														<div>
-															<label class="mr-3">
-																<input type="radio" name="bsAvailable" value="yes"> Yes
-															</label>
-															<label>
-																<input type="radio" name="bsAvailable" value="no"> No
-															</label>
-														</div>
-														<div id="bsSection" style="display:none; margin-top:15px;">
-															<label for="bsCount">Count<span class="text-danger">*</span></label>
-															<input type="text" class="form-control integer-only" id="bsCount">
-														</div>
-													</div>
-
-
-													<div class="col-md-4 mb-4">
-														<label class="form-label">
-															Street Light Poles Available or Not?
-														</label>
-														<div>
-															<label class="mr-3">
-																<input type="radio" name="slpAvailable" value="yes"> Yes
-															</label>
-															<label>
-																<input type="radio" name="slpAvailable" value="no"> No
-															</label>
-														</div>
-														<div id="slpSection" style="display:none; margin-top:15px;">
-															<label for="slpCount">Count<span class="text-danger">*</span></label>
-															<input type="text" class="form-control integer-only" id="slpCount">
-														</div>
-													</div>
-													
-													<div class="col-md-4 mb-4">
-														<label class="form-label">
-															High Mass Light Available or Not?
-														</label>
-														<div>
-															<label class="mr-3">
-																<input type="radio" name="hmlAvailable" value="yes"> Yes
-															</label>
-															<label>
-																<input type="radio" name="hmlAvailable" value="no"> No
-															</label>
-														</div>
-														<div id="hmlSection" style="display:none; margin-top:15px;">
-															<label for="hmlCount">Count<span class="text-danger">*</span></label>
-															<input type="text" class="form-control integer-only" id="hmlCount">
-														</div>
-													</div>
-													
-													
-													<div class="col-md-4 mb-4">
-														<label class="form-label">
-															Mini Mass Light Available or Not?
-														</label>
-														<div>
-															<label class="mr-3">
-																<input type="radio" name="mmlAvailable" value="yes"> Yes
-															</label>
-															<label>
-																<input type="radio" name="mmlAvailable" value="no"> No
-															</label>
-														</div>
-														<div id="mmlSection" style="display:none; margin-top:15px;">
-															<label for="mmlCount">Count<span class="text-danger">*</span></label>
-															<input type="text" class="form-control integer-only" id="mmlCount">
-														</div>
-													</div>
-
-													
-
-													<div class="col-md-4 mb-4">
-														<label class="form-label">
-															Center Median Available or Not?
-														</label>
-														<div>
-															<label class="mr-3">
-																<input type="radio" name="cmAvailable" value="yes"> Yes
-															</label>
-															<label>
-																<input type="radio" name="cmAvailable" value="no"> No
-															</label>
-														</div>
-														
-													</div>
-												
-											
-											<!-- ═══ end SWD-dependent fields ═══ -->
-
-											<div class="col-md-3 mb-3">
-												<label for="sewerLength" class="form-label">Length Of Sewer(CMWSSB) (m)
-													</label>
-												<input type="text" class="form-control decimal-only" id="sewerLength"
-													name="sewerLength"  placeholder="e.g. 190.5">
-											</div>
-
-											<div class="col-md-3 mb-3">
-												<label for="sewerSize" class="form-label">Size of sewer (feet or cm)
-													</label>
-												<input type="text" class="form-control decimal-only" id="sewerSize"
-													name="sewerSize"  placeholder="e.g. 300.0">
-											</div>
-
-											<div class="col-md-3 mb-3">
-												<label for="noofcb" class="form-label">No of Culverts &amp;
-													Bridges</label>
-												<input type="text" class="form-control integer-only" id="noofcb" name="noofcb">
-											</div>
-
-											<div class="col-md-12 mb-3">
-												<label for="detailsofcb" class="form-label">Details of Culverts &amp;
-													Bridges With date of Construction</label>
-												<textarea class="form-control" id="detailsofcb"
-													name="detailsofcb"></textarea>
-											</div>
-
-										</div>
-
-									</div>
-
-
-
-									<!-- Relaying Details -->
-
-									<hr>
-									<br>
-									<h5 class="card-title">Relaying Details</h5>
-									<div id="roadRelayingContainer">
-
-										<div class="card-block relaying-block mb-3">
-											<div class="row">
-
-												<div class="col-md-3 mb-3">
-													<label class="form-label">
-														Month of Relaying <span class="text-danger">*</span>
-													</label>
-													<select class="form-control monthDropdown" name="monthId[]">
-														<option value="">Select Month</option>
-													</select>
-												</div>
-
-												<div class="col-md-3 mb-3">
-													<label class="form-label">
-														Year of Relaying <span class="text-danger">*</span>
-													</label>
-													<select class="form-control yearDropdown" name="yearId[]">
-														<option value="">Select Year</option>
-													</select>
-												</div>
-												
-												
-												<div class="col-md-3 mb-3">
-													<label class="form-label">
-														Roadtype Material <span class="text-danger">*</span>
-													</label>
-													<select class="form-control r_roadmatDropdown" name="r_roadmat[]">
-														<option value="">Select Material</option>
-													</select>
-												</div>
-
-												<div class="col-md-3 mb-3">
-													<label class="form-label">
-														Completion Report Value (CR)
-														<span class="text-danger">*</span>
-													</label>
-													<input type="text" class="form-control decimal-only" name="crValue[]">
-												</div>
-
-												<div class="col-md-3 mb-3">
-													<label class="form-label">
-														Type/Subgrade base of the road
-														<span class="text-danger">*</span>
-													</label>
-													<input type="text" class="form-control" name="roadType[]">
-												</div>
-
-
-												<div class="col-md-9 mb-3">
-													<label class="form-label">
-														Remarks Reg.type of relaying <span class="text-danger">*</span>
-													</label>
-													<textarea class="form-control" name="remarks[]"></textarea>
-												</div>
-												
-												<div class="col-md-12 mb-3 d-flex justify-content-end">
-												    <button type="button" class="btn btn-danger removeBlock d-none">
-												        Remove
-												    </button>
-												</div>
-
-											</div>
-										</div>
-
-									</div>
-
-									<div class="text-end ">
-										<button type="button" id="addMoreBtn" class="btn btn-primary">
-											+ Add More
-										</button>
-									</div>
-
-									<div class="text-center mt-4 mb-3">
-										<button type="button" class="btn btn-success mr-2" id="saveBtn"> Save
-											Details</button>
-
-										<button type="reset" class="btn btn-secondary" id="resetBtn"> Reset</button>
-									</div>
-
-								</div>
-							</div>
-						</div>
-
-
-
-					</div>
-				</div>
-
-			</div>
-
-
-			<div id="pageLoader"
-				style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				<div style="position: relative; top: 50%; transform: translateY(-50%);">
-					<div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-						<span class="sr-only">Loading...</span>
-					</div>
-					<!-- Add the 'Please wait' text below the spinner -->
-					<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-
-	</div>
-
-
-
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-
-
-	<script type="text/javascript">
-
-	let roadSideList = [];
-	let fpMaterialList = [];
-	
-	let zoneSpan = document.getElementById('zoneSpan').textContent;
-	let wardSpan = document.getElementById('wardSpan').textContent;
-	
-		$(document).ready(function () {
-
-			loadRoadTypes();
-			loadRoadTypeMaterials();
-			
-			loadRoadSides();
-			loadFootpathMaterialTypes();
-
-				$.ajax({
-					url: '/gcc/api/roadwarweb/register/getzones',
-					type: 'GET',
-					success: function (response) {
-
-						$('#zoneDropdown').empty()
-							.append('<option value="">Select Zone</option>');
-
-						if (response.status) {
-
-							$.each(response.data, function (index, zone) {
-
-								$('#zoneDropdown').append(
-									'<option value="' + zone.zone_name + '">' +
-									zone.zone_name +
-									'</option>'
-								);
-
-							});
-							
-							if (zoneSpan) {
-
-					            $("#zoneDropdown").val(zoneSpan);
-
-					            $("#zoneDropdown").prop("disabled", true);
-
-					            // Fire zone change event
-					            $("#zoneDropdown").trigger('change');
-					        }
-							
-
-						}
-					},
-					error: function () {
-						alert('Failed to load zones.');
-					}
-				});
-			
-			
-
-
-			loadMonths();
-			loadYears();
-			loadRelayRoadMaterials();
-
-			$("#addMoreBtn").click(function () {
-
-				let block = $(".relaying-block:first").clone();
-
-				block.find("input").val("");
-				block.find("textarea").val("");
-				block.find("select").val("");
-
-				block.find(".removeBlock").removeClass("d-none");
-
-				$("#roadRelayingContainer").append(block);
-
-				loadMonths(block.find(".monthDropdown"));
-				loadYears(block.find(".yearDropdown"));
-				loadRelayRoadMaterials(block.find(".r_roadmatDropdown"));
-			});
-
-			$(document).on("click", ".removeBlock", function () {
-				$(this).closest(".relaying-block").remove();
-			});
-
-		});
-
-
-		$('#zoneDropdown').change(function () {
-
-			let zone = $(this).val();
-
-			$('#wardDropdown').empty()
-				.append('<option value="">Select Ward</option>');
-
-			if (zone) {
-
-				$.ajax({
-					url: '/gcc/api/roadwarweb/register/getwardbyzone',
-					type: 'GET',
-					data: {
-						zone: zone
-					},
-					success: function (response) {
-
-						if (response.status) {
-
-							$.each(response.data, function (index, ward) {
-
-								$('#wardDropdown').append(
-									'<option value="' + ward.ward_name + '">' +
-									ward.ward_name +
-									'</option>'
-								);
-
-							});
-							
-							if (wardSpan) {
-
-		                        $("#wardDropdown").val(wardSpan);
-		                        
-		                        $("#wardDropdown").prop("disabled", true);
-
-		                        // Trigger ward change
-		                        $("#wardDropdown").trigger('change');
-		                    }
-
-						}
-
-					},
-					error: function () {
-						alert('Failed to load wards.');
-					}
-				});
-
-			}
-
-		});
-
-
-		$('#wardDropdown').change(function () {
-
-			let ward = $(this).val();
-
-			$('#roadDropdown').empty()
-				.append('<option value="">Select Road</option>');
-
-			if (ward) {
-
-				$.ajax({
-					url: '/gcc/api/roadwarweb/register/getRoadNamesByWard',
-					type: 'GET',
-					data: {
-						ward: ward
-					},
-					beforeSend: function () {
-						$("#pageLoader").show();
-					},
-					success: function (response) {
-
-						console.log("API Response:", response);
-
-						if (response.status && response.data.length > 0) {
-
-							$.each(response.data, function (index, road) {
-
-								console.log("Road:", road);
-
-								$('#roadDropdown').append(
-									$('<option>', {
-										value: road.road_id,
-										text:  road.road_name+","+road.locality+","+road.area_name+","+"("+road.road_id+")"
-									}).attr('data-road-name', road.road_name)
-								);
-							});
-							
-							// Destroy existing Select2 if already initialized
-					        if ($('#roadDropdown').hasClass("select2-hidden-accessible")) {
-					            $('#roadDropdown').select2('destroy');
-					        }
-
-					        // Initialize Select2
-					        $('#roadDropdown').select2({
-					            placeholder: "Select Road",
-					            allowClear: true,
-					            width: '100%'
-					        });
-
-						} else {
-							console.log("No roads found");
-						}
-					},
-					error: function (xhr, status, error) {
-						console.log("Error:", error);
-						console.log(xhr.responseText);
-					},
-					complete: function () {
-						$("#pageLoader").hide();
-					}
-				});
-			}
-		});
-
-
-		$('#fpat').change(function () {
-			$('#rhs_section').find('input, select').val('');
-			$('#lhs_section').find('input, select').val('');
-			
-			let fpat = $(this).val();
-			if (fpat==='1') {
-				$('#lhs_section').slideDown();
-				$('#rhs_section').hide();				
-			}
-			else if(fpat==='2'){
-				$('#rhs_section').slideDown();
-				$('#lhs_section').hide();				
-			}
-			else if(fpat==='3'){
-				$('#rhs_section').slideDown();
-				$('#lhs_section').slideDown();				
-			}
-			else{
-				$('#rhs_section').slideUp();
-				$('#lhs_section').slideUp();				
-			}
-			
-		});
-		
-		
-		
-		$('#swd_at').change(function () {
-			$('#rhs_swd').find('input, select').val('');
-			$('#lhs_swd').find('input, select').val('');
-			
-			let swdat = $(this).val();
-			if (swdat==='1') {
-				$('#lhs_swd').slideDown();
-				$('#rhs_swd').hide();				
-			}
-			else if(swdat==='2'){
-				$('#rhs_swd').slideDown();
-				$('#lhs_swd').hide();				
-			}
-			else if(swdat==='3'){
-				$('#rhs_swd').slideDown();
-				$('#lhs_swd').slideDown();			
-			}
-			else{
-				$('#rhs_swd').slideUp();
-				$('#lhs_swd').slideUp();			
-			}
-			
-		});
-		
-		$('#scp_at').change(function () {
-			
-			$('#rhs_scp').find('input, select').val('');
-			$('#lhs_scp').find('input, select').val('');
-			
-			let scpat = $(this).val();
-			if (scpat==='1') {
-				$('#lhs_scp').slideDown();
-				$('#rhs_scp').hide();				
-			}
-			else if(scpat==='2'){
-				$('#rhs_scp').slideDown();
-				$('#lhs_scp').hide();
-				
-			}
-			else if(scpat==='3'){
-				$('#rhs_scp').slideDown();
-				$('#lhs_scp').slideDown();				
-			}
-			else{
-				$('#rhs_scp').slideUp();
-				$('#lhs_scp').slideUp();				
-			}
-			
-		});
-		
-		
-		$('#mhType').change(function () {
-			
-			$('#lhs_mh').find('input, select').val('');
-			$('#rhs_mh').find('input, select').val('');
-			
-			let mhat = $(this).val();
-			if (mhat==='1') {
-				$('#lhs_mh').slideDown();
-				$('#rhs_mh').hide();				
-			}
-			else if(mhat==='2'){
-				$('#rhs_mh').slideDown();
-				$('#lhs_mh').hide();
-				
-			}
-			else if(mhat==='3'){
-				$('#rhs_mh').slideDown();
-				$('#lhs_mh').slideDown();				
-			}
-			else{
-				$('#rhs_mh').slideUp();
-				$('#lhs_mh').slideUp();				
-			}
-			
-		});
-		
-		$('#cp_at').change(function () {
-			
-			$('#lhs_cp').find('input, select').val('');
-			$('#rhs_cp').find('input, select').val('');
-			
-			let cpat = $(this).val();
-			if (cpat==='1') {
-				$('#lhs_cp').slideDown();
-				$('#rhs_cp').hide();				
-			}
-			else if(cpat==='2'){
-				$('#rhs_cp').slideDown();
-				$('#lhs_cp').hide();
-				
-			}
-			else if(cpat==='3'){
-				$('#rhs_cp').show();
-				$('#lhs_cp').show();				
-			}
-			else{
-				$('#rhs_cp').hide();
-				$('#lhs_cp').hide();				
-			}
-			
-		});
-		
-		$('#rwh_at').change(function () {
-			
-			$('#lhs_rwh').find('input, select').val('');
-			$('#rhs_rwh').find('input, select').val('');
-			
-			let rwhat = $(this).val();
-			if (rwhat==='1') {
-				$('#lhs_rwh').slideDown();
-				$('#rhs_rwh').hide();				
-			}
-			else if(rwhat==='2'){
-				$('#rhs_rwh').slideDown();
-				$('#lhs_rwh').hide();
-				
-			}
-			else if(rwhat==='3'){
-				$('#rhs_rwh').show();
-				$('#lhs_rwh').show();				
-			}
-			else{
-				$('#rhs_rwh').hide();
-				$('#lhs_rwh').hide();				
-			}
-			
-		});
-
-
-		function loadRoadTypes() {
-			$.ajax({
-				url: '/gcc/api/roadwarweb/register/getRoadType',
-				type: 'GET',
-				success: function (response) {
-
-					if (response.status) {
-
-						let dropdown = $("#roadTypeDropdown");
-
-						// Clear existing options except default
-						dropdown.empty();
-						dropdown.append('<option value="">Select Road Type</option>');
-
-						$.each(response.data, function (index, item) {
-							dropdown.append(
-								'<option value="' + item.id + '">' +
-								item.roadType +
-								'</option>'
-							);
-						});
-
-					} else {
-						alert(response.message);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching road types:", error);
-				}
-			});
-		}
-		
-		function loadRoadTypeMaterials() {
-			$.ajax({
-				url: '/gcc/api/roadwarweb/register/getRoadTypeMaterial',
-				type: 'GET',
-				success: function (response) {
-
-					if (response.status) {
-
-						let dropdown = $("#roadTypeMaterialDropdown");
-
-						// Clear existing options except default
-						dropdown.empty();
-						dropdown.append('<option value="">Select Roadtype Material</option>');
-
-						$.each(response.data, function (index, item) {
-							dropdown.append(
-								'<option value="' + item.id + '">' +
-								item.roadtype_material +
-								'</option>'
-							);
-						});
-
-					} else {
-						alert(response.message);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching roadtype materials:", error);
-				}
-			});
-		}
-		
-		function loadRoadSides() {
-
-		    $.ajax({
-		        url: '/gcc/api/roadwarweb/register/getRoadSide',
-		        type: 'GET',
-		        success: function (response) {
-
-		            if (response.status) {
-
-		                roadSideList = response.data;
-
-		                populateRoadSideDropdown($("#fpat"));
-		                populateRoadSideDropdown($("#swd_at"));
-		                populateRoadSideDropdown($("#scp_at"));		               
-		                populateRoadSideDropdown($("#mhType"));
-		                populateRoadSideDropdown($("#cp_at"));
-		                populateRoadSideDropdown($("#rwh_at"));
-		            }
-		            else {
-						alert(response.message);
-					}
-
-		        },
-		        error: function () {
-		            console.error("Error fetching road sides");
-		        }
-		    });
-
-		}
-		
-		function populateRoadSideDropdown(dropdown) {
-
-		    dropdown.empty();
-		    dropdown.append('<option value="">Select</option>');
-
-		    $.each(roadSideList, function (index, item) {
-
-		        dropdown.append(
-		            `<option value="${item.id}">
-		                ${item.road_side_name}
-		            </option>`
-		        );
-
-		    });
-
-		}
-
-		function loadFootpathMaterialTypes() {
-			$.ajax({
-				url: '/gcc/api/roadwarweb/register/getFootpathType',
-				type: 'GET',
-				success: function (response) {
-
-					if (response.status) {
-						
-						fpMaterialList=response.data;
-						
-						 populatefootpathmaterialDropdown($("#footpathDropdown"));
-						 populatefootpathmaterialDropdown($("#rhs_footpathDropdown"));
-
-					}
-					else {
-						alert(response.message);
-					}
-				},
-				error: function (xhr, status, error) {
-					console.error("Error fetching footpath material types:", error);
-				}
-			});
-		}
-		
-		function populatefootpathmaterialDropdown(dropdown) {
-
-		    dropdown.empty();
-		    dropdown.append('<option value="">Select</option>');
-
-		    $.each(fpMaterialList, function (index, item) {
-
-		        dropdown.append(
-		            `<option value="${item.id}">
-		                ${item.footpath_type_name}
-		            </option>`
-		        );
-
-		    });
-
-		}
-		
-		function loadMonths(dropdown = $(".monthDropdown")) {
-
-			$.ajax({
-				url: "/gcc/api/roadwarweb/register/getMonthList",
-				type: "GET",
-				success: function (response) {
-
-					if (response.status) {
-
-						dropdown.each(function () {
-
-							let select = $(this);
-
-							select.empty()
-								.append('<option value="">Select Month</option>');
-
-							$.each(response.data, function (i, month) {
-
-								select.append(
-									`<option value="${month.id}">
-	                                ${month.month_name}
-	                             </option>`
-								);
-
-							});
-
-						});
-
-					}
-
-				}
-			});
-
-		}
-
-		function loadRelayRoadMaterials(dropdown = $(".r_roadmatDropdown")) {
-
-			$.ajax({
-				url: "/gcc/api/roadwarweb/register/getRoadTypeMaterial",
-				type: "GET",
-				success: function (response) {
-
-					if (response.status) {
-
-						dropdown.each(function () {
-
-							let select = $(this);
-
-							select.empty()
-								.append('<option value="">Select Material</option>');
-
-							$.each(response.data, function (i, rrtmat) {
-
-								select.append(
-									`<option value="${rrtmat.id}">
-	                                ${rrtmat.roadtype_material}
-	                             </option>`
-								);
-
-							});
-
-						});
-
-					}
-
-				}
-			});
-
-		}
-		
-		function loadYears(dropdown = $(".yearDropdown")) {
-
-			$.ajax({
-				url: "/gcc/api/roadwarweb/register/getYearList",
-				type: "GET",
-				success: function (response) {
-
-					if (response.status) {
-
-						dropdown.each(function () {
-
-							let select = $(this);
-
-							select.empty()
-								.append('<option value="">Select Year</option>');
-
-							$.each(response.data, function (i, year) {
-
-								select.append(
-									`<option value="${year.id}">
-	                                ${year.year_name}
-	                             </option>`
-								);
-
-							});
-
-						});
-
-					}
-
-				}
-			});
-
-		}
-
-
-		$(document).on('change', 'input[name="swdAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#swdSection').slideDown();
-				$('#lhs_swd').slideUp();
-				$('#rhs_swd').slideUp();
-				$('#swdDependentFields').slideDown();
-			} else {
-				$('#swdSection').slideUp();
-				$('#swdSection').find('input, select').val('');
-				$('#lhs_swd').slideUp();
-				$('#rhs_swd').slideUp();
-				
-				$('#swdDependentFields').slideUp();
-				$('#swdDependentFields').find('input[type="radio"]').prop('checked', false);
-				$('#swdDependentFields').find('input[type="text"], select').val('');
-				$('#scpSection, #mhSection, #cpSection, #rwSection').hide();
-			}
-		});
-		
-		$(document).on('change', 'input[name="fpAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#fpSection').slideDown();
-							
-			} else {
-				$('#fpSection').slideUp();
-				$('#fpSection').find('input, select').val('');
-				$('#lhs_section').slideUp();
-				$('#rhs_section').slideUp();
-			}
-		});
-
-
-		$(document).on('change', 'input[name="scpAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#scpSection').slideDown();
-				$('#lhs_scp').hide();
-				$('#rhs_scp').hide();
-			} else {
-				$('#scpSection').slideUp();
-				$('#lhs_scp').slideUp();
-				$('#rhs_scp').slideUp();
-				// Optional: clear fields when hidden
-				$('#scpSection').find('input, select').val('');
-			}
-		});
-
-
-		$(document).on('change', 'input[name="mhAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#mhSection').slideDown();
-				$('#lhs_mh').hide();
-				$('#rhs_mh').hide();
-			} else {
-				$('#mhSection').slideUp();
-				$('#lhs_mh').slideUp();
-				$('#rhs_mh').slideUp();
-				// Optional: clear fields when hidden
-				$('#mhSection').find('input, select').val('');
-			}
-		});
-
-
-		$(document).on('change', 'input[name="cpAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#cpSection').slideDown();
-				$('#lhs_cp').hide();
-				$('#rhs_cp').hide();
-			} else {
-				$('#cpSection').slideUp();
-				$('#lhs_cp').slideUp();
-				$('#rhs_cp').slideUp();
-				// Optional: clear fields when hidden
-				$('#cpSection').find('input, select').val('');
-			}
-		});
-
-
-
-		$(document).on('change', 'input[name="rwAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#rwSection').slideDown();
-				$('#lhs_rwh').hide();
-				$('#rhs_rwh').hide();
-			} else {
-				$('#rwSection').slideUp();
-				$('#lhs_rwh').slideUp();
-				$('#rhs_rwh').slideUp();
-				// Optional: clear fields when hidden
-				$('#rwSection').find('input, select').val('');
-			}
-		});
-
-
-		$(document).on('change', 'input[name="epAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#epSection').slideDown();
-			} else {
-				$('#epSection').slideUp();
-
-				// Optional: clear fields when hidden
-				$('#epSection').find('input, select').val('');
-			}
-		});
-
-		$(document).on('change', 'input[name="bsAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#bsSection').slideDown();
-			} else {
-				$('#bsSection').slideUp();
-
-				// Optional: clear fields when hidden
-				$('#bsSection').find('input, select').val('');
-			}
-		});
-
-		
-		$(document).on('change', 'input[name="slpAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#slpSection').slideDown();
-			} else {
-				$('#slpSection').slideUp();
-				$('#slpSection').find('input, select').val('');
-			}
-		});
-
-		$(document).on('change', 'input[name="hmlAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#hmlSection').slideDown();
-			} else {
-				$('#hmlSection').slideUp();
-				$('#hmlSection').find('input, select').val('');
-			}
-		});
-		
-		$(document).on('change', 'input[name="mmlAvailable"]', function () {
-
-			if ($(this).val() === 'yes') {
-				$('#mmlSection').slideDown();
-			} else {
-				$('#mmlSection').slideUp();
-				$('#mmlSection').find('input, select').val('');
-			}
-		});
-
-
-		// ── Decimal-only enforcement for (m) and (inches) inputs ────────────────
-		$(document).on('keypress', '.decimal-only', function (e) {
-			let char = String.fromCharCode(e.which);
-			let val = $(this).val();
-			// Allow digits and a single decimal point
-			if (!/[0-9.]/.test(char)) { e.preventDefault(); return; }
-			if (char === '.' && val.indexOf('.') !== -1) { e.preventDefault(); }
-		});
-
-		// Paste guard: strip non-numeric characters
-		$(document).on('paste', '.decimal-only', function (e) {
-			setTimeout(() => {
-				let v = $(this).val().replace(/[^0-9.]/g, '');
-				// Keep only first decimal point
-				let parts = v.split('.');
-				if (parts.length > 2) v = parts[0] + '.' + parts.slice(1).join('');
-				$(this).val(v);
-			}, 0);
-		});
-		
-		$(document).on('input', '.integer-only', function () {
-
-		    this.value = this.value.replace(/\D/g, '');
-
-		});
-
-
-		$("#resetBtn").click(function () {
-			location.reload();
-		});
-
-		$("#saveBtn").click(function () {
-			
-			$('#saveBtn').prop('disabled', true);
-									
-			let userId = document.getElementById('userIdSpan').textContent;
-			
-			
-			let length = $("#length").val().trim();
-			let rowWidth = $("#row_width").val().trim();
-			let avgWidth = $("#averageWidth").val().trim();
-			let minWidth = $("#minWidth").val().trim();
-			let maxWidth = $("#maxWidth").val().trim();
-			let area = $("#area").val().trim();
-			
-			let fpVal = $('input[name="fpAvailable"]:checked').val();
-			
-			let footpathfrom=$("#footPathFrom").val().trim();
-			let footpathto=$("#footPathTo").val().trim();
-			
-			let footpathat =$("#fpat").val() ;
-			
-			let footpathDropdown =$("#footpathDropdown").val() ;						
-			let fpLen = $("#fplength").val().trim();
-			let fpWidth = $("#fpwidth").val().trim();
-			
-			let rhs_footpathDropdown =$("#rhs_footpathDropdown").val() ;						
-			let rhs_fplength = $("#rhs_fplength").val().trim();
-			let rhs_fpwidth = $("#rhs_fpwidth").val().trim();
-
-			let swdVal = $('input[name="swdAvailable"]:checked').val();
-			let swd_at =$("#swd_at").val();
-			let scp_at=$("#scp_at").val();
-			let mhType=$("#mhType").val();
-			let cp_at=$("#cp_at").val();
-			let rwh_at=$("#rwh_at").val();
-			
-			let scpVal = $('input[name="scpAvailable"]:checked').val() || "";
-			let mhVal = $('input[name="mhAvailable"]:checked').val();
-			
-			let cpVal = $('input[name="cpAvailable"]:checked').val();
-			let rwVal = $('input[name="rwAvailable"]:checked').val();
-			
-			let epVal = $('input[name="epAvailable"]:checked').val();
-			let bsVal = $('input[name="bsAvailable"]:checked').val();
-			
-			let hmlVal= $('input[name="hmlAvailable"]:checked').val();
-			let mmlVal= $('input[name="mmlAvailable"]:checked').val();
-			let slpVal= $('input[name="slpAvailable"]:checked').val();
-			
-			let sewerLength=$("#sewerLength").val().trim();
-			let sewerSize=$("#sewerSize").val().trim();
-			
-			// Zone
-			if (!$("#zoneDropdown").val()) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please select a Zone.", "warning");
-			    
-			    return;
-			}
-
-			// Ward
-			if (!$("#wardDropdown").val()) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please select a Ward.", "warning");
-			    
-			    return;
-			}
-
-			// Road Name
-			if (!$("#roadDropdown").val()) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please select a Road Name.", "warning");
-			    
-			    return;
-			}
-			
-			if (!$("#areaname").val()) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please enter Area name.", "warning");
-			    
-			    return;
-			}
-			
-			if (!$("#localityname").val()) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please enter Locality name.", "warning");
-			    
-			    return;
-			}
-
-			// Road Type
-			if (!$("#roadTypeDropdown").val()) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please select a Road Type.", "warning");
-			    
-			    return;
-			}
-			
-			// Road Type Material
-			if (!$("#roadTypeMaterialDropdown").val()) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please select a Road Type Material.", "warning");
-			    
-			    return;
-			}
-
-			// Road Length						 			
-			if (!length) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please enter Road Length.", "warning");
-			    return;
-			}
-			
-/* 			if (!rowWidth) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please enter Right of Way Width.", "warning");
-			    return;
-			}
-					
-			if (!avgWidth) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please enter Average Width.", "warning");
-			    return;
-			} */
-
-			// Area						
-			if (!area) {
-				$('#saveBtn').prop('disabled', false);
-			    Swal.fire("Missing Field", "Please enter Road Area.", "warning");
-			    return;
-			}
-						
-			if (!validate(length, "Road Length")) return;
-			if (!validate(rowWidth, "Right of Way Width")) return;
-			if (!validate(avgWidth, "Average Width")) return;
-			if (!validate(area, "Road Area")) return;
-			
-			if (!validate(minWidth, "Road Min Width")) return;
-			if (!validate(maxWidth, "Road Max Width")) return;
-			
-			if(footpathat){
-				if(footpathat==='1'){
-					if (!footpathDropdown) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please select LHS Footpath Material Type", "warning");					    
-					    return;
-					}
-					if (!fpLen) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please enter LHS Length of Footpath", "warning");					    
-					    return;
-					}
-					if (!fpWidth) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please enter LHS Average Width of Footpath", "warning");					    
-					    return;
-					}
-				}
-				if(footpathat==='2'){
-					if (!rhs_footpathDropdown) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please select RHS Footpath Material Type", "warning");					    
-					    return;
-					}
-					if (!rhs_fplength) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please enter RHS Length of Footpath", "warning");					    
-					    return;
-					}
-					if (!rhs_fpwidth) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please enter RHS Average Width of Footpath", "warning");					    
-					    return;
-					}
-				}
-				if(footpathat==='3'){
-					if (!footpathDropdown) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please select LHS Footpath Material Type", "warning");					    
-					    return;
-					}
-					if (!fpLen) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please enter LHS Length of Footpath", "warning");					    
-					    return;
-					}
-					if (!fpWidth) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please enter LHS Average Width of Footpath", "warning");					    
-					    return;
-					}
-					if (!rhs_footpathDropdown) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please select RHS Footpath Material Type", "warning");					    
-					    return;
-					}
-					if (!rhs_fplength) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please enter RHS Length of Footpath", "warning");					    
-					    return;
-					}
-					if (!rhs_fpwidth) {
-						$('#saveBtn').prop('disabled', false);
-					    Swal.fire("Missing Field", "Please enter RHS Average Width of Footpath", "warning");					    
-					    return;
-					}
-				}
-			}
-			
-			if (!validate(fpLen, "LHS Footpath Length")) return;
-			if (!validate(fpWidth, "LHS Footpath Width")) return;
-			if (!validate(rhs_fplength, "RHS Footpath Length")) return;
-			if (!validate(rhs_fpwidth, "RHS Footpath Width")) return;
-			
-			if (swdVal === "yes") {
-				
-				
-				let swdlength=$("#swdlength").val().trim();
-				let swdsize=$("#size").val().trim();
-				let rhs_swdlength=$("#rhs_swdlength").val().trim();
-				let rhs_swdsize=$("#rhs_swdsize").val().trim();
-				
-				
-				if(swd_at){
-					if(swd_at==='1'){
-						
-						if (!swdlength) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS SWD Length", "warning");					    
-						    return;
-						}
-						if (!swdsize) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS SWD Size", "warning");					    
-						    return;
-						}
-					}
-					if(swd_at==='2'){
-						
-						if (!rhs_swdlength) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS SWD Length", "warning");					    
-						    return;
-						}
-						if (!rhs_swdsize) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS SWD Size", "warning");					    
-						    return;
-						}
-					}
-					if(swd_at==='3'){
-						
-						if (!swdlength) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS SWD Length", "warning");					    
-						    return;
-						}
-						if (!swdsize) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS SWD Size", "warning");					    
-						    return;
-						}
-						
-						if (!rhs_swdlength) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS SWD Length", "warning");					    
-						    return;
-						}
-						if (!rhs_swdsize) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS SWD Size", "warning");					    
-						    return;
-						}
-					}
-				}
-				
-				
-				
-
-			    if (!validate(swdlength, "LHS SWD Length")) return;			   
-			    if (!validate(swdsize, "LHS SWD Size")) return;
-			    
-			    if (!validate(rhs_swdlength, "RHS SWD Length")) return;			   
-			    if (!validate(rhs_swdsize, "RHS SWD Size")) return;
- 
-			   
-			}
-			
-						
-			if(scpVal==="yes"){
-				
-				let scpCount =$("#scpCount").val().trim();
-				let rhs_scpCount =$("#rhs_scpCount").val().trim();
-				
-				if(scp_at){
-					if(scp_at==='1'){
-						
-						if (!scpCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS Slit catch pit Count", "warning");					    
-						    return;
-						}
-					}
-					if(scp_at==='2'){
-						
-						if (!rhs_scpCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS Slit catch pit Count", "warning");					    
-						    return;
-						}
-					}
-					if(scp_at==='3'){
-						
-						if (!scpCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS Slit catch pit Count", "warning");					    
-						    return;
-						}
-						if (!rhs_scpCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS Slit catch pit Count", "warning");					    
-						    return;
-						}												
-					}
-				}
-				
-				
-				 if (!validate(scpCount, "LHS Slit catch pit Count")) return;
-				 if (!validate(rhs_scpCount, "RHS Slit catch pit Count")) return;
-			
-			}
-			
-			if(mhVal==="yes"){
-				
-				let mhCount =$("#mhCount").val().trim();
-				let r_mhCount =$("#r_mhCount").val().trim();
-				
-				
-				if(mhType){
-					if(mhType==='1'){
-						
-						if (!mhCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS Manhole Count", "warning");					    
-						    return;
-						}
-					}
-					if(mhType==='2'){
-						
-						if (!r_mhCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS Manhole Count", "warning");					    
-						    return;
-						}
-					}
-					if(mhType==='3'){
-						
-						if (!mhCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS Manhole Count", "warning");					    
-						    return;
-						}
-						if (!r_mhCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS Manhole Count", "warning");					    
-						    return;
-						}												
-					}
-				}
-				
-				
-				if (!validate(mhCount, "LHS Manhole Count")) return;
-				if (!validate(r_mhCount, "RHS Manhole Count")) return;
-				
-			}
-			
-			if(cpVal === "yes"){
-				
-				let cpCount =$("#cpCount").val().trim();
-				let  r_cpCount=$("#r_cpCount").val().trim();
-								
-				
-				if(cp_at){
-					if(cp_at==='1'){
-						
-						if (!cpCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS ChutPipe Count", "warning");					    
-						    return;
-						}
-					}
-					if(cp_at==='2'){
-						
-						if (!r_cpCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS ChutPipe Count", "warning");					    
-						    return;
-						}
-					}
-					if(cp_at==='3'){
-						
-						if (!cpCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS ChutPipe Count", "warning");					    
-						    return;
-						}
-						if (!r_cpCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS ChutPipe Count", "warning");					    
-						    return;
-						}												
-					}
-				}
-				
-				if (!validate(cpCount, "LHS ChutPipe Count")) return;
-				if (!validate(r_cpCount, "RHS ChutPipe Count")) return;
-				
-			}
-
-			if(rwVal === "yes"){
-				
-				let rwCount =$("#rwCount").val().trim();
-				let r_rwCount =$("#r_rwCount").val().trim();
-				
-				if(rwh_at){
-					if(rwh_at==='1'){
-						
-						if (!rwCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS Rain Water Harvesting Count", "warning");					    
-						    return;
-						}
-					}
-					if(rwh_at==='2'){
-						
-						if (!r_rwCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS Rain Water Harvesting Count", "warning");					    
-						    return;
-						}
-					}
-					if(rwh_at==='3'){
-						
-						if (!rwCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter LHS Rain Water Harvesting Count", "warning");					    
-						    return;
-						}
-						if (!r_rwCount) {
-							$('#saveBtn').prop('disabled', false);
-						    Swal.fire("Missing Field", "Please enter RHS Rain Water Harvesting Count", "warning");					    
-						    return;
-						}												
-					}
-				}
-				
-				
-				if (!validate(rwCount, "LHS Rain Water Harvesting Count")) return;
-				if (!validate(r_rwCount, "RHS Rain Water Harvesting Count")) return;
-								
-			}
-									
-			if(epVal === "yes"){
-				
-				let epCount =$("#epCount").val().trim();
-				
-				if (!epCount) {
-					$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please enter Electricity Poles Count.", "warning");
-			        return;
-			    }
-				
-				if (!validate(epCount, "Electricity Poles Count")) return;
-				
-				
-			}
-			
-			
-			if(bsVal === "yes"){
-				
-				let bsCount =$("#bsCount").val().trim();
-				
-				if (!bsCount) {
-					$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please enter Bus Shelter Count.", "warning");
-			        return;
-			    }				
-				if (!validate(bsCount, "Bus Shelter Count")) return;
-	
-			}
-			
-			if(slpVal === "yes"){
-				
-				let slpCount =$("#slpCount").val().trim();
-				
-				if (!slpCount) {
-					$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please enter Street Light Poles Count.", "warning");
-			        return;
-			    }				
-				if (!validate(slpCount, "Street Light Poles Count")) return;
-	
-			}
-			
-			if(hmlVal === "yes"){
-				
-				let hmlCount =$("#hmlCount").val().trim();
-				
-				if (!hmlCount) {
-					$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please enter High Mass Light Count.", "warning");
-			        return;
-			    }				
-				if (!validate(hmlCount, "High Mass Light Count")) return;
-	
-			}
-			
-			if(mmlVal === "yes"){
-				
-				let mmlCount =$("#mmlCount").val().trim();
-				
-				if (!mmlCount) {
-					$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please enter Mini Mass Light Count.", "warning");
-			        return;
-			    }				
-				if (!validate(mmlCount, "Mini Mass Light Count")) return;
-	
-			}		
-
-			if (!validate(sewerLength, "Sewer Length")) return;
-			if (!validate(sewerSize, "Sewer Size")) return;
-
-			let noofcb = $("#noofcb").val().trim();
-			if(noofcb){
-				if (!validate(noofcb, "No of Culverts & Bridges ")) return;
-			}
-			
-			let relayingDetails = [];
-			let relayingError = false;
-
-			$("#roadRelayingContainer .relaying-block").each(function () {
-
-			    let month = $(this).find(".monthDropdown").val();
-			    let year = $(this).find(".yearDropdown").val();
-			    let rrmtype = $(this).find(".r_roadmatDropdown").val();
-			    let crValue = $(this).find('input[name="crValue[]"]').val().trim();
-			    let roadType = $(this).find('input[name="roadType[]"]').val().trim();
-			    let remarks = $(this).find('textarea[name="remarks[]"]').val().trim();
-
-			    if (!month) {
-			    	$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please select Month of Relaying.", "warning");
-			        relayingError = true;
-			        return false;
-			    }
-
-			    if (!year) {
-			    	$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please select Year of Relaying.", "warning");
-			        relayingError = true;
-			        return false;
-			    }
-			    
-			    if (!rrmtype) {
-			    	$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please select Roadtype material of Relaying.", "warning");
-			        relayingError = true;
-			        return false;
-			    }
-
-			    if (!crValue) {
-			    	$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please enter CR Value.", "warning");
-			        relayingError = true;
-			        return false;
-			    }
-
-			    if (!validate(crValue, "CR Value")) {
-			        relayingError = true;
-			        return false;
-			    }
-			    
-			    if (crValue !== '' &&(isNaN(crValue) ||parseFloat(crValue) <= 0)) 
-			    {
-			    	$('#saveBtn').prop('disabled', false);
-			    	relayingError = true;
-			        Swal.fire(
-			            'Warning',
-			            'CR Value must be Number and greater than 0',
-			            'warning'
-			        );
-
-			        return false;
-			    }
-
-			    if (!roadType) {
-			    	$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please enter Type/Subgrade box of the road.", "warning");
-			        relayingError = true;
-			        return false;
-			    }
-
-			    if (!remarks) {
-			    	$('#saveBtn').prop('disabled', false);
-			        Swal.fire("Missing Field", "Please enter Remarks.", "warning");
-			        relayingError = true;
-			        return false;
-			    }
-
-			    relayingDetails.push({
-			        relay_month: month,
-			        relay_year: year,
-			        road_type_material:rrmtype,
-			        cr_value: crValue,
-			        road_type: roadType,
-			        remarks: remarks
-			    });
-			});
-
-			if (relayingError) {
-				$('#saveBtn').prop('disabled', false);
-			    return;
-			}
-			
-			console.log("road id>>>>>",$("#roadDropdown").val());
-
-			let payload = {
-
-				zone: $("#zoneDropdown").val(),
-				ward: $("#wardDropdown").val(),
-				/* road_name: $("#roadDropdown").val(), */
-				
-				road_id: $("#roadDropdown").val(),
-				
-    			road_name: $("#roadDropdown option:selected").data("road-name"),
-    			areaname:$("#areaname").val(),
-    			localityname:$("#localityname").val(),
-				road_type: $("#roadTypeDropdown").val(),
-				
-				road_type_material: $("#roadTypeMaterialDropdown").val(),
-
-				road_length: $("#length").val(),
-				road_row_width: $("#row_width").val().trim()|| null,
-				road_avg_width: $("#averageWidth").val().trim()|| null,
-								
-				road_min_width: $("#minWidth").val().trim()|| null,
-				road_max_width: $("#maxWidth").val().trim()|| null,
-				
-				road_area: $("#area").val(),
-				
-				 roadfrom:$("#roadFrom").val().trim()|| null,
-				 roadto:$("#roadTo").val().trim()|| null,
-
-				 is_footpath:$('input[name="fpAvailable"]:checked').val(),
-				 footpath_from_location: $("#footPathFrom").val()|| null,
-				 footpath_to_location: $("#footPathTo").val()|| null,		
-				 
-				footpathat: $("#fpat").val()|| null,
-				
-				footpath_material: $("#footpathDropdown").val()|| null,
-				footpath_length: $("#fplength").val()|| null,
-				footpath_width: $("#fpwidth").val()|| null,
-				
-				rhs_footpathDropdown :$("#rhs_footpathDropdown").val() || null,						
-				rhs_fplength : $("#rhs_fplength").val().trim()|| null,
-				rhs_fpwidth :$("#rhs_fpwidth").val().trim()|| null,
-				
-
-				is_swd: $('input[name="swdAvailable"]:checked').val() || "",
-				swd_from: $("#fromswd").val() || null,
-				swd_to:$("#toswd").val() || null,
-				
-				swd_at :$("#swd_at").val()|| null,
-				
-				swd_length: $("#swdlength").val() || null,
-				swd_size:  $("#size").val() || null,
-				rhs_swdlength: $("#rhs_swdlength").val() || null,
-				rhs_swdsize:  $("#rhs_swdsize").val() || null,
-								
-				is_scp: $('input[name="scpAvailable"]:checked').val() || "",
-				scp_at:$("#scp_at").val()|| null,				
-				scp_count: $("#scpCount").val().trim() ||  null,
-				rhs_scpCount: $("#rhs_scpCount").val().trim() ||  null,
-
-				is_manhole: $('input[name="mhAvailable"]:checked').val() || "",
-				manhole_at :$("#mhType").val()|| null,				
-				manhole_count: $("#mhCount").val().trim() || null,
-				r_mhCount: $("#r_mhCount").val().trim() || null,
-				
-				is_cpipe: $('input[name="cpAvailable"]:checked').val() || "",
-				cp_at:$("#cp_at").val()|| null,
-				cpipe_count:$("#cpCount").val().trim() || null,
-				r_cpCount:$("#r_cpCount").val().trim() || null,
-
-				is_rwh: $('input[name="rwAvailable"]:checked').val() || "",
-				rwh_at :$("#rwh_at").val()|| null,
-				rwh_count:$("#rwCount").val().trim() || null,
-				r_rwCount:$("#r_rwCount").val().trim() || null,
-
-				sewer_length: $("#sewerLength").val().trim()|| null,
-				sewer_size: $("#sewerSize").val().trim()|| null,
-
-				is_electric_poles: $('input[name="epAvailable"]:checked').val() || "",
-				ep_count: $('input[name="epAvailable"]:checked').val() === "yes" ? ($("#epCount").val().trim() || null) : null,
-						
-				is_streetlight_poles: $('input[name="slpAvailable"]:checked').val() || "",
-				streetlight_poles_count:$('input[name="slpAvailable"]:checked').val() === "yes" ? ($("#slpCount").val().trim() || null) : null,
-						
-				is_hml: $('input[name="hmlAvailable"]:checked').val() || "",
-				hml_count:$('input[name="hmlAvailable"]:checked').val() === "yes" ? ($("#hmlCount").val().trim() || null) : null,
-
-				is_mml:$('input[name="mmlAvailable"]:checked').val() || "",
-				mml_count:$('input[name="mmlAvailable"]:checked').val() === "yes" ? ($("#mmlCount").val().trim() || null) : null,
-						
-				culvert_bridge_count: $("#noofcb").val().trim()|| null,
-				details: $("#detailsofcb").val().trim()|| null,
-
-				is_busshelter: $('input[name="bsAvailable"]:checked').val() || "",
-				busshelter_count: $('input[name="bsAvailable"]:checked').val() === "yes" ? ($("#bsCount").val().trim() || null) : null,
-
-				is_centermedian: $('input[name="cmAvailable"]:checked').val() || "",
-
-				erp_asset_code: "",
-				cby: userId,
-
-				relaying_details: relayingDetails
-			};
-
-			console.log(payload);
-
-			$.ajax({
-				url: "/gcc/api/roadwarweb/register/saveRoadWarDetails",
-				type: "POST",
-				contentType: "application/json",
-				data: JSON.stringify(payload),
-
-				beforeSend: function () {
-					$("#pageLoader").show();
-				},
-
-				success: function (response) {
-
-					$("#pageLoader").hide();
-
-					if (response.status) {
-
-						$('#saveBtn').prop('disabled', false);
-						Swal.fire({
-							icon: "success",
-							title: "Success",
-							text: response.message
-						}).then(() => {
-							location.reload();
-						});
-
-					} else {
-						
-						$('#saveBtn').prop('disabled', false);
-
-						Swal.fire({
-							icon: "error",
-							title: "Error",
-							text: response.message
-						});
-
-					}
-
-				},
-
-				error: function () {
-					
-					$('#saveBtn').prop('disabled', false);
-
-					$("#pageLoader").hide();
-
-					Swal.fire({
-						icon: "error",
-						title: "Error",
-						text: "Failed to save details"
-					});
-
-				}
-			});
-
-		});
-		
-		
-		$('#roadDropdown').on('change', function () {
-
-		    let roadId = $(this).val();
-
-		    if (!roadId) {
-		        return;
-		    }
-
-		    $.ajax({
-		        url: '/gcc/api/roadwarweb/register/checkRoadExists',
-		        type: 'GET',
-		        data: {
-		            roadId: roadId
-		        },
-		        success: function (response) {
-
-		            if (response.status && response.exists) {
-
-		                Swal.fire({
-		                    icon: 'warning',
-		                    title: 'Already Registered',
-		                    text: 'Selected road already registered.'
-		                });
-
-		                $('#roadDropdown').val('').trigger('change');
-		            }
-		        }
-		    });
-
-		});
-		
-		function validate(value, fieldName) {
-		    if (parseFloat(value) <= 0) {
-		    	$('#saveBtn').prop('disabled', false);
-		        Swal.fire("Invalid Value", fieldName + " must be greater than 0.", "warning");
-		        return false;
-		    }
-		    return true;
-		}
-
-
-	</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/roadwar/updateform.html b/src/main/resources/templates/modules/roadwar/updateform.html
deleted file mode 100644
index 5ce1f24b..00000000
--- a/src/main/resources/templates/modules/roadwar/updateform.html
+++ /dev/null
@@ -1,3543 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.custom-width1 {
-	width: 30%; /* Adjust the width as needed */
-}
-.custom-width2 {
-	width: 15%; /* Adjust the width as needed */
-}
-#roadWarModal .modal-body {
-    max-height: 80vh;  /* Limit the height to 70% of the viewport */
-    overflow-y: auto;  /* Enable vertical scrolling */
-}
-</style>
-
-<body>
-
-
-<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		
-		<div class="page-wrap">
-		
-		<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-		
-		
-		
-		<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Update Form</h5>
-										<span>Road War</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item" aria-current="page">Road War</li>
-										<li class="breadcrumb-item active" aria-current="page">Update Form</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;"> Filters</span>
-									<span th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span>
-								</div>
-								<div class="card-body">
-									<div class="row">
-									
-									<div class="col-md-4 mb-3">
-												<label for="zoneDropdown" class="form-label"> Select
-													Zone 
-												</label> <select id="zoneDropdown" class="form-control">
-													<option value="">Select Zone</option>
-													<!-- Zones will be loaded dynamically -->
-												</select>
-
-											</div>
-
-											<div class="col-md-4 mb-3">
-
-												<label for="wardDropdown" class="form-label"> Select
-													Ward
-												</label> <select id="wardDropdown" class="form-control">
-													<option value="">Select Ward</option>
-													<!-- Wards will be loaded based on selected zone -->
-												</select>
-											</div>
-
-
-											<div class="col-md-4 mb-3">
-												<label for="roadDropdown" class="form-label">
-													Name of the Road 
-												</label>
-
-												<select id="roadDropdown" class="form-control">
-													<option value="">Select Road</option>
-												</select>
-											</div>
-				
-									
-										<div class="col-md-12 mb-2 d-flex justify-content-center">
-											<button type="submit" id="searchBtn" 
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn" name="reset" type="button">Reset</button>
-
-										</div>
-									
-									
-								</div>
-							</div>
-						</div>
-					</div>
-			
-			         <div class="col-md-12">
-							<div class="card">
-							<div class="card-header">
-								<span style="font-size: medium;font-weight: bold;">Road war List</span>
-							</div>
-							<div class="card-body">
-								<div class="table-responsive" >
-
-									<table id="ReportDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-										<thead class="thead-dark">
-											<tr role="row">
-
-												<th class="text-center no-sort">S.No</th>
-												<th class="text-center no-sort">Zone</th>
-												<th class="text-center no-sort">Ward</th>
-												<th class="text-center custom-width1 no-sort">Road Name</th>
-												<th class="text-center custom-width2 no-sort">Road Type</th>
-												<th class="text-center custom-width2 no-sort">Road Length(m)</th>
-												<th class="text-center custom-width2 no-sort">Road Average Width(m)</th>
-												<th class="text-center custom-width2 no-sort">Area(m<sup>2</sup>)</th>	
-												
-												<th class="text-center no-sort">Update</th>
-												<th class="text-center no-sort">Delete</th>
-											</tr>
-										</thead>
-										<tbody>
-
-										</tbody>
-									</table>
-								</div>
-							</div>
-						 </div>
-						</div>
-			
-				</div>
-				</div>
-
-			</div>
-		
-		
-		
-		<div id="pageLoader"
-				style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				<div style="position: relative; top: 50%; transform: translateY(-50%);">
-					<div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-						<span class="sr-only">Loading...</span>
-					</div>
-					<!-- Add the 'Please wait' text below the spinner -->
-					<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				</div>
-			</div>
-		
-		
-		<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		
-		</div>
-		
-	</div>
-
-<!-- modal body -->
-
-	<div class="modal fade" id="roadWarModal" tabindex="-1" role="dialog" aria-labelledby="roadWarModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-    <div class="modal-dialog modal-xl" role="document" style="max-width:95%;">
-        <div class="modal-content">
-
-            <div class="modal-header">
-                <h5 class="modal-title" id="titleModalLabel">
-                    Road War Details
-                </h5>
-
-                <button type="button"
-                        class="close"
-                        data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-
-            <div class="modal-body">
-			<h5>Road Details</h5>
-                <div class="row">
-
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Zone<span class="text-danger">*</span></label>
-                        <select id="view_zone" class="form-control">
-						<option value="">Select Zone</option>
-						
-					</select>
-                    </div>
-
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Ward<span class="text-danger">*</span></label>
-                         <select id="view_ward" class="form-control">
-						<option value="">Select ward</option>
-						</select>
-                    </div>
-
-                    <div class="col-md-6 mb-3">
-                        <label class="form-label">Name of the Road<span class="text-danger">*</span></label>
-                        <select id="view_road_name" class="form-control">
-													<option value="">Select Road</option>
-												</select>
-                    </div>
-                    
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Area Name<span class="text-danger">*</span></label>
-                        <input type="text"
-                               id="view_areaname"
-                               class="form-control">
-                    </div>
-                    
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Locality Name<span class="text-danger">*</span></label>
-                        <input type="text"
-                               id="view_localityname"
-                               class="form-control">
-                    </div>
-
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Road Type<span class="text-danger">*</span></label>
-                          <select id="view_road_type" class="form-control">
-								<option value="">Select Road Type</option>
-							</select>
-                    </div>
-                    
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Roadtype Material<span class="text-danger">*</span></label>
-                          <select id="view_roadtype_material" class="form-control">
-								<option value="">Select Roadtype material</option>
-						  </select>
-                    </div>
-
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Length of Road (m)<span class="text-danger">*</span></label>
-                        <input type="text"
-                               id="view_road_length"
-                               class="form-control decimal-only">
-                    </div>
-                    
-                    
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Right of Way(ROW) Width of Road (m)</label>
-                        <input type="text"
-                               id="view_road_row_width"
-                               class="form-control decimal-only" >
-                    </div>
-                    
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Average Carriage way Width of Road (m)</label>
-                        <input type="text"
-                               id="view_road_avg_width"
-                               class="form-control decimal-only" >
-                    </div>
-                    
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Area of Road (m<sup>2</sup>)<span class="text-danger">*</span></label>
-                        <input type="text"
-                               id="view_road_area"
-                               class="form-control decimal-only" >
-                    </div>
-
-                    
-                    
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Min Width of Road (m)</label>
-                        <input type="text"
-                               id="view_road_min_width"
-                               class="form-control decimal-only" >
-                    </div>
-                    
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Max Width of Road (m)</label>
-                        <input type="text"
-                               id="view_road_max_width"
-                               class="form-control decimal-only" >
-                    </div>
-
-                     <div class="col-md-12 mb-3">                   
-                     	<label class="form-label">Road Location</label>
-							<div class="row">
-								<div class="col-md-6">
-									<label for="view_roadFrom">From</label>
-									<input type="text" class="form-control" id="view_roadFrom"
-										name="view_roadFrom">
-								</div>
-	
-								<div class="col-md-6">
-									<label for="view_roadTo">To</label>
-									<input type="text" class="form-control" id="view_roadTo"
-										name="view_roadTo">
-								</div>
-							</div>                    
-                     </div>
-                     
-                     <div class="col-md-4 mb-3">
-											
-						<label class="form-label">Footpath available or Not ?</label>
-						<div>
-							<label class="mr-3">
-								<input type="radio" name="view_fpAvailable" value="yes"> Yes
-							</label>
-
-							<label>
-								<input type="radio" name="view_fpAvailable" value="no"> No
-							</label>
-						</div>
-					
-					</div>
-					
-					</div>
-											
-					<div class="row" id="fpSection" style="display:none;">
-
-					<div class="col-md-12 mb-3">
-									
-					    <label class="form-label"> FootPath Location</label>					
-					    <div class="row">
-					
-					        <div class="col-md-6">
-					            <label for="view_footPathFrom">From</label>					
-					            <input type="text" class="form-control" id="view_footPathFrom" >
-					        </div>
-					
-					        <div class="col-md-6">
-					            <label for="view_footPathTo">To</label>					
-					            <input type="text" class="form-control" id="view_footPathTo" >
-					        </div>
-					
-					    </div>
-					
-					</div>
-
-					<div class="col-md-4 mb-3">
-						<label for="view_fpat" class="form-label">Footpath Present at ?</label>
-						<select class="form-control" id="view_fpat" name="view_fpat">
-							<option value="">Select</option>						
-						</select>
-					</div>
-					</div>
-					<div id="lhs_fsection" style="display: none;">
-						<div class="row">
-							   <div class="col-md-4 mb-3">
-			                       <label class="form-label">LHS Footpath Material Type<span class="text-danger">*</span></label>
-			                         <select id="view_footpath_material" class="form-control">
-										<option value="">Select Material</option>								
-									</select>
-			                   </div>
-			
-			                   <div class="col-md-4 mb-3">
-			                       <label class="form-label">LHS Length of Footpath (m)<span class="text-danger">*</span></label>
-			                       <input type="text" id="view_footpath_length" class="form-control decimal-only" >
-			                   </div>
-			                   
-			                   <div class="col-md-4 mb-3">
-								    <label for="view_fpwidth" class="form-label">LHS Average Width of Footpath(m)<span class="text-danger">*</span></label>						
-								    <input type="text" class="form-control decimal-only"  id="view_fpwidth" >
-							</div>
-						</div>
-					</div>
-					<div id="rhs_fsection" style="display: none;">
-						<div class="row">
-							<div class="col-md-4 mb-3">
-			                       <label class="form-label">RHS Footpath Material Type<span class="text-danger">*</span></label>
-			                         <select id="view_rfootpath_material" class="form-control">
-										<option value="">Select Material</option>								
-									</select>
-			                   </div>
-			
-			                   <div class="col-md-4 mb-3">
-			                       <label class="form-label">RHS Length of Footpath (m)<span class="text-danger">*</span></label>
-			                       <input type="text" id="view_rfootpath_length" class="form-control decimal-only" >
-			                   </div>
-			                   
-			                   <div class="col-md-4 mb-3">
-								    <label for="view_rfpwidth" class="form-label">RHS Average Width of Footpath(m)<span class="text-danger">*</span></label>						
-								    <input type="text" class="form-control decimal-only"  id="view_rfpwidth" >
-							</div>
-						</div>
-					</div>
-		
-                	
-                		
-                		<hr>
-                		<h5>SWD Details</h5>
-                		<div class="row">
-
-						    <div class="col-md-6 mb-3">
-						        <label class="form-label">SWD Available or Not?</label>						
-						        <div>
-						            <label class="mr-3">
-						                <input type="radio" name="update_swdAvailable" value="yes">
-						                Yes
-						            </label>						
-						            <label>
-						                <input type="radio"name="update_swdAvailable"value="no">
-						                No
-						            </label>
-						        </div>
-						    </div>
-						
-						    <div id="update_swdSection" class="col-md-12" style="display:none;">
-						
-						        <div class="row">
-						
-						            <div class="col-md-3 mb-3">
-						                <label>From</label>
-						                <input type="text" class="form-control" id="update_fromswd">
-						            </div>
-						
-						            <div class="col-md-3 mb-3">
-						                <label>To</label>
-						                <input type="text" class="form-control" id="update_toswd">
-						            </div>
-						           <div class="col-md-6 mb-3">
-										<label for="swd_at"> SWD Present at ?</label>
-										<select class="form-control" id="swd_at" name="swd_at">
-											<option value="">Select </option>
-										</select>
-									</div>
-						
-									<div class="col-md-6 mb-3" id="lhs_swd" style="display: none;">
-										<div class="row">
-								            <div class="col-md-6 mb-3">
-								                <label>LHS SWD Length (m)<span class="text-danger">*</span></label>
-								                <input type="text" class="form-control decimal-only" id="update_swdlength">
-								            </div>
-						
-								            <div class="col-md-6 mb-3">
-								                <label>LHS SWD Size (m)<span class="text-danger">*</span></label>
-								                <input type="text" class="form-control decimal-only" id="update_size">
-								            </div>
-								         </div>
-						            </div>
-						            
-						            <div class="col-md-6 mb-3" id="rhs_swd" style="display: none;">
-										<div class="row">
-										<div class="col-md-6 mb-3">
-											<label for="rhs_swdlength">RHS SWD Length (m)<span class="text-danger">*</span></label>
-											<input type="text" class="form-control decimal-only" id="rhs_swdlength">
-										</div>
-
-										<div class="col-md-6 mb-3">
-											<label for="rhs_swdsize">RHS SWD Size (m)<span class="text-danger">*</span></label>
-											<input type="text" class="form-control decimal-only" id="rhs_swdsize">
-										</div>
-										</div>
-									</div>
-						
-						        </div>
-						
-						    </div>
-						
-						</div>
-						
-						<div id="update_swdDependentFields" class="col-md-12" style="display:none;">
-						
-						    <div class="row">
-						
-						        <!-- SCP -->
-						
-						        <div class="col-md-6 mb-4">
-						
-						            <label class="form-label">
-						                Slit Catch Pit Available or Not?
-						            </label>						
-						            <div>						
-						                <label class="mr-3">
-						                    <input type="radio" name="update_scpAvailable" value="yes"> Yes
-						                </label>
-						
-						                <label>
-						                    <input type="radio"name="update_scpAvailable" value="no">No
-						                </label>
-						
-						            </div>
-						
-						            <div id="update_scpSection" style="display:none;margin-top:15px;">
-						
-										<div class="row">
-											<div class="col-md-6">
-												<label for="scp_at"> Slit catch pit Present at ?</label>
-												<select class="form-control" id="scp_at" name="scp_at">
-													<option value="">Select </option>
-												</select>
-											</div>
-											<div class="col-md-3" id="lhs_scp" style="display: none;">
-												<label for="update_scpCount"> LHS Count<span class="text-danger">*</span></label>
-												<input type="text" class="form-control integer-only" id="update_scpCount">
-											</div>
-											<div class="col-md-3" id="rhs_scp" style="display: none;">
-												<label for="rhs_scpCount"> RHS Count<span class="text-danger">*</span></label>
-												<input type="text" class="form-control integer-only" id="rhs_scpCount">
-											</div>
-											
-											</div>	               
-						
-						            </div>
-						
-						        </div>
-						        
-						        
-						        <!-- MANHOLE -->
-						
-						        <div class="col-md-6 mb-4">
-						
-						            <label class="form-label">
-						                Manhole / Machine hole Available or Not?
-						            </label>					
-						            <div>
-						
-						                <label class="mr-3">
-						                    <input type="radio" name="update_mhAvailable" value="yes">
-						                    Yes
-						                </label>
-						
-						                <label>
-						                    <input type="radio" name="update_mhAvailable" value="no">
-						                    No
-						                </label>
-						
-						            </div>
-						
-						            <div id="update_mhSection" style="display:none;margin-top:15px;">						
-						                <div class="row">
-						                
-						                <div class="col-md-6">
-						                        <label>Manhole / Machine hole present at?</label>						
-						                        <select class="form-control"id="update_mhType">						
-						                            <option value=""> Select</option>
-						                        </select>						
-						                    </div>
-						
-						                    <div class="col-md-3" id="lhs_mh" style="display: none;">
-						                        <label for="update_mhCount">LHS Count<span class="text-danger">*</span></label>						
-						                        <input type="text" class="form-control integer-only" id="update_mhCount">
-						                    </div>
-											<div class="col-md-3" id="rhs_mh" style="display: none;">
-												<label for="r_mhCount">RHS Count<span class="text-danger">*</span></label>
-												<input type="text" class="form-control integer-only" id="r_mhCount" name="r_mhCount">
-											</div>
-						                    
-						
-						                </div>
-						
-						            </div>
-						
-						        </div>
-						        
-						        
-						        <!-- CHUT PIPE -->
-						
-						        <div class="col-md-6 mb-4">
-						
-						            <label class="form-label">
-						                Chut Pipe Available or Not?
-						            </label>						
-						            <div>						
-						                <label class="mr-3">
-						                    <input type="radio" name="update_cpAvailable" value="yes">  Yes
-						                </label>
-						
-						                <label>
-						                    <input type="radio"  name="update_cpAvailable"  value="no"> No
-						                </label>
-						
-						            </div>
-						
-						            <div id="update_cpSection" style="display:none;margin-top:15px;">					
-										<div class="row">
-														
-											<div class="col-md-6">
-												<label for="cp_at">Chut Pipe present at?</label>
-												<select class="form-control" id="cp_at" name="cp_at">
-													<option value="">Select </option>
-												</select>
-											</div>
-											<div class="col-md-3" id="lhs_cp" style="display: none;">
-												<label for="update_cpCount">LHS Count<span class="text-danger">*</span></label>
-												<input type="text" class="form-control integer-only" id="update_cpCount">															
-											</div>
-											<div class="col-md-3" id="rhs_cp" style="display: none;">
-												<label for="r_cpCount">RHS Count<span class="text-danger">*</span></label>
-												<input type="text" class="form-control integer-only" id="r_cpCount">															
-											</div>
-										
-										</div>
-						
-						            </div>
-						
-						        </div>
-						
-						        <!-- RWH -->
-						
-						        <div class="col-md-6 mb-4">						
-						            <label class="form-label">
-						                Rain Water Harvesting Available or Not?
-						            </label>
-						
-						            <div>						
-						                <label class="mr-3">
-						                    <input type="radio"  name="update_rwAvailable" value="yes">Yes
-						                </label>
-						
-						                <label>
-						                    <input type="radio"  name="update_rwAvailable" value="no">No
-						                </label>						
-						            </div>
-						
-						            <div id="update_rwSection" style="display:none;margin-top:15px;">						
-										<div class="row">											
-											<div class="col-md-6">
-													<label for="rwh_at">RWH present at?</label>
-													<select class="form-control" id="rwh_at" name="rwh_at">
-														<option value="">Select </option>
-													</select>
-											</div>
-											<div class="col-md-3" id="lhs_rwh" style="display: none;">
-												<label for="update_rwCount">LHS Count<span class="text-danger">*</span></label>
-												<input type="text" class="form-control integer-only" id="update_rwCount">
-											</div>
-											<div class="col-md-3" id="rhs_rwh" style="display: none;">
-												<label for="r_rwCount">RHS Count<span class="text-danger">*</span></label>
-												<input type="text" class="form-control integer-only" id="r_rwCount">
-											</div>
-										</div>	
-												               						
-						            </div>
-						
-						        </div>
-						
-						        
-						
-						               						   
-							</div>
-
-					</div>
-					
-					
-					<div class="row">
-					
-						<div class="col-md-3 mb-4">
-						
-						    <label class="form-label">
-						        Electricity Poles / Pillar Box Available or Not? (TNEB)
-						    </label>
-						
-						    <div>
-						        <label class="mr-3">
-						            <input type="radio"
-						                   name="update_epAvailable"
-						                   value="yes">
-						            Yes
-						        </label>
-						
-						        <label>
-						            <input type="radio"
-						                   name="update_epAvailable"
-						                   value="no">
-						            No
-						        </label>
-						    </div>
-						
-						    <div class="col-md-6" id="update_epSection"
-						         style="display:none;margin-top:15px;">
-						
-						        <label>Count<span class="text-danger">*</span></label>
-						
-						        <input type="text"
-						               class="form-control integer-only"
-						               id="update_epCount">
-						
-						    </div>
-						
-						</div>
-												
-						
-						<div class="col-md-3 mb-4">
-
-							    <label class="form-label">
-							        Bus Shelter Available or Not?
-							    </label>
-							
-							    <div>
-							        <label class="mr-3">
-							            <input type="radio"
-							                   name="update_bsAvailable"
-							                   value="yes">
-							            Yes
-							        </label>
-							
-							        <label>
-							            <input type="radio"
-							                   name="update_bsAvailable"
-							                   value="no">
-							            No
-							        </label>
-							    </div>
-							
-							    <div class="col-md-6" id="update_bsSection"
-							         style="display:none;margin-top:15px;">
-							
-							        <label>Count<span class="text-danger">*</span></label>
-							
-							        <input type="text"
-							               class="form-control integer-only"
-							               id="update_bsCount">
-							
-							    </div>
-							
-							</div>
-							
-							<div class="col-md-3 mb-4">
-							    <label class="form-label"> Street Light Poles Available or Not?</label>							
-							    <div>
-							        <label class="mr-3">
-							            <input type="radio" name="update_slpAvailable" value="yes">Yes
-							        </label>							
-							        <label>
-							            <input type="radio" name="update_slpAvailable" value="no">No
-							        </label>
-							    </div>
-							
-							    <div class="col-md-6" id="update_slpSection" style="display:none;margin-top:15px;">
-							
-							        <label>Count<span class="text-danger">*</span></label>
-							
-							        <input type="text" class="form-control integer-only" id="update_slpCount">							
-							    </div>							
-							</div>
-							
-						<div class="col-md-3 mb-4">
-
-						    <label class="form-label">High Mass Light Available or Not?</label>
-						
-						    <div>
-						        <label class="mr-3">
-						            <input type="radio" name="update_hmlAvailable"value="yes">Yes
-						        </label>
-						
-						        <label>
-						            <input type="radio" name="update_hmlAvailable" value="no">No
-						        </label>
-						    </div>
-						    <div class="col-md-6" id="update_hmlSection" style="display:none;margin-top:15px;">
-							
-							        <label>Count<span class="text-danger">*</span></label>
-							
-							        <input type="text" class="form-control integer-only" id="update_hmlCount">							
-							    </div>
-						
-						</div>
-						
-						
-						<div class="col-md-3 mb-4">
-							    <label class="form-label">Mini Mass Light Available or Not?</label>							
-							    <div>
-							        <label class="mr-3">
-							            <input type="radio" name="update_mmlAvailable" value="yes">Yes</label>							
-							        <label>
-							            <input type="radio" name="update_mmlAvailable" value="no">No
-							        </label>
-							    </div>
-							
-							    <div class="col-md-6" id="update_mmlSection" style="display:none;margin-top:15px;">
-							
-							        <label>Count<span class="text-danger">*</span></label>
-							
-							        <input type="text" class="form-control integer-only" id="update_mmlCount">							
-							    </div>							
-							</div>
-							
-							
-							<div class="col-md-3 mb-4">
-
-							    <label class="form-label">
-							        Center Median Available or Not?
-							    </label>
-							
-							    <div>
-							        <label class="mr-3">
-							            <input type="radio"
-							                   name="update_cmAvailable"
-							                   value="yes">
-							            Yes
-							        </label>
-							
-							        <label>
-							            <input type="radio"
-							                   name="update_cmAvailable"
-							                   value="no">
-							            No
-							        </label>
-							    </div>
-														 							
-							</div>
-					
-					</div>
-					
-							
-							<div class="row">
-							
-								<div class="col-md-4 mb-3">
-									    <label class="form-label">
-									        Length Of Sewer(CMWSSB) (m)
-									    </label>
-									
-									    <input type="text"
-									           class="form-control decimal-only"
-									           id="update_sewerLength">
-									</div>
-									
-									<div class="col-md-4 mb-3">
-									    <label class="form-label">
-									        Size of Sewer (feet or cm)
-									    </label>
-									
-									    <input type="text"
-									           class="form-control decimal-only"
-									           id="update_sewerSize">
-									</div>
-									
-									<div class="col-md-4 mb-3">
-									    <label class="form-label">
-									        No of Culverts & Bridges
-									    </label>
-									
-									    <input type="text"
-									           class="form-control integer-only"
-									           id="update_noofcb">
-									</div>
-									
-									<div class="col-md-12 mb-3">
-									    <label class="form-label">
-									        Details of Culverts & Bridges With Date of Construction
-									    </label>
-									
-									    <textarea class="form-control"
-									              id="update_detailsofcb"
-									              rows="4"></textarea>
-									</div></div>
-
-    						
-
-                <hr>
-
-                <h5>Relaying Details</h5>
-                             
-                <div id="relayingContainer"></div>
-                
-                <div class="text-left mb-3">
-				    <button type="button"
-				            class="btn btn-primary"
-				            id="btnAddRelay">
-				        + Add More
-				    </button>
-				</div>
-
-					<div class="text-center mt-4">
-					    <button type="button"
-					            class="btn btn-success"
-					            id="btnUpdateRoadWar">
-					        Update
-					    </button>
-					
-					    <button type="button"
-					            class="btn btn-secondary ml-2"
-					            data-dismiss="modal">
-					        Cancel
-					    </button>
-					</div>
-
-            </div>
-
-        </div>
-    </div>
-</div>
-	
-
-
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-	
-	<script type="text/javascript">
-	let roadSideList = [];
-	let fpMaterialList = [];
-	let monthList = [];
-	let yearList = [];
-	let roadtypeMaterialList = [];
-
-	$(document).ready(function () {
-		
-		var table = $('#ReportDatatable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [
-                { targets: 'no-sort', orderable: false }
-            ],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', 'Show all']
-            ],
-            scrollY: '80vh',
-            scrollX: true,
-            
-            buttons: [
-                {
-                    extend: 'pageLength',
-                    className: 'btn btn-warning'
-                },
-                {
-                    title: 'Data export',
-                    extend: 'copyHtml5',
-                    text: 'Copy',
-                    className: 'btn btn-secondary',
-                    id: 'copyBtn'
-                },
-                {
-                    extend: 'excelHtml5',
-                    text: 'Excel',
-                    className: 'btn btn-secondary',
-                    id: 'excelBtn'
-                },
-                {
-                    extend: 'csvHtml5',
-                    text: 'CSV',
-                    className: 'btn btn-secondary',
-                    id: 'csvBtn'
-                },
-                {
-                    extend: 'pdfHtml5',
-                    text: 'PDF',
-                    className: 'btn btn-secondary',
-                    id: 'pdfBtn'
-                }
-            ],
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: false,
-            searching: true,
-            select: true,
-            processing: true
-        });
-		
-		
-		$.ajax({
-			url: '/gcc/api/roadwarweb/register/getzones',
-			type: 'GET',
-			success: function (response) {
-
-				$('#zoneDropdown').empty()
-					.append('<option value="">Select Zone</option>');
-
-				if (response.status) {
-
-					$.each(response.data, function (index, zone) {
-
-						$('#zoneDropdown').append(
-							'<option value="' + zone.zone_name + '">' +
-							zone.zone_name +
-							'</option>'
-						);
-
-					});
-
-				}
-			},
-			error: function () {
-				alert('Failed to load zones.');
-			}
-		});
-
-		loadRoadWarDetails();
-		
-		
-	});
-	
-	
-	$(document).on('input', '.decimal-only', function () {
-
-	    this.value = this.value
-	        .replace(/[^0-9.]/g, '')
-	        .replace(/(\..*)\./g, '$1');
-
-	});
-	
-	$(document).on('input', '.integer-only', function () {
-
-	    this.value = this.value.replace(/\D/g, '');
-
-	});
-	
-	$('#view_fpat').change(function () {
-		$('#lhs_fsection').find('input, select').val('');
-		$('#rhs_fsection').find('input, select').val('');
-		
-		let fpat = $(this).val();
-		if (fpat==='1') {
-			$('#lhs_fsection').slideDown();
-			$('#rhs_fsection').hide();				
-		}
-		else if(fpat==='2'){
-			$('#rhs_fsection').slideDown();
-			$('#lhs_fsection').hide();				
-		}
-		else if(fpat==='3'){
-			$('#rhs_fsection').slideDown();
-			$('#lhs_fsection').slideDown();				
-		}
-		else{
-			$('#rhs_fsection').slideUp();
-			$('#lhs_fsection').slideUp();				
-		}
-		
-	});
-	
-	$('#swd_at').change(function () {
-		$('#rhs_swd').find('input, select').val('');
-		$('#lhs_swd').find('input, select').val('');
-		
-		let swdat = $(this).val();
-		if (swdat==='1') {
-			$('#lhs_swd').slideDown();
-			$('#rhs_swd').hide();				
-		}
-		else if(swdat==='2'){
-			$('#rhs_swd').slideDown();
-			$('#lhs_swd').hide();				
-		}
-		else if(swdat==='3'){
-			$('#rhs_swd').slideDown();
-			$('#lhs_swd').slideDown();			
-		}
-		else{
-			$('#rhs_swd').slideUp();
-			$('#lhs_swd').slideUp();			
-		}
-		
-	});
-	
-	$('#scp_at').change(function () {
-		
-		$('#rhs_scp').find('input, select').val('');
-		$('#lhs_scp').find('input, select').val('');
-		
-		let scpat = $(this).val();
-		if (scpat==='1') {
-			$('#lhs_scp').slideDown();
-			$('#rhs_scp').hide();				
-		}
-		else if(scpat==='2'){
-			$('#rhs_scp').slideDown();
-			$('#lhs_scp').hide();
-			
-		}
-		else if(scpat==='3'){
-			$('#rhs_scp').slideDown();
-			$('#lhs_scp').slideDown();				
-		}
-		else{
-			$('#rhs_scp').slideUp();
-			$('#lhs_scp').slideUp();				
-		}
-		
-	});
-	
-	
-	$('#update_mhType').change(function () {
-		
-		$('#lhs_mh').find('input, select').val('');
-		$('#rhs_mh').find('input, select').val('');
-		
-		let mhat = $(this).val();
-		if (mhat==='1') {
-			$('#lhs_mh').slideDown();
-			$('#rhs_mh').hide();				
-		}
-		else if(mhat==='2'){
-			$('#rhs_mh').slideDown();
-			$('#lhs_mh').hide();
-			
-		}
-		else if(mhat==='3'){
-			$('#rhs_mh').slideDown();
-			$('#lhs_mh').slideDown();				
-		}
-		else{
-			$('#rhs_mh').slideUp();
-			$('#lhs_mh').slideUp();				
-		}
-		
-	});
-	
-	$('#cp_at').change(function () {
-		
-		$('#lhs_cp').find('input, select').val('');
-		$('#rhs_cp').find('input, select').val('');
-		
-		let cpat = $(this).val();
-		if (cpat==='1') {
-			$('#lhs_cp').slideDown();
-			$('#rhs_cp').hide();				
-		}
-		else if(cpat==='2'){
-			$('#rhs_cp').slideDown();
-			$('#lhs_cp').hide();
-			
-		}
-		else if(cpat==='3'){
-			$('#rhs_cp').show();
-			$('#lhs_cp').show();				
-		}
-		else{
-			$('#rhs_cp').hide();
-			$('#lhs_cp').hide();				
-		}
-		
-	});
-	
-	$('#rwh_at').change(function () {
-		
-		$('#lhs_rwh').find('input, select').val('');
-		$('#rhs_rwh').find('input, select').val('');
-		
-		let rwhat = $(this).val();
-		if (rwhat==='1') {
-			$('#lhs_rwh').slideDown();
-			$('#rhs_rwh').hide();				
-		}
-		else if(rwhat==='2'){
-			$('#rhs_rwh').slideDown();
-			$('#lhs_rwh').hide();
-			
-		}
-		else if(rwhat==='3'){
-			$('#rhs_rwh').show();
-			$('#lhs_rwh').show();				
-		}
-		else{
-			$('#rhs_rwh').hide();
-			$('#lhs_rwh').hide();				
-		}
-		
-	});
-	
-	function loadZonesInModal(){
-		return 	$.ajax({
-			url: '/gcc/api/roadwarweb/register/getzones',
-			type: 'GET',
-			success: function (response) {
-
-				$('#view_zone').empty()
-					.append('<option value="">Select Zone</option>');
-
-				if (response.status) {
-
-					$.each(response.data, function (index, zone) {
-
-						$('#view_zone').append(
-							'<option value="' + zone.zone_name + '">' +
-							zone.zone_name +
-							'</option>'
-						);
-
-					});
-
-				}
-			},
-			error: function () {
-				alert('Failed to load zones in modal.');
-			}
-		});
-	}
-	
-	$('#view_zone').change(function () {
-
-	    let zone = $(this).val();
-
-	    // Clear ward
-	    $('#view_ward').empty()
-	        .append('<option value="">Select Ward</option>');
-
-	    // Clear road
-	    $('#view_road_name').empty()
-	        .append('<option value="">Select Road</option>');
-
-	    if (zone) {
-	        loadWards(zone);
-	    }
-	});
-	
-	$('#view_ward').change(function () {
-
-	    let ward = $(this).val();
-
-	    // Clear road
-	    $('#view_road_name').empty()
-	        .append('<option value="">Select Road</option>');
-
-	    if (ward) {
-	        loadRoads(ward);
-	    }
-	});
-	
-	function loadWards(zone, selectedWard = null) {
-
-	return  $.ajax({
-	        url: '/gcc/api/roadwarweb/register/getwardbyzone',
-	        type: 'GET',
-	        data: { zone: zone },
-
-	        success: function (response) {
-
-	            $('#view_ward').empty()
-	                .append('<option value="">Select Ward</option>');
-
-	            if (response.status) {
-
-	                $.each(response.data, function (index, ward) {
-
-	                    $('#view_ward').append(
-	                        `<option value="${ward.ward_name}">
-	                            ${ward.ward_name}
-	                        </option>`
-	                    );
-
-	                });
-
-	                if (selectedWard) {
-	                    $('#view_ward').val(selectedWard);
-	                }
-	            }
-	        }
-	    });
-	}
-	
-	function loadRoads(ward, selectedRoad = null) {
-
-		return   $.ajax({
-	        url: '/gcc/api/roadwarweb/register/getRoadNamesByWard',
-	        type: 'GET',
-	        data: { ward: ward },
-
-	        success: function (response) {
-
-	            $('#view_road_name').empty()
-	                .append('<option value="">Select Road</option>');
-
-	            if (response.status) {
-
-	                $.each(response.data, function (index, road) {
-
-	                    $('#view_road_name').append(	                        
-	                        $('<option>', {
-							value: road.road_id,
-						    text:  road.road_name+","+road.locality+","+road.area_name+","+"("+road.road_id+")"
-						}).attr('data-road-name', road.road_name)
-	                    );
-
-	                });
-	                
-	             	// Destroy existing Select2 if already initialized
-			        if ($('#view_road_name').hasClass('select2-hidden-accessible')) {
-					    $('#view_road_name').select2('destroy');
-					}
-					
-					$('#view_road_name').off('select2:select');
-			        // Initialize Select2
-			        $('#view_road_name').select2({
-			            placeholder: "Select Road",
-			            allowClear: true,
-			            width: '100%',
-			            dropdownParent: $('#roadWarModal')
-			        });
-	                
-
-	                if (selectedRoad) {
-	                	$('#view_road_name').val(String(selectedRoad)).trigger('change.select2');
-	                }
-	                	                
-	            }
-	        }
-	    });
-	}
-	
-	function loadFootpathTypeMaterials() {
-		return  $.ajax({
-			url: '/gcc/api/roadwarweb/register/getFootpathType',
-			type: 'GET',
-			success: function (response) {
-
-				if (response.status) {
-					
-					fpMaterialList=response.data;
-
-					 populatefootpathmaterialDropdown($("#view_footpath_material"));
-					 populatefootpathmaterialDropdown($("#view_rfootpath_material"));
-					
-
-				} else {
-					alert(response.message);
-				}
-			},
-			error: function (xhr, status, error) {
-				console.error("Error fetching footpath type materials:", error);
-			}
-		});
-	}
-	
-	function populatefootpathmaterialDropdown(dropdown) {
-
-	    dropdown.empty();
-	    dropdown.append('<option value="">Select</option>');
-
-	    $.each(fpMaterialList, function (index, item) {
-
-	        dropdown.append(
-	            `<option value="${item.id}">
-	                ${item.footpath_type_name}
-	            </option>`
-	        );
-
-	    });
-
-	}
-	
-	function loadRoadTypeMaterials() {
-		return  $.ajax({
-			url: '/gcc/api/roadwarweb/register/getRoadTypeMaterial',
-			type: 'GET',
-			success: function (response) {
-
-				if (response.status) {
-
-					let dropdown = $("#view_roadtype_material");
-
-					// Clear existing options except default
-					dropdown.empty();
-					dropdown.append('<option value="">Select Roadtype material</option>');
-
-					$.each(response.data, function (index, item) {
-						dropdown.append(
-							'<option value="' + item.id + '">' +
-							item.roadtype_material +
-							'</option>'
-						);
-					});
-
-				} else {
-					alert(response.message);
-				}
-			},
-			error: function (xhr, status, error) {
-				console.error("Error fetching roadtype materials:", error);
-			}
-		});
-	}
-	
-	function loadRoadTypes() {
-		return 	$.ajax({
-			url: '/gcc/api/roadwarweb/register/getRoadType',
-			type: 'GET',
-			success: function (response) {
-
-				if (response.status) {
-
-					let dropdown = $("#view_road_type");
-
-					// Clear existing options except default
-					dropdown.empty();
-					dropdown.append('<option value="">Select Road Type</option>');
-
-					$.each(response.data, function (index, item) {
-						dropdown.append(
-							'<option value="' + item.id + '">' +
-							item.roadType +
-							'</option>'
-						);
-					});
-
-				} else {
-					alert(response.message);
-				}
-			},
-			error: function (xhr, status, error) {
-				console.error("Error fetching road types:", error);
-			}
-		});
-	}
-	
-	function loadMonthMaster() {
-
-	    return $.ajax({
-	        url: "/gcc/api/roadwarweb/register/getMonthList",
-	        type: "GET",
-	        success: function(response) {
-
-	            if (response.status) {
-	                monthList = response.data;
-	            }
-	        }
-	    });
-	}
-
-	function loadYearMaster() {
-
-	    return $.ajax({
-	        url: "/gcc/api/roadwarweb/register/getYearList",
-	        type: "GET",
-	        success: function(response) {
-
-	            if (response.status) {
-	                yearList = response.data;
-	            }
-	        }
-	    });
-	}
-	
-	function loadRelayRoadtypeMaterial(){
-		
-		
-		return $.ajax({
-	        url: "/gcc/api/roadwarweb/register/getRoadTypeMaterial",
-	        type: "GET",
-	        success: function(response) {
-
-	            if (response.status) {
-	            	roadtypeMaterialList = response.data;
-	            }
-	        }
-	    });
-	}
-	
-	function loadRoadSides() {
-
-		return  $.ajax({
-	        url: '/gcc/api/roadwarweb/register/getRoadSide',
-	        type: 'GET',
-	        success: function (response) {
-
-	            if (response.status) {
-
-	                roadSideList = response.data;
-
-	                populateRoadSideDropdown($("#view_fpat"));
-	                populateRoadSideDropdown($("#swd_at"));
-	                populateRoadSideDropdown($("#scp_at"));		               
-	                populateRoadSideDropdown($("#update_mhType"));
-	                populateRoadSideDropdown($("#cp_at"));
-	                populateRoadSideDropdown($("#rwh_at"));
-	            }
-	            else {
-					alert(response.message);
-				}
-
-	        },
-	        error: function () {
-	            console.error("Error fetching road sides");
-	        }
-	    });
-
-	}
-	
-	function populateRoadSideDropdown(dropdown) {
-
-	    dropdown.empty();
-	    dropdown.append('<option value="">Select</option>');
-
-	    $.each(roadSideList, function (index, item) {
-
-	        dropdown.append(
-	            `<option value="${item.id}">
-	                ${item.road_side_name}
-	            </option>`
-	        );
-
-	    });
-
-	}
-	
-	$("#resetBtn").click(function () {
-	    location.reload();
-	});
-	
-	
-	$(document).on('click', '.viewBtn', function () {
-		
-		 const refId = $(this).data('refid');
-
-		    console.log("Ref Id = " + refId);		    
-		    $.when(
-
-		            loadMonthMaster(),
-		            loadYearMaster(),
-		            loadRelayRoadtypeMaterial(),
-		            loadRoadTypes(),
-		            loadRoadTypeMaterials(),
-		            loadZonesInModal(),
-		            loadFootpathTypeMaterials(),
-		            loadRoadSides()
-
-		        ).done(function () {
-
-		            fetchRoadWarDetails(refId);
-
-		        });
-
-		});
-	
-	$(document).on('click', '.deleteBtn', function () {
-
-	    const refId = $(this).data('refid');
-	    let deleteby = document.getElementById('userIdSpan').textContent;
-
-	    Swal.fire({
-	        title: 'Are you sure?',
-	        text: 'Do you want to delete this Road War record?',
-	        icon: 'warning',
-	        showCancelButton: true,
-	        confirmButtonText: 'Yes, Delete',
-	        cancelButtonText: 'Cancel',
-	        confirmButtonColor: '#d33'
-	    }).then((result) => {
-
-	        if (result.isConfirmed) {
-
-	            $.ajax({
-
-	                url: '/gcc/api/roadwarweb/register/deleteRoadWarDetails',
-	                type: 'POST',
-
-	                data: {
-	                    refId: refId,
-	                    updatedby:deleteby
-	                },
-
-	                beforeSend: function () {
-	                    $("#pageLoader").show();
-	                },
-
-	                success: function (response) {
-
-	                    if (response.status) {
-
-	                        Swal.fire(
-	                            'Deleted!',
-	                            response.message,
-	                            'success'
-	                        );
-
-	                        loadRoadWarDetails();
-
-	                    } else {
-
-	                        Swal.fire(
-	                            'Error',
-	                            response.message,
-	                            'error'
-	                        );
-	                    }
-	                },
-
-	                error: function () {
-
-	                    Swal.fire(
-	                        'Error',
-	                        'Failed to delete record',
-	                        'error'
-	                    );
-	                },
-
-	                complete: function () {
-	                    $("#pageLoader").hide();
-	                }
-	            });
-	        }
-	    });
-	});
-	
-  
-        	
-        $(document).on('change', 'input[name="view_fpAvailable"]', function () {
-            if ($(this).val() === 'yes') {
-            	$("#fpSection").show();
-            	$("#lhs_fsection").hide();
-            	$("#rhs_fsection").hide();
-            	$('#fpSection') .find('input[type="text"], input[type="number"], textarea, select').val('');
-            	$('#lhs_fsection') .find('input[type="text"], input[type="number"], textarea, select').val('');
-            	$('#rhs_fsection') .find('input[type="text"], input[type="number"], textarea, select').val('');
-            } else {
-            	$("#fpSection").hide();
-            	$("#lhs_fsection").hide();
-            	$("#rhs_fsection").hide();
-            	$('#fpSection') .find('input[type="text"], input[type="number"], textarea, select').val('');
-            	$('#lhs_fsection') .find('input[type="text"], input[type="number"], textarea, select').val('');
-            	$('#rhs_fsection') .find('input[type="text"], input[type="number"], textarea, select').val('');
-            }
-        });
-  
-	
-
-        	$(document).on('change', 'input[name="update_swdAvailable"]', function () {
-           
-            if ($(this).val() === 'yes') {
-            	console.log("inside swd");
-            	
-            	$("#update_swdSection").show();
-            	$('#update_swdSection') .find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $("#update_swdDependentFields").show();
-    	        $('#update_swdDependentFields').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        
-    	        $('input[name="update_scpAvailable"]').prop('checked', false);
-    	        $('input[name="update_mhAvailable"]').prop('checked', false);
-    	        $('input[name="update_cpAvailable"]').prop('checked', false);
-    	        $('input[name="update_rwAvailable"]').prop('checked', false);
-    	        
-    	        $("#update_scpSection").hide();
-    	        $("#update_mhSection").hide();
-    	        $("#update_cpSection").hide();
-    	        $("#update_rwSection").hide();
-    	        
-    	        $("#lhs_swd").hide();$("#rhs_swd").hide();
-    	        $('#lhs_swd').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $('#rhs_swd').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        
-    	        $("#lhs_scp").hide();$("#rhs_scp").hide();
-    	        $('#lhs_scp').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $('#rhs_scp').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        
-    	        $("#lhs_mh").hide();$("#rhs_mh").hide();
-    	        $('#lhs_mh').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $('#rhs_mh').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        
-    	        $("#lhs_cp").hide();$("#rhs_cp").hide();
-    	        $('#lhs_cp').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $('#rhs_cp').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        
-    	        $("#lhs_rwh").hide();$("#rhs_rwh").hide();
-    	        $('#lhs_rwh').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $('#rhs_rwh').find('input[type="text"], input[type="number"], textarea, select').val('');
-
-            	 
-            }else {
-            	
-            	$("#update_swdSection").hide();
-            	$('#update_swdSection').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $("#update_swdDependentFields").hide();
-    	        $('#update_swdDependentFields').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        
-    	        $('input[name="update_scpAvailable"]').prop('checked', false);
-    	        $('input[name="update_mhAvailable"]').prop('checked', false);
-    	        $('input[name="update_cpAvailable"]').prop('checked', false);
-    	        $('input[name="update_rwAvailable"]').prop('checked', false);
-    	        
-    	        $("#update_scpSection").hide();
-    	        $("#update_mhSection").hide();
-    	        $("#update_cpSection").hide();
-    	        $("#update_rwSection").hide();
-    	        
-    	        $("#lhs_swd").hide();$("#rhs_swd").hide();
-    	        $('#lhs_swd').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $('#rhs_swd').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        
-    	        $("#lhs_scp").hide();$("#rhs_scp").hide();
-    	        $('#lhs_scp').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $('#rhs_scp').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        
-    	        $("#lhs_mh").hide();$("#rhs_mh").hide();
-    	        $('#lhs_mh').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $('#rhs_mh').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        
-    	        $("#lhs_cp").hide();$("#rhs_cp").hide();
-    	        $('#lhs_cp').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $('#rhs_cp').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        
-    	        $("#lhs_rwh").hide();$("#rhs_rwh").hide();
-    	        $('#lhs_rwh').find('input[type="text"], input[type="number"], textarea, select').val('');
-    	        $('#rhs_rwh').find('input[type="text"], input[type="number"], textarea, select').val('');
-            }
-        });
-   
-	
-        	$(document).on('click', 'input[name="update_scpAvailable"]', function () {
-        	    console.log("CLICK");
-        	});
-
-        	$(document).on('change', 'input[name="update_scpAvailable"]', function () {
-        	    console.log("CHANGE", $(this).val());
-        	});
-        	
-        	$(document).on('change', 'input[name="update_scpAvailable"]', function () {
-
-        	    console.log("inside scp");
-        	    console.log("Current:", $(this).val());
-        	    console.log("Checked:", $('input[name="update_scpAvailable"]:checked').val());
-
-        	    if ($(this).val() === 'yes') {
-        	        console.log("YES BLOCK");
-        	    } else {
-        	        console.log("NO BLOCK");
-        	    }
-        	});
-
-    	
-    	$(document).on('change', 'input[name="update_scpAvailable"]', function () {
-            
-            if ($(this).val() === 'yes') {
-            	console.log("inside scp");
-            	$("#update_scpSection").show();
-            	$('#update_scpSection').find('input[type="text"], input[type="number"], textarea, select').val('');
-            	$("#lhs_scp").hide();
-            	$("#rhs_scp").hide();
-            } else {
-            	$("#update_scpSection").hide();
-            	$('#update_scpSection').find('input[type="text"], input[type="number"], textarea, select').val('');
-            	$("#lhs_scp").hide();
-            	$("#rhs_scp").hide();
-	            
-            }
-        });
-
-        	$(document).on('change', 'input[name="update_mhAvailable"]', function () {
-                
-                if ($(this).val() === 'yes') {        	
-
-            	$("#update_mhSection").show();
-            	$('#update_mhSection').find('input[type="text"], input[type="number"], textarea, select').val('');
-            	$("#lhs_mh").hide();
-            	$("#rhs_mh").hide();
-            } else {
-            	 $("#update_mhSection").hide();
-            	 $('#update_mhSection').find('input[type="text"], input[type="number"], textarea, select').val('');
-            	 $("#lhs_mh").hide();
-             	$("#rhs_mh").hide();	
-            }
-        });
-
-	
- 
-        	
-$(document).on('change', 'input[name="update_cpAvailable"]', function () {
-                
-                if ($(this).val() === 'yes') { 
-
-            	$("#update_cpSection").show();
-            	$('#update_cpSection').find('input[type="text"], input[type="number"], textarea, select').val('');
-            	$("#lhs_cp").hide();
-            	$("#rhs_cp").hide();
-            } else {
-            	 $("#update_cpSection").hide();
-            	 $('#update_cpSection').find('input[type="text"], input[type="number"], textarea, select').val('');
-            	 $("#lhs_cp").hide();
-             	$("#rhs_cp").hide();
-            }
-        });
-    
-
-
-$(document).on('change', 'input[name="update_rwAvailable"]', function () {
-                
-                if ($(this).val() === 'yes') {       	
-        	
-            	$("#update_rwSection").show();
-            	 $('#update_rwSection').find('input[type="text"], input[type="number"], textarea, select').val('');
-            	 $("#lhs_rwh").hide();
-              	$("#rhs_rwh").hide();
-            } else {
-            	$("#update_rwSection").hide();
-            	$('#update_rwSection').find('input[type="text"], input[type="number"], textarea, select').val('');
-            	$("#lhs_rwh").hide();
-              	$("#rhs_rwh").hide();
-            }
-        });
-	
-	document.querySelectorAll('input[name="update_epAvailable"]').forEach(radio => {
-        radio.addEventListener('change', function () {         
-            if (this.value === 'yes') {
-            	$("#update_epSection").show();
-            } 
-            else {
-            	 $("#update_epSection").hide();
- 	            $("#update_epCount").val('');
-            }
-        });
-    });	
-	 
-	document.querySelectorAll('input[name="update_bsAvailable"]').forEach(radio => {
-        radio.addEventListener('change', function () {         
-            if (this.value === 'yes') {
-            	 $("#update_bsSection").show();
-            } else {
-            	$("#update_bsSection").hide();
-	            $("#update_bsCount").val('');
-            }
-        });
-    });	
-	
-	document.querySelectorAll('input[name="update_slpAvailable"]').forEach(radio => {
-        radio.addEventListener('change', function () {         
-            if (this.value === 'yes') {
-            	 $("#update_slpSection").show();
-            } else {
-            	$("#update_slpSection").hide();
-	            $("#update_slpCount").val('');
-            }
-        });
-    });	
-	
-	document.querySelectorAll('input[name="update_hmlAvailable"]').forEach(radio => {
-        radio.addEventListener('change', function () {         
-            if (this.value === 'yes') {
-            	 $("#update_hmlSection").show();
-            } else {
-            	$("#update_hmlSection").hide();
-	            $("#update_hmlCount").val('');
-            }
-        });
-    });
-
-	document.querySelectorAll('input[name="update_mmlAvailable"]').forEach(radio => {
-        radio.addEventListener('change', function () {         
-            if (this.value === 'yes') {
-            	 $("#update_mmlSection").show();
-            } else {
-            	$("#update_mmlSection").hide();
-	            $("#update_mmlCount").val('');
-            }
-        });
-    });
-	
-	
-		
-	$('#zoneDropdown').change(function () {
-
-		let zone = $(this).val();
-
-		$('#wardDropdown').empty()
-			.append('<option value="">Select Ward</option>');
-		
-		$('#roadDropdown').empty()
-		.append('<option value="">Select Road</option>');
-
-		if (zone) {
-
-			$.ajax({
-				url: '/gcc/api/roadwarweb/register/getwardbyzone',
-				type: 'GET',
-				data: {
-					zone: zone
-				},
-				success: function (response) {
-
-					if (response.status) {
-
-						$.each(response.data, function (index, ward) {
-
-							$('#wardDropdown').append(
-								'<option value="' + ward.ward_name + '">' +
-								ward.ward_name +
-								'</option>'
-							);
-
-						});
-
-					}
-
-				},
-				error: function () {
-					alert('Failed to load wards.');
-				}
-			});
-
-		}
-
-	});
-	
-	
-	$('#wardDropdown').change(function () {
-
-		let ward = $(this).val();
-
-		$('#roadDropdown').empty()
-			.append('<option value="">Select Road</option>');
-
-		if (ward) {
-
-			$.ajax({
-				url: '/gcc/api/roadwarweb/register/getRoadNamesByWard',
-				type: 'GET',
-				data: {
-					ward: ward
-				},
-				beforeSend: function () {
-					$("#pageLoader").show();
-				},
-				success: function (response) {
-
-					console.log("API Response:", response);
-
-					if (response.status && response.data.length > 0) {
-
-						$.each(response.data, function (index, road) {
-
-							console.log("Road:", road);
-
-							$('#roadDropdown').append(
-								$('<option>', {
-									value: road.road_id,
-									text:  road.road_name+","+road.locality+","+road.area_name+","+"("+road.road_id+")"
-								})
-							);
-						});
-						
-						 // Destroy existing Select2 if already initialized
-				        if ($('#roadDropdown').hasClass("select2-hidden-accessible")) {
-				            $('#roadDropdown').select2('destroy');
-				        }
-
-				        // Initialize Select2
-				        $('#roadDropdown').select2({
-				            placeholder: "Select Road",
-				            allowClear: true,
-				            width: '100%'
-				        });
-
-
-					} else {
-						console.log("No roads found");
-					}
-				},
-				error: function (xhr, status, error) {
-					console.log("Error:", error);
-					console.log(xhr.responseText);
-				},
-				complete: function () {
-					$("#pageLoader").hide();
-				}
-			});
-		}
-	});
-	
-	
-	
-	$("#searchBtn").click(function () {
-
-	    loadRoadWarDetails();
-
-	});
-	
-	
-	function loadRoadWarDetails() {
-		
-		let cby = document.getElementById('userIdSpan').textContent;
-
-	    let zone = $("#zoneDropdown").val();
-	    let ward = $("#wardDropdown").val();
-	    let roadId = $("#roadDropdown").val();
-
-	    $("#pageLoader").show();
-
-	    $.ajax({
-
-	        url: "/gcc/api/roadwarweb/register/getAllRoadWarDetails",
-	        type: "GET",
-
-	        data: {
-	        	userid:cby,
-	            zone: zone,
-	            ward: ward,
-	            roadId: roadId
-	        },
-
-	        success: function (response) {
-	        	
-	        	let tableData = Array.isArray(response) ? response : [];
-	        	
-	        	if (Array.isArray(response) && response.length > 0) {
-    	            let table = $('#ReportDatatable').DataTable({
-    	                destroy: true,
-    	                searching: true,
-    	                autoWidth: true,           	                
-    	                paging: true,
-    	                info: true,
-    	                data: tableData,           	                
-    	                columns: [
-    	                    { 
-    	                        data: null, 
-    	                        render: (data, type, row, meta) => meta.row + 1, 
-    	                        className: 'text-center' 
-    	                    },
-    	                    { data: 'zone', defaultContent: '-', className: 'text-center' },
-    	                    { data: 'ward', defaultContent: '-', className: 'text-center' },
-    	                    { data: 'road_name', defaultContent: '-', className: 'text-center' },
-    	                    { data: 'road_type_name', defaultContent: '-', className: 'text-center' },
-    	                    
-    	                    { data: 'road_length', defaultContent: '-', className: 'text-center' },
-    	                    { data: 'road_avg_width', defaultContent: '-', className: 'text-center' },
-    	                    { data: 'road_area', defaultContent: '-', className: 'text-center' },
-    	                    
-    	                    { 
-    	                        data: 'ref_id', 
-    	                        render: function(data) {
-    	                            return `<button type="button" class="btn btn-primary btn-sm viewBtn"  data-refid="${data}">Update</button>`;
-    	                        }, 
-    	                        className: 'text-center' 
-    	                    },
-    	                    { 
-    	                        data: 'ref_id', 
-    	                        render: function(data) {
-    	                            return `<button type="button" class="btn btn-warning btn-sm deleteBtn"  data-refid="${data}">Delete</button>`;
-    	                        }, 
-    	                        className: 'text-center' 
-    	                    }
-    	                    
-    	                      
-    	                ],
-    	                dom: 'Bfrtip',
-    	                buttons: [
-     		                  {
-     		                      extend: 'pageLength',
-     		                      className: 'btn btn-warning'
-     		                  },
-     		                  {
-     		                      title: 'Data export',
-     		                      extend: 'copyHtml5',
-     		                      text: 'Copy',
-     		                      className: 'btn btn-secondary',
-     		                      id: 'copyBtn'
-     		                  },
-     		                  {
-     		                      extend: 'excelHtml5',
-     		                      text: 'Excel',
-     		                      className: 'btn btn-secondary',
-     		                      id: 'excelBtn'
-     		                  },
-     		                  {
-     		                      extend: 'csvHtml5',
-     		                      text: 'CSV',
-     		                      className: 'btn btn-secondary',
-     		                      id: 'csvBtn'
-     		                  },
-     		                  {
-     		                      extend: 'pdfHtml5',
-     		                      text: 'PDF',
-     		                      className: 'btn btn-secondary',
-     		                      id: 'pdfBtn'
-     		                  }
-     		              ],
-     		             columnDefs: [
-     		                { targets: 'no-sort', orderable: false }
-     		            ],
-     		            lengthMenu: [
-     		                [50, 100, 200, 500, -1],
-     		                ['50 rows', '100 rows', '200 rows', 'Show all']
-     		            ],
-     		            scrollY: '80vh',
-     		            scrollX: true,   	      		            
-     		       		responsive: false,
-               		    searching: true,
-               		 language: {
-                         emptyTable: "No Records Found"
-                     }
-               	
-     		            });
-    	        }
-	            
-	            setTimeout(function () {
-	                $('#ReportDatatable').DataTable().columns.adjust();
-	            }, 100);
-	            
-	        },
-
-	        error: function () {
-
-	        	Swal.fire(
-	                    'Error',
-	                    'Failed to load Road War details',
-	                    'error'
-	                );
-
-	        },
-
-	        complete: function () {
-
-	            $("#pageLoader").hide();
-
-	        }
-
-	    });
-	}
-	
-	
-	
-	function fetchRoadWarDetails(refId) {
-
-	    $.ajax({
-
-	        url: '/gcc/api/roadwarweb/register/getRoadWarDetailsById',
-	        type: 'GET',
-	        data: {refid: refId},
-	        success: function (response) {
-
-	            console.log(response);
-
-	            $("#view_zone").val(response.zone);
-
-		         // Load wards
-		         loadWards(response.zone, response.ward)
-				 .done(function () {
-				
-				     loadRoads(response.ward, response.road_id);
-				
-				 });	            
-	            $("#view_areaname").val(response.area_name);
-	            $("#view_localityname").val(response.locality_name);
-	            $("#view_road_type").val(response.road_type);
-	            $("#view_roadtype_material").val(response.road_type_material);
-	            $("#view_road_length").val(response.road_length);
-	            $("#view_road_row_width").val(response.road_row_width);
-	            $("#view_road_avg_width").val(response.road_avg_width);
-	            
-	            $("#view_road_min_width").val(response.road_min_width);
-	            $("#view_road_max_width").val(response.road_max_width);
-	            
-	            $("#view_road_area").val(response.road_area);
-	            $("#view_roadFrom").val(response.road_from);
-	            $("#view_roadTo").val(response.road_to);
-	            	           	            
-	            
-	            if(response.is_footpath === 'yes'){
-	            	$('input[name="view_fpAvailable"][value="yes"]').prop('checked', true);
-	            	$("#view_footPathFrom").val(response.footpath_from_location);
-		            $("#view_footPathTo").val(response.footpath_to_location);
-		            $("#fpSection").show();
-	            	if(response.footpath_at){
-	            		$("#view_fpat").val(response.footpath_at);
-	            		
-	            		if(response.footpath_at===1){
-	            			$("#view_footpath_material").val(response.footpath_material);	    		            
-	    		            $("#view_footpath_length").val(response.footpath_length);	            	            
-	    		            $("#view_fpwidth").val(response.footpath_width);
-	            			$("#lhs_fsection").show();
-	            			$("#rhs_fsection").hide();
-	            		}
-	            		else if(response.footpath_at===2){
-	            			$("#view_rfootpath_material").val(response.r_footpath_material);	    		            
-	    		            $("#view_rfootpath_length").val(response.r_footpath_length);	            	            
-	    		            $("#view_rfpwidth").val(response.r_footpath_width);
-	            			$("#rhs_fsection").show();
-	            			$("#lhs_fsection").hide();
-	            		}
-	            		else{
-	            			$("#view_footpath_material").val(response.footpath_material);	    		            
-	    		            $("#view_footpath_length").val(response.footpath_length);	            	            
-	    		            $("#view_fpwidth").val(response.footpath_width);
-	    		            $("#view_rfootpath_material").val(response.r_footpath_material);	    		            
-	    		            $("#view_rfootpath_length").val(response.r_footpath_length);	            	            
-	    		            $("#view_rfpwidth").val(response.r_footpath_width);
-	            			$("#lhs_fsection").show();
-	            			$("#rhs_fsection").show();
-	            		}
-	            	}
-	            	else{
-	            		$("#lhs_fsection").hide();
-            			$("#rhs_fsection").hide();
-	            	}
-	            	
-	            }
-	            else if(response.is_footpath === 'no'){
-	            	$('input[name="view_fpAvailable"][value="no"]').prop('checked', true);
-	            	$("#fpSection").hide();
-	            	$("#lhs_fsection").hide();
-        			$("#rhs_fsection").hide();
-	            }
-	            else{
-	            	$('input[name="view_fpAvailable"]').prop('checked', false);
-	            	$("#fpSection").hide();
-	            	$("#lhs_fsection").hide();
-        			$("#rhs_fsection").hide();
-	            }
-	            
-	            if(response.is_swd === 'yes'){	            	
-	            	$('input[name="update_swdAvailable"][value="yes"]').prop('checked', true);
-	            	 $("#update_fromswd").val(response.swd_from);
-		             $("#update_toswd").val(response.swd_to);
-		             $("#update_swdSection").show();
-		             
-		             if(response.swd_at){
-		            	 $("#swd_at").val(response.swd_at);
-		            	 
-		            	 if(response.swd_at===1){
-		            		 $("#update_swdlength").val(response.swd_length);	            	            
-		    		            $("#update_size").val(response.swd_size);
-		            			$("#lhs_swd").show();
-		            			$("#rhs_swd").hide();
-		            	 }
-		            	 else if(response.swd_at===2){
-		            		 $("#rhs_swdlength").val(response.rhs_swdlength);	            	            
-		    		            $("#rhs_swdsize").val(response.rhs_swdsize);
-		            			$("#rhs_swd").show();
-		            			$("#lhs_swd").hide();
-		            	 }
-		            	 else{
-		            		 $("#update_swdlength").val(response.swd_length);	            	            
-		    		            $("#update_size").val(response.swd_size);
-		    		            $("#rhs_swdlength").val(response.rhs_swdlength);	            	            
-		    		            $("#rhs_swdsize").val(response.rhs_swdsize);
-		    		            $("#lhs_swd").show();
-		            			$("#rhs_swd").show();
-		            	 }
-		             }
-		             else{
-		            	 $("#lhs_swd").hide();
-	            		 $("#rhs_swd").hide();
-		             }
-
-		             
-		            if(response.is_scp === 'yes'){
-							$('input[name="update_scpAvailable"][value="yes"]').prop('checked', true);
-							$('#update_scpSection').show();
-							if(response.scp_at){
-								$("#scp_at").val(response.scp_at);
-								
-								if(response.scp_at==1){
-									$("#update_scpCount").val(response.scp_count);
-			            			$("#lhs_scp").show();
-			            			$("#rhs_scp").hide();
-								}
-								else if (response.scp_at==2){
-									$("#rhs_scpCount").val(response.rhs_scpCount);
-									$("#rhs_scp").show();
-			            			$("#lhs_scp").hide();		            			
-								}
-								else{
-									$("#update_scpCount").val(response.scp_count);
-									$("#rhs_scpCount").val(response.rhs_scpCount);
-									$("#lhs_scp").show();
-			            			$("#rhs_scp").show();
-								}
-							}
-							
-							else{
-								$("#lhs_scp").hide();
-		            			$("#rhs_scp").hide();
-							}
-
-		            		    
-		            }
-	                else if(response.is_scp === 'no')
-	                {
-	                	$('input[name="update_scpAvailable"][value="no"]').prop('checked', true);
-
-        		    	$('#update_scpSection').hide();
-        		    	$("#lhs_scp").hide();
-            			$("#rhs_scp").hide();
-	                }
-	                else{
-	                	$('input[name="update_scpAvailable"]').prop('checked', false);
-	                	$('#update_scpSection').hide();
-	                	$("#lhs_scp").hide();
-            			$("#rhs_scp").hide();
-	                }
-		            
-	                
-	                if(response.is_manhole === 'yes'){
-
-            		    $('input[name="update_mhAvailable"][value="yes"]').prop('checked', true);
-            		    $('#update_mhSection').show();
-            		    
-            		    if(response.manhole_at){
-							$("#update_mhType").val(response.manhole_at);
-							
-							if(response.manhole_at==1){
-								$("#update_mhCount").val(response.manhole_count);
-		            			$("#lhs_mh").show();
-		            			$("#rhs_mh").hide();
-							}
-							else if (response.manhole_at==2){
-								$("#r_mhCount").val(response.r_mhCount);
-								$("#rhs_mh").show();
-		            			$("#lhs_mh").hide();		            			
-							}
-							else{
-								$("#update_mhCount").val(response.manhole_count);
-								$("#r_mhCount").val(response.r_mhCount);
-								$("#lhs_mh").show();
-		            			$("#rhs_mh").show();
-							}
-						}
-						
-						else{
-							$("#lhs_mh").hide();
-	            			$("#rhs_mh").hide();
-						}
-
-            		    
-
-            		}
-	                else if(response.is_manhole === 'no') {
-
-            		    $('input[name="update_mhAvailable"][value="no"]').prop('checked', true);
-            		               		    
-            		    $('#update_mhSection').hide();
-            		    $("#lhs_mh").hide();
-            			$("#rhs_mh").hide();
-            		}
-	                else{
-	                	$('input[name="update_mhAvailable"]').prop('checked', false);
-	                	 $('#update_mhSection').hide();
-	                	 $("#lhs_mh").hide();
-	            			$("#rhs_mh").hide();
-	                }
-	                
-	                if(response.is_cpipe === 'yes'){
-
-		                $('input[name="update_cpAvailable"][value="yes"]').prop('checked', true);
-		                $('#update_cpSection').show();
-		                
-		                if(response.cp_at){
-							$("#cp_at").val(response.cp_at);
-							
-							if(response.cp_at==1){
-								$("#update_cpCount").val(response.cpipe_count);
-		            			$("#lhs_cp").show();
-		            			$("#rhs_cp").hide();
-							}
-							else if (response.cp_at==2){
-								$("#r_cpCount").val(response.r_cpCount);
-								$("#rhs_cp").show();
-		            			$("#lhs_cp").hide();		            			
-							}
-							else{
-								$("#update_cpCount").val(response.cpipe_count);
-								$("#r_cpCount").val(response.r_cpCount);
-								$("#lhs_cp").show();
-		            			$("#rhs_cp").show();
-							}
-						}
-						
-						else{
-							$("#lhs_cp").hide();
-	            			$("#rhs_cp").hide();
-						}
-		            }
-	                else if(response.is_cpipe === 'no'){
-
-		                $('input[name="update_cpAvailable"][value="no"]').prop('checked', true);
-		                $('#update_cpSection').hide();
-		                $("#lhs_cp").hide();
-            			$("#rhs_cp").hide();
-		            }
-	                else{
-	                	$('input[name="update_cpAvailable"]').prop('checked', false);
-	                	$('#update_cpSection').hide();
-	                	$("#lhs_cp").hide();
-            			$("#rhs_cp").hide();
-	                }
-
-		            
-
-		            if(response.is_rwh === 'yes'){
-		                $('input[name="update_rwAvailable"][value="yes"]').prop('checked', true);
-		                $('#update_rwSection').show();
-		                
-		                if(response.rwh_at){
-							$("#rwh_at").val(response.rwh_at);
-							
-							if(response.rwh_at==1){
-								$("#update_rwCount").val(response.rwh_count);
-		            			$("#lhs_rwh").show();
-		            			$("#rhs_rwh").hide();
-							}
-							else if (response.rwh_at==2){
-								$("#r_rwCount").val(response.r_rwCount);
-								$("#rhs_rwh").show();
-		            			$("#lhs_rwh").hide();		            			
-							}
-							else{
-								$("#update_rwCount").val(response.rwh_count);
-								$("#r_rwCount").val(response.r_rwCount);
-								$("#lhs_rwh").show();
-		            			$("#rhs_rwh").show();
-							}
-						}
-						
-						else{
-							$("#lhs_rwh").hide();
-	            			$("#rhs_rwh").hide();
-						}
-		                
-
-		            }
-		            else if(response.is_rwh === 'no'){
-		            	$('input[name="update_rwAvailable"][value="no"]').prop('checked', true);
-		            	$('#update_rwSection').hide();
-		            	$("#lhs_rwh").hide();
-            			$("#rhs_rwh").hide();
-		            }
-		            else{
-
-		            	$('input[name="update_rwAvailable"]').prop('checked', false);
-		                $('#update_rwSection').hide();
-		                $("#lhs_rwh").hide();
-            			$("#rhs_rwh").hide();
-		            }
-		            
-	                
-	                $("#update_swdDependentFields").show();
-
-	            }
-	            else if(response.is_swd === 'no'){
-	            	$('input[name="update_swdAvailable"][value="no"]').prop('checked', true);
-	            	$("#update_swdSection").hide();
-	                $("#update_swdDependentFields").hide();
-	                $("#lhs_swd").hide();
-           		 	$("#rhs_swd").hide();
-	                $("#lhs_scp").hide();
-        			$("#rhs_scp").hide();
-        			$("#lhs_mh").hide();
-        			$("#rhs_mh").hide();
-        			$("#lhs_cp").hide();
-        			$("#rhs_cp").hide();
-        			$("#lhs_rwh").hide();
-        			$("#rhs_rwh").hide();
-	            }
-	            else{
-
-	            	$('input[name="update_swdAvailable"]').prop('checked', false);
-	                $("#update_swdSection").hide();
-	                $("#update_swdDependentFields").hide();
-	                $("#lhs_swd").hide();
-           		 	$("#rhs_swd").hide();
-	                $("#lhs_scp").hide();
-        			$("#rhs_scp").hide();
-        			$("#lhs_mh").hide();
-        			$("#rhs_mh").hide();
-        			$("#lhs_cp").hide();
-        			$("#rhs_cp").hide();
-        			$("#lhs_rwh").hide();
-        			$("#rhs_rwh").hide();
-	            }
-	            
-
-	            if(response.is_electric_poles === 'yes'){
-
-	                $('input[name="update_epAvailable"][value="yes"]')
-	                    .prop('checked', true);
-
-	                $('#update_epSection').show();
-
-	                $('#update_epCount')
-	                    .val(response.ep_count);
-
-	            }
-	            else if(response.is_electric_poles === 'no'){
-
-	                $('input[name="update_epAvailable"][value="no"]')
-	                    .prop('checked', true);
-
-	                $('#update_epSection').hide();
-	            }
-	            else{
-	            	$('input[name="update_epAvailable"]').prop('checked', false);
-	            	$('#update_epSection').hide();
-	            }
-	            
-	            
-	         // HIGH MASS LIGHT
-
-	            if(response.is_hml === 'yes'){
-
-	                $('input[name="update_hmlAvailable"][value="yes"]')
-	                    .prop('checked', true);
-	                
-	                $('#update_hmlSection').show();
-
-	                $('#update_hmlCount')
-	                    .val(response.hml_count);
-
-	            }
-	            else if(response.is_hml === 'no'){
-
-	                $('input[name="update_hmlAvailable"][value="no"]')
-	                    .prop('checked', true);
-	                $('#update_hmlSection').hide();
-	            }
-	            else{
-	            	$('input[name="update_hmlAvailable"]').prop('checked', false);
-	            	$('#update_hmlSection').hide();
-	            }
-
-
-	            // BUS SHELTER
-
-	            if(response.is_busshelter === 'yes'){
-
-	                $('input[name="update_bsAvailable"][value="yes"]')
-	                    .prop('checked', true);
-
-	                $('#update_bsSection').show();
-
-	                $('#update_bsCount')
-	                    .val(response.busshelter_count);
-
-	            }
-	            else if(response.is_busshelter === 'no'){
-
-	                $('input[name="update_bsAvailable"][value="no"]')
-	                    .prop('checked', true);
-
-	                $('#update_bsSection').hide();
-	            }
-	            
-	            else{
-	            	$('input[name="update_bsAvailable"]').prop('checked', false);
-	            	$('#update_bsSection').hide();
-	            }
-
-	            // streetlight poles
-	            if(response.is_streetlight_poles === 'yes'){
-
-	                $('input[name="update_slpAvailable"][value="yes"]')
-	                    .prop('checked', true);
-
-	                $('#update_slpSection').show();
-
-	                $('#update_slpCount')
-	                    .val(response.streetlight_poles_count);
-
-	            }
-	            else if(response.is_streetlight_poles === 'no'){
-
-	                $('input[name="update_slpAvailable"][value="no"]')
-	                    .prop('checked', true);
-
-	                $('#update_slpSection').hide();
-	            }
-	            
-	            else{
-	            	$('input[name="update_slpAvailable"]').prop('checked', false);
-	            	$('#update_slpSection').hide();
-	            }
-	            
-	         // mini mass light
-	            if(response.is_mml === 'yes'){
-
-	                $('input[name="update_mmlAvailable"][value="yes"]')
-	                    .prop('checked', true);
-
-	                $('#update_mmlSection').show();
-
-	                $('#update_mmlCount')
-	                    .val(response.mml_count);
-
-	            }
-	            else if(response.is_mml === 'no'){
-
-	                $('input[name="update_mmlAvailable"][value="no"]')
-	                    .prop('checked', true);
-
-	                $('#update_mmlSection').hide();
-	            }
-	            
-	            else{
-	            	$('input[name="update_mmlAvailable"]').prop('checked', false);
-	            	$('#update_mmlSection').hide();
-	            }
-
-
-	            // CENTER MEDIAN
-
-	            if(response.is_centermedian === 'yes'){
-
-	                $('input[name="update_cmAvailable"][value="yes"]')
-	                    .prop('checked', true);
-
-	            }
-	            else if(response.is_centermedian === 'no'){
-
-	                $('input[name="update_cmAvailable"][value="no"]')
-	                    .prop('checked', true);
-
-	            }
-	            else{
-	            	$('input[name="update_cmAvailable"]').prop('checked', false);
-	            }
-	            
-	            
-	            
-	            $("#update_sewerLength")
-	            .val(response.sewer_length);
-
-		        $("#update_sewerSize")
-		            .val(response.sewer_size);
-	
-		        if(response.culvert_bridge_count){
-		        	$("#update_noofcb").val(response.culvert_bridge_count);
-		        }
-		        else{
-		        	$("#update_noofcb").val('');
-		        }
-		        
-		        if(response.culvert_bridge_count){
-		        	$("#update_detailsofcb").val(response.details);
-		        }
-		        else{
-		        	$("#update_detailsofcb").val('');
-		        }
-	            
-		        let container = $("#relayingContainer");
-		        container.empty();
-
-		        if (response.relayingDetails &&
-		            response.relayingDetails.length > 0) {
-
-		            $.each(response.relayingDetails, function(index, item) {
-
-		                container.append(createRelayBlock(item));
-
-		            });
-		        }
-		        
-		        $('#titleModalLabel').text(`Road War Details - ${response.ref_id}`);
-
-	            $("#roadWarModal").modal("show");
-
-	        },
-
-	        error: function () {
-
-	            Swal.fire({
-	                icon: 'error',
-	                title: 'Error',
-	                text: 'Unable to fetch details'
-	            });
-
-	        }
-
-	    });
-
-	}
-	$(document).on('click', '.removeRelayRow', function () {
-
-	    let totalRows = $('.relay-block').length;
-
-	    // If only one block exists, don't allow removal
-	    if (totalRows === 1) {
-
-	        Swal.fire(
-	            'Warning',
-	            'At least one relaying detail is required',
-	            'warning'
-	        );
-
-	        return;
-	    }
-
-	    $(this).closest('.relay-block').remove();
-	});
-	
-	
-	function createRelayBlock(item = {}) {
-
-	    let monthOptions =
-	        '<option value="">Select Month</option>';
-
-	    monthList.forEach(month => {
-
-	        monthOptions += `
-	            <option value="${month.id}"
-	                ${month.id == item.relay_month ? 'selected' : ''}>
-	                ${month.month_name}
-	            </option>`;
-	    });
-
-	    let yearOptions =
-	        '<option value="">Select Year</option>';
-
-	    yearList.forEach(year => {
-
-	        yearOptions += `
-	            <option value="${year.id}"
-	                ${year.id == item.relay_year ? 'selected' : ''}>
-	                ${year.year_name}
-	            </option>`;
-	    });
-
-	    let relayRoadMaterialOptions='<option value="">Select Material</option>';
-	    
-	    roadtypeMaterialList.forEach(roadtype => {
-	    	relayRoadMaterialOptions +=`
-	    		<option value = "${roadtype.id}" 
-	    		 ${roadtype.id == item.road_type_material ? 'selected' : ''}>
-	    		 ${roadtype.roadtype_material}
-	    		</option>
-	    	`;
-	    });
-	    
-	    return `
-	        <div class="relay-block border p-3 mb-3">
-
-	            <div class="row">
-
-	                <div class="col-md-2">
-	                    <label>Month of relaying<span class="text-danger">*</span></label>
-
-	                    <select class="form-control relay_month">
-	                        ${monthOptions}
-	                    </select>
-	                </div>
-
-	                <div class="col-md-2">
-	                    <label>Year of relaying<span class="text-danger">*</span></label>
-
-	                    <select class="form-control relay_year">
-	                        ${yearOptions}
-	                    </select>
-	                </div>
-	                
-	                <div class="col-md-2">
-	                    <label>Roadtype Material<span class="text-danger">*</span></label>
-	
-	                    <select class="form-control relay_roadtype_material">
-	                        ${relayRoadMaterialOptions}
-	                    </select>
-                	</div>
-
-	                <div class="col-md-3">
-	                    <label>Completion Report Value (CR)<span class="text-danger">*</span></label>
-
-	                    <input type="text"
-	                           class="form-control cr_value decimal-only"
-	                           value="${item.cr_value || ''}">
-	                </div>
-
-	                <div class="col-md-3">
-	                    <label>Type/subgrade base of the road<span class="text-danger">*</span></label>
-
-	                    <input type="text"
-	                           class="form-control road_type"
-	                           value="${item.road_type || ''}">
-	                </div>
-
-	                <div class="col-md-12 mt-3">
-	                    <label>Remarks Reg.type of relaying<span class="text-danger">*</span></label>
-
-	                    <textarea class="form-control remarks">${item.remarks || ''}</textarea>
-	                </div>
-
-	                <div class="col-md-12 mt-3 text-right">
-	                    <button type="button"
-	                            class="btn btn-danger btn-sm removeRelayRow">
-	                        Remove
-	                    </button>
-	                </div>
-
-	            </div>
-
-	        </div>
-	    `;
-	}
-	
-	$(document).on('click', '#btnAddRelay', function () {
-
-	    $('#relayingContainer')
-	        .append(createRelayBlock());
-
-	});
-	
-	function validateRelayingDetails() {
-
-	    let isValid = true;
-
-	    $('.relay-block').each(function(index) {
-
-	        let rowNo = index + 1;
-
-	        let month = $(this).find('.relay_month').val();
-	        let year = $(this).find('.relay_year').val();
-	        let roadtype_material = $(this).find('.relay_roadtype_material').val();
-	        let crValue = $(this).find('.cr_value').val();
-	        let roadType = $(this).find('.road_type').val();
-	        let remarks = $(this).find('.remarks').val();
-
-	        if (!month) {
-
-	            Swal.fire(
-	                'Warning',
-	                'Select Month of Relaying in Set ' + rowNo +' in Relaying Details',
-	                'warning'
-	            );
-
-	            isValid = false;
-	            return false;
-	        }
-
-	        if (!year) {
-
-	            Swal.fire(
-	                'Warning',
-	                'Select Year of Relaying in Set ' + rowNo+' in Relaying Details',
-	                'warning'
-	            );
-
-	            isValid = false;
-	            return false;
-	        }
-	        
-	        if (!roadtype_material) {
-
-	            Swal.fire(
-	                'Warning',
-	                'Select Roadtype material in Set ' + rowNo+' in Relaying Details',
-	                'warning'
-	            );
-
-	            isValid = false;
-	            return false;
-	        }
-
-	        if (!validatePositiveNumber(
-	                crValue,
-	                'CR Value in Set ' + rowNo
-	        )) {
-
-	            isValid = false;
-	            return false;
-	        }
-
-	        if ($.trim(roadType) === '') {
-
-	            Swal.fire(
-	                'Warning',
-	                'Enter Type/Subgrade Base of the Road in Set ' + rowNo+' in Relaying Details',
-	                'warning'
-	            );
-
-	            isValid = false;
-	            return false;
-	        }
-
-	        if ($.trim(remarks) === '') {
-
-	            Swal.fire(
-	                'Warning',
-	                'Enter Remarks in Set ' + rowNo+' in Relaying Details',
-	                'warning'
-	            );
-
-	            isValid = false;
-	            return false;
-	        }
-
-	    });
-
-	    return isValid;
-	}
-	
-	
-	
-	
-	function validatePositiveNumber(value, fieldName) {
-
-	    if (parseFloat(value) <= 0) {
-
-	        Swal.fire(
-	            'Warning',
-	            fieldName + ' must be valid number or greater than 0',
-	            'warning'
-	        );
-
-	        return false;
-	    }
-
-	    return true;
-	}
-	
-	function getRelayingDetails() {
-
-	    let relays = [];
-
-	    $('.relay-block').each(function () {
-
-	        relays.push({
-
-	            relay_month:
-	                $(this).find('.relay_month').val(),
-
-	            relay_year:
-	                $(this).find('.relay_year').val(),
-	                
-	            road_type_material:
-		            $(this).find('.relay_roadtype_material').val(),
-
-	            cr_value:
-	                $(this).find('.cr_value').val(),
-
-	            road_type:
-	                $(this).find('.road_type').val(),
-
-	            remarks:
-	                $(this).find('.remarks').val()
-
-	        });
-
-	    });
-
-	    return relays;
-	}
-	
-	$('#btnUpdateRoadWar').click(function () {
-		
-		let userId = document.getElementById('userIdSpan').textContent;
-
-	    let refId =
-	        $('#titleModalLabel')
-	        .text()
-	        .replace('Road War Details - ', '')
-	        .trim();
-
-	    if ($('#view_zone').val() === '') {
-	        Swal.fire('Warning','Select Zone','warning');
-	        return;
-	    }
-
-	    if ($('#view_ward').val() === '') {
-	        Swal.fire('Warning','Select Ward','warning');
-	        return;
-	    }
-
-	    if ($('#view_road_name').val() === '' || $('#view_road_name').val() ===null) {
-	        Swal.fire('Warning','Select Road','warning');
-	        return;
-	    }
-	    
-	    if ($('#view_areaname').val() === '') {
-	        Swal.fire('Warning','Enter Area name','warning');
-	        return;
-	    }
-	    
-	    if ($('#view_localityname').val() === '') {
-	        Swal.fire('Warning','Enter Locality name','warning');
-	        return;
-	    }
-	    
-
-	    if ($('#view_road_type').val() === '' || $('#view_road_type').val() ===null ) {
-	        Swal.fire('Warning','Select Road Type','warning');
-	        return;
-	    }
-	    
-	    if ($('#view_roadtype_material').val() === '') {
-	        Swal.fire('Warning','Select Roadtype Material','warning');
-	        return;
-	    }
-	    	    
-	    if (!$('#view_road_length').val()) {
-		    Swal.fire("Missing Field", "Please enter Road Length.", "warning");
-		    return;
-		}
-		
-/* 		if (!$('#view_road_row_width').val()) {
-		    Swal.fire("Missing Field", "Please enter Right of Way Width.", "warning");
-		    return;
-		}
-					
-		if (!$('#view_road_avg_width').val()) {
-		    Swal.fire("Missing Field", "Please enter Average Width.", "warning");
-		    return;
-		} */
-
-		// Area						
-		if (!$('#view_road_area').val()) {
-		    Swal.fire("Missing Field", "Please enter Road Area.", "warning");
-		    return;
-		}
-	    if (!validatePositiveNumber($('#view_road_length').val(),'Road Length')) return;	    
-	    if (!validatePositiveNumber($('#view_road_row_width').val(),'Right of Way(ROW) Width')) return;
-	    if (!validatePositiveNumber($('#view_road_avg_width').val(),'Road Average Width')) return;
-	    if (!validatePositiveNumber($('#view_road_area').val(),'Area of Road')) return;
-	    
-	    
-	    if (!validatePositiveNumber($('#view_road_min_width').val(),'Road Min Width')) return;
-	    if (!validatePositiveNumber($('#view_road_max_width').val(),'Road Max Width')) return;
-	    
-	    
-	    let footpathfrom=$("#view_footPathFrom").val().trim();
-		let footpathto=$("#view_footPathTo").val().trim();
-		
-		let footpathat =$("#view_fpat").val() ;
-		
-		let footpathDropdown =$("#view_footpath_material").val() ;						
-		let fpLen = $("#view_footpath_length").val().trim();
-		let fpWidth = $("#view_fpwidth").val().trim();
-		
-		let rhs_footpathDropdown =$("#view_rfootpath_material").val() ;						
-		let rhs_fplength = $("#view_rfootpath_length").val().trim();
-		let rhs_fpwidth = $("#view_rfpwidth").val().trim();
-	    
-		if(footpathat){
-			if(footpathat==='1'){
-				if (!footpathDropdown) {
-				    Swal.fire("Missing Field", "Please select LHS Footpath Material Type", "warning");					    
-				    return;
-				}
-				if (!fpLen) {
-				    Swal.fire("Missing Field", "Please enter LHS Length of Footpath", "warning");					    
-				    return;
-				}
-				if (!fpWidth) {
-				    Swal.fire("Missing Field", "Please enter LHS Average Width of Footpath", "warning");					    
-				    return;
-				}
-			}
-			if(footpathat==='2'){
-				if (!rhs_footpathDropdown) {
-				    Swal.fire("Missing Field", "Please select RHS Footpath Material Type", "warning");					    
-				    return;
-				}
-				if (!rhs_fplength) {
-				    Swal.fire("Missing Field", "Please enter RHS Length of Footpath", "warning");					    
-				    return;
-				}
-				if (!rhs_fpwidth) {
-				    Swal.fire("Missing Field", "Please enter RHS Average Width of Footpath", "warning");					    
-				    return;
-				}
-			}
-			if(footpathat==='3'){
-				if (!footpathDropdown) {
-				    Swal.fire("Missing Field", "Please select LHS Footpath Material Type", "warning");					    
-				    return;
-				}
-				if (!fpLen) {
-				    Swal.fire("Missing Field", "Please enter LHS Length of Footpath", "warning");					    
-				    return;
-				}
-				if (!fpWidth) {
-				    Swal.fire("Missing Field", "Please enter LHS Average Width of Footpath", "warning");					    
-				    return;
-				}
-				if (!rhs_footpathDropdown) {
-				    Swal.fire("Missing Field", "Please select RHS Footpath Material Type", "warning");					    
-				    return;
-				}
-				if (!rhs_fplength) {
-				    Swal.fire("Missing Field", "Please enter RHS Length of Footpath", "warning");					    
-				    return;
-				}
-				if (!rhs_fpwidth) {
-				    Swal.fire("Missing Field", "Please enter RHS Average Width of Footpath", "warning");					    
-				    return;
-				}
-			}
-		}
-		
-		if (!validatePositiveNumber(fpLen, "LHS Footpath Length")) return;
-		if (!validatePositiveNumber(fpWidth, "LHS Footpath Width")) return;
-		if (!validatePositiveNumber(rhs_fplength, "RHS Footpath Length")) return;
-		if (!validatePositiveNumber(rhs_fpwidth, "RHS Footpath Width")) return;
-	    
-		let swdVal = $('input[name="update_swdAvailable"]:checked').val();
-		let scpVal = $('input[name="update_scpAvailable"]:checked').val() || "";
-		let mhVal = $('input[name="update_mhAvailable"]:checked').val();	
-		let cpVal = $('input[name="update_cpAvailable"]:checked').val();
-		let rwVal = $('input[name="update_rwAvailable"]:checked').val();
-		
-		let swd_at =$("#swd_at").val();
-		let scp_at=$("#scp_at").val();
-		let mhType=$("#update_mhType").val();
-		let cp_at=$("#cp_at").val();
-		let rwh_at=$("#rwh_at").val();
-	 	  
-	 	 if (swdVal === "yes") {
-
-				let swdlength=$("#update_swdlength").val().trim();
-				let swdsize=$("#update_size").val().trim();
-				let rhs_swdlength=$("#rhs_swdlength").val().trim();
-				let rhs_swdsize=$("#rhs_swdsize").val().trim();
-				
-				
-				if(swd_at){
-					if(swd_at==='1'){
-						
-						if (!swdlength) {
-						    Swal.fire("Missing Field", "Please enter LHS SWD Length", "warning");					    
-						    return;
-						}
-						if (!swdsize) {
-						    Swal.fire("Missing Field", "Please enter LHS SWD Size", "warning");					    
-						    return;
-						}
-					}
-					if(swd_at==='2'){
-						
-						if (!rhs_swdlength) {
-						    Swal.fire("Missing Field", "Please enter RHS SWD Length", "warning");					    
-						    return;
-						}
-						if (!rhs_swdsize) {
-						    Swal.fire("Missing Field", "Please enter RHS SWD Size", "warning");					    
-						    return;
-						}
-					}
-					if(swd_at==='3'){
-						
-						if (!swdlength) {
-						    Swal.fire("Missing Field", "Please enter LHS SWD Length", "warning");					    
-						    return;
-						}
-						if (!swdsize) {
-						    Swal.fire("Missing Field", "Please enter LHS SWD Size", "warning");					    
-						    return;
-						}
-						
-						if (!rhs_swdlength) {
-						    Swal.fire("Missing Field", "Please enter RHS SWD Length", "warning");					    
-						    return;
-						}
-						if (!rhs_swdsize) {
-						    Swal.fire("Missing Field", "Please enter RHS SWD Size", "warning");					    
-						    return;
-						}
-					}
-				}
-				
-				
-				
-
-			    if (!validatePositiveNumber(swdlength, "LHS SWD Length")) return;			   
-			    if (!validatePositiveNumber(swdsize, "LHS SWD Size")) return;
-			    
-			    if (!validatePositiveNumber(rhs_swdlength, "RHS SWD Length")) return;			   
-			    if (!validatePositiveNumber(rhs_swdsize, "RHS SWD Size")) return;
-
-			   
-			}
-	 	  
-	 	if(scpVal==="yes"){
-			
-			let scpCount =$("#update_scpCount").val().trim();
-			let rhs_scpCount =$("#rhs_scpCount").val().trim();
-			
-			if(scp_at){
-				if(scp_at==='1'){
-					
-					if (!scpCount) {
-					    Swal.fire("Missing Field", "Please enter LHS Slit catch pit Count", "warning");					    
-					    return;
-					}
-				}
-				if(scp_at==='2'){
-					
-					if (!rhs_scpCount) {
-					    Swal.fire("Missing Field", "Please enter RHS Slit catch pit Count", "warning");					    
-					    return;
-					}
-				}
-				if(scp_at==='3'){
-					
-					if (!scpCount) {
-					    Swal.fire("Missing Field", "Please enter LHS Slit catch pit Count", "warning");					    
-					    return;
-					}
-					if (!rhs_scpCount) {
-					    Swal.fire("Missing Field", "Please enter RHS Slit catch pit Count", "warning");					    
-					    return;
-					}												
-				}
-			}
-			
-			
-			 if (!validatePositiveNumber(scpCount, "LHS Slit catch pit Count")) return;
-			 if (!validatePositiveNumber(rhs_scpCount, "RHS Slit catch pit Count")) return;
-		
-		}
-	 	
-	 	if(mhVal==="yes"){
-			
-			let mhCount =$("#update_mhCount").val().trim();
-			let r_mhCount =$("#r_mhCount").val().trim();
-			
-			
-			if(mhType){
-				if(mhType==='1'){
-					
-					if (!mhCount) {
-					    Swal.fire("Missing Field", "Please enter LHS Manhole Count", "warning");					    
-					    return;
-					}
-				}
-				if(mhType==='2'){
-					
-					if (!r_mhCount) {
-					    Swal.fire("Missing Field", "Please enter RHS Manhole Count", "warning");					    
-					    return;
-					}
-				}
-				if(mhType==='3'){
-					
-					if (!mhCount) {
-					    Swal.fire("Missing Field", "Please enter LHS Manhole Count", "warning");					    
-					    return;
-					}
-					if (!r_mhCount) {
-					    Swal.fire("Missing Field", "Please enter RHS Manhole Count", "warning");					    
-					    return;
-					}												
-				}
-			}
-			
-			
-			if (!validatePositiveNumber(mhCount, "LHS Manhole Count")) return;
-			if (!validatePositiveNumber(r_mhCount, "RHS Manhole Count")) return;
-			
-		}
-	 	
-	 	if(cpVal === "yes"){
-			
-			let cpCount =$("#update_cpCount").val().trim();
-			let  r_cpCount=$("#r_cpCount").val().trim();
-							
-			
-			if(cp_at){
-				if(cp_at==='1'){
-					
-					if (!cpCount) {
-					    Swal.fire("Missing Field", "Please enter LHS ChutPipe Count", "warning");					    
-					    return;
-					}
-				}
-				if(cp_at==='2'){
-					
-					if (!r_cpCount) {
-					    Swal.fire("Missing Field", "Please enter RHS ChutPipe Count", "warning");					    
-					    return;
-					}
-				}
-				if(cp_at==='3'){
-					
-					if (!cpCount) {
-					    Swal.fire("Missing Field", "Please enter LHS ChutPipe Count", "warning");					    
-					    return;
-					}
-					if (!r_cpCount) {
-					    Swal.fire("Missing Field", "Please enter RHS ChutPipe Count", "warning");					    
-					    return;
-					}												
-				}
-			}
-			
-			if (!validatePositiveNumber(cpCount, "LHS ChutPipe Count")) return;
-			if (!validatePositiveNumber(r_cpCount, "RHS ChutPipe Count")) return;
-			
-		}
-	 	
-	 	if(rwVal === "yes"){
-			
-			let rwCount =$("#update_rwCount").val().trim();
-			let r_rwCount =$("#r_rwCount").val().trim();
-			
-			if(rwh_at){
-				if(rwh_at==='1'){
-					
-					if (!rwCount) {
-					    Swal.fire("Missing Field", "Please enter LHS Rain Water Harvesting Count", "warning");					    
-					    return;
-					}
-				}
-				if(rwh_at==='2'){
-					
-					if (!r_rwCount) {
-					    Swal.fire("Missing Field", "Please enter RHS Rain Water Harvesting Count", "warning");					    
-					    return;
-					}
-				}
-				if(rwh_at==='3'){
-					
-					if (!rwCount) {
-					    Swal.fire("Missing Field", "Please enter LHS Rain Water Harvesting Count", "warning");					    
-					    return;
-					}
-					if (!r_rwCount) {
-					    Swal.fire("Missing Field", "Please enter RHS Rain Water Harvesting Count", "warning");					    
-					    return;
-					}												
-				}
-			}
-			
-			
-			if (!validatePositiveNumber(rwCount, "LHS Rain Water Harvesting Count")) return;
-			if (!validatePositiveNumber(r_rwCount, "RHS Rain Water Harvesting Count")) return;
-							
-		}
-	    
-	    if($('input[name="update_epAvailable"]:checked').val() === 'yes'){
-	    	if ($('#update_epCount').val().trim() === '') {
-		        Swal.fire('Warning','Enter Electricity Pole Count','warning');
-		        return;
-		    }
-	    }
-	    
-	    if($('input[name="update_bsAvailable"]:checked').val() === 'yes'){
-	    	if ($('#update_bsCount').val().trim() === '') {
-		        Swal.fire('Warning','Enter Bus Shelter Count','warning');
-		        return;
-		    }
-	    }
-	    
-	    if($('input[name="update_slpAvailable"]:checked').val() === 'yes'){
-	    	if ($('#update_slpCount').val().trim() === '') {
-		        Swal.fire('Warning','Enter Street Light Poles Count','warning');
-		        return;
-		    }
-	    }
-	    
-	    if($('input[name="update_hmlAvailable"]:checked').val() === 'yes'){
-	    	if ($('#update_hmlCount').val().trim() === '') {
-		        Swal.fire('Warning','Enter High Mass Light Count','warning');
-		        return;
-		    }
-	    }
-	    
-	    if($('input[name="update_mmlAvailable"]:checked').val() === 'yes'){
-	    	if ($('#update_mmlCount').val().trim() === '') {
-		        Swal.fire('Warning','Enter Mini Mass Light Count','warning');
-		        return;
-		    }
-	    }
-	    
-	    
-	    let cbCount = $('#update_noofcb').val().trim();
-
-	    if (cbCount !== '' && (!/^[1-9]\d*$/.test(cbCount))) {
-
-	        Swal.fire(
-	            'Warning',
-	            'No. of Culvert/Bridge must be a positive number and should not start with 0',
-	            'warning'
-	        );
-
-	        return;
-	    }
-	    
-	    if (!validateRelayingDetails()) {
-	        return;
-	    }
-
-	    let payload = {
-
-	        ref_id: refId,
-
-	        zone: $('#view_zone').val(),
-
-	        ward: $('#view_ward').val(),
-
-	        road_name: $('#view_road_name option:selected').text(),
-
-	        road_id: $('#view_road_name').val(),
-	        
-	        road_areaname: $('#view_areaname').val(),
-	        road_localityname: $('#view_localityname').val(),
-	        road_type: $('#view_road_type').val(),
-	        
-	        road_type_material: $('#view_roadtype_material').val(),
-	        road_length: $('#view_road_length').val(),
-	        road_row_width: $('#view_road_row_width').val()|| null,
-	        road_avg_width:$('#view_road_avg_width').val()|| null,
-	            
-	        road_min_width:$('#view_road_min_width').val()|| null,
-	        road_max_width:$('#view_road_max_width').val()|| null,
-
-	        road_area:$('#view_road_area').val(),
-	        
-	        road_from:$('#view_roadFrom').val()|| null,
-	        road_to:$('#view_roadTo').val()|| null,
-	        
-	        is_footpath:$('input[name="view_fpAvailable"]:checked').val(),
-	        footpath_from_location:$('#view_footPathFrom').val()|| null,
-	        footpath_to_location:$('#view_footPathTo').val()|| null,
-	        footpath_at:$('#view_fpat').val()|| null,
-	        
-	        footpath_material:$('#view_footpath_material').val()|| null,	        
-	        footpath_length:$('#view_footpath_length').val()|| null,
-	        footpath_width:$('#view_fpwidth').val()|| null,
-	       
-	        rhs_footpathDropdown :$("#view_rfootpath_material").val() || null,						
-			rhs_fplength : $("#view_rfootpath_length").val().trim()|| null,
-			rhs_fpwidth :$("#view_rfpwidth").val().trim()|| null,
-
-	        is_swd:$('input[name="update_swdAvailable"]:checked').val()|| null,	
-	        swd_from:$('#update_fromswd').val()|| null,
-	        swd_to:$('#update_toswd').val()|| null,
-
-	        swd_at :$("#swd_at").val()|| null,
-	        
-	        swd_length:$('#update_swdlength').val()|| null,
-	        swd_size:$('#update_size').val()|| null,
-	        rhs_swdlength: $("#rhs_swdlength").val() || null,
-			rhs_swdsize:  $("#rhs_swdsize").val() || null,
-
-	        is_scp:$('input[name="update_scpAvailable"]:checked').val()|| null,
-	        scp_at:$("#scp_at").val()|| null,				
-			scp_count: $("#update_scpCount").val().trim() ||  null,
-			rhs_scpCount: $("#rhs_scpCount").val().trim() ||  null,
-			
-
-	        is_manhole:$('input[name="update_mhAvailable"]:checked').val()|| null,
-	        manhole_at:$('#update_mhType').val()|| null,
-	        manhole_count:$('#update_mhCount').val()|| null,
-	        r_mhCount: $("#r_mhCount").val().trim() || null,
-	       
-
-	        is_cpipe:$('input[name="update_cpAvailable"]:checked').val()|| null,
-	        cp_at:$("#cp_at").val()|| null,
-	        cpipe_count:$('#update_cpCount').val()|| null,
-	        r_cpCount:$("#r_cpCount").val().trim() || null,
-
-	        is_rwh:$('input[name="update_rwAvailable"]:checked').val()|| null,
-	        rwh_at :$("#rwh_at").val()|| null,
-	        rwh_count:$('#update_rwCount').val()|| null,
-	        r_rwCount:$("#r_rwCount").val().trim() || null,
-	        
-	        is_electric_poles:
-	            $('input[name="update_epAvailable"]:checked').val()|| null,
-
-	        ep_count:
-	            $('#update_epCount').val()|| null,
-	            
-	        is_streetlight_poles:$('input[name="update_slpAvailable"]:checked').val()|| null,
-	        streetlight_poles_count:$('#update_slpCount').val()|| null,
-
-	        is_hml:$('input[name="update_hmlAvailable"]:checked').val()|| null,
-	        hml_count:$('#update_hmlCount').val()|| null,
-
-	        is_mml:$('input[name="update_mmlAvailable"]:checked').val()|| null,
-	        mml_count:$('#update_mmlCount').val()|| null,	        
-	        
-	        is_busshelter:
-	            $('input[name="update_bsAvailable"]:checked').val()|| null,
-
-	        busshelter_count:
-	            $('#update_bsCount').val()|| null,
-
-	        is_centermedian:
-	            $('input[name="update_cmAvailable"]:checked').val()|| null,
-
-	        sewer_length:
-	            $('#update_sewerLength').val()|| null,
-
-	        sewer_size:
-	            $('#update_sewerSize').val()|| null,
-
-	        culvert_bridge_count:
-	            $('#update_noofcb').val()|| null,
-
-	        details:
-	            $('#update_detailsofcb').val()|| null,
-
-	        updated_by: userId,
-
-	        relaying_details:
-	            getRelayingDetails()
-
-	    };
-
-	    console.log(payload);
-
-	    $.ajax({
-
-	        url:
-	            '/gcc/api/roadwarweb/register/updateRoadWarDetails',
-
-	        type: 'POST',
-
-	        contentType: 'application/json',
-
-	        data: JSON.stringify(payload),
-
-	        beforeSend: function () {
-	            $("#pageLoader").show();
-	        },
-
-	        success: function (response) {
-
-	            if (response.status) {
-
-	                Swal.fire(
-	                    'Success',
-	                    response.message,
-	                    'success'
-	                );
-
-	                $('#roadWarModal').modal('hide');
-
-	                loadRoadWarDetails();
-
-	            } else {
-
-	                Swal.fire(
-	                    'Error',
-	                    response.message,
-	                    'error'
-	                );
-	            }
-	        },
-
-	        error: function () {
-
-	            Swal.fire(
-	                'Error',
-	                'Failed to update record',
-	                'error'
-	            );
-	        },
-
-	        complete: function () {
-	            $("#pageLoader").hide();
-	        }
-	    }); 
-
-	});
-	
-	</script>
-	
-	
-	
-	
-	</body>
-	</html>
diff --git a/src/main/resources/templates/modules/school/.DS_Store b/src/main/resources/templates/modules/school/.DS_Store
deleted file mode 100644
index de5dcf8181f4f91df0e6e7d5ebc1010ef00338e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMOK#gR5FI92q{zQ<(rgOo1OajbHE<VQXCE}S6+5UT8jg&jn?UOX1$u&Bp~vV&
zy6zR)H$x(!q|&fAMT-m#au|v4iF`AZFboly^ZDqE=!A$iQQ7Wqq4`7M`&>I^&0k@#
z0iGzQjD}RvjBYxk^@1v(3aA3AfGVI0{0j=;o6Ti2^4)iLwN(XFfoG`zzaJ7*wyC$Z
zv-0XdBPjsv1};lMA9;Xa5^qy)Yi9)tPM19x4>dl;Fb<CU2@i)&y{(;fa54@~#y{Ek
z48_RPflFjKnbcWrRRL9?s{rTjujq<K_+^d!eTb_$>Med5a{5!6pe-nWm)qeWw*w$~
zv%Nt*{UrrGqGQi?O>>+BlsE~fq?awh^{vI#3or%xCF&TnDNxJ!oXqPM&khYRha0SC
zgti1nWHsiYh1>;#HJE_GqBq0e5v(ZjHBjOu#_~x>Ngw=EKZ2pc+-Fe^Rv_d!!szf+
zrR|m57?WraGWBSYN8&uJNXWB;wN#>si;F0d^)S1E9^0Zrg%hHQ_%Eg-G-%)spnN45
zR-a?>3UkQel?Vf`y}__YQ;FqI@cayHbND3cM~;C8dK;Jw3>LP6idNzXUhM9KwadnO
zBe;Bgb}_WY6w0D}zDE;%Mq&GXzuWMMtAAMYop;=V@uQW-PbcAAzVL*a+)<UqzjwiU
zUx>CAyEEb!V$X(%y+_2;dnWok@oI=ZKm>3sT;sP~T(D<DhC^YP3!2|2OR>nhe+KLB
zwOH8eV?-#=ZoyvXIBUgAh1lZA<``eBL->65nHE)GRRz`^;A9K-ZT$RyRazad3aA4A
zkpgC;f6+h3gne$^nL6j%3F>=PE<CPwRv>639fy^49QN@ahUh04%9zyK+F4vd`RfM(
N`u!K(wRzqO{01%cyx0H$

diff --git a/src/main/resources/templates/modules/school/addelectricalasset.html b/src/main/resources/templates/modules/school/addelectricalasset.html
deleted file mode 100644
index 0b73070b..00000000
--- a/src/main/resources/templates/modules/school/addelectricalasset.html
+++ /dev/null
@@ -1,740 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-	<title>Add Electrical Asset In Master</title>
-	<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-	<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
-	
-</head>			
-
-
-<style>
-		
-/* Remove background image from the container itself */
-.select2-container--default .select2-selection--multiple {
-    padding-right: 30px;
-    min-height: 38px;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    position: relative; /* important for the ::after */
-    background-image: none;
-}
-
-/* Add the dropdown arrow via a pseudo-element */
-.select2-container--default .select2-selection--multiple::after {
-    content: "";
-    position: absolute;
-    top: 50%;
-    right: 8px;
-    width: 14px;
-    height: 14px;
-    transform: translateY(-50%);
-    background-image: url("data:image/svg+xml;utf8,<svg fill='gray' height='20' viewBox='0 0 24 24' width='20' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/></svg>");
-    background-repeat: no-repeat;
-    background-size: contain;
-    pointer-events: none;
-}
-
-/* Each selected tag */
-.select2-container--default .select2-selection--multiple .select2-selection__choice {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 5px 10px;
-    margin: 4px 4px 0 0;
-    background-color: #f5f5f5;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 13px;
-    line-height: 1.4;
-    max-width: 100%;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-/* The text inside the tag */
-.select2-container--default .select2-selection--multiple .select2-selection__choice__display {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    flex: 1;
-    margin-right: 8px;
-}
-
-/* The "X" close icon */
-.select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
-    position: static;
-    transform: none;
-    color: #333;
-    font-size: 14px;
-    font-weight: bold;
-    cursor: pointer;
-    background: transparent;
-    border: none;
-    line-height: 1;
-}
-.custom-card-wrapper {
-  padding: 0;
-  margin-top: -58px;
-  margin-left: -233px;
-}
-
-@media (max-width: 768px) {
-  .custom-card-wrapper {
-    margin-left: 0;
-    margin-top: 0;
-    padding: 10px;
-  }
-}
-
-
-		
-	
-</style>
-
-
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="card">
-				<div class="main-content" style="background-color: white;">
-					<div class="container">
-						<!-- Card 2: Other Details -->
-						<div class="col-md-12">
-						<div class="custom-card-wrapper">
-							<!--  <div style="padding: 0px;margin-top:-58px;margin-left: -233px;">-->
-								<div class="card-header d-flex justify-content-between align-items-center">
-								    <b>List of Electrical Assets</b>
-								    <button type="button" class="btn btn-primary add-ebtn"> <i class="ik ik-plus"></i>Add Assets</button>
-								</div>															
-								<div class="card-body" style="padding: 5px;">
-									<table id="EAssetManageDatatable"
-										class="table table-striped table-bordered table-hover dataTable" role="grid"
-										style="width: 100%">
-										<thead class="thead-dark">
-											<tr>
-												<th>S.NO</th>
-												<th>ASSET TYPE</th>
-												<th>MASTER QTY</th>
-												<th>MAPPED QTY</th>
-												<th>UNMAPPED QTY</th>												
-												<th>ACTION</th>
-											</tr>
-										</thead>
-										<tbody>
-										
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="pageLoader"
-						style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-						<div style="position: relative; top: 50%; transform: translateY(-50%);">
-							<div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-								<span class="sr-only">Loading...</span>
-							</div>
-							<!-- Add the 'Please wait' text below the spinner -->
-							<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-						</div>
-					</div>
-
-				</div>
-			</div>
-		</div>
-		</div>
-		
-	<div class="modal fade" id="AddEAssetModal" tabindex="-1" role="dialog" aria-labelledby="AddEAssetModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-			<div class="modal-dialog modal-lg" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-						     Add Electrical Assets
-						</h5>
-						<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-	
-					<div class="modal-body">
-						<div class="row">
-						
-						 <div class="form-group col-6">
-				            <label>Select Asset <span style="color: red;">*</span></label>
-				            <select id="subAssetType" class="form-control" multiple></select>
-				        </div>	
-						
-						</div>
-						<div id="selectedAssetsContainer" class="mt-3"></div>
-
-						<div class="row pb-2 mt-4" id="savingcontainer" style="display: none;">
-							<div class="col-12 d-flex justify-content-center">								
-								<button type="button" class="btn btn-primary" id="savingEAsset">Save</button>
-							</div>
-						</div>
-					</div>
-					<div class="modal-footer">
-							<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>							
-					</div>
-					
-				</div>
-			</div>
-		</div>
-		
-		
-		<div class="modal fade" id="EditEAssetModal" tabindex="-1" role="dialog" aria-labelledby="EditEAssetModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-			<div class="modal-dialog modal-lg" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-						    <span id="Eeditassetname"></span> - Edit Electrical Asset
-						</h5>
-						<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-	
-					<div class="modal-body">					
-						
-						<span id="Eeditid" style="display: none;"></span>
-					<div class="row">
-						<div class="form-group col-6">
-						    <label for="Emaster_qty">Master Quantity &nbsp;<!-- (&nbsp;Already in master&nbsp;<span id="AEmaster_qty" style="font-style: italic;font-weight: bold;"></span>&nbsp;) --><span class="text-danger">*</span></label>
-        					<input type="text" class="form-control" id="Emaster_qty" name="Emaster_qty">						    
-						</div>											
-						
-						<div class="form-group col-6">
-						    <label for="Emapped_qty">Mapped Quantity</label>
-        					<input type="text" class="form-control" id="Emapped_qty" name="Emapped_qty" readonly>						    
-						</div>
-						
-						<div class="form-group col-6">
-						    <label for="">Unmapped Quantity</label>
-        					<input type="text" class="form-control" id="Eunmapped_qty" name="Eunmapped_qty" readonly>						    
-						</div>
-												
-							    	
-						</div>						
-						
-						<div class="row pb-2 mt-4">
-							<div class="col-12 d-flex justify-content-center">								
-								<button type="button" class="btn btn-primary" id="UpdatingEAsset">Update</button>
-							</div>
-						</div>
-					</div>
-					<div class="modal-footer">
-							<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>							
-					</div>
-					
-				</div>
-			</div>
-		</div>
-
-		<script th:replace="~{fragments/modules/base/script :: script}"></script>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-		<script type="text/javascript">
-
-		console.log("hi electrical assets...");
-		  $(document).ready(function () {
-			  $('#Emaster_qty').on('input', function() {
-			        this.value = this.value.replace(/[^0-9]/g, '');
-			    });
-			  
-			  let ElectricalAsseturlParams = new URLSearchParams(window.location.search);
-				let EAssetschoolId = ElectricalAsseturlParams.get("schoolId");
-			  
-				loadEAsset(EAssetschoolId);
-			   // Only run after DOM and libraries are ready
-
-            $('#subAssetType').on('select2:opening', function() {
-                setTimeout(() => {
-                    $('.select2-search__field').prop('readonly', true); // disable typing
-                }, 0);
-            });
-			   
-            if (!window.EassetEventsBound) {
-			    
-            	$(document).on('click', '.add-ebtn', function () {
-            	    handleAddEAsset(EAssetschoolId);
-            	});
-            	
-            	$(document).on('click', '#savingEAsset', function () {
-            	    handleSaveEAsset(EAssetschoolId);
-            	});
-            	
-            	$(document).on('click', '.edit-btne', handleEAssetEdit);
-            	
-            	 $(document).on('click', '#UpdatingEAsset', handelEditEAsset);
-			    
-						    
-			    window.EassetEventsBound = true;
-			}
-		  
-            
-           $('#subAssetType').on('change', function () {
-        	   console.log("hi...");
-        	    const selectedOptions = $(this).find('option:selected');
-        	    const $container = $('#selectedAssetsContainer');
-        	    $container.empty(); // Clear previous entries
-
-        	    if (selectedOptions.length >= 1) {
-        	        $('#savingcontainer').show();
-        	    } else {
-        	        $('#savingcontainer').hide();
-        	    }
-
-        	    let labelRow = '';
-        	    let inputRow = '';
-        	    let counter = 0;
-
-        	    selectedOptions.each(function (index) {
-        	        const assetName = $(this).text();
-        	        const assetId = $(this).val();
-
-        	        // Start new row every 3 items
-        	        if (counter % 3 === 0) {
-        	            if (labelRow || inputRow) {
-        	                labelRow += '</div>';
-        	                inputRow += '</div>';
-        	                $container.append(labelRow);
-        	                $container.append(inputRow);
-        	            }
-        	            labelRow = '<div class="row mb-1">';
-        	            inputRow = '<div class="row mb-3">';
-        	        }
-
-        	        labelRow += `
-        	            <div class="col-md-4">
-        	                <label><b>${assetName}</b></label>
-        	            </div>
-        	        `;
-
-        	        inputRow += `
-        	            <div class="col-md-4">
-        	        	<input type="number" class="form-control asset-quantity-input" name="assetQuantity_${assetId}" placeholder="Enter Quantity" min="0">
-        	            </div>
-        	        `;
-
-        	        counter++;
-        	    });
-
-        	    // Append remaining items
-        	    if (labelRow || inputRow) {
-        	        labelRow += '</div>';
-        	        inputRow += '</div>';
-        	        $container.append(labelRow);
-        	        $container.append(inputRow);
-        	    }
-        	});
-        // Add an event listener to all input fields with the class 'asset-quantity-input'
-           $(document).on('input', '.asset-quantity-input', function() {
-               // Replace any character that is NOT a digit with an empty string
-               this.value = this.value.replace(/[^0-9]/g, '');
-           });
-          
-        });
-		
-		  
-		  
-		  function handleEAssetEdit(){
-				
-				console.log("Button clicked");
-				let id = $(this).data('id');
-				console.log("id=" + id);
-				
-				$.ajax({
-			        type: "GET",
-			        url: "/gcc/api/gccschool/schoolproperty/getAssetMasterById",
-			        data: { assetMasterId: id,asset_id:2 },
-			        success: function (response) {
-			            if (response.status === "Success" && response.data) {
-			                let data = response.data;
-
-			                // Populate modal fields
-			                $('#Eeditassetname').text(data.asset_name || '');
-			                //$('#Emaster_qty').val(data.master_qty || '');
-			                $('#Emapped_qty').val(data.mapped_qty || '');
-			                $('#Eunmapped_qty').val(data.unmapped_qty || '');
-			                
-			                
-			                $('#Eeditid').val(data.electrical_master_id);
-			                
-			                $('#AEmaster_qty').text(data.master_qty || '');
-
-			                // Show the modal
-			                $('#EditEAssetModal').modal('show');
-			            } else {
-			                Swal.fire('Error', 'Unable to fetch Electrical asset details.', 'error');
-			            }
-			        },
-			        error: function (xhr, status, error) {
-			            console.error('Error fetching Electrical asset:', error);
-			            Swal.fire('Error', 'Server error while fetching Electrical asset.', 'error');
-			        }
-			    });
-				
-			}
-		  
-		  function loadEAsset(schoolId) {
-				//console.log("vvvvvvvvvv");
-				var buttons = [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'Excel',
-						className: 'btn btn-secondary',
-						id: 'excelBtn',
-						title: 'Electrical Asset List'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn',
-						title: 'Electrical Asset List'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						title: 'Electrical Asset List'
-					},
-					{
-						extend: 'print',
-						text: 'Print',
-						className: 'btn btn-secondary',
-						id: 'printBtn',
-						title: 'Electrical Asset List',
-						exportOptions: {
-							columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-						}
-					}
-				];
-				
-			    $.get('/gcc/api/gccschool/schoolproperty/getAssetMaster', {school_id: schoolId,asset_id:2}, res => {
-			        if ($.fn.DataTable.isDataTable('#EAssetManageDatatable')) {
-			            $('#EAssetManageDatatable').DataTable().clear().destroy(true);
-			        }
-					
-			        //console.log("hello");
-			        let tableData = [];
-			        if (res.status === "Success" && Array.isArray(res.data)) {
-			        	//console.log("res.data="+res.data);
-			            tableData = res.data;
-			        }
-
-			        $('#EAssetManageDatatable').DataTable({
-			            data: tableData,
-			            columns: [
-			                {data: null, render: (d, t, r, m) => m.row + 1, className: 'text-center'},
-			                {data: 'asset_name',className: 'text-center'},
-			                {data: 'master_qty',className: 'text-center'},
-			                {
-			                	  data: 'mapped_qty',className: 'text-center',
-			                	  render: data => data != null ? data : '-'
-			                	},
-			                	{
-			                	  data: 'unmapped_qty',className: 'text-center',
-			                	  render: data => data != null ? data : '-'
-			                	},
-			                	
-			                {
-			                    data: 'electrical_master_id',
-			                    render: (data, t, row) => `
-			                        <div class="text-center">
-			                            <button class="btn btn-sm btn-success edit-btne" data-id="${row.electrical_master_id}" ><i class="ik ik-edit-2" style="font-size:medium;margin-left:5px;"></i></button>
-			                        </div>`, className: 'text-center'
-			                }
-			            ],
-			            lengthMenu: [
-			                [50, 100, 200, 500, -1],
-			                ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-			            ],
-			            dom: 'Bftip',			          
-			            //fixedColumns: {left: 0, right: 0},
-			            scrollY: '70vh',
-			            scrollX: true,
-			            autoWidth: true,           	                
-  	                	paging: true,
-  	                	info: true,
-			            buttons: buttons,
-			            responsive: false,
-			            searching: true,
-			            select: false,
-			            processing: false,
-			            language: {
-			                emptyTable: '<span class="text-danger">No Details found</span>'
-			            }
-			        });
-			        
-			    });
-			}
-		  
-		  function loadsubassets(schoolId) {
-              $.ajax({
-                  url: '/gcc/api/gccschool/dropdown/getSplSubAssetType',
-                  type: 'GET',
-                  data: { school_id:schoolId,assetid: 2 },
-                  success: function (response) {
-                      const $court = $('#subAssetType');
-                      $court.empty();                    
-  					
-                      if (response.status === 'OK' && Array.isArray(response.data)) {
-                          response.data.forEach(item => {
-                              $court.append(`<option value="${item.sub_asset_id}">${item.asset_name}</option>`);
-                          });
-                      } else {
-                          $court.append('<option value="">No Data Found</option>');
-                      }
-
-                      if ($court.hasClass("select2-hidden-accessible")) {
-                          $court.select2('destroy');
-                      }
-
-                      $court.select2({
-                          placeholder: "Select Asset",
-                          width: '100%',
-                          minimumResultsForSearch: Infinity,
-                          closeOnSelect: false
-                      });
-                  },
-                  error: function () {
-                      const $court = $('#subAssetType');
-                      $court.empty().append('<option value="">Error loading data</option>');
-
-                      if ($court.hasClass("select2-hidden-accessible")) {
-                          $court.select2('destroy');
-                      }
-
-                      $court.select2({
-                          placeholder: "Select Asset",
-                          width: '100%',
-                          minimumResultsForSearch: Infinity,
-                          closeOnSelect: false
-                      });
-
-                      alert("Something went wrong while fetching asset sub types.");
-                  }
-              });
-          }
-       
-        
-        function handleAddEAsset(schoolId) {
-           
-        	 $('#savingcontainer').hide();
-        	$('#subAssetType').empty();
-        	$('#selectedAssetsContainer').empty();
-        	loadsubassets(schoolId);
-        	
-            // Then show the modal
-            $('#AddEAssetModal').modal('show');
-        }
- 	
-        function handleSaveEAsset(EAssetschoolId) {
-        	$('#savingEAsset').prop('disabled', true).text('Saving...');
-        	const selectedAssets = $('#subAssetType').val(); // array of selected sub_asset_id
-            const assetData = [];
-
-            if (!selectedAssets || selectedAssets.length === 0) {
-            	$('#savingEAsset').prop('disabled', false).text('Save');
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Missing Field',
-                    text: 'Please select at least one asset.',
-                });               
-                return;
-            }
-
-            let hasError = false;
-            let hasZero = false;
-            let errorAssets = [];
-            let zeroAssets = [];
-
-            selectedAssets.forEach(function (subAssetId) {
-                const quantityInput = $(`input[name="assetQuantity_${subAssetId}"]`);
-                const quantity = quantityInput.val();
-                const assetName = $(`#subAssetType option[value="${subAssetId}"]`).text(); // Get asset name
-
-                if (!quantity || isNaN(quantity) || parseInt(quantity) < 0) {
-                    hasError = true;
-                    errorAssets.push(assetName);
-                } else if (parseInt(quantity) === 0) {
-                    hasZero = true;
-                    zeroAssets.push(assetName);
-                } else {
-                    assetData.push({                       
-                        sub_asset_id: subAssetId,
-                        master_qty: parseInt(quantity)
-                    });
-                }
-            });
-
-            if (hasError) {
-            	$('#savingEAsset').prop('disabled', false).text('Save');
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error',
-                    html: `Please enter a valid quantity for the following assets:<br><b>${errorAssets.join(', ')}</b>`,
-                });
-                return;
-            }
-
-            if (hasZero) {
-            	$('#savingEAsset').prop('disabled', false).text('Save');
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Zero Quantity Error',
-                    html: `You have entered 0 for the following assets:<br><b>${zeroAssets.join(', ')}</b><br>Please remove them from the selection or enter a valid quantity.`,
-                    allowOutsideClick: false,
-                    allowEscapeKey: false,
-                    showConfirmButton: true
-                });
-                return;
-            }
-            
-            const payload = {
-                    school_id: EAssetschoolId,
-                    asset_id: "2", // electrical asset
-                    data: assetData
-                };
-
-                console.log("Final Payload to Save:", payload);
-            
-             
-             
-             $.ajax({
-                url: '/gcc/api/gccschool/schoolproperty/saveAssetMaster',
-                type: 'POST',
-                contentType: 'application/json',
-                data: JSON.stringify(payload),
-                success: function(response) {
-                	$('#savingEAsset').prop('disabled', false).text('Save');
-                	if (response.status === 'OK') {
-                        //Swal.fire('Success', response.message, 'success');
-                        //$('#AddEAssetModal').modal('hide');
-                        Swal.fire({
-		                	allowOutsideClick: false,
-		  	              	allowEscapeKey: false,
-		  	              	allowEnterKey: false,
-		                    icon: 'success',
-		                    title: 'Success',
-		                    text: response.message
-		                }).then(() => {		                    		               		                    
-		                    location.reload();
-		                });
-                        
-                    } else {
-                        Swal.fire('Error ', response.message, 'error');
-                    }
-                },
-                error: function() {
-                	$('#savingEAsset').prop('disabled', false).text('Save');
-                    Swal.fire('Error', 'Something went wrong while saving assets.', 'error');
-                }
-            }); 
-            
-        }
-
-        function handelEditEAsset(){
-			
-        	 let emaster_qty = $('#Emaster_qty').val();
-        	    let eassetMasterId = $('#Eeditid').val(); 
-        	    
-        	    console.log("emaster_qty"+emaster_qty);
-                console.log("eassetMasterId"+eassetMasterId);
-
-        	    if (!emaster_qty || isNaN(emaster_qty)) {
-        	        Swal.fire({
-        	            icon: 'warning',
-        	            title: 'Invalid Quantity',
-        	            text: 'Please enter a valid Master Quantity',
-        	        });
-        	        return;
-        	    }
-
-        	    if (!eassetMasterId || isNaN(eassetMasterId)) {
-        	        Swal.fire({
-        	            icon: 'warning',
-        	            title: 'Missing ID',
-        	            text: 'Electrical Asset ID is missing or invalid.',
-        	        });
-        	        return;
-        	    }
-
-           
-       	
-		    $.ajax({
-		        type: "POST",
-		        url: "/gcc/api/gccschool/schoolproperty/updateAssetMaster", // your endpoint
-		        data: {
-		        	master_qty: parseInt(emaster_qty),
-		            assetMasterId: parseInt(eassetMasterId),
-		        	asset_id:2
-		        },
-		        success: function (response) {
-		            if (response === "Success") {
-		                Swal.fire({
-		                	allowOutsideClick: false,
-		  	              	allowEscapeKey: false,
-		  	              	allowEnterKey: false,
-		                    icon: 'success',
-		                    title: 'Asset Updated',
-		                    text: 'Asset Updated successfully!'
-		                
-		                }).then(() => {
-	                        
-		                    	location.reload();
-		                   });
-		            }
-		            else if (response === "lesser than") {
-		                Swal.fire({
-		                    icon: 'error',
-		                    title: 'Error',
-		                    text: 'Entered Quantity is lesser than Mapped Quantity!'		                
-		                });
-		            }
-		            else {
-		                Swal.fire({
-		                    icon: 'error',
-		                    title: 'Error',
-		                    text: 'Something went wrong while updating asset.'
-		                });
-		            }
-		        },
-		        error: function (xhr, status, error) {
-		        	console.error('Error updating assets:', error);
-		            Swal.fire({
-		                icon: 'error',
-		                title: 'Request Failed',
-		                text: 'Unable to send request to the server.'
-		            });
-		        }
-		    });
-		}
-       
-		</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/addfurnitureasset.html b/src/main/resources/templates/modules/school/addfurnitureasset.html
deleted file mode 100644
index 61343b38..00000000
--- a/src/main/resources/templates/modules/school/addfurnitureasset.html
+++ /dev/null
@@ -1,728 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-	<title>Add Furniture Asset In Master</title>
-	<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-	<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
-	
-</head>	<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-		
-/* Remove background image from the container itself */
-.select2-container--default .select2-selection--multiple {
-    padding-right: 30px;
-    min-height: 38px;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    position: relative; /* important for the ::after */
-    background-image: none;
-}
-
-/* Add the dropdown arrow via a pseudo-element */
-.select2-container--default .select2-selection--multiple::after {
-    content: "";
-    position: absolute;
-    top: 50%;
-    right: 8px;
-    width: 14px;
-    height: 14px;
-    transform: translateY(-50%);
-    background-image: url("data:image/svg+xml;utf8,<svg fill='gray' height='20' viewBox='0 0 24 24' width='20' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/></svg>");
-    background-repeat: no-repeat;
-    background-size: contain;
-    pointer-events: none;
-}
-
-/* Each selected tag */
-.select2-container--default .select2-selection--multiple .select2-selection__choice {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 5px 10px;
-    margin: 4px 4px 0 0;
-    background-color: #f5f5f5;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 13px;
-    line-height: 1.4;
-    max-width: 100%;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-/* The text inside the tag */
-.select2-container--default .select2-selection--multiple .select2-selection__choice__display {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    flex: 1;
-    margin-right: 8px;
-}
-
-/* The "X" close icon */
-.select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
-    position: static;
-    transform: none;
-    color: #333;
-    font-size: 14px;
-    font-weight: bold;
-    cursor: pointer;
-    background: transparent;
-    border: none;
-    line-height: 1;
-}
-.custom-card-wrapper {
-  padding: 0;
-  margin-top: -58px;
-  margin-left: -233px;
-}
-
-@media (max-width: 768px) {
-  .custom-card-wrapper {
-    margin-left: 0;
-    margin-top: 0;
-    padding: 10px;
-  }
-}
-
-
-		
-	
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="card">
-				<div class="main-content" style="background-color: white;">
-					<div class="container">
-						<!-- Card 2: Other Details -->
-						<div class="col-md-12">
-						<div class="custom-card-wrapper">
-							<!--  <div style="padding: 0px;margin-top:-58px;margin-left: -233px;">-->
-								<div class="card-header d-flex justify-content-between align-items-center">
-								    <b>List of Furniture Assets</b>
-								    <button type="button" class="btn btn-primary add-fbtn"> <i class="ik ik-plus"></i>Add Assets</button>
-								</div>														
-								<div class="card-body" style="padding: 5px;">
-								<table id="FAssetManageDatatable"
-										class="table table-striped table-bordered table-hover dataTable" role="grid"
-										style="width: 100%">
-										<thead class="thead-dark">
-											<tr>
-												<th>S.NO</th>
-												<th>ASSET TYPE</th>
-												<th>MASTER QTY</th>
-												<th>MAPPED QTY</th>
-												<th>UNMAPPED QTY</th>												
-												<th>ACTION</th>
-											</tr>
-										</thead>
-										<tbody>
-										
-										</tbody>
-									</table>	
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="pageLoader"
-						style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-						<div style="position: relative; top: 50%; transform: translateY(-50%);">
-							<div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-								<span class="sr-only">Loading...</span>
-							</div>
-							<!-- Add the 'Please wait' text below the spinner -->
-							<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-						</div>
-					</div>
-
-				</div>
-			</div>
-		</div>
-		</div>
-		
-		<div class="modal fade" id="AddFAssetModal" tabindex="-1" role="dialog" aria-labelledby="AddFAssetModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-			<div class="modal-dialog modal-lg" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-						     Add Furniture Assets
-						</h5>
-						<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-	
-					<div class="modal-body">
-						<div class="row">
-						
-						 <div class="form-group col-6">
-				            <label>Select Asset <span style="color: red;">*</span></label>
-				            <select id="FsubAssetType" class="form-control" multiple></select>
-				        </div>	
-						
-						</div>
-						<div id="selectedFAssetsContainer" class="mt-3"></div>
-
-						<div class="row pb-2 mt-4" id="savingcontainerf" style="display: none;">
-							<div class="col-12 d-flex justify-content-center">								
-								<button type="button" class="btn btn-primary" id="savingFAsset">Save</button>
-							</div>
-						</div>
-					</div>
-					<div class="modal-footer">
-							<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>							
-					</div>
-					
-				</div>
-			</div>
-		</div>
-	
-		
-		<div class="modal fade" id="EditFAssetModal" tabindex="-1" role="dialog" aria-labelledby="EditFAssetModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-			<div class="modal-dialog modal-lg" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-						    <span id="Feditassetname"></span> - Edit Furniture Asset
-						</h5>
-						<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-	
-					<div class="modal-body">					
-						
-						<span id="Feditid" style="display: none;"></span>
-					<div class="row">
-						<div class="form-group col-6">
-						    <label for="Fmaster_qty">Master Quantity&nbsp;<!-- (&nbsp;Already in master&nbsp;<span id="AFmaster_qty" style="font-style: italic;font-weight: bold;"></span>&nbsp;) --><span class="text-danger">*</span></label>
-        					<input type="text" class="form-control" id="Fmaster_qty" name="Fmaster_qty">						    
-						</div>
-											
-						
-						<div class="form-group col-6">
-						    <label for="Fmapped_qty">Mapped Quantity</label>
-        					<input type="text" class="form-control" id="Fmapped_qty" name="Fmapped_qty" readonly>						    
-						</div>
-						
-						<div class="form-group col-6">
-						    <label for="Funmapped_qty">Unmapped Quantity</label>
-        					<input type="text" class="form-control" id="Funmapped_qty" name="Funmapped_qty" readonly>						    
-						</div>
-												
-							    	
-						</div>						
-						
-						<div class="row pb-2 mt-4">
-							<div class="col-12 d-flex justify-content-center">								
-								<button type="button" class="btn btn-primary" id="UpdatingFAsset">Update</button>
-							</div>
-						</div>
-					</div>
-					<div class="modal-footer">
-							<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>							
-					</div>
-					
-				</div>
-			</div>
-		</div>
-		
-
-		<script th:replace="~{fragments/modules/base/script :: script}"></script>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-		<script type="text/javascript">
-
-		console.log("hi..furniture asset");
-		
-		$(document).ready(function () {
-			 $('#Fmaster_qty').on('input', function() {
-			        this.value = this.value.replace(/[^0-9]/g, '');
-			    });
-			  
-			  let FurnitureAsseturlParams = new URLSearchParams(window.location.search);
-				let FAssetschoolId = FurnitureAsseturlParams.get("schoolId");
-			  
-				loadFAsset(FAssetschoolId);
-			   // Only run after DOM and libraries are ready
-
-          $('#FsubAssetType').on('select2:opening', function() {
-              setTimeout(() => {
-                  $('.select2-search__field').prop('readonly', true); // disable typing
-              }, 0);
-          });
-			   
-          if (!window.FassetEventsBound) {
-			    
-          	$(document).on('click', '.add-fbtn', function () {
-          	    handleAddFAsset(FAssetschoolId);
-          	});
-          	
-          	$(document).on('click', '#savingFAsset', function () {
-          	    handleSaveFAsset(FAssetschoolId);
-          	});
-          	
-          	$(document).on('click', '.edit-btnf', handleFAssetEdit);
-          	
-          	$(document).on('click', '#UpdatingFAsset', handelEditFAsset);
-			    
-						    
-			    window.FassetEventsBound = true;
-			}
-		  
-          
-         $('#FsubAssetType').on('change', function () {
-      	   console.log("hi...");
-      	    const selectedOptions = $(this).find('option:selected');
-      	    const $container = $('#selectedFAssetsContainer');
-      	    $container.empty(); // Clear previous entries
-
-      	    if (selectedOptions.length >= 1) {
-      	        $('#savingcontainerf').show();
-      	    } else {
-      	        $('#savingcontainerf').hide();
-      	    }
-
-      	    let labelRow = '';
-      	    let inputRow = '';
-      	    let counter = 0;
-
-      	    selectedOptions.each(function (index) {
-      	        const assetName = $(this).text();
-      	        const assetId = $(this).val();
-
-      	        // Start new row every 3 items
-      	        if (counter % 3 === 0) {
-      	            if (labelRow || inputRow) {
-      	                labelRow += '</div>';
-      	                inputRow += '</div>';
-      	                $container.append(labelRow);
-      	                $container.append(inputRow);
-      	            }
-      	            labelRow = '<div class="row mb-1">';
-      	            inputRow = '<div class="row mb-3">';
-      	        }
-
-      	        labelRow += `
-      	            <div class="col-md-4">
-      	                <label><b>${assetName}</b></label>
-      	            </div>
-      	        `;
-
-      	        inputRow += `
-      	            <div class="col-md-4">
-      	        	<input type="number" class="form-control asset-quantity-input" name="assetQuantity_${assetId}" placeholder="Enter Quantity" min="0">
-      	              
-      	            </div>
-      	        `;
-
-      	        counter++;
-      	    });
-
-      	    // Append remaining items
-      	    if (labelRow || inputRow) {
-      	        labelRow += '</div>';
-      	        inputRow += '</div>';
-      	        $container.append(labelRow);
-      	        $container.append(inputRow);
-      	    }
-      	});
-      // Add an event listener to all input fields with the class 'asset-quantity-input'
-         $(document).on('input', '.asset-quantity-input', function() {
-             // Replace any character that is NOT a digit with an empty string
-             this.value = this.value.replace(/[^0-9]/g, '');
-         });
-        
-      });
-		
-		function handleFAssetEdit(){
-			
-			console.log("Button clicked");
-			let id = $(this).data('id');
-			console.log("id=" + id);
-			
-			$.ajax({
-		        type: "GET",
-		        url: "/gcc/api/gccschool/schoolproperty/getAssetMasterById",
-		        data: { assetMasterId: id,asset_id:3 },
-		        success: function (response) {
-		            if (response.status === "Success" && response.data) {
-		                let data = response.data;
-
-		                // Populate modal fields
-		                $('#Feditassetname').text(data.asset_name || '');
-		                //$('#Fmaster_qty').val(data.master_qty || '');
-		                $('#Fmapped_qty').val(data.mapped_qty || '');
-		                $('#Funmapped_qty').val(data.unmapped_qty || '');
-		                
-		                
-		                $('#Feditid').val(data.furniture_master_id);
-		                
-		                $('#AFmaster_qty').text(data.master_qty || '');
-
-		                // Show the modal
-		                $('#EditFAssetModal').modal('show');
-		            } else {
-		                Swal.fire('Error', 'Unable to fetch Furniture asset details.', 'error');
-		            }
-		        },
-		        error: function (xhr, status, error) {
-		            console.error('Error fetching Furniture asset:', error);
-		            Swal.fire('Error', 'Server error while fetching Furniture asset.', 'error');
-		        }
-		    });
-			
-		}
-		
-		function loadFAsset(schoolId) {
-			//console.log("vvvvvvvvvv");
-			var buttons = [
-				{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-				{
-					title: 'Data export',
-					extend: 'copyHtml5',
-					text: 'Copy',
-					className: 'btn btn-secondary',
-					id: 'copyBtn'
-				},
-				{
-					extend: 'excelHtml5',
-					text: 'Excel',
-					className: 'btn btn-secondary',
-					id: 'excelBtn',
-					title: 'Furniture Asset List'
-				},
-				{
-					extend: 'csvHtml5',
-					text: 'CSV',
-					className: 'btn btn-secondary',
-					id: 'csvBtn',
-					title: 'Furniture Asset List'
-				},
-				{
-					extend: 'pdfHtml5',
-					text: 'PDF',
-					className: 'btn btn-secondary',
-					id: 'pdfBtn',
-					title: 'Furniture Asset List'
-				},
-				{
-					extend: 'print',
-					text: 'Print',
-					className: 'btn btn-secondary',
-					id: 'printBtn',
-					title: 'Furniture Asset List',
-					exportOptions: {
-						columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-					}
-				}
-			];
-			
-		    $.get('/gcc/api/gccschool/schoolproperty/getAssetMaster', {school_id: schoolId,asset_id:3}, res => {
-		        if ($.fn.DataTable.isDataTable('#FAssetManageDatatable')) {
-		            $('#FAssetManageDatatable').DataTable().clear().destroy(true);
-		        }
-				
-		        //console.log("hello");
-		        let tableData = [];
-		        if (res.status === "Success" && Array.isArray(res.data)) {
-		        	//console.log("res.data="+res.data);
-		            tableData = res.data;
-		        }
-
-		        $('#FAssetManageDatatable').DataTable({
-		            data: tableData,
-		            columns: [
-		                {data: null, render: (d, t, r, m) => m.row + 1, className: 'text-center'},
-		                {data: 'asset_name',className: 'text-center'},
-		                {data: 'master_qty',className: 'text-center'},
-		                {
-		                	  data: 'mapped_qty',className: 'text-center',
-		                	  render: data => data != null ? data : '-'
-		                	},
-		                	{
-		                	  data: 'unmapped_qty',className: 'text-center',
-		                	  render: data => data != null ? data : '-'
-		                	},
-		                	
-		                {
-		                    data: 'furniture_master_id',
-		                    render: (data, t, row) => `
-		                        <div class="text-center">
-		                            <button class="btn btn-sm btn-success edit-btnf" data-id="${row.furniture_master_id}" ><i class="ik ik-edit-2" style="font-size:medium;margin-left:5px;"></i></button>
-		                        </div>`, className: 'text-center'
-		                }
-		            ],
-		            lengthMenu: [
-		                [50, 100, 200, 500, -1],
-		                ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-		            ],
-		            dom: 'Bftip',			          
-		            //fixedColumns: {left: 0, right: 0},
-		            scrollY: '70vh',
-		            scrollX: true,
-		            autoWidth: true,           	                
-	                	paging: true,
-	                	info: true,
-		            buttons: buttons,
-		            responsive: false,
-		            searching: true,
-		            select: false,
-		            processing: false,
-		            language: {
-		                emptyTable: '<span class="text-danger">No Details found</span>'
-		            }
-		        });
-		        
-		    });
-		}
-		
-		function loadfsubassets(schoolId) {
-            $.ajax({
-                url: '/gcc/api/gccschool/dropdown/getSplSubAssetType',
-                type: 'GET',
-                data: { school_id:schoolId,assetid: 3 },
-                success: function (response) {
-                    const $court = $('#FsubAssetType');
-                    $court.empty();                    
-					
-                    if (response.status === 'OK' && Array.isArray(response.data)) {
-                        response.data.forEach(item => {
-                            $court.append(`<option value="${item.sub_asset_id}">${item.asset_name}</option>`);
-                        });
-                    } else {
-                        $court.append('<option value="">No Data Found</option>');
-                    }
-
-                    if ($court.hasClass("select2-hidden-accessible")) {
-                        $court.select2('destroy');
-                    }
-
-                    $court.select2({
-                        placeholder: "Select Asset",
-                        width: '100%',
-                        minimumResultsForSearch: Infinity,
-                        closeOnSelect: false
-                    });
-                },
-                error: function () {
-                    const $court = $('#FsubAssetType');
-                    $court.empty().append('<option value="">Error loading data</option>');
-
-                    if ($court.hasClass("select2-hidden-accessible")) {
-                        $court.select2('destroy');
-                    }
-
-                    $court.select2({
-                        placeholder: "Select Asset",
-                        width: '100%',
-                        minimumResultsForSearch: Infinity,
-                        closeOnSelect: false
-                    });
-
-                    alert("Something went wrong while fetching asset sub types.");
-                }
-            });
-        }
-		
-		function handleAddFAsset(schoolId) {
-	           
-       	 $('#savingcontainerf	').hide();
-       	$('#FsubAssetType').empty();
-       	$('#selectedFAssetsContainer').empty();
-       	loadfsubassets(schoolId);
-       	
-           // Then show the modal
-           $('#AddFAssetModal').modal('show');
-       }
-		
-		function handleSaveFAsset(FAssetschoolId) {
-        	$('#savingFAsset').prop('disabled', true).text('Saving...');
-        	const selectedAssets = $('#FsubAssetType').val(); // array of selected sub_asset_id
-            const assetData = [];
-
-            if (!selectedAssets || selectedAssets.length === 0) {
-            	$('#savingFAsset').prop('disabled', false).text('Save');
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Missing Field',
-                    text: 'Please select at least one asset.',
-                });               
-                return;
-            }
-
-            let hasError = false;
-            let hasZero = false;
-            let errorAssets = [];
-            let zeroAssets = [];
-
-            selectedAssets.forEach(function (subAssetId) {
-                const quantityInput = $(`input[name="assetQuantity_${subAssetId}"]`);
-                const quantity = quantityInput.val();
-                const assetName = $(`#subAssetType option[value="${subAssetId}"]`).text(); // Get asset name
-
-                if (!quantity || isNaN(quantity) || parseInt(quantity) < 0) {
-                    hasError = true;
-                    errorAssets.push(assetName);
-                } else if (parseInt(quantity) === 0) {
-                    hasZero = true;
-                    zeroAssets.push(assetName);
-                } else {
-                    assetData.push({                       
-                        sub_asset_id: subAssetId,
-                        master_qty: parseInt(quantity)
-                    });
-                }
-            });
-
-            if (hasError) {
-            	$('#savingFAsset').prop('disabled', false).text('Save');
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Validation Error',
-                    html: `Please enter a valid quantity for the following assets:<br><b>${errorAssets.join(', ')}</b>`,
-                });
-                return;
-            }
-
-            if (hasZero) {
-            	$('#savingFAsset').prop('disabled', false).text('Save');
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Zero Quantity Error',
-                    html: `You have entered 0 for the following assets:<br><b>${zeroAssets.join(', ')}</b><br>Please remove them from the selection or enter a valid quantity.`,
-                    allowOutsideClick: false,
-                    allowEscapeKey: false,
-                    showConfirmButton: true
-                });
-                return;
-            }
-            
-            const payload = {
-                    school_id: FAssetschoolId,
-                    asset_id: "3", // electrical asset
-                    data: assetData
-                };
-
-                console.log("Final Payload to Save:", payload);
-            
-             
-             
-             $.ajax({
-                url: '/gcc/api/gccschool/schoolproperty/saveAssetMaster',
-                type: 'POST',
-                contentType: 'application/json',
-                data: JSON.stringify(payload),
-                success: function(response) {
-                	$('#savingFAsset').prop('disabled', false).text('Save');
-                	if (response.status === 'OK') {
-                        //Swal.fire('Success', response.message, 'success');
-                        //$('#AddEAssetModal').modal('hide');
-                        Swal.fire({
-		                	allowOutsideClick: false,
-		  	              	allowEscapeKey: false,
-		  	              	allowEnterKey: false,
-		                    icon: 'success',
-		                    title: 'Success',
-		                    text: response.message
-		                }).then(() => {		                    		               		                    
-		                    location.reload();
-		                });
-                        
-                    } else {
-                        Swal.fire('Error', response.message, 'error');
-                    }
-                },
-                error: function() {
-                	$('#savingFAsset').prop('disabled', false).text('Save');
-                    Swal.fire('Error', 'Something went wrong while saving assets.', 'error');
-                }
-            }); 
-            
-        }
-		
-		function handelEditFAsset(){
-			
-       	 let fmaster_qty = $('#Fmaster_qty').val();
-       	    let fassetMasterId = $('#Feditid').val(); 
-       	    
-       	    console.log("fmaster_qty"+fmaster_qty);
-               console.log("fassetMasterId"+fassetMasterId);
-
-       	    if (!fmaster_qty || isNaN(fmaster_qty)) {
-       	        Swal.fire({
-       	            icon: 'warning',
-       	            title: 'Invalid Quantity',
-       	            text: 'Please enter a valid Master Quantity',
-       	        });
-       	        return;
-       	    }
-
-       	    if (!fassetMasterId || isNaN(fassetMasterId)) {
-       	        Swal.fire({
-       	            icon: 'warning',
-       	            title: 'Missing ID',
-       	            text: 'Furniture Asset ID is missing or invalid.',
-       	        });
-       	        return;
-       	    }
-
-               	
-		    $.ajax({
-		        type: "POST",
-		        url: "/gcc/api/gccschool/schoolproperty/updateAssetMaster", // your endpoint
-		        data: {
-		        	master_qty: parseInt(fmaster_qty),
-		            assetMasterId: parseInt(fassetMasterId),
-		        	asset_id:3
-		        },
-		        success: function (response) {
-		            if (response === "Success") {
-		                Swal.fire({
-		                	allowOutsideClick: false,
-		  	              	allowEscapeKey: false,
-		  	              	allowEnterKey: false,
-		                    icon: 'success',
-		                    title: 'Asset Updated',
-		                    text: 'Asset Updated successfully!'
-		                
-		                }).then(() => {
-	                        
-		                    	location.reload();
-		                   });
-		            } else {
-		                Swal.fire({
-		                    icon: 'error',
-		                    title: 'Error',
-		                    text: 'Something went wrong while updating asset.'
-		                });
-		            }
-		        },
-		        error: function (xhr, status, error) {
-		        	console.error('Error updating assets:', error);
-		            Swal.fire({
-		                icon: 'error',
-		                title: 'Request Failed',
-		                text: 'Unable to send request to the server.'
-		            });
-		        }
-		    });
-		}
-
-		</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/assetmanagement.html b/src/main/resources/templates/modules/school/assetmanagement.html
deleted file mode 100644
index c489e989..00000000
--- a/src/main/resources/templates/modules/school/assetmanagement.html
+++ /dev/null
@@ -1,819 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-
-.custom-card-wrapper {
-  padding: 0;
-  margin-top: -58px;
-  margin-left: -233px;
-}
-
-@media (max-width: 768px) {
-  .custom-card-wrapper {
-    margin-left: 0;
-    margin-top: 0;
-    padding: 10px;
-  }
-}
-
-
-
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="card">
-				<div class="main-content" style="background-color: white;">
-					<div class="container">
-						<!-- Card 2: Other Details -->
-						<div class="col-md-12">
-						<div class="custom-card-wrapper">
-						<!-- 	<div style="padding: 0px;margin-top:-58px;margin-left: -233px;"> -->
-								<div class="card-header d-flex justify-content-between align-items-center">
-								    <b>List of IT Assets</b>
-								    <button type="button" class="btn btn-primary add-btn"> <i class="ik ik-plus"></i>Add Assets</button>
-								</div>															
-								<div class="card-body" style="padding: 5px;">
-									<table id="AssetManageDatatable"
-										class="table table-striped table-bordered table-hover dataTable" role="grid"
-										style="width: 100%">
-										<thead class="thead-dark">
-											<tr>
-												<th>S.NO</th>
-												<th>ASSET CODE</th>
-												<th>NAME</th>
-												<th>SOURCE</th>
-												<th>SERIAL NUMBER</th>
-												<th>RECEIVED DATE</th>
-												<th>RECEIVED BY</th>
-												<th>VENDOR DETAILS</th>
-												<th>INVOICE NUMBER</th>
-												<th>ACTION</th>
-											</tr>
-										</thead>
-										<tbody>
-										
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="pageLoader"
-						style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-						<div style="position: relative; top: 50%; transform: translateY(-50%);">
-							<div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-								<span class="sr-only">Loading...</span>
-							</div>
-							<!-- Add the 'Please wait' text below the spinner -->
-							<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-						</div>
-					</div>
-
-				</div>
-			</div>
-		</div>
-		</div>
-		
-		
-		<div class="modal fade" id="AddAssetModal2" tabindex="-1" role="dialog" aria-labelledby="AddAssetModal2Label" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-			<div class="modal-dialog modal-lg" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-						     Add Assets
-						</h5>
-						<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-	
-					<div class="modal-body">
-						
-						<span id="school_udise" style="display: none;"></span>
-					<div class="row">
-					<!--  	<div class="form-group col-6">
-						    <label for="assetCode">Asset Code<span class="text-danger">*</span></label>
-        					<input type="text" class="form-control" id="assetCode" name="assetCode">
-						    
-						</div>-->
-						
-						<div class="form-group col-6">
-						    <label for="assetName">Name <span class="text-danger">*</span></label>
-						    <select class="form-control" id="assetName" name="assetName" required>
-						        <option value="">-- Select Sub Asset Type --</option>
-						    </select>
-						</div>
-
-						
-						<div class="form-group col-6">
-						    <label for="assetSource">Source<span class="text-danger">*</span></label>
-						   	<input type="text" class="form-control" id="assetSource" name="assetSource">
-						   
-						</div>
-						
-						<div class="form-group col-6">
-						    <label for="serialNumber">Serial Number<span class="text-danger">*</span></label>
-						   	<input type="text" class="form-control" id="serialNumber" name="serialNumber">
-						   
-						</div>
-						
-						<div class="form-group col-6">
-						    <label for="vendorDetail">Vendor Detail<span class="text-danger">*</span></label>
-						   	<input type="text" class="form-control" id="vendorDetail" name="vendorDetail">
-						   
-						</div>
-						
-						<div class="form-group col-6">
-						   <label for="invoiceNumber">Invoice Number</label>
-						   	<input type="text" class="form-control" id="invoiceNumber" name="invoiceNumber">
-						   
-						</div>
-							    	
-						</div>						
-						
-						<div class="row pb-2 mt-4">
-							<div class="col-12 d-flex justify-content-center">								
-								<button type="button" class="btn btn-primary" id="savingAsset">Save</button>
-							</div>
-						</div>
-					</div>
-					<div class="modal-footer">
-							<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>							
-					</div>
-					
-				</div>
-			</div>
-		</div>
-		
-		
-		<div class="modal fade" id="EditAssetModal2" tabindex="-1" role="dialog" aria-labelledby="EditAssetModal2Label" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-			<div class="modal-dialog modal-lg" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-						     Edit Assets
-						</h5>
-						<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-	
-					<div class="modal-body">					
-						
-						<span id="editid" style="display: none;"></span>
-					<div class="row">
-						<div class="form-group col-6">
-						    <label for="editassetCode">Asset Code<span class="text-danger">*</span></label>
-        					<input type="text" class="form-control" id="editassetCode" name="editassetCode">
-						    
-						</div>
-						
-						<div class="form-group col-6">
-						    <label for="editassetName">Name<span class="text-danger">*</span></label>
-						   	<input type="text" class="form-control" id="editassetName" name="editassetName">
-						</div>
-						
-						<div class="form-group col-6">
-						    <label for="editassetSource">Source<span class="text-danger">*</span></label>
-						   	<input type="text" class="form-control" id="editassetSource" name="editassetSource">
-						   
-						</div>
-						
-						<div class="form-group col-6">
-						    <label for="editserialNumber">Serial Number<span class="text-danger">*</span></label>
-						   	<input type="text" class="form-control" id="editserialNumber" name="editserialNumber">
-						   
-						</div>
-						
-						<div class="form-group col-6">
-						    <label for="editvendorDetail">Vendor Detail<span class="text-danger">*</span></label>
-						   	<input type="text" class="form-control" id="editvendorDetail" name="vendorDetail">
-						   
-						</div>
-						
-						<div class="form-group col-6">
-						   <label for="editinvoiceNumber">Invoice Number</label>
-						   	<input type="text" class="form-control" id="editinvoiceNumber" name="editinvoiceNumber">
-						   
-						</div>
-							    	
-						</div>						
-						
-						<div class="row pb-2 mt-4">
-							<div class="col-12 d-flex justify-content-center">								
-								<button type="button" class="btn btn-primary" id="UpdatingAsset">Update</button>
-							</div>
-						</div>
-					</div>
-					<div class="modal-footer">
-							<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>							
-					</div>
-					
-				</div>
-			</div>
-		</div>
-
-		<script th:replace="~{fragments/modules/base/script :: script}"></script>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-		<script type="text/javascript">
-
-		console.log("hi..asset Management");
-		
-			$(document).ready(function () {
-
-				let AssetManageurlParams = new URLSearchParams(window.location.search);
-				let AssetManageschoolId = AssetManageurlParams.get("schoolId");
-				
-				loadSavedBuildingAm(AssetManageschoolId);
-				
-				if (!window.assetManagementEventsBound) {
-				    
-				    $(document).on('click', '.edit-btn1', handleManageEdit);
-				   // $(document).on('click', '.add-btn', handleAddAsset);
-				   $(document).on('click', '.add-btn', function () {
-				    	handleAddAsset(AssetManageschoolId);
-			        });
-				    
-				    //$(document).on('click', '#savingAsset', handleSavingAsset);
-				    
-				 // Pass school ID to the handler
-			        $(document).on('click', '#savingAsset', function () {
-			            handleSavingAsset(AssetManageschoolId);
-			        });
-				 
-			        $(document).on('click', '#UpdatingAsset', handelEditAsset);
-				    
-				    window.assetManagementEventsBound = true;
-				}
-
-			});
-			$(document).on('input', '#assetSource, #vendorDetail', function () {
-			    this.value = this.value.replace(/[^a-zA-Z0-9 ]/g, ''); // Allow only alphanumeric + space
-			});
-
-			$(document).on('input', '#serialNumber, #invoiceNumber', function () {
-			    this.value = this.value.replace(/[^a-zA-Z0-9/]/g, ''); // Allow only alphanumeric + "/"
-			});
-
-			
-			function loadSavedBuildingAm(AssetManageschoolId) {
-				//console.log("hi");
-				var buttons = [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'Excel',
-						className: 'btn btn-secondary',
-						id: 'excelBtn',
-						title: 'Asset List'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn',
-						title: 'Asset List'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						title: 'Asset List'
-					},
-					{
-						extend: 'print',
-						text: 'Print',
-						className: 'btn btn-secondary',
-						id: 'printBtn',
-						title: 'Asset List',
-						exportOptions: {
-							columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-						}
-					}
-				];
-				
-			    $.get('/gcc/api/gccschool/buildingasset/getAssetManagement', {school_id: AssetManageschoolId}, res => {
-			        if ($.fn.DataTable.isDataTable('#AssetManageDatatable')) {
-			            $('#AssetManageDatatable').DataTable().clear().destroy(true);
-			        }
-					
-			        //console.log("hello");
-			        let tableData = [];
-			        if (res.status === "Sucess" && Array.isArray(res.data)) {
-			        	//console.log("res.data="+res.data);
-			            tableData = res.data;
-			        }
-
-			        $('#AssetManageDatatable').DataTable({
-			            data: tableData,
-			            columns: [
-			                {data: null, render: (d, t, r, m) => m.row + 1, className: 'text-center'},
-			                {data: 'asset_name'},
-			                {data: 'hardware_type'},
-			                {data: 'source_of_asset'},
-			                {data: 'serial_no'},
-			                {data: 'date_received'},
-			                {data: 'asset_category'},
-			                {data: 'vendor_name'},
-			                {data: 'invoice_num'},
-			                {
-			                    data: 'it_details_id',
-			                    render: (data, t, row) => `
-			                        <div class="text-center">
-			                            <button class="btn btn-sm btn-success edit-btn1" data-id="${row.it_details_id}" ><i class="ik ik-edit-2" style="font-size:medium;margin-left:5px;"></i></button>
-			                        </div>`, className: 'text-center'
-			                }
-			            ],
-			            lengthMenu: [
-			                [50, 100, 200, 500, -1],
-			                ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-			            ],
-			            dom: 'Bftip',			          
-			            //fixedColumns: {left: 0, right: 0},
-			            scrollY: '70vh',
-			            scrollX: true,
-			            autoWidth: true,           	                
-    	                paging: true,
-    	                info: true,
-			            buttons: buttons,
-			            responsive: false,
-			            searching: true,
-			            select: false,
-			            processing: false,
-			            language: {
-			                emptyTable: '<span class="text-danger">No Details found</span>'
-			            }
-			        });
-			        
-			    });
-			}
-			
-			// Load sub asset types on modal open or page load
-			// Load sub asset types on modal open or page load
-$.ajax({
-  url: '/gcc/api/gccschool/dropdown/getSubAssetType',
-  type: 'GET',
-  data: { assetid: 1 }, // or dynamic ID later
-  success: function (res) {
-    console.log("Sub Asset API Response:", res);
-
-    if (res.status === "OK" && Array.isArray(res.data)) {
-      $('#assetName').empty().append('<option value="">-- Select Sub Asset Type --</option>');
-
-      res.data.forEach(function (item) {
-        $('#assetName').append(
-          $('<option>', {
-            value: item.code,
-            text: item.asset_name
-          })
-        );
-      });
-    } else {
-      $('#assetName').empty().append('<option value="">No Sub Asset Types Found</option>');
-    }
-  },
-  error: function (xhr, status, error) {
-    console.error("Failed to load sub asset types:", error);
-    $('#assetName').empty().append('<option value="">Error Loading</option>');
-  }
-});
-
-
-function handleAddAsset(schid) {
-	
-	 $('#AddAssetModal2').modal('show');
-	 
-	$.ajax({
-		type: 'GET',
-		url: '/gcc/api/gccschool/schoolproperty/getSchoolDetails',
-		data: {schoolId: schid},
-		success: function (data) {
-			console.log(data);
-			 $('#school_udise').text(data.udise);
-		},
-		 error: function (xhr) {
-		        console.log("Failed to get udise for school: " + xhr.responseJSON?.message);
-		    }
-		});
- 			 
-       			       
-       $('#assetCode').val('');
-       $('#assetName').val('');
-	    $('#assetSource').val('');
-	    $('#serialNumber').val('');
-	    $('#vendorDetail').val('');
-	    $('#invoiceNumber').val('');
-	    			       
-       
-   }
-			function handleSavingAsset(assetManageschoolId){
-				
-				 let school_udise = $('#school_udise').text().trim();
-				 
-				// let assetCode = $('#assetCode').val().trim();
-				    //let subAssetId = $('#assetName').val();
-					//let subAssetId = $('#assetName').val();  // This gives selected value = sub_asset_id
-
-				    let assetSource = $('#assetSource').val().trim();
-				    let serialNumber = $('#serialNumber').val().trim();
-				    let vendorDetail = $('#vendorDetail').val().trim();
-				    let invoiceNumber = $('#invoiceNumber').val().trim();
-					//let assetCode = $('#assetName option:selected').text().trim();
-					
-					let assetCode = $('#assetName').val(); // Get selected value
-					let assetName = $('#assetName option:selected').text().trim(); // Get selected text
-					 
-
-				    // Console log to verify  
-				    console.log("UDISE:", school_udise);
-				    console.log("Asset Code:", assetCode);
-					console.log("Asset Name:", assetName);
-				    //console.log("Asset Name:", assetName);
-				    console.log("Source:", assetSource);
-				    console.log("Serial Number:", serialNumber);
-				    console.log("Vendor Detail:", vendorDetail);
-				    console.log("Invoice Number:", invoiceNumber);
-				    console.log("assetManageschoolId="+assetManageschoolId); 
-					//console.log("Asset Name:", assetName);
-					//console.log("Code:", code);
-				    
-				 // Validation
-			/*	 if (assetCode === '') {
-    Swal.fire({
-        icon: 'warning',
-        title: 'Missing Field',
-        text: 'Please enter Asset Code',
-        allowOutsideClick: false,
-        allowEscapeKey: false,
-        allowEnterKey: false,
-        showConfirmButton: true
-    });
-    return;
-}*/
-
-if (assetCode === '' || assetName === '') {
-    Swal.fire({
-        icon: 'warning',
-        title: 'Missing Field',
-        text: 'Please Select Name',
-        allowOutsideClick: false,
-        allowEscapeKey: false,
-        allowEnterKey: false,
-        showConfirmButton: true
-    });
-    return;
-}
-
-if (assetSource === '') {
-    Swal.fire({
-        icon: 'warning',
-        title: 'Missing Field',
-        text: 'Please enter Source',
-        allowOutsideClick: false,
-        allowEscapeKey: false,
-        allowEnterKey: false,
-        showConfirmButton: true
-    });
-    return;
-}
-
-if (serialNumber === '') {
-    Swal.fire({
-        icon: 'warning',
-        title: 'Missing Field',
-        text: 'Please enter Serial Number',
-        allowOutsideClick: false,
-        allowEscapeKey: false,
-        allowEnterKey: false,
-        showConfirmButton: true
-    });
-    return;
-}
-
-if (vendorDetail === '') {
-    Swal.fire({
-        icon: 'warning',
-        title: 'Missing Field',
-        text: 'Please enter Vendor Detail',
-        allowOutsideClick: false,
-        allowEscapeKey: false,
-        allowEnterKey: false,
-        showConfirmButton: true
-    });
-    return;
-}
-console.log(assetManageschoolId);
-
-/*if (invoiceNumber === '') {
-    Swal.fire({
-        icon: 'warning',
-        title: 'Missing Field',
-        text: 'Please enter Invoice Number',
-        allowOutsideClick: false,
-        allowEscapeKey: false,
-        allowEnterKey: false,
-        showConfirmButton: true
-    });
-    return;
-}*/
-
-				  /*  if (assetCode === '') {
-				        Swal.fire('Missing Field', 'Please enter Asset Code', 'warning');
-				        return;
-				    }
-				    if (assetName === '') {
-				        Swal.fire('Missing Field', 'Please enter Name', 'warning');
-				        return;
-				    }
-				    if (assetSource === '') {
-				        Swal.fire('Missing Field', 'Please enter Source', 'warning');
-				        return;
-				    }
-				    if (serialNumber === '') {
-				        Swal.fire('Missing Field', 'Please enter Serial Number', 'warning');
-				        return;
-				    }
-				    if (vendorDetail === '') {
-				        Swal.fire('Missing Field', 'Please enter Vendor Detail', 'warning');
-				        return;
-				    }
-				    if (invoiceNumber === '') {
-				        Swal.fire('Missing Field', 'Please enter Invoice Number', 'warning');
-				        return;
-				    }*/
-				    
-				 // AJAX POST
-				    $.ajax({
-				        type: "POST",
-				        url: "/gcc/api/gccschool/buildingasset/addAsset", // your endpoint
-				        data: {
-				           // assetCode: code,
-				           // sub_asset_id: subAssetId,
-							name:assetName,
-							code:assetCode,
-				            source: assetSource,
-				            serialNum: serialNumber,
-				            vendorDetail: vendorDetail,
-				            invoice_num: invoiceNumber,
-				            udise: school_udise,
-				            is_online: 0,
-				            school_id: assetManageschoolId
-				        },
-				        success: function (response) {
-				            if (response === "Sucess") {
-				                Swal.fire({
-				                	allowOutsideClick: false,
-				  	              	allowEscapeKey: false,
-				  	              	allowEnterKey: false,
-				                    icon: 'success',
-				                    title: 'Asset Added',
-				                    text: 'Asset added successfully!'
-				                }).then(() => {
-				                    
-				                   /*  loadSavedBuildingAm(assetManageschoolId);
-				                   
-				                    $('#AddAssetModal2').modal('hide'); */
-				                    
-				                    location.reload();
-				                });
-				            } else {
-				                Swal.fire({
-				                    icon: 'error',
-				                    title: 'Error',
-				                    text: 'Something went wrong while saving asset.'
-				                });
-				            }
-				        },
-				        error: function (xhr, status, error) {
-				        	console.error('Error saving assets:', error);
-				            Swal.fire({
-				                icon: 'error',
-				                title: 'Request Failed',
-				                text: 'Unable to send request to the server.'
-				            });
-				        }
-				    });
-			}
-			
-			function handleManageEdit(){
-				
-				console.log("Button clicked");
-				let id = $(this).data('id');
-				console.log("id=" + id);
-				
-				$.ajax({
-			        type: "GET",
-			        url: "/gcc/api/gccschool/buildingasset/getAssets",
-			        data: { it_details_id: id },
-			        success: function (response) {
-			            if (response.status === "Success" && response.data) {
-			                let data = response.data;
-
-			                // Populate modal fields
-			                $('#editassetCode').val(data.asset_name || '');
-			                $('#editassetName').val(data.hardware_type || '');
-			                $('#editassetSource').val(data.source_of_asset || '');
-			                $('#editserialNumber').val(data.serial_no || '');
-			                $('#editvendorDetail').val(data.vendor_name || '');
-			                $('#editinvoiceNumber').val(data.invoice_num || '');
-			                
-			                $('#editid').val(data.it_details_id);
-
-			                // Show the modal
-			                $('#EditAssetModal2').modal('show');
-			            } else {
-			                Swal.fire('Error', 'Unable to fetch asset details.', 'error');
-			            }
-			        },
-			        error: function (xhr, status, error) {
-			            console.error('Error fetching asset:', error);
-			            Swal.fire('Error', 'Server error while fetching asset.', 'error');
-			        }
-			    });
-				
-			}
-			
-			function handelEditAsset(){
-				
-				let editassetCode = $('#editassetCode').val().trim();
-			    let editassetName = $('#editassetName').val().trim();
-			    let editassetSource = $('#editassetSource').val().trim();
-			    let editserialNumber = $('#editserialNumber').val().trim();
-			    let editvendorDetail = $('#editvendorDetail').val().trim();
-			    let editinvoiceNumber = $('#editinvoiceNumber').val().trim();
-			    let  editid= $('#editid').val().trim();
-			    
-			 // Validation
-			   /* if (editassetCode === '') {
-			        Swal.fire('Missing Field', 'Please enter Asset Code', 'warning');
-			        return;
-			    }
-			    if (editassetName === '') {
-			        Swal.fire('Missing Field', 'Please enter Name', 'warning');
-			        return;
-			    }
-			    if (editassetSource === '') {
-			        Swal.fire('Missing Field', 'Please enter Source', 'warning');
-			        return;
-			    }
-			    if (editserialNumber === '') {
-			        Swal.fire('Missing Field', 'Please enter Serial Number', 'warning');
-			        return;
-			    }
-			    if (editvendorDetail === '') {
-			        Swal.fire('Missing Field', 'Please enter Vendor Detail', 'warning');
-			        return;
-			    }
-			    if (editinvoiceNumber === '') {
-			        Swal.fire('Missing Field', 'Please enter Invoice Number', 'warning');
-			        return;
-			    }*/
-			    if (editassetCode === '') {
-			        Swal.fire({
-			            icon: 'warning',
-			            title: 'Missing Field',
-			            text: 'Please enter Asset Code',
-			            allowOutsideClick: false,
-			            allowEscapeKey: false,
-			            allowEnterKey: false,
-			            showConfirmButton: true
-			        });
-			        return;
-			    }
-
-			    if (editassetName === '') {
-			        Swal.fire({
-			            icon: 'warning',
-			            title: 'Missing Field',
-			            text: 'Please enter Name',
-			            allowOutsideClick: false,
-			            allowEscapeKey: false,
-			            allowEnterKey: false,
-			            showConfirmButton: true
-			        });
-			        return;
-			    }
-
-			    if (editassetSource === '') {
-			        Swal.fire({
-			            icon: 'warning',
-			            title: 'Missing Field',
-			            text: 'Please enter Source',
-			            allowOutsideClick: false,
-			            allowEscapeKey: false,
-			            allowEnterKey: false,
-			            showConfirmButton: true
-			        });
-			        return;
-			    }
-
-			    if (editserialNumber === '') {
-			        Swal.fire({
-			            icon: 'warning',
-			            title: 'Missing Field',
-			            text: 'Please enter Serial Number',
-			            allowOutsideClick: false,
-			            allowEscapeKey: false,
-			            allowEnterKey: false,
-			            showConfirmButton: true
-			        });
-			        return;
-			    }
-
-			    if (editvendorDetail === '') {
-			        Swal.fire({
-			            icon: 'warning',
-			            title: 'Missing Field',
-			            text: 'Please enter Vendor Detail',
-			            allowOutsideClick: false,
-			            allowEscapeKey: false,
-			            allowEnterKey: false,
-			            showConfirmButton: true
-			        });
-			        return;
-			    }
-
-			   /* if (editinvoiceNumber === '') {
-			        Swal.fire({
-			            icon: 'warning',
-			            title: 'Missing Field',
-			            text: 'Please enter Invoice Number',
-			            allowOutsideClick: false,
-			            allowEscapeKey: false,
-			            allowEnterKey: false,
-			            showConfirmButton: true
-			        });
-			        return;
-			    }*/
-
-			    
-			    
-			    $.ajax({
-			        type: "POST",
-			        url: "/gcc/api/gccschool/buildingasset/editAsset", // your endpoint
-			        data: {
-			            assetCode: editassetCode,
-			            name: editassetName,
-			            source: editassetSource,
-			            serialNum: editserialNumber,
-			            vendorDetail: editvendorDetail,
-			            invoice_num: editinvoiceNumber,
-			            it_details_id: editid
-			            
-			        },
-			        success: function (response) {
-			            if (response === "Success") {
-			                Swal.fire({
-			                	allowOutsideClick: false,
-			  	              	allowEscapeKey: false,
-			  	              	allowEnterKey: false,
-			                    icon: 'success',
-			                    title: 'Asset Updated',
-			                    text: 'Asset Updated successfully!'
-			                
-			                }).then(() => {
-		                        
-			                    	location.reload();
-			                   });
-			            } else {
-			                Swal.fire({
-			                    icon: 'error',
-			                    title: 'Error',
-			                    text: 'Something went wrong while updating asset.'
-			                });
-			            }
-			        },
-			        error: function (xhr, status, error) {
-			        	console.error('Error updating assets:', error);
-			            Swal.fire({
-			                icon: 'error',
-			                title: 'Request Failed',
-			                text: 'Unable to send request to the server.'
-			            });
-			        }
-			    });
-			}
-
-		</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/building.html b/src/main/resources/templates/modules/school/building.html
deleted file mode 100644
index ff697c8a..00000000
--- a/src/main/resources/templates/modules/school/building.html
+++ /dev/null
@@ -1,1583 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	body {
-		background-color: #f8f9fa;
-		/*  font-family: Arial, sans-serif;*/
-	}
-
-
-
-	.header {
-		font-size: 22px;
-		font-weight: bold;
-		margin-bottom: 20px;
-
-
-	}
-
-	.table {
-		border: 1px solid #dee2e6;
-	}
-
-	.table th,
-	.table td {
-		border: 1px solid #dee2e6;
-		padding: 10px;
-	}
-
-	.section-title {
-		font-size: 18px;
-		font-weight: bold;
-		margin-top: 20px;
-		border-bottom: 2px solid #007bff;
-		padding-bottom: 5px;
-	}
-
-	.form-group {
-		margin-top: 15px;
-	}
-
-	.radio-group {
-		display: flex;
-		gap: 20px;
-		margin-top: 10px;
-	}
-
-	#assetModal .modal-body {
-		max-height: 80vh;
-		overflow-y: auto;
-
-	}
-
-	#floordetailsModal .modal-body {
-		max-height: 80vh;
-		overflow-y: auto;
-	}
-
-	#roomMappingModal .modal-body {
-		max-height: 80vh;
-		overflow-y: auto;
-		min-height: 40vh;
-	}
-/* 	.responsive-section {
-  margin-left: -256px;
-} */
-
-/* Wider negative margin if needed */
-/* .responsive-section-wide {
-  margin-left: -281px;
-} */
-
-/* Mobile responsiveness */
-@media (max-width: 768px) {
-  .responsive-section,
-  .responsive-section-wide {
-    margin-left: 0 !important;
-    padding: 0 10px;
-  }
-
-  .btn.mb-2 {
-    width: 100%;
-    margin-top: 10px;
-  }
-
-  .d-flex.justify-content-between {
-    flex-direction: column;
-    align-items: flex-start;
-  }
-
-  .table {
-    display: block;
-    width: 100%;
-    overflow-x: auto;
-    white-space: nowrap;
-  }
-}
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content" style="margin-top: 6px;padding-left: 0px;">
-				<div class="container">
-
-					<div class="col-md-12">
-						<div class="d-flex justify-content-between align-items-center responsive-section">
-							<!-- <h4 style="margin-left: -256px;">Buildings</h4> -->
-							<h4 >Buildings</h4> 
-							<button type="button" class="btn btn-primary"
-								style="background-color: #0D587B; border: none; border-radius: 6px; padding: 6px 16px;"
-								data-bs-toggle="modal" data-bs-target="#assetModal">
-								+ Add Building
-							</button>
-						</div>
-
-						<hr class="responsive-section"
-							style="border: 1px solid #ccc; margin-top: 10px;">
-					</div>
-
-
-					<div class="row mt-4 responsive-section-wide">
-						<div class="col-md-12">
-							<div class="card">
-								<div class="card-block">
-
-									<table id="CompletedCPSDatatable"
-										class="table table-striped table-bordered table-hover dataTable" role="grid"
-										style="width: 100%">
-										<thead class="thead-dark">
-											<tr>
-												<th style="width: 5%;">S.NO</th>
-												<th style="width: 10%;">Building Name</th>
-												<th style="width: 15%;">Total Floor</th>
-												<th style="width: 10%;">Building Material</th>
-												<th style="width: 15%;">Roof Material</th>
-												<th style="width: 10%;">Action</th>
-											</tr>
-										</thead>
-										<tbody>
-
-
-										</tbody>
-									</table>
-
-								</div>
-							</div>
-						</div>
-					</div>
-
-					<!-- Card 2: Other Details -->
-
-				</div>
-
-			</div>
-
-		</div>
-	</div>
-
-
-	<!-- Modal -->
-	<div class="modal fade" id="assetModal" tabindex="-1"
-     data-bs-backdrop="static" data-bs-keyboard="false"
-     aria-labelledby="assetModalLabel" aria-hidden="true">
-
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title">Building Management</h5>
-					<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-
-				<div class="modal-body">
-				<span id="EditSchoolId" style="display:none;"></span>				
-					<div class="row">
-						<div class="col-md-12 mb-3 d-flex justify-content-end">
-						  <!-- <label class="mb-0">Total No of Buildings: <span id="lastBuildingId"></span></label> -->
-							<button type="button" class="btn btn-success btn-sm" id="addBuildingBtn">+ Add
-								Building</button>
-						</div>
-					</div>
-					<!-- Dynamic Asset Selection Section -->
-					<div class="col-md-12" id="assetContainer"></div>
-
-					<div class="modal-footer">
-						<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-						<button type="button" class="btn btn-primary" id="buildingSave">Save</button>
-						<button type="button" class="btn btn-primary" id="buildingupdate">Update</button>
-						
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<!-- Floor Details Modal -->
-	<div class="modal fade" id="floordetailsModal" tabindex="-1" role="dialog" aria-labelledby="floordetailsModalLabel"
-		aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="detailsModalLabel">Floor Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						onclick="$('#floordetailsModal').modal('hide');" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body">
-					<table class="table table-striped table-bordered" id="floorDetailsTable">
-						<thead class="thead-dark">
-							<tr>
-								<th class="text-center">S.No</th>
-								<th class="text-center">Floor Name</th>
-								<th class="text-center">Rooms</th>
-								<th class="text-center">Status</th>
-								<th class="text-center">Action</th>
-							</tr>
-						</thead>
-						<tbody>
-							<!-- Data will be inserted here -->
-						</tbody>
-					</table>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-dismiss="modal"
-						onclick="$('#floordetailsModal').modal('hide');">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<!-- Room Mapping Modal -->
-	<div class="modal fade" id="roomMappingModal" tabindex="-1" role="dialog" aria-labelledby="roomMappingModalLabel"
-		aria-hidden="true">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title"><span id="BuildingRoomMapping">&nbsp;</span>&nbsp;Room Mapping</h5>
-					<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body">
-					Add&nbsp;<span id="roomFloorName"></span>&nbsp;Details
-					<form>
-						<!-- Hidden Inputs to Store Building ID and Floor ID -->
-						<input type="hidden" id="roomBuildingId">
-						<input type="hidden" id="roomFloorId">
-
-						<div class="row">
-							<div class="col-md-4 form-group">
-								<label>Select Type of Rooms <span class="text-danger">*</span></label>
-								<div class="dropdown">
-									<button class="form-control dropdown-toggle" type="button" id="room_type_dropdown"
-										data-bs-toggle="dropdown" aria-expanded="false">
-										Select Rooms Type
-									</button>
-									<ul class="dropdown-menu" id="room_type_options"
-										aria-labelledby="room_type_dropdown"
-										style="max-height: 400px; overflow-y: auto; width: 100%;">
-										<!-- Options will be added dynamically -->
-									</ul>
-								</div>
-								<input type="hidden" id="selected_room_types"> <!-- Stores selected values -->
-							</div>
-						</div>
-
-						<!-- Dynamic Inputs for Selected room Types -->
-						<div class="row mt-3" id="room_capacity_container"></div>
-
-
-					</form>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-					<button type="button" class="btn btn-primary" id="saveRoomMapping">Save Room Mapping</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-</body>
-
-<script>
-	//let buildings = [];
-	//let lastBuildingId = 0;
-	//Full rearranged and cleaned-up script for Building Management Page
-
-	
-	$(document).ready(function () {
-		
-		function getQueryParam(param) {
-			const urlParams = new URLSearchParams(window.location.search);
-			return urlParams.get(param);
-		}
-		
-		
-		
-		//if(!window.buildingBound){
-			let schoolId;
-			// buildings = [];
-			let lastBuildingId = 0;
-			schoolId = getQueryParam('schoolId');
-
-			// Load saved buildings on page load
-			loadSavedBuilding(schoolId);
-
-			// Reset modal when shown
-			$('#assetModal').on('show.bs.modal', function () {
-				$('#assetContainer').empty();
-				buildings = [];
-				//lastBuildingId = parseInt($('#lastBuildingId').text()) || 0;
-				//console.log("lastBuildingId====="+lastBuildingId);
-				$('#addBuildingBtn').show();
-				$('#buildingupdate').hide();
-				$('#buildingSave').hide();
-				
-				
-				
-			});
-
-			/* $(document).on('click', '.edit-btn', function () {
-				console.log('Edit button clicked'); // Debugging line
-				$('#addBuildingBtn').hide();
-				$('#buildingupdate').show();
-				
-			}); */
-
-			$(document).on('click', '.view-btn', function () {
-				console.log('View button clicked'); // Debugging line
-				$('#addBuildingBtn').hide();
-				// Load data for viewing
-				//$('#assetModal').modal('show');
-			});
-
-			// Add building
-			$(document).on('click', '#addBuildingBtn', function () {
-				//lastBuildingId1 = parseInt($('#lastBuildingId').text()) || 0;
-				//console.log("lastBuildingId1====="+lastBuildingId1);
-				
-				addNewBuilding();
-				
-				$('#buildingSave').show();
-			});
-
-			// Save buildings
-			$('#buildingSave').on('click', saveBuildings);
-
-			// View and Edit buttons
-			$(document).on('click', '.view-btn', handleView);
-			//$(document).on('click', '.edit-btn', handleEdit);
-			$(document).on('click', '.edit-btn', function () {
-				const buildingId = $(this).data('building-number');
-				handleEdit(buildingId);
-				$('#buildingupdate').show();
-				$('#addBuildingBtn').hide();
-				$('#buildingSave').hide();
-			});
-			
-			
-			//window.buildingBound=true;
-		//}
-		
-			
-		
-	});
-
-	function addNewBuilding() {
-		
-		
-		const assetContainer = $('#assetContainer');
-		const lastId = $('.building-section').length;
-	    const buildingId = lastId + 1;
-		//console.log("lastBuildingId="+lastBuildingId);
-		buildings.push(buildingId);
-
-		let buildingMaterials = '', roofMaterials = '';
-
-		$.ajax({
-			url: '/gcc/api/gccschool/dropdown/getBuildingMaterial', method: 'GET', async: false, success: res => {
-				if (res.status === "OK") {
-					res.data.forEach(item => {
-						buildingMaterials += `<option value="${item.bm_id}">${item.content}</option>`;
-					});
-				}
-			}
-		});
-
-		$.ajax({
-			url: '/gcc/api/gccschool/dropdown/getRoofMaterial', method: 'GET', async: false, success: res => {
-				if (res.status === "OK") {
-					res.data.forEach(item => {
-						roofMaterials += `<option value="${item.rm_id}">${item.content}</option>`;
-					});
-				}
-			}
-		});
-		//ak
-
-		const buildingSection = $(`
-        <div class="building-section border p-3 mb-3" data-id="${buildingId}">
-            <h5 class="building-title">Building </h5>
-            <div class="row">
-                <div class="col-md-6 form-group">
-                    <label>Building Name <span class="text-danger">*</span></label>
-                    <input class="form-control" id="buildingName${buildingId}" placeholder="Enter Building Names">
-                </div>
-                <div class="col-md-6 form-group">
-                    <label>No. of Floors <span class="text-danger">*</span></label>
-                    <input type="text"  class="form-control noOfFloorsInput" id="noOfFloors${buildingId}" placeholder="Enter No. of Floors">
-                </div>
-                <div class="col-md-6 form-group">
-                    <label>Building Material <span class="text-danger">*</span></label>
-                    <select class="form-control" id="buildingMaterial${buildingId}">
-                        <option value="">Select Building Material</option>
-                        ${buildingMaterials}
-                    </select>
-                </div>
-                <div class="col-md-6 form-group">
-                    <label>Roof Material <span class="text-danger">*</span></label>
-                    <select class="form-control" id="roofMaterial${buildingId}">
-                        <option value="">Select Roof Material</option>
-                        ${roofMaterials}
-                    </select>
-                </div>
-            </div>
-            <button type="button" class="btn btn-danger mt-2 remove-building">Remove</button>
-        </div>
-    `);
-
-		assetContainer.append(buildingSection);
-	}
-	$(document).on('input', '.noOfFloorsInput', function () {
-	    const value = $(this).val().trim();
-
-	    // Accept only numbers, ++, or --
-	    const isValid = /^(\d+|\+\+|--)$/.test(value);
-
-	    if (!isValid) {
-	        $(this).val(value.slice(0, -1)); // Remove last character
-	    }
-	});
-
-
-
-
-	// Remove building section
-	$(document).on('click', '.remove-building', function () {
-		
-		
-		const section = $(this).closest('.building-section');
-		const id = parseInt(section.data('id'));
-		section.remove();
-		buildings = buildings.filter(b => b !== id);
-		//reorderBuildings();
-			
-		// Check if any building-section remains
-	    const remainingSections = $('.building-section');
-	    
-	    if (remainingSections.length === 0) {
-	        $('#buildingSave').hide();
-	    } else {
-	        $('#buildingSave').show();
-	    }
-			
-		
-	});
-
-	function reorderBuildings() {
-				
-		$('.building-section').each((i, el) => {
-			const newId = i + 1;
-			$(el).attr('data-id', newId);
-			$(el).find('.building-title').text(`Building ${newId}`);
-			
-		});	
-	}
-
-	function saveBuildings() {
-		let buildingList = [];
-		let allValid = true;
-
-		$('.building-section').each((i, el) => {
-			const section = $(el);
-			const id = section.data('id');
-
-			const name = section.find(`#buildingName${id}`).val()?.trim() || '';
-			const floors = section.find(`#noOfFloors${id}`).val()?.toString().trim() || '';
-			const material = section.find(`#buildingMaterial${id}`).val() || '';
-			const roof = section.find(`#roofMaterial${id}`).val() || '';
-
-			if (!name) {
-				Swal.fire({
-					icon: 'warning',
-					title: `Building ${id}: Missing Field`,
-					text: 'Please enter Building Name.',
-					showConfirmButton: true,
-					allowOutsideClick: false
-				});
-				allValid = false;
-				return false;
-			}
-
-			if (!floors) {
-				Swal.fire({
-					icon: 'warning',
-					title: `Building ${id}: Missing Field`,
-					text: 'Please enter No. of Floors.',
-					showConfirmButton: true,
-					allowOutsideClick: false
-				});
-				allValid = false;
-				return false;
-			}
-
-			if (!material) {
-				Swal.fire({
-					icon: 'warning',
-					title: `Building ${id}: Missing Field`,
-					text: 'Please select Building Material.',
-					showConfirmButton: true,
-					allowOutsideClick: false
-				});
-				allValid = false;
-				return false;
-			}
-
-			if (!roof) {
-				Swal.fire({
-					icon: 'warning',
-					title: `Building ${id}: Missing Field`,
-					text: 'Please select Roof Material.',
-					showConfirmButton: true,
-					allowOutsideClick: false
-				});
-				allValid = false;
-				return false;
-			}
-
-			buildingList.push({
-				building_name: name,
-				total_floor: floors,
-				building_material: material,
-				roof_material: roof,
-				school_id: schoolId // You can dynamically fetch this if needed
-			});
-		});
-
-		if (!allValid) return;
-
-		// Submit valid data
-		$.ajax({
-			url: '/gcc/api/gccschool/buildingasset/saveBuildings',
-			type: 'POST',
-			contentType: 'application/json',
-			data: JSON.stringify(buildingList),
-			success: res => {
-			    console.log("Server Response:", res);
-
-			    if (res === 'Building Name Alredy Exist') {
-			        Swal.fire({
-			            icon: 'info',
-			            title: 'Already Exists',
-			            text: 'Building name already exists. Please enter a different name.',
-			            showConfirmButton: true,
-			            allowOutsideClick: false
-			        });
-			    } else if (res === 'Building Saved sucessfully') {
-			        Swal.fire({
-			            icon: 'success',
-			            title: 'Success',
-			            text: 'Building saved successfully!',
-			            showConfirmButton: true
-			        }).then(() => location.reload());
-			    } else {
-			        Swal.fire({
-			            icon: 'error',
-			            title: 'Error',
-			            text: 'Something went wrong. Please try again.',
-			            showConfirmButton: true
-			        });
-			    }
-			}
-
-			/*success: res => {
-				console.log("dsgdgs");	
-				console.log(res);
-				
-					Swal.fire({
-					icon: 'success',
-					title: 'Success',
-					text:  res,
-					showConfirmButton: true
-				}).then(() => location.reload());
-				
-				
-			},
-			error: () => {
-				Swal.fire({
-					icon: 'error',
-					title: 'Error',
-					text: 'Failed to save buildings.',
-					showConfirmButton: true
-				});
-			}*/
-		});
-	}
-	$(document).on('input', '[id^="buildingName"]', function() {
-	    this.value = this.value.replace(/[^a-zA-Z0-9 ]/g, '');
-	});
-
-
-		var buttons = [
-		{
-			extend: 'pageLength',
-			className: 'btn btn-warning'
-		},
-		{
-			title: 'Data export',
-			extend: 'copyHtml5',
-			text: 'Copy',
-			className: 'btn btn-secondary',
-			id: 'copyBtn'
-		},
-		{
-			extend: 'excelHtml5',
-			text: 'Excel',
-			className: 'btn btn-secondary',
-			id: 'excelBtn',
-			title: 'Petition List'
-		},
-		{
-			extend: 'csvHtml5',
-			text: 'CSV',
-			className: 'btn btn-secondary',
-			id: 'csvBtn',
-			title: 'Petition List'
-		},
-		{
-			extend: 'pdfHtml5',
-			text: 'PDF',
-			className: 'btn btn-secondary',
-			id: 'pdfBtn',
-			title: 'Petition List'
-		},
-		{
-			extend: 'print',
-			text: 'Print',
-			className: 'btn btn-secondary',
-			id: 'printBtn',
-			title: 'Petition List',
-			exportOptions: {
-				columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-			}
-		}
-	];
-
-
-	function loadSavedBuilding(schoolId) {
-		$.get('/gcc/api/gccschool/buildingasset/getSavedBuildings', {school_id: schoolId}, res => {
-			//$('#lastBuildingId').text(res.lastId);
-
-			if (res.status === "OK") {
-				if ($.fn.DataTable.isDataTable('#CompletedCPSDatatable')) {
-					$('#CompletedCPSDatatable').DataTable().clear().destroy(true);
-				}
-
-				$('#CompletedCPSDatatable').DataTable({
-					data: res.data,
-					columns: [
-						{data: null, render: (d, t, r, m) => m.row + 1},
-						{data: 'building_name'},
-						{data: 'total_floor'},
-						{data: 'building_material_name'},
-						{data: 'roof_material_name'},
-						{
-							data: 'buildng_id',
-							render: (data, t, row) => `
-                            <div class="text-center">
-	                                <button class="btn btn-sm btn-primary view-btn" data-building-number="${data}" data-building-name="${row.building_name}"><i class="bi bi-eye"></i></button>
-                                <button class="btn btn-sm btn-success edit-btn" data-building-number="${data}" data-building-name="${row.building_name}"><i class="bi bi-pencil"></i></button>
-                                <button class="btn btn-sm btn-danger delete-btn" data-building-number="${data}" data-building-name="${row.building_name}" data-school-id="${row.school_id}">
-                                <i class="bi bi-trash"></i>
-                            </button>
-                            </div>`
-						}
-					],
-					lengthMenu: [
-						[50, 100, 200, 500, -1],
-						['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-					],
-
-					dom: 'Bftip',
-					autoWidth: false,
-					//fixedColumns: {left: 0, right: 0},
-					scrollY: '60vh',
-					scrollX:true,
-					fixedHeader:false,
-					//scrollCollapse: true,
-					buttons: [buttons],
-					responsive: false,
-					searching: true,
-					select: false,
-					processing: false,
-				});
-			} else {
-				$('#CompletedCPSDatatable tbody').html('<tr><td colspan="6" class="text-center text-danger">No buildings found</td></tr>');
-			}
-		});
-	}
-	function handleView() {
-		const buildingId = $(this).data('building-number');
-		$('#assetModal').modal('show');
-		$('#assetContainer').html('<p>Loading...</p>');
-
-		$.get('/gcc/api/gccschool/buildingasset/getBuildingbyid', {building_id: buildingId}, res => {
-			if (res.status === "OK") {
-				const d = res.data;
-				const viewHtml = `
-                <div class="border p-3">
-                    <h5>Building Details</h5>
-                    <div class="row">
-                        <div class="col-md-6"><label>Building Name</label><input class="form-control" value="${d.building_name}" disabled></div>
-                        <div class="col-md-6"><label>Total Floors</label><input class="form-control" value="${d.total_floor}" disabled></div>
-                        <div class="col-md-6"><label>Building Material</label><input class="form-control" value="${d.buildingmaterial}" disabled></div>
-                        <div class="col-md-6"><label>Roof Material</label><input class="form-control" value="${d.roofmaterial}" disabled></div>
-                    </div>
-                </div>
-            `;
-				$('#assetContainer').html(viewHtml);
-
-				// ✅ Hide buttons only after content is loaded
-				$('#addBuildingBtn').hide();
-				$('#buildingSave').hide();   // hide Save button
-				$('.modal-footer .btn-secondary').show(); // keep Close visible
-			}
-		});
-	}
-
-
-	function handleEdit(buildingId) {
-		//const buildingId = $(this).data('building-number');
-		$('#assetModal').modal('show');
-		$('#addBuildingBtn').hide();
-		$('#assetContainer').html('<p>Loading...</p>');
-
-		$.get('/gcc/api/gccschool/buildingasset/getBuildingbyid', {building_id: buildingId}, res => {
-			if (res.status === "OK") {
-				const d = res.data;
-				$('#EditSchoolId').val(d.school_id);
-				console.log("d.school_id="+d.school_id);
-					const html = `
-				    <div class="building-section border p-3" data-id="${buildingId}">
-				        <h5>Edit Building</h5>
-				        <div class="row mb-3">
-				            <div class="col-md-4">
-				                <label>Building Name</label>
-				                <input class="form-control" id="buildingName${buildingId}" value="${d.building_name}">
-				            </div>
-				            <div class="col-md-4">
-				                <label>Total Floors</label>
-				                <select class="form-control" id="noOfFloors${buildingId}" data-selected="${d.total_floor}" disabled></select>
-				            </div>
-				            <div class="col-md-4 d-flex align-items-end" style="gap: 1rem;">
-
-				            <button type="button" class="btn btn-success me-2" id="flooredit">+</button>
-				            <button type="button" class="btn btn-danger" id="floordelete">-</button>
-				        </div>
-
-				        </div>
-				        <div class="row">
-				            <div class="col-md-6">
-				                <label>Building Material</label>
-				                <select class="form-control" id="buildingMaterial${buildingId}">
-				                    <option selected value="${d.buildingmaterial}">${d.buildingmaterial}</option>
-				                </select>
-				            </div>
-				            <div class="col-md-6">
-				                <label>Roof Material</label>
-				                <select class="form-control" id="roofMaterial${buildingId}">
-				                    <option selected value="${d.roofmaterial}">${d.roofmaterial}</option>
-				                </select>
-				            </div>
-				        </div>
-				    </div>`;
-
-				$('#assetContainer').html(html);
-				$('.modal-footer').show();
-				populateDropdowns(buildingId, d.building_material, d.roof_material);
-				populatefloorDropdowns(buildingId);
-			}
-			setTimeout(() => {
-			    const totalFloors = getTotalFloors(buildingId);
-			    console.log(`Total number of floors in edit: ${totalFloors}`);
-			    // Optionally display it somewhere on the page/modal
-			}, 300);
-
-		});
-	}
-	$(document).on('input', '.noOfFloorsInput', function () {
-	    let value = parseInt($(this).val()) || 0;
-
-	    if (value > 9) {
-	        $(this).val(''); // Set back to 9
-	        Swal.fire({
-	            icon: 'warning',
-	            title: 'Limit Exceeded',
-	            text: 'You can enter a maximum of 9 floors only.',
-	            allowOutsideClick: false,
-	            allowEscapeKey: false,
-	            allowEnterKey: false,
-	            showConfirmButton: true
-	        });
-	    }
-	});
-
-
-
-
-	/*function populateDropdowns(buildingId, selectedBM, selectedRM) {
-		$.get('/gcc/api/gccschool/dropdown/getBuildingMaterial', res => {
-			if (res.status === "OK") {
-				let options = res.data.map(item => `<option value="${item.bm_id}" ${item.bm_id == selectedBM ? 'selected' : ''}>${item.content}</option>`);
-				$(`#buildingMaterial${buildingId}`).html(options);
-			}
-		});
-		$.get('/gcc/api/gccschool/dropdown/getRoofMaterial', res => {
-			if (res.status === "OK") {
-				let options = res.data.map(item => `<option value="${item.rm_id}" ${item.rm_id == selectedRM ? 'selected' : ''}>${item.content}</option>`);
-				$(`#roofMaterial${buildingId}`).html(options);
-			}
-		});
-	}*/
-	function populatefloorDropdowns(buildingId) {
-	    $.get('/gcc/api/gccschool/buildingasset/getFloorsByBuildingId', { buildingId }, res => {
-	        if (res.status === "OK") {
-	            const floorSelect = $(`#noOfFloors${buildingId}`);
-	            const selectedFloor = parseInt(floorSelect.data('selected'), 10);
-	            floorSelect.empty();
-
-	            res.floors.forEach(f => {
-	                //const floor = f.floor_name;
-	                const selected = f.floor_name === selectedFloor ? 'selected' : '';
-	                floorSelect.append(`<option value="${f.floors_id}" data-exe="${f.execution_order}" ${selected}>${f.floor_name}</option>`);
-	            });
-	        }
-	    });
-	}
-
-	function populateDropdowns(buildingId, selectedBuildingMaterialId, selectedRoofMaterialId) {
-		$.get('/gcc/api/gccschool/buildingasset/getAllMaterials', res => {
-			if (res.status === "OK") {
-				const buildingMaterialSelect = $(`#buildingMaterial${buildingId}`);
-				const roofMaterialSelect = $(`#roofMaterial${buildingId}`);
-
-				buildingMaterialSelect.empty();
-				roofMaterialSelect.empty();
-
-				res.buildingMaterials.forEach(item => {
-					const selected = item.execution_order === selectedBuildingMaterialId ? 'selected' : '';
-					buildingMaterialSelect.append(`<option value="${item.execution_order}" ${selected}>${item.content}</option>`);
-				});
-
-				res.roofMaterials.forEach(item => {
-					const selected = item.execution_order === selectedRoofMaterialId ? 'selected' : '';
-					roofMaterialSelect.append(`<option value="${item.execution_order}" ${selected}>${item.content}</option>`);
-				});
-			}
-		});
-	}
-	function getTotalFloors(buildingId) {
-	    const floorSelect = $(`#noOfFloors${buildingId}`);
-	    const totalFloors = floorSelect.find('option').length;
-	    return totalFloors;
-	}
-
-	
-	//for update
-	/* $(document).on('click', '#buildingupdate', function () {
-		
-    const buildingId = $('.building-section').data('id');
-    const buildingName = $(`#buildingName${buildingId}`).val();
-    const totalFloors = getTotalFloors(buildingId);
-   // const totalFloor = $(`#noOfFloors${buildingId}`).data('selected');
-
-    const buildingMaterial = $(`#buildingMaterial${buildingId}`).val();
-    const roofMaterial = $(`#roofMaterial${buildingId}`).val();
-    let edit_schoolId = $('#EditSchoolId').val();
-    console.log("edit_schoolId="+edit_schoolId);
-    //schoolId = schoolId; // Make sure you have a hidden input or dropdown with school ID
-    console.log("buildingId",buildingId)
-    console.log("buildingName",buildingName)
-    //console.log("totalFloor",totalFloor)
-    console.log("buildingMaterial",buildingMaterial)
-     console.log("roofMaterial",roofMaterial)
-     console.log("Total Floors:", totalFloors);
-
-
-    // Optional: Input validation
-    if (!buildingName || !totalFloors || !buildingMaterial || !roofMaterial ) {
-        Swal.fire({
-            icon: 'warning',
-            title: 'Missing Fields',
-            text: 'Please fill all the required fields before updating.'
-        });
-        return;
-    }
-
-    $.ajax({
-        url: '/gcc/api/gccschool/buildingasset/updateBuilding',
-        type: 'POST',
-        data: {
-            building_id: buildingId,
-            building_name: buildingName,
-            total_floor: totalFloors,
-            building_material: buildingMaterial,
-            roof_material: roofMaterial,
-            school_id: edit_schoolId
-        },
-        success: function (res) {
-        	if (res.toLowerCase() === 'success') {
-                Swal.fire({
-                    icon: 'success',
-                    title: 'Updated',
-                    text: 'Building updated successfully!'
-                }).then(() => {
-                    location.reload(); // Refresh after success
-                });
-            } else {
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error',
-                    text: 'Something went wrong while updating.'
-                });
-            }
-        },
-        error: function () {
-            Swal.fire({
-                icon: 'error',
-                title: 'Error',
-                text: 'Failed to communicate with server.'
-            });
-        }
-    });
-}); */
-
-$(document).on('click', '#buildingupdate', function () {
-    const buildingId = $('.building-section').data('id');
-    const buildingName = $(`#buildingName${buildingId}`).val();
-    const totalFloors = getTotalFloors(buildingId);
-    const buildingMaterial = $(`#buildingMaterial${buildingId}`).val();
-    const roofMaterial = $(`#roofMaterial${buildingId}`).val();
-    const schoolId = $('#EditSchoolId').val();
-
-    if (!buildingName || !totalFloors || !buildingMaterial || !roofMaterial) {
-        Swal.fire('Missing Fields', 'Please fill all fields', 'warning');
-        return;
-    }
-
-    // STEP 1: Update building basic info
-    $.post('/gcc/api/gccschool/buildingasset/updateBuilding', {
-        building_id: buildingId,
-        building_name: buildingName,
-        total_floor: totalFloors,
-        building_material: buildingMaterial,
-        roof_material: roofMaterial,
-        school_id: schoolId
-    }).done(function () {
-        // STEP 2: Fetch existing floors
-        $.get('/gcc/api/gccschool/buildingasset/getFloorsByBuildingId', {
-            buildingId: buildingId
-        }).done(function (res) {
-            if (res.status === "OK") {
-                const existingFloors = res.floors.length;
-
-                if (totalFloors < existingFloors) {
-                    // STEP 3: Reduce floors
-                    const floorToRemove = res.floors[existingFloors - 1]; // Get the last floor
-                    $.post('/gcc/api/gccschool/buildingasset/editBuildings', {
-                        building_id: buildingId,
-                        floor_id: floorToRemove.floors_id
-                    });
-                } else if (totalFloors > existingFloors) {
-                    // STEP 4: Add missing floors
-                    for (let i = existingFloors; i < totalFloors; i++) {
-                        $.post('/gcc/api/gccschool/buildingasset/addFloor', {
-                            building_id: buildingId,
-                            exe_order: i
-                        });
-                    }
-                }
-
-                Swal.fire({
-                    icon: 'success',
-                    title: 'Updated',
-                    text: 'Building updated successfully!',
-                    	 allowOutsideClick: false, // Disable clicking outside the modal to close it
-		                    allowEscapeKey: false, // Disable escape key to close the modal
-		                    allowEnterKey: false, // Disable enter key to close the modal	                   
-	                        showConfirmButton: true
-                }).then(() => location.reload());
-            }
-        });
-    }).fail(function () {
-        Swal.fire('Error', 'Failed to update building.', 'error');
-    });
-});
-
-
-	//for add
-
-
-// Attach click listener to floorEditBtn
-/* $(document).on('click', '#flooredit', function () {
-	console.log("hello floor add")
-    const buildingId = $('.building-section').data('id');
-    const floorSelect = $(`#noOfFloors${buildingId}`);
-    const selectedOption = floorSelect.find('option:selected');
-    const exe_order = selectedOption.attr('data-exe');
-
-   
-
-    Swal.fire({
-        title: 'Are you sure?',
-        text: `Do you want to update the floor with execution order ${exe_order}?`,
-        icon: 'question',
-        showCancelButton: true,
-        confirmButtonColor: '#3085d6',
-        cancelButtonColor: '#d33',
-        confirmButtonText: 'Yes, update it!',
-        cancelButtonText: 'Cancel'
-    }).then((result) => {
-        if (result.isConfirmed) {
-            $.post('/gcc/api/gccschool/buildingasset/addFloor', {
-                building_id: buildingId,
-                exe_order: exe_order
-            }, function (response) {
-                Swal.fire(
-                    'Updated!',
-                    'The floor was updated successfully.',
-                    'success'
-                ).then(() => {
-                    // Optionally refresh the table or UI
-                   //reloadbuildingSection();  // OR refreshDataTable();
-                	// ✅ Reuse your existing function
-					//handleEdit.call({ dataset: { buildingNumber: buildingId } });
-                	handleEdit(buildingId);  // simple and clean
-               });
-                // Optionally, refresh data or do something else
-            });
-        } else {
-            Swal.fire(
-                'Cancelled',
-                'Floor update was cancelled.',
-                'info'
-            );
-        }
-    });
-}); */
-
-
-//Add floor
-/*$(document).on('click', '#flooredit', function () {
-    const buildingId = $('.building-section').data('id');
-    const totalFloors = $('#noOfFloors' + buildingId + ' option').length;
-
-    $.post('/gcc/api/gccschool/buildingasset/addFloor', {
-        building_id: buildingId,
-        exe_order: totalFloors // execution order starts from 1, 2, 3...
-    }, function (res) {
-        if (res === 'Sucess') {
-            Swal.fire('Success', 'Floor added successfully', 'success');
-            populatefloorDropdowns(buildingId); // Reload dropdown
-        } else {
-            Swal.fire('Error', 'Failed to add floor', 'error');
-        }
-    });
-});*/
-$(document).on('click', '#flooredit', function () {
-    const buildingId = $('.building-section').data('id');
-    const totalFloors = $('#noOfFloors' + buildingId + ' option').length;
-
-    Swal.fire({
-        title: 'Are you sure?',
-        text: `Do you want to add a new floor? Current floors: ${totalFloors}`,
-        icon: 'question',
-        showCancelButton: true,
-        confirmButtonText: 'Yes, add it',
-        cancelButtonText: 'Cancel', allowOutsideClick: false, // Disable clicking outside the modal to close it
-        allowEscapeKey: false, // Disable escape key to close the modal
-        allowEnterKey: false, // Disable enter key to close the modal	                   
-        showConfirmButton: true
-    }).then((result) => {
-        if (result.isConfirmed) {
-            // User clicked "Yes"
-            $.post('/gcc/api/gccschool/buildingasset/addFloor', {
-                building_id: buildingId,
-                exe_order: totalFloors
-            }, function (res) {
-                if (res === 'Sucess') {
-                /*	Swal.fire({
-                        title: 'Success!',
-                        text: 'Floor added successfully.',
-                        icon: 'success',
-                        allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                    allowEscapeKey: false, // Disable escape key to close the modal
-	                    allowEnterKey: false, // Disable enter key to close the modal	                   
-                        showConfirmButton: true
-                    });*/
-                    populatefloorDropdowns(buildingId); // reload dropdown
-                } /*else {
-                	  Swal.fire({
-                          title: 'Error!',
-                          text: 'Failed to add floor.',
-                          icon: 'error',
-                          allowOutsideClick: false, // Disable clicking outside the modal to close it
-		                    allowEscapeKey: false, // Disable escape key to close the modal
-		                    allowEnterKey: false, // Disable enter key to close the modal	                   
-	                        showConfirmButton: true
-                      });
-                }*/
-            });
-        } else {
-        	Swal.fire({
-        	    title: 'Cancelled',
-        	    text: 'No changes were made.',
-        	    icon: 'info',
-        	    allowOutsideClick: false, // Disable clicking outside the modal to close it
-                allowEscapeKey: false, // Disable escape key to close the modal
-                allowEnterKey: false, // Disable enter key to close the modal	                   
-                showConfirmButton: true
-        	});
-
-        }
-    });
-});
-
-
-// Delete floor
-
-/* $(document).on('click', '#floordelete', function () {
-    const buildingId = $('.building-section').data('id');
-    const selectedFloorId = $('#noOfFloors' + buildingId).val();
-
-    if (!selectedFloorId) {
-        Swal.fire('Warning', 'No floor selected to delete', 'warning');
-        return;
-    }
-
-    $.post('/gcc/api/gccschool/buildingasset/editBuildings', {
-        building_id: buildingId,
-        floor_id: selectedFloorId
-    }, function (res) {
-        if (res === 'Success') {
-            Swal.fire('Success', 'Floor deleted successfully', 'success');
-            populatefloorDropdowns(buildingId); // Reload dropdown
-        } else {
-            Swal.fire('Error', 'Failed to delete floor', 'error');
-        }
-    });
-}); */
-/* $(document).on('click', '#floordelete', function () {
-    const buildingId = $('.building-section').data('id');
-    const selectedFloorId = $('#noOfFloors' + buildingId).val();
-
-    if (!selectedFloorId) {
-        Swal.fire('Warning', 'No floor selected to delete', 'warning');
-        return;
-    }
-
-    $.post('/gcc/api/gccschool/buildingasset/editBuildings', {
-        building_id: buildingId,
-        floor_id: selectedFloorId
-    }, function (res) {
-        if (res === 'Success') {
-            Swal.fire('Success', 'Floor deleted successfully', 'success');
-            populatefloorDropdowns(buildingId); // Reload dropdown
-        } else {
-            Swal.fire('Error', 'Failed to delete floor', 'error');
-        }
-    });
-});
- */
-
-	/*$(document).on('click', '#flooredit', function () {
-    const buildingId = $('.building-section').data('id');
-    const floorSelect = $(#noOfFloors${buildingId});
-    const selectedOption = floorSelect.find('option:selected');
-  
-    const exe_order = selectedOption.attr('data-exe');
-
-    console.log("exe_order",exe_order);
-
-   
-
-    $.post('/gcc/api/gccschool/buildingasset/addFloor', {
-        building_id: buildingId,
-        exe_order: exe_order
-    }, function (response) {
-        //console.log('Floor add/edit response:', response);
-        //alert('Floor updated successfully!');
-        // optionally refresh something or update UI
-    });
-});*/
-
-
-
-// Click handler for the "Edit Floor" button
-
-
-
-	
-	
-	
-	// for delete
-	/*$(document).on('click', '#floordelete', function () {
-    const buildingId = $('.building-section').data('id');
-    const floorId = $(`#noOfFloors${buildingId}`).val();
-    console.log(floorId)
-
-    $.ajax({
-        url: '/gcc/api/gccschool/buildingasset/editBuildings', // adjust your controller path
-        method: 'POST',
-        data: {
-            building_id: buildingId,
-            floor_id: floorId
-        },
-        success: function (response) {
-            Swal.fire({
-                icon: 'success',
-                title: 'Success',
-                text: response.message || "Floor edited successfully"
-            });
-        },
-        error: function () {
-            Swal.fire({
-                icon: 'error',
-                title: 'Error',
-                text: 'Could not edit the floor.'
-            });
-        }
-    });
-});*/
-/* $(document).on('click', '#floordelete', function () {
-	console.log("hello floor delete")
-    const buildingId = $('.building-section').data('id');
-    const floorSelect = $(`#noOfFloors${buildingId}`);
-    const floorId = floorSelect.val();
-    //const floorName = floorSelect.find('option:selected').text();
-
-    if (!floorId) {
-        Swal.fire({
-            icon: 'warning',
-            title: 'No Floor Selected',
-            text: 'Please select a floor to delete or edit.'
-        });
-        return;
-    }
-
-    Swal.fire({
-        title: 'Are you sure?',
-        text: `Do you really want to delete `,
-        icon: 'warning',
-        showCancelButton: true,
-        confirmButtonColor: '#d33',
-        cancelButtonColor: '#3085d6',
-        confirmButtonText: 'Yes, proceed',
-        cancelButtonText: 'Cancel'
-    }).then((result) => {
-        if (result.isConfirmed) {
-            $.ajax({
-                url: '/gcc/api/gccschool/buildingasset/editBuildings', // update as needed /updateBuilding
-               
-                method: 'POST',
-                data: {
-                    building_id: buildingId,
-                    floors_id: floorId
-                },
-                success: function (response) {
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Success',
-                        text: response.message || "Floor updated successfully"
-                    }).then(() => {
-                        // Optionally refresh the table or UI
-                       //reloadbuildingSection();  // OR refreshDataTable();
-                    	//location.reload();
-                    	handleEdit(buildingId);
-                   });
-                    // Optionally refresh dropdown or UI
-                },
-                error: function () {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Could not update the floor.'
-                    });
-                }
-            });
-        } else {
-            Swal.fire(
-                'Cancelled',
-                'No changes were made.',
-                'info'
-            );
-        }
-    });
-});
- */
- 
- $(document).on('click', '#floordelete', function () {
-	    const buildingId = $('.building-section').data('id');
-	    const floorSelect = $(`#noOfFloors${buildingId}`);
-	    const floorId = floorSelect.val();
-	    //const floorName = floorSelect.find('option:selected').text();
-
-	    if (!floorId) {
-	        Swal.fire({
-	            icon: 'warning',
-	            title: 'No Floor Selected',
-	            text: 'Please select a floor to delete or edit.'
-	        });
-	        return;
-	    }
-
-	    Swal.fire({
-	        title: 'Are you sure?',
-	        text: `Do you really want to delete `,
-	        icon: 'warning',
-	        showCancelButton: true,
-	        confirmButtonColor: '#d33',
-	        cancelButtonColor: '#3085d6',
-	        confirmButtonText: 'Yes, proceed',
-	        cancelButtonText: 'Cancel',
-	        allowOutsideClick: false, // Disable clicking outside the modal to close it
-            allowEscapeKey: false, // Disable escape key to close the modal
-            allowEnterKey: false, // Disable enter key to close the modal	                   
-            showConfirmButton: true
-	    }).then((result) => {
-	        if (result.isConfirmed) {
-	            $.ajax({
-	                url: '/gcc/api/gccschool/buildingasset/editBuildings', // update as needed
-	                method: 'POST',
-	                data: {
-	                    building_id: buildingId,
-	                    floor_id: floorId
-	                },
-	                success: function (response) {
-	                	populatefloorDropdowns(buildingId);
-	                 /*   Swal.fire({
-	                        icon: 'success',
-	                        title: 'Success',
-	                        text: response.message || "Floor updated successfully"
-	                    }).then(() => {
-	                        // Optionally refresh the table or UI
-	                       //reloadbuildingSection();  // OR refreshDataTable();
-	                    	//location.reload();
-	                    	handleEdit(buildingId);
-	                   });*/
-	                    // Optionally refresh dropdown or UI
-	                },
-	                error: function () {
-	                    Swal.fire({
-	                        icon: 'error',
-	                        title: 'Error',
-	                        text: 'Could not update the floor.',
-	                        allowOutsideClick: false, // Disable clicking outside the modal to close it
-		                    allowEscapeKey: false, // Disable escape key to close the modal
-		                    allowEnterKey: false, // Disable enter key to close the modal	                   
-	                        showConfirmButton: true
-	                    });
-	                }
-	            });
-	        } else {
-	        	Swal.fire({
-	        	    title: 'Cancelled',
-	        	    text: 'No changes were made.',
-	        	    icon: 'info',
-	        	    confirmButtonText: 'OK',
-	        	    allowOutsideClick: false, // Disable clicking outside the modal to close it
-                    allowEscapeKey: false, // Disable escape key to close the modal
-                    allowEnterKey: false, // Disable enter key to close the modal	                   
-                    showConfirmButton: true
-	        	});
-
-	        }
-	    });
-	});
-
-	// this delete is for edit modal
-// Use event delegation
-$(document).on('click', '#buildingDelete', function () {
-    const buildingId = $('.building-section').data('id');
-    const selectedFloor = $(`#noOfFloors${buildingId}`).val();
-    const highestFloor = $(`#noOfFloors${buildingId} option:first`).val(); // Gets first option (i.e., highest)
-    console.log("selectedFloor", selectedFloor);
-    console.log("highestFloor", highestFloor);
-    console.log("buildingId", buildingId);
-
-    if (selectedFloor !== highestFloor) {
-        Swal.fire({
-            icon: 'warning',
-            title: 'Not Selected Highest Floor',
-            text: `Please select the highest floor (${highestFloor}) to delete this building!`,
-            confirmButtonText: 'OK'
-        });
-        return;
-    }
-
-    if (confirm("Are you sure you want to delete this building?")) {
-      //  deleteBuilding(buildingId); // your actual delete logic
-    }
-});
-
-	
-	function deleteBuilding(buildingId) {
-		  const isDelete = true; 
-		  console.log("buildingId",buildingId);
-    $.ajax({
-        url: '/gcc/api/gccschool/buildingasset/', // your delete endpoint
-        type: 'POST',
-        data: {
-        	building_id: buildingId,
-            is_delete: isDelete
-        },
-        success: function (res) {
-            if (res.status === "OK") {
-                alert("Building deleted successfully.");
-               // $('#assetModal').modal('hide');
-                // Refresh your building list here
-            } else {
-                alert("Failed to delete building.");
-            }
-        },
-        error: function () {
-            alert("Error occurred while deleting the building.");
-        }
-    });
-}
-	// this delete is for whole building
-	/*$(document).on('click', '.delete-btn', function () {
-		const buildingId = $(this).data('building-number');
-	    const buildingName = $(this).data('building-name');
-	    const isDelete = true;// or false if you're toggling
-	    
-	    
-	    const school_id = $(this).data('school-id');
-	    console.log("buildingId",buildingId);
-	    
-
-	    Swal.fire({
-	        title: `Delete ${buildingName}?`,
-	        text: "Are you sure you want to delete this building?",
-	        icon: 'warning',
-	        showCancelButton: true,
-	        confirmButtonText: 'Yes, Delete',
-	        cancelButtonText: 'Cancel',
-	        allowOutsideClick: false, // Disable clicking outside the modal to close it
-            allowEscapeKey: false, // Disable escape key to close the modal
-            allowEnterKey: false, // Disable enter key to close the modal	                   
-            showConfirmButton: true
-	    }).then((result) => {
-	        if (result.isConfirmed) {
-	            $.ajax({
-	                url: '/gcc/api/gccschool/buildingasset/deleteBuilding',
-	                method: 'POST',
-	                data: {
-	                    building_id: buildingId,
-	                    is_delete: isDelete
-	                },
-	                success: function (response) {
-	                    Swal.fire({
-	                        icon: 'success',
-	                        title: 'Deleted!',
-	                        text: response,
-	                        allowOutsideClick: false, // Disable clicking outside the modal to close it
-		                    allowEscapeKey: false, // Disable escape key to close the modal
-		                    allowEnterKey: false, // Disable enter key to close the modal	                   
-	                        showConfirmButton: true
-	                    }).then(() => {
-	                        // Optionally refresh the table or UI
-	                         //reloadbuildingSection(school_id);  // OR refreshDataTable();
-	                    	location.reload();
-	                    	//loadSavedBuilding(school_id);
-	                    });
-	                },
-	                error: function () {
-	                    Swal.fire({
-	                        icon: 'error',
-	                        title: 'Error',
-	                        text: 'Failed to delete building.',
-	                        confirmButtonText: 'OK'
-	                    });
-	                }
-	            });
-	        }
-	    });
-	});*/
-	$(document).on('click', '.delete-btn', function () {
-		const buildingId = $(this).data('building-number');
-		const buildingName = $(this).data('building-name');
-		const isDelete = true;
-		const school_id = $(this).data('school-id');
-
-		Swal.fire({
-			title: `Delete ${buildingName}?`,
-			text: "Are you sure you want to delete this building?",
-			icon: 'warning',
-			showCancelButton: true,
-			confirmButtonText: 'Yes, Delete',
-			cancelButtonText: 'Cancel',
-			allowOutsideClick: false,
-			allowEscapeKey: false,
-			allowEnterKey: false,
-			showConfirmButton: true
-		}).then((result) => {
-			if (result.isConfirmed) {
-				$.ajax({
-					url: '/gcc/api/gccschool/buildingasset/deleteBuilding',
-					method: 'POST',
-					data: {
-						building_id: buildingId,
-						is_delete: isDelete
-					},
-					success: function (response) {
-						Swal.fire({
-							icon: 'success',
-							title: 'Deleted!',
-							text: response,
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						}).then(() => {
-							location.reload();
-						});
-					},
-					error: function () {
-						Swal.fire({
-							icon: 'error',
-							title: 'Error',
-							text: 'Failed to delete building.',
-							confirmButtonText: 'OK',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						}).then(() => {
-						});
-					}
-				});
-			} else if (result.dismiss === Swal.DismissReason.cancel) {
-				Swal.fire({
-					title: 'Cancelled',
-					text: 'No changes were made.',
-					icon: 'info',
-					confirmButtonText: 'OK',
-					allowOutsideClick: false,
-					allowEscapeKey: false,
-					allowEnterKey: false,
-					showConfirmButton: true
-				}).then(() => {
-				});
-			}
-		});
-	});
-
-	
-</script>
-
-</html> 
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/dashboard.html b/src/main/resources/templates/modules/school/dashboard.html
deleted file mode 100644
index 0f14e2ce..00000000
--- a/src/main/resources/templates/modules/school/dashboard.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	body {
-		background-color: #f8f9fa;
-	}
-
-	.header {
-		font-size: 22px;
-		font-weight: bold;
-		margin-bottom: 20px;
-	}
-
-	.table {
-		border: 1px solid #dee2e6;
-	}
-
-	.table th,
-	.table td {
-		border: 1px solid #dee2e6;
-		padding: 10px;
-	}
-
-	.section-title {
-		font-size: 18px;
-		font-weight: bold;
-		margin-top: 20px;
-		border-bottom: 2px solid #007bff;
-		padding-bottom: 5px;
-	}
-
-	.form-group {
-		margin-top: 15px;
-	}
-
-	.radio-group {
-		display: flex;
-		gap: 20px;
-		margin-top: 10px;
-	}
-
-	/* 🆕 Added Styles for Better Layout */
-	.card {
-		padding: 20px;
-		border-radius: 10px;
-		box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
-		margin-bottom: 20px;
-		background-color: white;
-	}
-
-	.card .row {
-		margin-top: 10px;
-	}
-
-	.card .col-md-3 {
-		margin-bottom: 15px;
-	}
-
-	.form-control {
-		border-radius: 5px;
-	}
-
-	/* 🆕 Centering the Filter Button */
-	.text-center {
-		text-align: center;
-	}
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-
-			<div class="main-content">
-				<div class="container">
-					<div class="header">School Module - Dashboard</div>
-
-					<hr style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;">
-
-					<!-- Card 1: School Information -->
-					<div class="col-md-12">
-						<div class="card">
-							<div class="row">
-								<div class="col-md-3">
-									<label>Search with UDISE Number</label>
-									<select class="form-control" id="udiseDropdown">
-									   <option value="">Select UDISE Number</option>
-									</select>
-								</div>
-								<div class="col-md-3">
-									<label>Category</label>
-									<select class="form-control" id="categoryDropdown">
-										<option value="">Select Category</option>
-									</select>
-								</div>
-								<div class="col-md-3">
-									<label>Zone</label>
-									<select class="form-control" id="zoneDropdown">
-										<option value="">Select Zone</option>
-									</select>
-								</div>
-								<div class="col-md-3">
-									<label>Ward</label>
-									<select class="form-control" id="wardDropdown">
-										<option value="">Select Ward</option>
-									</select>
-								</div>
-							</div> <!-- Row End -->
-
-							<!-- Centered Filter Button -->
-							<div class="row mt-3">
-								<div class="col-12 text-center">
-									<button id="filterButton" class="btn btn-primary " style="background-color: #0D587B;">Filter</button>
-								<button id="resetButton" class="btn btn-secondary">Reset</button>
-								</div>
-							</div>
-
-						</div> <!-- Card End -->
-					</div> <!-- Col-md-12 End -->
-
-					<!-- 🆕 DataTable -->
-					<div class="card">
-						<div class="table-responsive">
-							<input type="hidden" id="loggedUserId" th:value="${user_id}">
-
-							<table id="schoolTable" class="table table-bordered table-striped">
-								<thead class="thead-dark">
-									<tr>
-										<th>S.No</th>
-										<th>UDISE Number</th>
-										<th>Name</th>
-										<th>Category</th>
-										<th>Zone</th>
-										<th>Ward</th>
-										<th>Address</th>
-									</tr>
-								</thead>
-								<tbody id="schoolTableBody">
-									<!-- Rows will be populated by JS -->
-								</tbody>
-							</table>
-						</div>
-					</div> <!-- DataTable Card End -->
-
-
-				</div> <!-- Container End -->
-			</div> <!-- Main Content End -->
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-
-		<script th:replace="~{fragments/modules/base/script :: script}"></script>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-		<script src="https://cdn.datatables.net/1.11.5/js/jquery.dataTables.min.js"></script>
-		<script src="https://cdn.datatables.net/1.11.5/js/dataTables.bootstrap5.min.js"></script>
-
-		<!-- 🆕 DataTable Initialization Script -->
-		<script>
-			$(document).ready(function () {
-				$('#schoolTable').DataTable({
-				    paging: true,
-				    responsive: false,
-				    searching: true,
-				    select: false,
-				    processing: false,
-				    ordering: true,
-				    info: true,
-				    language: {
-				        zeroRecords: "No schools found for this user.",
-				        emptyTable: "No data available in table"
-				    }
-				});
-			});
-			
-			function loadDropdown(userId, type, dropdownId, placeholderText) {
-				$.ajax({
-					url: "/gcc/api/gccschool/dropdown/getAllDropdownValues",
-					method: "GET",
-					data: { user_id: userId, type: type },
-					success: function (response) {
-						console.log(`Dropdown (${type}) response:`, response);
-						let dropdown = $(`#${dropdownId}`);
-						dropdown.empty().append(`<option value="">${placeholderText}</option>`);
-
-						if (response[0].Message === "Success" && response[0].Data.length > 0) {
-							response[0].Data.forEach(item => {
-								dropdown.append(`<option value="${item}">${item}</option>`);
-							});
-						}
-					},
-					error: function () {
-						alert(`Failed to load ${type} dropdown`);
-					}
-				});
-			}
-
-
-			$('#filterButton').click(function () {
-			    const userId = $('#loggedUserId').val();
-			    const udise = $('#udiseDropdown').val();
-			    const category = $('#categoryDropdown').val();
-			    const zone = $('#zoneDropdown').val();
-			    const ward = $('#wardDropdown').val();
-
-			    $.ajax({
-			        url: '/gcc/api/gccschool/schoolproperty/filterSchools',
-			        method: 'GET',
-			        data: {
-			            user_id: userId,
-			            udise: udise,
-			            category: category,
-			            zone: zone,
-			            ward: ward
-			        },
-			        success: function (response) {
-			            const table = $('#schoolTable').DataTable();
-			            table.clear();
-
-			            if (response.length > 0 && response[0].Message === "Success" && response[0].Data.length > 0) {
-			                let schoolList = response[0].Data;
-
-			                schoolList.forEach((school, index) => {
-			                    table.row.add([
-			                        index + 1,
-			                        school.udise || '',
-			                        school.school_name || '',
-			                        school.category || '',
-			                        school.zone || '',
-			                        school.division || '',
-			                        school.address || ''
-			                    ]);
-			                });
-			            }
-
-			            table.draw(); // Draw table whether data exists or not
-			        },
-			        error: function () {
-			            alert("Error fetching filtered school data.");
-			        }
-			    });
-			});
-
-
-			$('#filterButton').click(function () {
-			    filterSchools(); // Call the function on button click
-			});
-
-
-
-			function loadSchoolsForUser(userId) {
-				$.ajax({
-					url: "/gcc/api/gccschool/schoolproperty/getLoginDetails",
-					method: "GET",
-					data: { user_id: userId },
-					success: function (response) {
-						if (response.length > 0 && response[0].Message === "Success") {
-							let schoolList = response[0].Data;
-
-							// Destroy and reinitialize the DataTable with createdRow
-							if ($.fn.DataTable.isDataTable('#schoolTable')) {
-								$('#schoolTable').DataTable().destroy();
-							}
-
-							const table = $('#schoolTable').DataTable({
-								createdRow: function (row, data, dataIndex) {
-									$(row).attr("onclick", `redirectToDetails(${schoolList[dataIndex].id})`);
-									$(row).css("cursor", "pointer");
-								}
-							});
-
-							table.clear();
-
-							schoolList.forEach((school, index) => {
-								table.row.add([
-									index + 1,
-									school.udise || '',
-									school.school_name || '',
-									school.category || '',
-									school.zone || '',
-									school.division || '',
-									school.address || ''
-								]);
-							});
-
-							table.draw();
-						} else {
-							alert("No schools found for this user.");
-						}
-					},
-					error: function () {
-						alert("Failed to load schools.");
-					}
-				});
-			}
-
-			// ⏬ Call this on page load with the logged-in user's ID
-			$(document).ready(function () {
-			    const userId = $('#loggedUserId').val();
-			    loadSchoolsForUser(userId);
-			    loadDropdown(userId, 'udise', 'udiseDropdown', 'Select UDISE Number');
-			    loadDropdown(userId, 'category', 'categoryDropdown', 'Select Category');
-			    loadDropdown(userId, 'zone', 'zoneDropdown', 'Select Zone');
-			    loadDropdown(userId, 'ward', 'wardDropdown', 'Select Ward');
-
-			   // $('#schoolTable').DataTable();
-			});
-
-			function redirectToDetails(schoolId) {
-				window.location.href = "/gcc/school/otherdetails?schoolId=" + schoolId;
-			}
-			$('#resetButton').click(function () {
-			    location.reload(); // This will reload the entire page
-			});
-
-
-		</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/drinkingwater.html b/src/main/resources/templates/modules/school/drinkingwater.html
deleted file mode 100644
index 52698445..00000000
--- a/src/main/resources/templates/modules/school/drinkingwater.html
+++ /dev/null
@@ -1,1662 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr" xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
-	<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0/dist/css/select2.min.css" rel="stylesheet" />
-</head>
-<style>
-.select2-container--default .select2-selection--multiple {
-    padding-right: 30px;
-    min-height: 38px;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    position: relative;
-    background-image: none;
-}
-
-.select2-container--default .select2-selection--multiple::after {
-    content: "";
-    position: absolute;
-    top: 50%;
-    right: 8px;
-    width: 14px;
-    height: 14px;
-    transform: translateY(-50%);
-    background-image: url("data:image/svg+xml;utf8,<svg fill='gray' height='20' viewBox='0 0 24 24' width='20' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/></svg>");
-    background-repeat: no-repeat;
-    background-size: contain;
-    pointer-events: none;
-}
-
-#drinkingWaterModal .modal-body {
-        max-height: 80vh;  
-        overflow-y: auto;  
-    }
-  
-
-  /* Override for larger screens (desktops) */
- /* @media (min-width: 992px) {
-    #drinkingWaterTableContainer {
-      padding: 236px;
-      margin-top: -233px;
-    }
-  }*/
-
-</style>
-
-<body>
-	<div class="container mt-4">
-				<header th:replace="~{fragments/modules/base/header :: header}"></header>
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-	
-		
-			<div class="card p-3">
-				<div class="card-header">
-					<b>Drinking Water</b>
-				</div>
-								
-
-								<!-- Table Container for Displaying Saved Data -->
-								<div id="drinkingWaterTableContainer" style="display: none; padding: 15px;">
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th>Water Sources</th>
-												<td id="view_water_sources"></td>
-
-												<th>Water Supply Types</th>
-												<td id="view_water_supply_types"></td>
-											</tr>
-											<tr>
-												<th>Purifier Available</th>
-												<td id="view_purifier"></td>
-
-												<th>Purifier Capacity</th>
-												<td id="view_purifier_capacity"></td>
-											</tr>
-											<tr>
-												<th>Borewell Available</th>
-												<td id="view_borewell"></td>
-
-												<th>No. of Borewells</th>
-												<td id="view_borewell_count"></td>
-											</tr>
-											<tr>
-												<th>Storage Available</th>
-												<td id="view_storage"></td>
-
-												<th>Storage Types & Capacities</th>
-												<td id="view_storage_details"></td>
-											</tr>
-											<tr>
-												<th>No of Drinking Water Tap</th>
-												<td id="view_drinkingwater_tap"></td>
-
-												<th>No of Handwash Tap</th>
-												<td id="view_handwash_tap"></td>
-											</tr>
-										</tbody>
-									</table>
-									<div class="text-center">
-										<button class="btn btn-primary" id="editDrinkingBtn">Update</button>
-									</div>
-								</div>
-	
-
-									<!-- your existing form rows -->
-									<div class="form-section">
-
-									<!-- your existing form rows -->
-									<div class="row" style="padding: 5px;">
-										<div class="col-md-8 form-group">
-											<label for="water_sources" class="form-label fw-bold">Source of Water <span
-													class="text-danger">*</span></label>
-											<div id="water_sources_container" class="row gx-4 gy-2"></div>
-										</div>
-									</div>
-									<br>
-									<div id="waterSupplyContainer" class="row" style="gap: 10px;"></div>
-
-									<div class="row" style="padding: 5px;">
-										<div class="col-md-4 form-group">
-											<label>Water Purifying Facility Available <span
-													class="text-danger">*</span></label>
-											<div class="radio-group">
-												<input type="radio" name="water_purifier_available" id="purifier_yes"
-													value="1"> Yes
-												<input type="radio" name="water_purifier_available" id="purifier_no"
-													value="0"> No
-											</div>
-										</div>
-										<div class="col-md-4 form-group" id="purifier_capacity_container"
-											style="display: none;">
-											<label for="purifier_capacity">Capacity Of Purifier (Liters) <span
-													class="text-danger">*</span></label>
-											<input type="text" id="purifier_capacity" name="purifier_capacity"
-												class="form-control" placeholder="Enter Capacity Of Purifier" />
-										</div>
-									</div>
-
-									<div class="row" style="padding: 5px;">
-										<!-- <div class="col-md-4 form-group">
-											<label>Borwell Status <span class="text-danger">*</span></label>
-											<div class="radio-group">
-												<input type="radio" name="borwell_status_available"
-													id="borwell_status_yes" value="1"> Yes
-												<input type="radio" name="borwell_status_available"
-													id="borwell_status_no" value="0"> No
-											</div>
-										</div> -->
-										<div class="col-md-4 form-group" id="borwell_status_container"
-											style="display: none;">
-											<label for="no_of_borwells">No.of Borewells <span
-													class="text-danger">*</span></label>
-											<input type="number" id="no_of_borwells" name="no_of_borwells"
-												class="form-control" placeholder="Enter no Of Borwells" />
-										</div>
-									</div>
-
-									<div class="row" style="padding: 5px;">
-										<div class="col-md-4 form-group">
-											<label>Storage Status <span class="text-danger">*</span></label>
-											<div class="radio-group">
-												<input type="radio" name="storage_status" id="storage_yes" value="1">
-												Yes
-												<input type="radio" name="storage_status" id="storage_no" value="0"> No
-											</div>
-										</div>
-									</div>
-
-									<div class="row" id="storage_type_container" style="display: none; padding: 5px;">
-										<div class="col-md-4 form-group">
-											<label for="storage_types" class="form-label fw-bold">Type of Storage for
-												Drinking Water <span class="text-danger">*</span></label>
-											<select id="storage_types" class="form-control" multiple="multiple"
-												style="width: 100%;"></select>
-										</div>
-									</div>
-
-									<div class="row" id="storage_capacity_container" style="padding: 5px;"></div>
-									
-									<div class="row" style="padding: 5px;">										
-										<div class="col-md-4 form-group">
-											<label for="drinkingwater_tap">No of Drinking Water Tap<span
-													class="text-danger">*</span></label>
-											<input type="number" id="drinkingwater_tap" name="drinkingwater_tap"
-												class="form-control" placeholder="Enter Capacity Of Drinking Water Tap" />
-										</div>
-										
-										<div class="col-md-4 form-group">
-											<label for="handwash_tap">No of Handwash Tap<span
-													class="text-danger">*</span></label>
-											<input type="number" id="handwash_tap" name="handwash_tap"
-												class="form-control" placeholder="Enter Capacity Of Handwash Tap" />
-										</div>
-									</div>
-
-									<div class="row" style="padding: 5px;">
-										<div class="col-md-12 form-group">
-											<div class="card-footer text-center">
-												<button type="submit" class="btn btn-primary"
-													id="drinkingWaterSubmitBtn"><i
-														class="ik ik-save"></i>Submit</button>
-												<button type="reset" class="btn btn-secondary mr-2" id="resetButton"><i
-														class="ik ik-refresh-cw"></i>Reset</button>
-											</div>
-										</div>
-									</div>
-
-									<!-- Wrap ends here -->
-						
-	
-	</div>
-		</div>
-		<!-- Modal (Editable Form) -->
-				
-		<div class="modal fade" id="drinkingWaterModal" tabindex="-1" aria-labelledby="drinkingWaterModalLabel"
-			aria-hidden="true">
-			<div class="modal-dialog modal-lg">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">Update Drinking Water Details</h5>
-						<button type="button" class="close" data-bs-dismiss="modal"
-												aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					</div>
-					<div class="modal-body">
-						<form id="editDrinkingWaterForm">
-						</form>
-					</div>
-					<div class="modal-footer">
-					  <button class="btn btn-primary" id="saveDrinkingwaterModalUpdate">Save Changes</button>
-						<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-					</div>
-				</div>
-			</div>
-		</div>
-<script th:replace="~{fragments/modules/base/script :: script}"></script>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-		<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0/dist/js/select2.min.js"></script>
-
-		<script>
-			$(document).ready(function () {
-
-				const urlParams = new URLSearchParams(window.location.search);
-				const schoolId = urlParams.get("schoolId");
-
-
-				document.getElementById('no_of_borwells').addEventListener('input', function () {
-					this.value = this.value.replace(/[^0-9]/g, '');
-					if (parseInt(this.value) < 0) {
-						this.value = '';
-					}
-				});
-				  $('#storage_types').select2({
-		        	  placeholder: "Select Storage Type",
-		        	  
-		        	 
-		        	  minimumResultsForSearch: Infinity,
-		        	  closeOnSelect: false
-		        	});
-		        	$('#storage_types').on('select2:opening', function () {
-		        	  setTimeout(() => {
-		        	    $('.select2-search__field').prop('readonly', true);
-		        	  }, 0);
-		        	});
-				$(document).on('input', '#purifier_capacity', function () {
-					let value = $(this).val();
-
-					// Allow only digits and at most one decimal point
-					let cleaned = value.replace(/[^0-9.]/g, '');         // Remove anything that's not digit or dot
-					cleaned = cleaned.replace(/(\..*?)\..*/g, '$1');      // Allow only one dot
-
-					$(this).val(cleaned);
-				});
-
-				loadWaterSources();
-
-				function loadWaterSources() {
-					$.ajax({
-						url: '/gcc/api/gccschool/dropdown/getWaterSource',
-						method: 'GET',
-						success: function (response) {
-							  console.log(response.data);
-							$('#water_sources_container').empty();
-							if (response.status === "OK") {
-								window.allWaterSources = response.data;
-								
-								response.data.forEach(item => {
-									$('#water_sources_container').append(`
-            				  <div class="col-auto">
-            				    <div class="form-check form-check-inline me-3">
-            				      <input class="form-check-input water-source-checkbox me-2 " type="checkbox" value="${item.source_water_id}" data-label="${item.water_type}" id="water_source_${item.source_water_id}">
-            				      <label class="form-check-label" for="water_source_${item.source_water_id}" style="margin-bottom: 0;">${item.water_type}</label>
-            				    </div>
-            				  </div>
-            				`);
-
-
-
-								});
-							}
-
-						}
-					});
-				}
-
-				loadDrinkingWaterTable();
-				
-				function loadDrinkingWaterTable() {
-					$.ajax({
-						url: "/gcc/api/gccschool/schoolproperty/checkWaterDetails",
-						method: "GET",
-						cache: false,
-						data: {school_id: schoolId},
-						success: function (res) {
-							console.log("Drinking Water API Response:", res);
-
-							const d = res?.DrinkingWater || res[0]?.DrinkingWater;
-							const sources = res?.WaterSource || res[0]?.WaterSource || [];
-							const storage = res?.WaterStorage || res[0]?.WaterStorage || [];
-
-							window.modalDrinkingData = {
-								    drinking_water_id: d.drinking_water_id,  // ✅ Add this line
-								    purifier: d.is_purifier == 1 ? 'Yes' : 'No',
-								    purifier_capacity: d.purifier_capacity || '',
-								    borewell: d.is_borewell == 1 ? 'Yes' : 'No',
-								    borewell_count: d.borewell_count || '',
-								    storage: d.is_storage == 1 ? 'Yes' : 'No',
-								    drinkingwater_tap:d.drinkingwater_tap,
-								    handwash_tap: d.handwash_tap,
-								    storageDetails: storage.map(s => `${s.storage_type}: ${s.capacity} L`).join('<br>')
-								};
-
-							window.modalDrinkingRawResponse = res;
-
-
-							if (d && Object.keys(d).length > 0) {
-								  $('#view_purifier').text(d.is_purifier == 1 ? 'Yes' : 'No');
-							        $('#view_purifier_capacity').text(d.purifier_capacity || '-');
-							        $('#view_borewell').text(d.is_borewell == 1 ? 'Yes' : 'No');
-							        $('#view_borewell_count').text(d.borewell_count || '-');
-							        $('#view_storage').text(d.is_storage == 1 ? 'Yes' : 'No');
-
-							        const sourceNames = sources.map(w => w.water_type).join(', ');
-							        const sourceTypes = sources.map(w => `${w.water_type}: ${w.supply_type}`).join('<br>');
-
-							        $('#view_water_sources').text(sourceNames || '-');
-							        $('#view_water_supply_types').html(sourceTypes || '-');
-
-									if (d.is_storage == 1 && storage && storage.length > 0) {
-									  const storageText = storage.map(s => `${s.storage_type}: ${s.capacity} L`).join('<br>');
-									  $('#view_storage_details').html(storageText);
-									} else {
-									  $('#view_storage_details').text('-');
-									}
-									
-									//view_drinkingwater_tap view_handwash_tap
-									 $('#view_drinkingwater_tap').text(d.drinkingwater_tap);
-									 $('#view_handwash_tap').text(d.handwash_tap);
-								$('#drinkingWaterTableContainer').show();
-								$('.form-section').hide(); // ✅ Hides the entire form
-							} else {
-								$('#drinkingWaterTableContainer').hide();
-								$('.form-section').show(); // ✅ Shows the form if no data
-							}
-
-						},
-						error: function () {
-							console.warn("No Drinking Water data found for school_id", schoolId);
-							$('#drinkingWaterTableContainer').hide();
-							$('#drinkingWaterSubmitBtn').closest('.row').show();
-						}
-					});
-				}
-
-								$(document).on('change', '#editDrinkingWaterForm input[name="water_purifier_available"]', function () {
-				    if ($('#editDrinkingWaterForm #purifier_yes').is(':checked')) {
-				        $('#editDrinkingWaterForm #purifier_capacity_container').show();
-				    } else {
-				        $('#editDrinkingWaterForm #purifier_capacity_container').hide();
-				       // $('#editDrinkingWaterForm #purifier_capacity').val('');
-				    }
-				});
-
-				$(document).on('change', '#editDrinkingWaterForm input[name="borwell_status_available"]', function () {
-				    if ($('#editDrinkingWaterForm #borwell_status_yes').is(':checked')) {
-				        $('#editDrinkingWaterForm #borwell_status_container').show();
-				    } else {
-				        $('#editDrinkingWaterForm #borwell_status_container').hide();
-				       // $('#editDrinkingWaterForm #no_of_borwells').val('');
-				    }
-				});
-			
-
-
-
-				$('#editDrinkingBtn').click(function () {
-					const d = window.modalDrinkingData;
-					const res = window.modalDrinkingRawResponse;
-
-					const allSources = window.allWaterSources || []; // cache this globally after loading dropdown
-					const selectedSources = res?.WaterSource || res[0]?.WaterSource || [];
-				    if ($('#storage_types').hasClass('select2-hidden-accessible')) {
-				        $('#storage_types').select2('destroy');
-				    }
-
-
-					// Clone and inject form
-					const formHtml = $('.form-section').html();
-					$('#editDrinkingWaterForm').html(formHtml);
-					$('#editDrinkingWaterForm').find('.card-footer').remove();
-					$('#editDrinkingWaterForm #storage_types').select2({
-					    placeholder: "Select Storage Types",
-					    allowClear: false,
-					    minimumResultsForSearch: Infinity,
-					    closeOnSelect: false
-					  }).on('select2:opening', function () {
-					    setTimeout(() => {
-					      $('.select2-search__field').prop('readonly', true);
-					    }, 0);
-					  });
-
-					const waterSourceContainer = $('#editDrinkingWaterForm #water_sources_container');
-					const waterSupplyContainer = $('#editDrinkingWaterForm #waterSupplyContainer');
-					waterSourceContainer.empty();
-					waterSupplyContainer.empty();
-
-					// Build all checkboxes and pre-select only saved ones
-					allSources.forEach(source => {
-						const { source_water_id, water_type } = source;
-						const isChecked = selectedSources.some(s => s.source_water_id == source_water_id);
-						const selected = selectedSources.find(s => s.source_water_id == source_water_id);
-						const supply_type = selected?.supply_type || "";
-
-						// Add checkbox
-						waterSourceContainer.append(`
-							<div class="col-auto">
-								<div class="form-check form-check-inline me-3">
-									<input class="form-check-input water-source-checkbox me-2"
-										   type="checkbox"
-										   value="${source_water_id}"
-										   data-label="${water_type}"
-										   id="edit_water_source_${source_water_id}"
-										   ${isChecked ? 'checked' : ''}>
-									<label class="form-check-label" for="edit_water_source_${source_water_id}" style="margin-bottom: 0;">${water_type}</label>
-								</div>
-							</div>
-						`);
-
-						// If it's selected, show the supply type radios
-						if (isChecked) {
-							waterSupplyContainer.append(`
-								<div class="col-md-3 mb-3" id="edit-water-supply-${source_water_id}">
-									<label class="fw-bold d-block mb-2">${water_type} Type Of Water Supply <span class="text-danger">*</span></label>
-									<div class="d-flex gap-4">
-										<div class="form-check form-check-inline">
-											<input class="form-check-input" type="radio" name="water_supply_${source_water_id}" value="Continuous" ${supply_type === 'Continuous' ? 'checked' : ''}>
-											<label class="form-check-label">Continuous</label>
-										</div>
-										<div class="form-check form-check-inline">
-											<input class="form-check-input" type="radio" name="water_supply_${source_water_id}" value="Intermittent" ${supply_type === 'Intermittent' ? 'checked' : ''}>
-											<label class="form-check-label">Intermittent</label>
-										</div>
-									</div>
-								</div>
-							`);
-						}
-					});
-					
-					
-
-					// Prefill purifier
-					if (d.purifier === 'Yes') {
-						$('#editDrinkingWaterForm #purifier_yes').prop('checked', true);
-						$('#editDrinkingWaterForm #purifier_capacity_container').show();
-						$('#editDrinkingWaterForm #purifier_capacity').val(d.purifier_capacity);
-					} else {
-						$('#editDrinkingWaterForm #purifier_no').prop('checked', true);
-						$('#editDrinkingWaterForm #purifier_capacity_container').hide();
-					}
-
-					// Borewell
-					if (d.borewell === 'Yes') {
-						$('#editDrinkingWaterForm #borwell_status_yes').prop('checked', true);
-						$('#editDrinkingWaterForm #borwell_status_container').show();
-						$('#editDrinkingWaterForm #no_of_borwells').val(d.borewell_count);
-					} else {
-						$('#editDrinkingWaterForm #borwell_status_no').prop('checked', true);
-						$('#editDrinkingWaterForm #borwell_status_container').hide();
-					}
-					
-					$('#editDrinkingWaterForm #drinkingwater_tap').val(d.drinkingwater_tap);
-					$('#editDrinkingWaterForm #handwash_tap').val(d.handwash_tap);
-					
-					//console.log("d.drinkingwater_tap=",d.drinkingwater_tap);
-					
-					// Storage
-					if (d.storage === 'Yes') {
-						$('#editDrinkingWaterForm #storage_yes').prop('checked', true);
-						$('#editDrinkingWaterForm #storage_type_container').show();
-
-						fetchStorageTypes(() => {
-							const storage = res?.WaterStorage || res[0]?.WaterStorage || [];
-							const selectedIds = [];
-
-							storage.forEach(s => {
-								const storageType = s.storage_type?.trim();
-								$('#editDrinkingWaterForm #storage_types option').each(function () {
-									if ($(this).text().trim() === storageType) {
-										selectedIds.push($(this).val());
-									}
-								});
-							});
-
-							$('#editDrinkingWaterForm #storage_types').val(selectedIds).trigger('change');
-
-							setTimeout(() => {
-								storage.forEach(s => {
-									const storageType = s.storage_type?.trim();
-									const capacity = s.capacity;
-									$('#editDrinkingWaterForm #storage_types option').each(function () {
-										if ($(this).text().trim() === storageType) {
-											const id = $(this).val();
-											$(`#editDrinkingWaterForm #capacity_${id}`).val(capacity);
-											
-										}
-									});
-								});
-							}, 500);
-						}, '#editDrinkingWaterForm #storage_types');
-						
-						
-					} else {
-						$('#editDrinkingWaterForm #storage_no').prop('checked', true);
-						$('#editDrinkingWaterForm #storage_type_container').hide();
-						$('#editDrinkingWaterForm #storage_capacity_container').empty();
-					}
-
-					new bootstrap.Modal(document.getElementById('drinkingWaterModal')).show();
-				});
-
-
-
-
-
-
-				$('#saveDrinkingwaterModalUpdate').click(function () {
-					const drinkingWaterId = window.modalDrinkingData?.drinking_water_id;
-
-					const form = $('#editDrinkingWaterForm');
-					const schoolId = new URLSearchParams(window.location.search).get("schoolId");
-
-					// 👉 You MUST set this somewhere when loading the edit modal
-					//const drinkingWaterId = window.modalDrinkingData?.drinking_water_id; // ✅ corrected
-
-
-					let water = [], waterError = false;
-					form.find('.water-source-checkbox:checked').each(function () {
-						const id = $(this).val();
-						const supplyType = form.find(`input[name="water_supply_${id}"]:checked`).val();
-						if (!supplyType) waterError = true;
-						water.push({
-							water_supply_id: 0, // placeholder, handled in backend
-							source_water_id: parseInt(id),
-							supply_type: supplyType
-						});
-					});
-					if (waterError || water.length === 0) {
-						return Swal.fire("Info", "Select supply type for all selected water sources.", "info");
-					}
-
-					const purifierValue = form.find('input[name="water_purifier_available"]:checked').val();
-					if (!purifierValue) return Swal.fire("Info", "Select purifier availability.", "info");
-					const purifierCapacity = purifierValue === '1' ? form.find('#purifier_capacity').val() : null;
-					/*if (purifierValue === '1' && !purifierCapacity) {
-						return Swal.fire("Info", "Enter purifier capacity.", "info");
-					}*/
-					if (purifierValue === '1') {
-					    if (!purifierCapacity || purifierCapacity <= 0) {
-					        return Swal.fire("Info", !purifierCapacity ? "Enter purifier capacity." : "Purifier capacity must be greater than 0.", "info");
-					    }
-					}
-
-					const isBorewell = form.find('.water-source-checkbox[data-label="Borewell"]').is(':checked') ? '1' : '0';
-					const borewellCount = isBorewell === '1' ? form.find('#no_of_borwells').val() : null;
-
-					if (isBorewell === '1') {
-					    if (!borewellCount || borewellCount <= 0) {
-					        return Swal.fire("Info", !borewellCount ? "Enter number of borewells." : "Number of borewells must be greater than 0.", "info");
-					    }
-					}
-
-					const up_drinkingwater_tap = form.find('#drinkingwater_tap').val();
-					if(!up_drinkingwater_tap){
-						Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: 'Please enter No of Drinking Water Tap.If No means enter Zero(0)',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-						return;
-					}
-					
-					const up_handwash_tap = form.find('#handwash_tap').val();
-					if(!up_handwash_tap){
-						Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: 'Please enter No of Handwash Tap.If No means enter Zero(0)',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-						return;
-					}
-					
-
-					const storageValue = form.find('input[name="storage_status"]:checked').val();
-					let storage = [], storageError = false;
-					if (!storageValue) return Swal.fire("Info", "Select storage status.", "info");
-
-					if (storageValue === '1') {
-						const selected = form.find('#storage_types').val() || [];
-						if (selected.length === 0) {
-							return Swal.fire("Info", "Select type of storage.", "info");
-						}
-						selected.forEach(id => {
-							const cap = form.find(`#capacity_${id}`).val();
-							if (!cap || isNaN(cap) || parseFloat(cap) <= 0) {
-								storageError = true;
-							} else {
-								storage.push({
-									water_storage_id: 0, // placeholder
-									storage_water_id: parseInt(id),
-									capacity: parseFloat(cap)
-								});
-							}
-						});
-					}
-
-					if (storageError) {
-						return Swal.fire("Info", "Enter valid capacity for all selected storage types.", "info");
-					}
-
-					
-					
-					const updatePayload = {
-						    is_purifier: purifierValue === '1',
-						    purifier_capacity: purifierCapacity ? parseFloat(purifierCapacity) : null,
-						    		is_borewell: isBorewell === '1',
-						    		borewell_count: borewellCount ? parseInt(borewellCount) : 0,
-
-						    is_storage: storageValue === '1',
-						    drinking_water_id: parseInt(drinkingWaterId), // ✅ will no longer be NaN or undefined
-						    school_id: parseInt(schoolId),
-						    supply: water,
-						    storage: storage,
-						    drinkingwater_tap:up_drinkingwater_tap,
-						    handwash_tap:up_handwash_tap
-						};
-
-					console.log("Update payload:", updatePayload);
-
-					$.ajax({
-						url: '/gcc/api/gccschool/schoolproperty/updateDrinkingWater',
-						type: 'POST',
-						contentType: 'application/json',
-						data: JSON.stringify(updatePayload),
-						success: function (response) {
-							let result = response;
-
-							// If response is a string like "Success", convert it to an object manually
-							if (typeof response === "string" && response.toLowerCase().includes("success")) {
-								result = { status: "OK" };
-							}
-
-							if (result.status === "OK") {
-								Swal.fire({
-									icon: "success",
-									title: "Success",
-									text: "Drinking water details updated successfully!",
-										 allowOutsideClick: false,
-										  allowEscapeKey: false,
-										  allowEnterKey: false,
-										  showConfirmButton: true
-								}).then(() => {
-									$('#drinkingWaterModal').modal('hide');
-									location.reload();
-								});
-							} else {
-								Swal.fire({
-									icon: "error",
-									title: "Submission Failed",
-									text: result.message || "Please try again.",
-									 allowOutsideClick: false,
-									  allowEscapeKey: false,
-									  allowEnterKey: false,
-									  showConfirmButton: true
-								});
-							}
-						},
-												error: function (xhr) {
-						  let errorMessage = "Something went wrong";
-
-						  try {
-						    // Try parsing as JSON
-						    const json = JSON.parse(xhr.responseText);
-						    if (json.message) {
-						      errorMessage = json.message;
-						    } else {
-						      errorMessage = JSON.stringify(json); // fallback if no message
-						    }
-						  } catch (e) {
-						    // If it's HTML or plain text
-						    if (typeof xhr.responseText === 'string') {
-						      // Detect if it's HTML and avoid showing it
-						      if (xhr.responseText.trim().startsWith('<!DOCTYPE')) {
-						        errorMessage = "Internal server error. Please contact support.";
-						      } else {
-						        errorMessage = xhr.responseText;
-						      }
-						    }
-						  }
-
-						  Swal.fire({
-						    icon: "error",
-						    title: "Error",
-						    text: errorMessage
-						  });
-						}
-
-					});
-					
-				});
-
-
-
-
-				$(document).on('change', '.water-source-checkbox', function () {
-				    const id = $(this).val();
-				    const label = $(this).data('label');
-				    const container = $('#waterSupplyContainer');
-
-				    if ($(this).is(':checked')) {
-				        // Add supply type section if not already added
-				        if ($(`#water-supply-${id}`).length === 0) {
-				            container.append(`
-				                <div class="col-md-3 mb-3" id="water-supply-${id}">
-				                    <label class="fw-bold d-block mb-2">${label} Type Of Water Supply <span class="text-danger">*</span></label>
-				                    <div class="d-flex gap-4">
-				                        <div class="form-check form-check-inline">
-				                            <input class="form-check-input" type="radio" name="water_supply_${id}" value="Continuous" id="supply_${id}_1">
-				                            <label class="form-check-label" for="supply_${id}_1">Continuous</label>
-				                        </div>
-				                        <div class="form-check form-check-inline">
-				                            <input class="form-check-input" type="radio" name="water_supply_${id}" value="Intermittent" id="supply_${id}_2">
-				                            <label class="form-check-label" for="supply_${id}_2">Intermittent</label>
-				                        </div>
-				                    </div>
-				                </div>
-				            `);
-				        }
-
-				        // ✅ Show borewell input if Borewell is selected
-				        if (label.toLowerCase().trim() === "borewell") {
-				            $('#borwell_status_container').show();
-				        }
-
-				    } else {
-				        // Remove corresponding water supply section
-				        $(`#water-supply-${id}`).remove();
-
-				        // ✅ Hide and clear borewell field if Borewell is deselected
-				        if (label.toLowerCase().trim() === "borewell") {
-				            $('#borwell_status_container').hide();
-				            $('#no_of_borwells').val('');
-				        }
-				    }
-				});
-				const previousSupplySelections = {};
-
-				$(document).on('change', '#editDrinkingWaterForm .water-source-checkbox', function () {
-					const id = $(this).val();
-					const label = $(this).data('label');
-					const container = $('#editDrinkingWaterForm #waterSupplyContainer');
-
-					if ($(this).is(':checked')) {
-						// Restore previous supply type from memory (if any)
-						const selectedValue = previousSupplySelections[id] || '';
-
-						if ($(`#edit-water-supply-${id}`).length === 0) {
-							container.append(`
-								<div class="col-md-3 mb-3" id="edit-water-supply-${id}">
-									<label class="fw-bold d-block mb-2">${label} Type Of Water Supply <span class="text-danger">*</span></label>
-									<div class="d-flex gap-4">
-										<div class="form-check form-check-inline">
-											<input class="form-check-input" type="radio" name="water_supply_${id}" value="Continuous" id="edit_supply_${id}_1">
-											<label class="form-check-label" for="edit_supply_${id}_1">Continuous</label>
-										</div>
-										<div class="form-check form-check-inline">
-											<input class="form-check-input" type="radio" name="water_supply_${id}" value="Intermittent" id="edit_supply_${id}_2">
-											<label class="form-check-label" for="edit_supply_${id}_2">Intermittent</label>
-										</div>
-									</div>
-								</div>
-							`);
-
-							// Preselect if available
-							if (selectedValue) {
-								$(`input[name="water_supply_${id}"][value="${selectedValue}"]`).prop('checked', true);
-							}
-						}
-
-						if (/bore\s*-?\s*well/i.test(label)) {
-							$('#editDrinkingWaterForm #borwell_status_container').show();
-						}
-
-					} else {
-						// Save the selected value before removing it
-						const selected = $(`input[name="water_supply_${id}"]:checked`).val();
-						if (selected) {
-							previousSupplySelections[id] = selected;
-						}
-
-						$(`#edit-water-supply-${id}`).remove();
-
-						if (/bore\s*-?\s*well/i.test(label)) {
-							$('#editDrinkingWaterForm #borwell_status_container').hide();
-						}
-					}
-				});
-
-				
-
-
-				/*$(document).on('change', '#editDrinkingWaterForm .water-source-checkbox', function () {
-					const id = $(this).val();
-					const label = $(this).data('label');
-					const container = $('#editDrinkingWaterForm #waterSupplyContainer');
-
-					if ($(this).is(':checked')) {
-						if ($(`#edit-water-supply-${id}`).length === 0) {
-							container.append(`
-								<div class="col-md-3 mb-3" id="edit-water-supply-${id}">
-									<label class="fw-bold d-block mb-2">${label} Type Of Water Supply <span class="text-danger">*</span></label>
-									<div class="d-flex gap-4">
-										<div class="form-check form-check-inline">
-											<input class="form-check-input" type="radio" name="water_supply_${id}" value="Continious" id="edit_supply_${id}_1">
-											<label class="form-check-label" for="edit_supply_${id}_1">Continious</label>
-										</div>
-										<div class="form-check form-check-inline">
-											<input class="form-check-input" type="radio" name="water_supply_${id}" value="Intermittent" id="edit_supply_${id}_2">
-											<label class="form-check-label" for="edit_supply_${id}_2">Intermittent</label>
-										</div>
-									</div>
-								</div>
-							`);
-						}
-
-						// ✅ Show Borewell count field if label matches "Borewell"
-						if (/bore\s*-?\s*well/i.test(label)) {
-							$('#editDrinkingWaterForm #borwell_status_container').show();
-						}
-
-					} else {
-						$(`#edit-water-supply-${id}`).remove();
-
-						if (/bore\s*-?\s*well/i.test(label)) {
-							$('#editDrinkingWaterForm #borwell_status_container').hide();
-							//$('#editDrinkingWaterForm #no_of_borwells').val('');
-						}
-					}
-				});*/
-
-
-
-				$('input[name="water_purifier_available"]').change(function () {
-					if ($('#purifier_yes').is(':checked')) {
-						$('#purifier_capacity_container').show();
-					} else {
-						$('#purifier_capacity_container').hide();
-						$('#purifier_capacity').val(''); // Clear input when "No" or nothing is selected
-					}
-				});
-
-
-				$('input[name="borwell_status_available"]').change(function () {
-					if ($('#borwell_status_yes').is(':checked')) {
-						$('#borwell_status_container').show();
-					} else {
-						$('#borwell_status_container').hide();
-						$('#no_of_borwells').val(''); // Clear input when "No" or nothing is selected
-					}
-				});
-				$('input[name="storage_status"]').change(function () {
-				    if ($('#storage_yes').is(':checked')) {
-				        $('#storage_type_container').show();
-				        $('#storage_capacity_container').show();
-
-				        // ✅ If options already loaded, just trigger change
-				        if (storageTypesLoaded) {
-				            $('#storage_types').trigger('change');
-				        } else {
-				            // First time loading storage types if not yet loaded
-				            fetchStorageTypes(function () {
-				                $('#storage_types').trigger('change');
-				                storageTypesLoaded = true;
-				            }, '#storage_types');
-				        }
-
-				    } else {
-				        $('#storage_type_container').hide();
-				        $('#storage_capacity_container').hide().empty();
-				        $('#storage_types').val(null).trigger('change');
-				    }
-				});
-
-
-
-
-
-
-				/*$('input[name="storage_status"]').change(function () {
-					if ($('#storage_yes').is(':checked')) {
-						$('#storage_type_container').show();
-						//fetchStorageTypes();
-						fetchStorageTypes(null, '#storage_types');
-					} else {
-						$('#storage_type_container').hide();
-						$('#storage_capacity_container').empty();
-					}
-				});*/
-				/*$(document).on('change', '#editDrinkingWaterForm input[name="storage_status"]', function () {
-				    if ($('#editDrinkingWaterForm #storage_yes').is(':checked')) {
-				        $('#editDrinkingWaterForm #storage_type_container').show();
-				        fetchStorageTypes(null, '#editDrinkingWaterForm #storage_types');
-				    } else {
-				        $('#editDrinkingWaterForm #storage_type_container').hide();
-				        $('#editDrinkingWaterForm #storage_capacity_container').empty();
-				    }
-				});*/
-				let storageTypesLoaded = false;
-				
-				fetchStorageTypes(function () {
-				    console.log("Storage types loaded initially.");
-				    storageTypesLoaded = true;
-				}, '#storage_types');
-
-				/* $(document).on('change', '#editDrinkingWaterForm input[name="storage_status"]', function () {
-				    const res = window.modalDrinkingRawResponse;
-				    const storageData = res?.WaterStorage || res[0]?.WaterStorage || [];
-
-				    if ($('#editDrinkingWaterForm #storage_yes').is(':checked')) {
-				        $('#editDrinkingWaterForm #storage_type_container').show();
-				        $('#editDrinkingWaterForm #storage_capacity_container').show();
-
-				        $('#editDrinkingWaterForm #storage_types').html(''); // clear dropdown
-
-				        fetchStorageTypes(function () {
-				            const $dropdown = $('#editDrinkingWaterForm #storage_types');
-				            const selectedIds = [];
-
-				            storageData.forEach(s => {
-				                const storageType = s.storage_type?.trim();
-				                $dropdown.find('option').each(function () {
-				                    if ($(this).text().trim() === storageType) {
-				                        selectedIds.push($(this).val());
-				                    }
-				                });
-				            });
-
-				            $dropdown.val(selectedIds).trigger('change');
-
-				            setTimeout(() => {
-				                storageData.forEach(s => {
-				                    const storageType = s.storage_type?.trim();
-				                    const capacity = s.capacity;
-				                    $dropdown.find('option').each(function () {
-				                        if ($(this).text().trim() === storageType) {
-				                            const id = $(this).val();
-				                            if (!$(`#capacity_group_${id}`).length) {
-				                                $('#editDrinkingWaterForm #storage_capacity_container').append(`
-				                                    <div class="col-md-4 form-group" id="capacity_group_${id}">
-				                                        <label>${storageType} Capacity Of Storage (Liters) <span class="text-danger">*</span></label>
-				                                        <input type="number" class="form-control storage-capacity" id="capacity_${id}" name="capacity_${id}" value="${capacity}" placeholder="Enter Capacity (Liters)" required>
-				                                    </div>
-				                                `);
-				                            } else {
-				                                $(`#capacity_${id}`).val(capacity);
-				                            }
-				                        }
-				                    });
-				                });
-				            }, 300);
-				        }, '#editDrinkingWaterForm #storage_types');
-
-				    } else {
-				        $('#editDrinkingWaterForm #storage_type_container').hide();
-				        $('#editDrinkingWaterForm #storage_capacity_container').hide().empty();
-				        $('#editDrinkingWaterForm #storage_types').val(null).trigger('change');
-				    }
-				}); */
-
-				// Inside your $(document).ready(function () { ... });
-				$(document).on('change', '#editDrinkingWaterForm input[name="storage_status"]', function () {
-				    const res = window.modalDrinkingRawResponse;
-				    const storageData = res?.WaterStorage || res[0]?.WaterStorage || [];
-
-				    const $dropdown = $('#editDrinkingWaterForm #storage_types');
-				    const $capacityContainer = $('#editDrinkingWaterForm #storage_capacity_container');
-
-				    if ($('#editDrinkingWaterForm #storage_yes').is(':checked')) {
-				        $('#editDrinkingWaterForm #storage_type_container').show();
-				        $capacityContainer.show();
-
-				        fetchStorageTypes(function () {
-				            const selectedIds = [];
-
-				            storageData.forEach(s => {
-				                const storageType = s.storage_type?.trim();
-				                $dropdown.find('option').each(function () {
-				                    if ($(this).text().trim() === storageType) {
-				                        selectedIds.push($(this).val());
-				                    }
-				                });
-				            });
-
-				            $dropdown.val(selectedIds).trigger('change');
-
-				            // Wait for dropdown to be populated, then fill values
-				            setTimeout(() => {
-				                storageData.forEach(s => {
-				                    const storageType = s.storage_type?.trim();
-				                    const capacity = s.capacity;
-
-				                    $dropdown.find('option').each(function () {
-				                        if ($(this).text().trim() === storageType) {
-				                            const id = $(this).val();
-
-				                            if (!$(`#editDrinkingWaterForm #capacity_group_${id}`).length) {
-				                                $capacityContainer.append(`
-				                                    <div class="col-md-4 form-group" id="capacity_group_${id}">
-				                                        <label>${storageType} Capacity Of Storage (Liters) <span class="text-danger">*</span></label>
-				                                        <input type="number" class="form-control storage-capacity" id="capacity_${id}" name="capacity_${id}" value="${capacity}" placeholder="Enter Capacity (Liters)" required>
-				                                    </div>
-				                                `);
-				                            } else {
-				                                // Important: Don't overwrite user modified values
-				                                const currentVal = $(`#capacity_${id}`).val();
-				                                if (!currentVal || parseFloat(currentVal) <= 0) {
-				                                    $(`#capacity_${id}`).val(capacity);
-				                                }
-				                            }
-				                        }
-				                    });
-				                });
-				            }, 300);
-
-				        }, '#editDrinkingWaterForm #storage_types');
-
-				    } else {
-				        $('#editDrinkingWaterForm #storage_type_container').hide();
-				        $capacityContainer.hide(); 
-				        // ❗ DO NOT empty container here, preserve previous fields
-				    }
-				});
-
-
-
-
-
-
-
-			/*	function fetchStorageTypes() {
-					$.ajax({
-						url: '/gcc/api/gccschool/dropdown/getWaterStorage',
-						method: 'GET',
-						success: function (response) {
-							$('#storage_types').empty();
-							if (response.status === "OK") {
-								response.data.forEach(item => {
-									$('#storage_types').append(`<option value="${item.storage_water_id}" data-label="${item.storage_type}">${item.storage_type}</option>`);
-								});
-								$('#storage_types').select2({placeholder: "Select Storage Types", allowClear: true});
-							}
-						}
-					});
-				}*/
-				function fetchStorageTypes(callback, dropdownSelector = '#storage_types') {
-				    $.ajax({
-				        url: '/gcc/api/gccschool/dropdown/getWaterStorage',
-				        method: 'GET',
-				        success: function (response) {
-				            const $dropdown = $(dropdownSelector);
-				            $dropdown.empty(); // Clear previous options
-
-				            if (response.status === "OK" && Array.isArray(response.data)) {
-				                response.data.forEach(item => {
-				                    $dropdown.append(`<option value="${item.storage_water_id}" data-label="${item.storage_type}">${item.storage_type}</option>`);
-				                });
-
-				                $dropdown.select2({
-				                    placeholder: "Select Storage Types",
-				                    allowClear: false,
-				                    minimumResultsForSearch: Infinity,
-				                    closeOnSelect: false
-				                });
-
-				                if (typeof callback === "function") {
-				                    callback();
-				                }
-				            }
-				        },
-				        error: function () {
-				            console.error("Failed to fetch storage types.");
-				            if (typeof callback === "function") {
-				                callback();
-				            }
-				        }
-				    });
-				}
-
-
-
-
-				/*$('#storage_types').on('change', function () {
-					$('#storage_capacity_container').empty();
-					$('#storage_types option:selected').each(function () {
-						const id = $(this).val();
-						const label = $(this).data('label');
-						$('#storage_capacity_container').append(`
-              <div class="col-md-4 form-group" id="capacity_group_${id}">
-                <label>${label} Capacity Of Storage (Liters) <span class="text-danger">*</span></label>
-                <input type="number" class="form-control storage-capacity" id="capacity_${id}" name="capacity_${id}" placeholder="Enter Capacity (Liters)" required>
-              </div>`);
-					});
-				});*/
-				$('#storage_types').on('change', function () {
-					const selected = $(this).val() || [];
-					const container = $('#storage_capacity_container');
-
-					// Step 1: Remove any capacity group not in selected list
-					container.find('.form-group').each(function () {
-						const id = $(this).attr('id')?.replace('capacity_group_', '');
-						if (!selected.includes(id)) {
-							$(this).remove(); // ❌ Remove only unselected
-						}
-					});
-
-					// Step 2: Add any newly selected items if not already present
-					$(this).find('option:selected').each(function () {
-						const id = $(this).val();
-						const label = $(this).data('label');
-
-						// Add only if it doesn't already exist
-						if (!container.find(`#capacity_group_${id}`).length) {
-							container.append(`
-								<div class="col-md-4 form-group" id="capacity_group_${id}">
-									<label>${label} Capacity Of Storage (Liters) <span class="text-danger">*</span></label>
-									<input type="number" class="form-control storage-capacity" id="capacity_${id}" name="capacity_${id}" placeholder="Enter Capacity (Liters)" required>
-								</div>
-							`);
-						}
-					});
-				});
-				$(document).on('change', '#editDrinkingWaterForm #storage_types', function () {
-					const selected = $(this).val() || [];
-					const container = $('#editDrinkingWaterForm #storage_capacity_container');
-
-					// Remove capacity groups not in selected
-					container.find('.form-group').each(function () {
-						const id = $(this).attr('id')?.replace('capacity_group_', '');
-						if (!selected.includes(id)) {
-							$(this).remove();
-						}
-					});
-
-					// Add new selected
-					$(this).find('option:selected').each(function () {
-						const id = $(this).val();
-						const label = $(this).data('label');
-
-						if (!container.find(`#capacity_group_${id}`).length) {
-							container.append(`
-								<div class="col-md-4 form-group" id="capacity_group_${id}">
-									<label>${label} Capacity Of Storage (Liters) <span class="text-danger">*</span></label>
-									<input type="number" class="form-control storage-capacity" id="capacity_${id}" name="capacity_${id}" placeholder="Enter Capacity (Liters)" required>
-								</div>
-							`);
-						}
-					});
-				});
-
-				/*$(document).on('change', '#editDrinkingWaterForm #storage_types', function () {
-					const selected = $(this).val() || [];
-					const container = $('#editDrinkingWaterForm #storage_capacity_container');
-
-					// Step 1: Remove capacity fields that are no longer selected
-					container.find('.form-group').each(function () {
-						const id = $(this).attr('id')?.replace('capacity_group_', '');
-						if (!selected.includes(id)) {
-							$(this).remove(); // ❌ Only remove what is unselected
-						}
-					});
-
-					// Step 2: Add capacity fields for newly selected items
-					$(this).find('option:selected').each(function () {
-						const id = $(this).val();
-						const label = $(this).data('label');
-
-						if (!container.find(`#capacity_group_${id}`).length) {
-							container.append(`
-								<div class="col-md-4 form-group" id="capacity_group_${id}">
-									<label>${label} Capacity Of Storage (Liters) <span class="text-danger">*</span></label>
-									<input type="number" class="form-control storage-capacity" id="capacity_${id}" name="capacity_${id}" placeholder="Enter Capacity (Liters)" required>
-								</div>
-							`);
-						}
-					});
-				});
-
-
-				$(document).on('change', '#editDrinkingWaterForm #storage_types', function () {
-					const $container = $('#editDrinkingWaterForm #storage_capacity_container');
-					$container.empty(); // clear previous
-
-					$('#editDrinkingWaterForm #storage_types option:selected').each(function () {
-						const id = $(this).val();
-						const label = $(this).data('label');
-
-						$container.append(`
-							<div class="col-md-4 form-group" id="capacity_group_${id}">
-								<label>${label} Capacity Of Storage (Liters) <span class="text-danger">*</span></label>
-								<input type="number" class="form-control storage-capacity" id="capacity_${id}" name="capacity_${id}" placeholder="Enter Capacity (Liters)" required>
-							</div>
-						`);
-					});
-				});*/
-
-
-				$('#resetButton').click(function () {
-					$('input[type="text"], input[type="number"]').val('');
-					$('input[type="radio"]').prop('checked', false);
-					$('select').val(null).trigger('change');
-					$('#purifier_capacity_container').hide();
-					$('#borwell_status_container').hide();
-					$('#storage_type_container').hide();
-					$('#storage_capacity_container').empty();
-					$('#waterSupplyContainer').empty();
-				});
-
-				$('#drinkingWaterSubmitBtn').click(function (e) {
-					e.preventDefault();
-					let water = [], waterError = false;
-					$('.water-source-checkbox:checked').each(function () {
-						const id = $(this).val();
-						const supplyType = $(`input[name="water_supply_${id}"]:checked`).val();
-						if (!supplyType) waterError = true;
-						water.push({source_water_id: parseInt(id), supply_type: supplyType});
-					});
-
-					/*if (waterError || water.length === 0) {
-						return Swal.fire({ icon: 'info', title: 'Info', text: 'Please select supply type for all selected water sources.' });
-					  }
-		  
-					const isPurifier = $('input[name="water_purifier_available"]:checked').val();
-					if (!isPurifier) return Swal.fire({ icon: 'info', title: 'Info', text: 'Please select water purifier availability.' });
-					const purifierCapacity = isPurifier === '1' ? $('#purifier_capacity').val() : null;
-					if (isPurifier === '1' && !purifierCapacity) return Swal.fire({ icon: 'info', title: 'Info', text: 'Enter Capacity for Purifier.' });
-		  
-					const isBorewell = $('input[name="borwell_status_available"]:checked').val();
-					if (!isBorewell) return Swal.fire({ icon: 'info', title: 'Info', text: 'Please select Borewell Status.' });
-					const borewellCount = isBorewell === '1' ? $('#no_of_borwells').val() : null;
-					if (isBorewell === '1' && !borewellCount) return Swal.fire({ icon: 'info', title: 'Info', text: 'Enter No of Borewells.' });
-		  
-					const isStorage = $('input[name="storage_status"]:checked').val();
-					let storage = [], storageError = false;
-					if (isStorage === '1') {
-					  const selected = $('#storage_types').val();
-					  if (!selected.length) return Swal.fire({ icon: 'info', title: 'Info', text: 'Please select Type of Storage.' });
-					  selected.forEach(id => {
-						const capacity = $(`#capacity_${id}`).val();
-						if (!capacity) storageError = true;
-						storage.push({ storage_water_id: parseInt(id), capacity: parseFloat(capacity) });
-					  });
-					  if (storageError) return Swal.fire({ icon: 'info', title: 'Info', text: 'Please enter capacity for all selected storage types.' });
-					}*/
-					if (waterError || water.length === 0) {
-						return Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: 'Please select supply type for all selected water sources.',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-					const isPurifier = $('input[name="water_purifier_available"]:checked').val();
-					if (!isPurifier) {
-						return Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: 'Please select water purifier availability.',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-					const purifierCapacity = isPurifier === '1' ? $('#purifier_capacity').val() : null;
-					/*if (isPurifier === '1' && !purifierCapacity && purifierCapacity <=0  ) {
-						return Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: 'Enter Capacity for Purifier.',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}*/
-					/*if (isPurifier === '1') {
-					    if (!purifierCapacity || purifierCapacity <= 0) {
-					        return Swal.fire({
-					            icon: 'info',
-					            title: 'Info',
-					            text: 'Enter Capacity for Purifier and  greater than 0.',
-					            allowOutsideClick: false,
-					            allowEscapeKey: false,
-					            allowEnterKey: false,
-					            showConfirmButton: true
-					        });
-					    }
-					}*/
-					if (isPurifier === '1') {
-					    if (!purifierCapacity || purifierCapacity <= 0) {
-					        return Swal.fire({
-					            icon: 'info',
-					            title: 'Info',
-					            text: !purifierCapacity ? 'Enter Capacity for Purifier.' : 'Capacity for Purifier must be greater than 0.',
-					            allowOutsideClick: false,
-					            allowEscapeKey: false,
-					            allowEnterKey: false,
-					            showConfirmButton: true
-					        });
-					    }
-					}
-
-
-					/*if (purifierCapacity <=0 ) {
-						return Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: ' Capacity for Purifier must be greater than 0.',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}*/
-
-					const isBorewell = $('input[data-label="Borewell"]').is(':checked') ? '1' : '0';
-
-					if (!isBorewell) {
-						return Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: 'Please select Borewell Status.',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-					const borewellCount = isBorewell === '1' ? $('#no_of_borwells').val() : null;
-
-					if (isBorewell === '1') {
-					    if (!borewellCount || borewellCount <= 0) {
-					        return Swal.fire({
-					            icon: 'info',
-					            title: 'Info',
-					            text: !borewellCount ? 'Enter No of Borewells.' : 'No of Borewells must be greater than 0.'
-					        });
-					    }
-					}
-					
-					
-
-					
-
-				/*	if (isBorewell === '1') {
-					    if (!borewellCount || borewellCount <= 0) {
-					        return Swal.fire({
-					            icon: 'info',
-					            title: 'Info',
-					            text:  'Enter No of Borewells and  greater than 0.',
-					            allowOutsideClick: false,
-					            allowEscapeKey: false,
-					            allowEnterKey: false,
-					            showConfirmButton: true
-					        });
-					    }
-					}*/
-					
-
-				/*	if (isBorewell === '1' && !borewellCount) {
-						return Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: 'Enter No of Borewells.',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-					if (borewellCount <=0 ) {
-						return Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: ' Borewells must be greater than 0.',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}*/
-
-					const isStorage = $('input[name="storage_status"]:checked').val();
-					let storage = [], storageError = false;
-
-					// Step 1: Check if Storage status is selected
-					if (!isStorage) {
-						return Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: 'Please select Storage Status.',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-					// Step 2: If "Yes", validate selected storage types and capacity
-					if (isStorage === '1') {
-						const selectedTypes = $('#storage_types').val();
-
-						if (!selectedTypes || selectedTypes.length === 0) {
-							return Swal.fire({
-								icon: 'info',
-								title: 'Info',
-								text: 'Please select Type of Storage.',
-								allowOutsideClick: false,
-								allowEscapeKey: false,
-								allowEnterKey: false,
-								showConfirmButton: true
-							});
-						}
-
-						selectedTypes.forEach(id => {
-							const capacity = $(`#capacity_${id}`).val();
-							if (!capacity || isNaN(capacity) || parseFloat(capacity) <= 0) {
-								storageError = true;
-							} else {
-								storage.push({
-									storage_water_id: parseInt(id),
-									capacity: parseFloat(capacity)
-								});
-							}
-						});
-
-						if (storageError ) {
-							return Swal.fire({
-								icon: 'info',
-								title: 'Info',
-								text: 'Please enter valid capacity for all selected storage types.',
-								allowOutsideClick: false,
-								allowEscapeKey: false,
-								allowEnterKey: false,
-								showConfirmButton: true
-							});
-						}
-						
-					}
-					
-					const drinkingwater_tap=$('#drinkingwater_tap').val().trim();
-					if(!drinkingwater_tap)
-					{
-						Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: 'Please enter No of Drinking Water Tap.If No means enter Zero(0)',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-						return;
-					}
-					
-					const handwash_tap=$('#handwash_tap').val().trim();
-					if(!handwash_tap)
-					{
-						Swal.fire({
-							icon: 'info',
-							title: 'Info',
-							text: 'Please enter No of Handwash Tap.If No means enter Zero(0)',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-						return;
-					}
-
-
-
-					const requestData = {
-						school_id: schoolId,
-						water,
-						is_purifier: isPurifier,
-						purifier_capacity: purifierCapacity,
-						is_borewell: isBorewell,
-						borewell_count: borewellCount,
-						is_storage: isStorage,
-						storage,
-						drinkingwater_tap:drinkingwater_tap,
-						handwash_tap:handwash_tap
-					};
-					
-					console.log("requestData===" + JSON.stringify(requestData));
-
-					 $.ajax({
-						url: '/gcc/api/gccschool/schoolproperty/saveDrinkingWater',
-						method: 'POST',
-						contentType: 'application/json',
-						data: JSON.stringify(requestData),						
-						success: function(response) {
-						    let title, icon;
-
-						    switch (response.status) {
-						      case "OK":
-						        title = "Success";
-						        icon = "success";
-						        break;
-						      case "SKIPPED":
-						        title = "Notice";
-						        icon = "info";
-						        break;
-						      default:
-						        title = "Error";
-						        icon = "error";
-						        break;
-						    }
-
-						    Swal.fire({
-						      title: title,
-						      text: response.message || 'No message from server',
-						      icon: icon,
-						      allowOutsideClick: false,
-						      allowEscapeKey: false,
-						      allowEnterKey: false,
-						      showConfirmButton: true
-						    }).then(() => {
-						     
-						        // Reload or redirect only after successful insert
-						        location.reload();
-						      
-						      // For SKIPPED or ERROR, you may just close the alert without reload
-						    });
-						  },
-						error: function (xhr) {
-						  let errorMessage = "An error occurred while submitting the form.";
-
-						  try {
-						    // If responseText is a valid JSON string
-						    const response = JSON.parse(xhr.responseText);
-						    if (response.message) {
-						      errorMessage = response.message;
-						    }
-						  } catch (e) {
-						    // fallback: responseText is not JSON, maybe plain text
-						    if (xhr.responseText) {
-						      errorMessage = xhr.responseText;
-						    }
-						  }
-
-						  Swal.fire({
-						    icon: "error",
-						    title: "Error",
-						    text: errorMessage  // ✅ Make sure this is always a string
-						  });
-						}
-
-					}); 
-					
-				});
-			});
-
-			function resetDrinkingWaterFields() {
-				console.log("Reset button clicked - Drinking Water");
-
-				// Uncheck all radio buttons and checkboxes
-				$('input[type="radio"]').prop('checked', false);
-				$('input[type="checkbox"]').prop('checked', false);
-
-				// Clear input fields
-				$('#purifier_capacity').val('');
-				$('#no_of_borwells').val('');
-
-				// Hide dependent sections
-				$('#purifier_capacity_container').hide();
-				$('#borwell_status_container').hide();
-				$('#storage_type_container').hide();
-
-				// Reset multi-select dropdown
-				$('#storage_types').val(null).trigger('change');
-
-				// ✅ Keep checkboxes visible but hide extra fields that depend on them
-				$('#water_sources_container').show();  // Ensures checkboxes remain visible
-				// Hide and clear dependent section
-				$('#waterSupplyContainer').hide().empty(); // 👈 Hides + removes previous dynamic HTML
-				// Hide dependent section
-			}
-
-			// ✅ Add event listener to show dependent fields when checkbox is clicked
-			$(document).on('change', 'input[type="checkbox"]', function () {
-				if ($('input[type="checkbox"]:checked').length > 0) {
-					$('#waterSupplyContainer').show();  // Show if at least one checkbox is checked
-				} else {
-					$('#waterSupplyContainer').hide();  // Hide if no checkboxes are checked
-
-				}
-			});
-
-			// Event Listener for Reset Button (Drinking Water section)
-			$(document).on('click', '#resetButton', function (event) {
-				event.preventDefault();
-				resetDrinkingWaterFields();
-			});
-
-
-
-			// Event Listener for Reset Button (Drinking Water section)
-
-
-
-		</script>
-	</div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/electricalassets.html b/src/main/resources/templates/modules/school/electricalassets.html
deleted file mode 100644
index fcd5311a..00000000
--- a/src/main/resources/templates/modules/school/electricalassets.html
+++ /dev/null
@@ -1,405 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	body {
-		background-color: #f8f9fa;
-		/*  font-family: Arial, sans-serif;*/
-	}
-
-
-
-	.header {
-		font-size: 22px;
-		font-weight: bold;
-		margin-bottom: 20px;
-	}
-
-	.table {
-		border: 1px solid #dee2e6;
-	}
-
-	.table th,
-	.table td {
-		border: 1px solid #dee2e6;
-		padding: 10px;
-	}
-
-	.section-title {
-		font-size: 18px;
-		font-weight: bold;
-		margin-top: 20px;
-		border-bottom: 2px solid #007bff;
-		padding-bottom: 5px;
-	}
-
-	.form-group {
-		margin-top: 15px;
-	}
-
-	.radio-group {
-		display: flex;
-		gap: 20px;
-		margin-top: 10px;
-	}
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container">
-					<div class="header">School Module - Master Details - {Id 3232193827918}</div>
-
-					<hr style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;">
-
-					<!-- Card 1: School Information -->
-					<div class="col-md-12">
-						<div class="card">
-							<div class="card-header" style="							background-color: #404E67;
-							color: white;">School Information</div>
-							<table class="table">
-								<tr>
-									<th>School Name:</th>
-									<td>CPS KOLATHUR II</td>
-									<th>UDISE Code:</th>
-									<td>33020401404</td>
-								</tr>
-								<tr>
-									<th>Category:</th>
-									<td>Primary School</td>
-									<th>Medium:</th>
-									<td>Tamil, English</td>
-								</tr>
-								<tr>
-									<th>School Type:</th>
-									<td>Government</td>
-									<th>Zone:</th>
-									<td>Zone 11</td>
-								</tr>
-								<tr>
-									<th>Ward:</th>
-									<td>Ward 122</td>
-									<th>Address:</th>
-									<td>1a, school road, Venkat Nagar, Kolathur, Chennai.</td>
-								</tr>
-							</table>
-						</div>
-					</div>
-					
-<div class="col-md-12">
-    <div class="d-flex justify-content-between align-items-center">
-        <h4>Room Wise Asset Mapping - Furniture Assets</h4>
-        <button type="button" class="btn btn-primary"
-                style="background-color: #0D587B; border: none; border-radius: 6px; padding: 6px 16px;"
-                data-bs-toggle="modal" data-bs-target="#assetModal">
-            + Add Assets
-        </button>
-    </div>
-
-    <hr style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;">
-</div>
-
-					
-					
-					
-					<div class="row mt-4">
-    <div class="col-md-12">
-        <div class="card">
-            <div class="card-block">
-
-                <h5 style="font-weight:bold;">List of Electrical Assets</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">
-                    <table id="CompletedCPSDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" style="width:100%">
-                        <thead class="thead-dark">
-                            <tr>
-                                <th style="width: 5%;">S.NO</th>
-                                <th style="width: 10%;">ASSET CODE</th>
-                                <th style="width: 15%;">NAME</th>
-                                <th style="width: 10%;">SOURCE</th>
-                                <th style="width: 15%;">SERIAL NUMBER</th>
-                                <th style="width: 15%;">RECEIVED DATE</th>
-                                <th style="width: 10%;">RECEIVED BY</th>
-                                <th style="width: 10%;">VENDOR DETAILS</th>
-                                <th style="width: 10%;">INVOICE NUMBER</th>
-                                <th style="width: 10%;">LOCATION</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                <td>1</td>
-                                <td>TH40V40I</td>
-                                <td>CAMERA</td>
-                                <td>GCC</td>
-                                <td>22023293837281</td>
-                                <td>JUN 23, 2025 12:40 PM</td>
-                                <td>RECEIVED BY</td>
-                                <td>N/A</td>
-                                <td>2345676543ER</td>
-                                <td>CHENNAI</td>
-                            </tr>
-                            <tr>
-                                <td>2</td>
-                                <td>TH40V40I</td>
-                                <td>CAMERA</td>
-                                <td>GCC</td>
-                                <td>22023293837281</td>
-                                <td>JUN 23, 2025 12:40 PM</td>
-                                <td>RECEIVED BY</td>
-                                <td>N/A</td>
-                                <td>2345676543ER</td>
-                                <td>CHENNAI</td>
-                            </tr>
-                            <tr>
-                                <td>3</td>
-                                <td>TH40V40I</td>
-                                <td>CAMERA</td>
-                                <td>GCC</td>
-                                <td>22023293837281</td>
-                                <td>JUN 23, 2025 12:40 PM</td>
-                                <td>RECEIVED BY</td>
-                                <td>N/A</td>
-                                <td>2345676543ER</td>
-                                <td>CHENNAI</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-					
-					
-					<!-- Card 2: Other Details -->
-					
-				
-				</div>
-				
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-</div>
-
-
-
-	<!-- Modal -->
-<div class="modal fade" id="assetModal" tabindex="-1" role="dialog" aria-labelledby="assetModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">Room Wise Asset Mapping - Electrical Assets</h5>
-                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Building Dropdown -->
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            <label for="buildingDropdown">Select Building *</label>
-                            <select id="buildingDropdown" class="form-control">
-                                <option value="">-- Select Building --</option>
-                                <option value="building1">Building 1</option>
-                                <option value="building2">Building 2</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Floor Dropdown -->
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            <label for="floorDropdown">Select Floor *</label>
-                            <select id="floorDropdown" class="form-control">
-                                <option value="">-- Select Floor --</option>
-                                <option value="floor1">1st Floor</option>
-                                <option value="floor2">2nd Floor</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Room Type Dropdown -->
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            <label for="roomTypeDropdown">Select Room Type *</label>
-                            <select id="roomTypeDropdown" class="form-control">
-                                <option value="">-- Select Room Type --</option>
-                                <option value="classroom">Classroom</option>
-                                <option value="conference">Conference Room</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Room Dropdown -->
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            <label for="roomDropdown">Select Room *</label>
-                            <select id="roomDropdown" class="form-control">
-                                <option value="">-- Select Room --</option>
-                                <option value="room1">Number 1</option>
-                                <option value="room2">Number 2</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Assets Dropdown -->
-                    <div class="col-md-12">
-                        <div class="form-group">
-                            <label for="assetDropdown">Select Assets *</label>
-                            <div class="form-control" id="assetDropdown">
-                                 <div class="form-check">
-                                    <input type="checkbox" class="asset-checkbox" value="fan"> Fan
-                                </div>
-                                <div class="form-check">
-                                    <input type="checkbox" class="asset-checkbox" value="Smart TV"> Lights
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Dynamic Asset Selection Section -->
-                    <div class="col-md-12" id="assetContainer"></div>
-                </div>
-
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                    <button type="button" class="btn btn-primary">Save</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-		<script th:replace="~{fragments/modules/base/script :: script}"></script>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-</body>
-
-<script>
-
-
-$(document).ready(function() {
-    $('#CompletedCPSDatatable').DataTable({
-        scrollX: true,  // Enables horizontal scrolling
-        autoWidth: false, // Ensures manual column widths are respected
-        responsive: true, // Ensures better mobile view
-        dom: 'Bftip',
-        lengthMenu: [
-            [10, 50, 100, 200, -1],
-            ['10 rows', '50 rows', '100 rows', 'Show all']
-        ],
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-});
-
-
-
-document.getElementById('buildingDropdown').addEventListener('change', function () {
-    const floorDropdown = document.getElementById('floorDropdown').parentElement;
-    const roomTypeDropdown = document.getElementById('roomTypeDropdown').parentElement;
-    const roomDropdown = document.getElementById('roomDropdown').parentElement;
-    const assetDropdown = document.getElementById('assetDropdown').parentElement;
-
-    if (this.value) {
-        floorDropdown.style.display = 'block';
-        roomTypeDropdown.style.display = 'block';
-        roomDropdown.style.display = 'block';
-    } else {
-        floorDropdown.style.display = 'none';
-        roomTypeDropdown.style.display = 'none';
-        roomDropdown.style.display = 'none';
-        assetDropdown.style.display = 'none';
-    }
-
-    document.getElementById('floorDropdown').value = "";
-    document.getElementById('roomTypeDropdown').value = "";
-    document.getElementById('roomDropdown').value = "";
-});
-
-// Show assets only when all dropdowns are selected
-function checkAllSelections() {
-    const building = document.getElementById('buildingDropdown').value;
-    const floor = document.getElementById('floorDropdown').value;
-    const roomType = document.getElementById('roomTypeDropdown').value;
-    const room = document.getElementById('roomDropdown').value;
-
-    const assetDropdown = document.getElementById('assetDropdown').parentElement;
-
-    if (building && floor && roomType && room) {
-        assetDropdown.style.display = 'block';
-    } else {
-        assetDropdown.style.display = 'none';
-        document.getElementById('assetContainer').innerHTML = ''; // Clear asset selection
-    }
-}
-
-document.getElementById('floorDropdown').addEventListener('change', checkAllSelections);
-document.getElementById('roomTypeDropdown').addEventListener('change', checkAllSelections);
-document.getElementById('roomDropdown').addEventListener('change', checkAllSelections);
-
-// Initially hide all dependent dropdowns and asset section
-window.addEventListener('DOMContentLoaded', function () {
-    document.getElementById('floorDropdown').parentElement.style.display = 'none';
-    document.getElementById('roomTypeDropdown').parentElement.style.display = 'none';
-    document.getElementById('roomDropdown').parentElement.style.display = 'none';
-    document.getElementById('assetDropdown').parentElement.style.display = 'none';
-});
-
-// Dynamic Asset Mapping with Quantity Input
-document.querySelectorAll('.asset-checkbox').forEach(checkbox => {
-    checkbox.addEventListener('change', function () {
-        const assetContainer = document.getElementById('assetContainer');
-        const assetValue = this.value;
-
-        if (this.checked) {
-            const assetDiv = document.createElement('div');
-            assetDiv.classList.add('asset-item');
-            assetDiv.id = `asset-${assetValue}`;
-            assetDiv.innerHTML = `
-            <div class="row"> 
-	            <div class="col-md-6">
-		                <div class="form-group mt-2">
-		                    <label>${assetValue} Quantity *</label>
-		                    <input type="number" class="form-control" placeholder="Enter Quantity" required>
-		                </div>
-	                </div>
-                </div>
-            `;
-            assetContainer.appendChild(assetDiv);
-        } else {
-            const existingDiv = document.getElementById(`asset-${assetValue}`);
-            if (existingDiv) {
-                assetContainer.removeChild(existingDiv);
-            }
-        }
-    });
-});
-
-
-
-
-</script>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/furnitureassets.html b/src/main/resources/templates/modules/school/furnitureassets.html
deleted file mode 100644
index ddc6b2a2..00000000
--- a/src/main/resources/templates/modules/school/furnitureassets.html
+++ /dev/null
@@ -1,411 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	body {
-		background-color: #f8f9fa;
-		/*  font-family: Arial, sans-serif;*/
-	}
-
-
-
-	.header {
-		font-size: 22px;
-		font-weight: bold;
-		margin-bottom: 20px;
-	}
-
-	.table {
-		border: 1px solid #dee2e6;
-	}
-
-	.table th,
-	.table td {
-		border: 1px solid #dee2e6;
-		padding: 10px;
-	}
-
-	.section-title {
-		font-size: 18px;
-		font-weight: bold;
-		margin-top: 20px;
-		border-bottom: 2px solid #007bff;
-		padding-bottom: 5px;
-	}
-
-	.form-group {
-		margin-top: 15px;
-	}
-
-	.radio-group {
-		display: flex;
-		gap: 20px;
-		margin-top: 10px;
-	}
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container">
-					<div class="header">School Module - Master Details - {Id 3232193827918}</div>
-
-					<hr style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;">
-
-					<!-- Card 1: School Information -->
-					<div class="col-md-12">
-						<div class="card">
-							<div class="card-header" style="							background-color: #404E67;
-							color: white;">School Information</div>
-							<table class="table">
-								<tr>
-									<th>School Name:</th>
-									<td>CPS KOLATHUR II</td>
-									<th>UDISE Code:</th>
-									<td>33020401404</td>
-								</tr>
-								<tr>
-									<th>Category:</th>
-									<td>Primary School</td>
-									<th>Medium:</th>
-									<td>Tamil, English</td>
-								</tr>
-								<tr>
-									<th>School Type:</th>
-									<td>Government</td>
-									<th>Zone:</th>
-									<td>Zone 11</td>
-								</tr>
-								<tr>
-									<th>Ward:</th>
-									<td>Ward 122</td>
-									<th>Address:</th>
-									<td>1a, school road, Venkat Nagar, Kolathur, Chennai.</td>
-								</tr>
-							</table>
-						</div>
-					</div>
-					
-<div class="col-md-12">
-    <div class="d-flex justify-content-between align-items-center">
-        <h4>Room Wise Asset Mapping - Furniture Assets</h4>
-        <button type="button" class="btn btn-primary"
-                style="background-color: #0D587B; border: none; border-radius: 6px; padding: 6px 16px;"
-                data-bs-toggle="modal" data-bs-target="#assetModal">
-            + Add Assets
-        </button>
-    </div>
-
-    <hr style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;">
-</div>
-
-					
-					
-					
-					<div class="row mt-4">
-    <div class="col-md-12">
-        <div class="card">
-            <div class="card-block">
-
-                <h5 style="font-weight:bold;">List of Furniture Assets</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">
-                    <table id="CompletedCPSDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" style="width:100%">
-                        <thead class="thead-dark">
-                            <tr>
-                                <th style="width: 5%;">S.NO</th>
-                                <th style="width: 10%;">ASSET CODE</th>
-                                <th style="width: 15%;">NAME</th>
-                                <th style="width: 10%;">SOURCE</th>
-                                <th style="width: 15%;">SERIAL NUMBER</th>
-                                <th style="width: 15%;">RECEIVED DATE</th>
-                                <th style="width: 10%;">RECEIVED BY</th>
-                                <th style="width: 10%;">VENDOR DETAILS</th>
-                                <th style="width: 10%;">INVOICE NUMBER</th>
-                                <th style="width: 10%;">LOCATION</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                <td>1</td>
-                                <td>TH40V40I</td>
-                                <td>CAMERA</td>
-                                <td>GCC</td>
-                                <td>22023293837281</td>
-                                <td>JUN 23, 2025 12:40 PM</td>
-                                <td>RECEIVED BY</td>
-                                <td>N/A</td>
-                                <td>2345676543ER</td>
-                                <td>CHENNAI</td>
-                            </tr>
-                            <tr>
-                                <td>2</td>
-                                <td>TH40V40I</td>
-                                <td>CAMERA</td>
-                                <td>GCC</td>
-                                <td>22023293837281</td>
-                                <td>JUN 23, 2025 12:40 PM</td>
-                                <td>RECEIVED BY</td>
-                                <td>N/A</td>
-                                <td>2345676543ER</td>
-                                <td>CHENNAI</td>
-                            </tr>
-                            <tr>
-                                <td>3</td>
-                                <td>TH40V40I</td>
-                                <td>CAMERA</td>
-                                <td>GCC</td>
-                                <td>22023293837281</td>
-                                <td>JUN 23, 2025 12:40 PM</td>
-                                <td>RECEIVED BY</td>
-                                <td>N/A</td>
-                                <td>2345676543ER</td>
-                                <td>CHENNAI</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-					
-					
-					<!-- Card 2: Other Details -->
-					
-				
-				</div>
-				
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-</div>
-
-
-
-	<!-- Modal -->
-<div class="modal fade" id="assetModal" tabindex="-1" role="dialog" aria-labelledby="assetModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">Room Wise Asset Mapping - Furniture Assets</h5>
-                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Building Dropdown -->
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            <label for="buildingDropdown">Select Building *</label>
-                            <select id="buildingDropdown" class="form-control">
-                                <option value="">-- Select Building --</option>
-                                <option value="building1">Building 1</option>
-                                <option value="building2">Building 2</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Floor Dropdown -->
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            <label for="floorDropdown">Select Floor *</label>
-                            <select id="floorDropdown" class="form-control">
-                                <option value="">-- Select Floor --</option>
-                                <option value="floor1">1st Floor</option>
-                                <option value="floor2">2nd Floor</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Room Type Dropdown -->
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            <label for="roomTypeDropdown">Select Room Type *</label>
-                            <select id="roomTypeDropdown" class="form-control">
-                                <option value="">-- Select Room Type --</option>
-                                <option value="classroom">Classroom</option>
-                                <option value="conference">Conference Room</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Room Dropdown -->
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            <label for="roomDropdown">Select Room *</label>
-                            <select id="roomDropdown" class="form-control">
-                                <option value="">-- Select Room --</option>
-                                <option value="room1">Number 1</option>
-                                <option value="room2">Number 2</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Assets Dropdown -->
-                    <div class="col-md-12">
-                        <div class="form-group">
-                            <label for="assetDropdown">Select Assets *</label>
-                            <div class="form-control" id="assetDropdown">
-                                <div class="form-check">
-                                    <input type="checkbox" class="asset-checkbox" value="desk"> Desk
-                                </div>
-                                <div class="form-check">
-                                    <input type="checkbox" class="asset-checkbox" value="bench"> Bench
-                                </div>
-                                <div class="form-check">
-                                    <input type="checkbox" class="asset-checkbox" value="cupboard"> Cup Board
-                                </div>
-                                <div class="form-check">
-                                    <input type="checkbox" class="asset-checkbox" value="blackboard"> Black Board
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Dynamic Asset Selection Section -->
-                    <div class="col-md-12" id="assetContainer"></div>
-                </div>
-
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                    <button type="button" class="btn btn-primary">Save</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-		<script th:replace="~{fragments/modules/base/script :: script}"></script>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-</body>
-
-<script>
-
-
-$(document).ready(function() {
-    $('#CompletedCPSDatatable').DataTable({
-        scrollX: true,  // Enables horizontal scrolling
-        autoWidth: false, // Ensures manual column widths are respected
-        responsive: true, // Ensures better mobile view
-        dom: 'Bftip',
-        lengthMenu: [
-            [10, 50, 100, 200, -1],
-            ['10 rows', '50 rows', '100 rows', 'Show all']
-        ],
-        buttons: [
-            { extend: 'pageLength', className: 'btn btn-warning' },
-            { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-        ],
-        fixedHeader: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-});
-
-
-
-document.getElementById('buildingDropdown').addEventListener('change', function () {
-    const floorDropdown = document.getElementById('floorDropdown').parentElement;
-    const roomTypeDropdown = document.getElementById('roomTypeDropdown').parentElement;
-    const roomDropdown = document.getElementById('roomDropdown').parentElement;
-    const assetDropdown = document.getElementById('assetDropdown').parentElement;
-
-    if (this.value) {
-        floorDropdown.style.display = 'block';
-        roomTypeDropdown.style.display = 'block';
-        roomDropdown.style.display = 'block';
-    } else {
-        floorDropdown.style.display = 'none';
-        roomTypeDropdown.style.display = 'none';
-        roomDropdown.style.display = 'none';
-        assetDropdown.style.display = 'none';
-    }
-
-    document.getElementById('floorDropdown').value = "";
-    document.getElementById('roomTypeDropdown').value = "";
-    document.getElementById('roomDropdown').value = "";
-});
-
-// Show assets only when all dropdowns are selected
-function checkAllSelections() {
-    const building = document.getElementById('buildingDropdown').value;
-    const floor = document.getElementById('floorDropdown').value;
-    const roomType = document.getElementById('roomTypeDropdown').value;
-    const room = document.getElementById('roomDropdown').value;
-
-    const assetDropdown = document.getElementById('assetDropdown').parentElement;
-
-    if (building && floor && roomType && room) {
-        assetDropdown.style.display = 'block';
-    } else {
-        assetDropdown.style.display = 'none';
-        document.getElementById('assetContainer').innerHTML = ''; // Clear asset selection
-    }
-}
-
-document.getElementById('floorDropdown').addEventListener('change', checkAllSelections);
-document.getElementById('roomTypeDropdown').addEventListener('change', checkAllSelections);
-document.getElementById('roomDropdown').addEventListener('change', checkAllSelections);
-
-// Initially hide all dependent dropdowns and asset section
-window.addEventListener('DOMContentLoaded', function () {
-    document.getElementById('floorDropdown').parentElement.style.display = 'none';
-    document.getElementById('roomTypeDropdown').parentElement.style.display = 'none';
-    document.getElementById('roomDropdown').parentElement.style.display = 'none';
-    document.getElementById('assetDropdown').parentElement.style.display = 'none';
-});
-
-// Dynamic Asset Mapping with Quantity Input
-document.querySelectorAll('.asset-checkbox').forEach(checkbox => {
-    checkbox.addEventListener('change', function () {
-        const assetContainer = document.getElementById('assetContainer');
-        const assetValue = this.value;
-
-        if (this.checked) {
-            const assetDiv = document.createElement('div');
-            assetDiv.classList.add('asset-item');
-            assetDiv.id = `asset-${assetValue}`;
-            assetDiv.innerHTML = `
-            <div class="row"> 
-	            <div class="col-md-6">
-		                <div class="form-group mt-2">
-		                    <label>${assetValue} Quantity *</label>
-		                    <input type="number" class="form-control" placeholder="Enter Quantity" required>
-		                </div>
-	                </div>
-                </div>
-            `;
-            assetContainer.appendChild(assetDiv);
-        } else {
-            const existingDiv = document.getElementById(`asset-${assetValue}`);
-            if (existingDiv) {
-                assetContainer.removeChild(existingDiv);
-            }
-        }
-    });
-});
-
-
-
-
-</script>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/itassets.html b/src/main/resources/templates/modules/school/itassets.html
deleted file mode 100644
index bc4dc23a..00000000
--- a/src/main/resources/templates/modules/school/itassets.html
+++ /dev/null
@@ -1,602 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	body {
-		background-color: #f8f9fa;
-		/*  font-family: Arial, sans-serif;*/
-	}
-
-
-
-	.header {
-		font-size: 22px;
-		font-weight: bold;
-		margin-bottom: 20px;
-	}
-
-	.table {
-		border: 1px solid #dee2e6;
-	}
-
-	.table th,
-	.table td {
-		border: 1px solid #dee2e6;
-		padding: 10px;
-	}
-
-	.section-title {
-		font-size: 18px;
-		font-weight: bold;
-		margin-top: 20px;
-		border-bottom: 2px solid #007bff;
-		padding-bottom: 5px;
-	}
-
-	.form-group {
-		margin-top: 15px;
-	}
-
-	.radio-group {
-		display: flex;
-		gap: 20px;
-		margin-top: 10px;
-	}
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container">
-
-					<div class="col-md-12">
-						<div class="d-flex justify-content-between align-items-center">
-							<h4 style="margin-left: -256px;">Room Wise Asset Mapping - IT Assits</h4>
-							<button type="button" class="btn btn-primary"
-								style="background-color: #0D587B; border: none; border-radius: 6px; padding: 6px 16px;"
-								data-bs-toggle="modal" data-bs-target="#assetModal">
-								+ Add Assets
-							</button>
-						</div>
-
-						<hr
-							style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;   margin-left: -261px;">
-					</div>
-
-
-
-
-					<div class="row mt-4" style="					margin-left: -281px;">
-						<div class="col-md-12">
-							<div class="card">
-								<div class="card-block">
-
-									<h5 style="font-weight:bold;">List of IT Assets</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">
-										<table id="CompletedCPSDatatable1"
-											class="table table-striped table-bordered table-hover dataTable" role="grid"
-											style="width:100%">
-											<thead class="thead-dark">
-												<tr>
-													<th style="width: 5%;">S.NO</th>
-													<th style="width: 10%;">ASSET CODE</th>
-													<th style="width: 15%;">NAME</th>
-													<th style="width: 10%;">SOURCE</th>
-													<th style="width: 15%;">SERIAL NUMBER</th>
-													<th style="width: 15%;">RECEIVED DATE</th>
-													<th style="width: 10%;">RECEIVED BY</th>
-													<th style="width: 10%;">VENDOR DETAILS</th>
-													<th style="width: 10%;">INVOICE NUMBER</th>
-													<th style="width: 10%;">LOCATION</th>
-												</tr>
-											</thead>
-											<tbody>
-												<tr>
-													<td>1</td>
-													<td>TH40V40I</td>
-													<td>CAMERA</td>
-													<td>GCC</td>
-													<td>22023293837281</td>
-													<td>JUN 23, 2025 12:40 PM</td>
-													<td>RECEIVED BY</td>
-													<td>N/A</td>
-													<td>2345676543ER</td>
-													<td>CHENNAI</td>
-												</tr>
-												<tr>
-													<td>2</td>
-													<td>TH40V40I</td>
-													<td>CAMERA</td>
-													<td>GCC</td>
-													<td>22023293837281</td>
-													<td>JUN 23, 2025 12:40 PM</td>
-													<td>RECEIVED BY</td>
-													<td>N/A</td>
-													<td>2345676543ER</td>
-													<td>CHENNAI</td>
-												</tr>
-												<tr>
-													<td>3</td>
-													<td>TH40V40I</td>
-													<td>CAMERA</td>
-													<td>GCC</td>
-													<td>22023293837281</td>
-													<td>JUN 23, 2025 12:40 PM</td>
-													<td>RECEIVED BY</td>
-													<td>N/A</td>
-													<td>2345676543ER</td>
-													<td>CHENNAI</td>
-												</tr>
-											</tbody>
-										</table>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-
-					<div class="row mt-4" style="margin-left: -281px;">
-						<div class="col-md-12">
-							<div class="card">
-								<div class="card-block">
-									<h5 style="font-weight:bold;">Building Wise Asset Mapping status - IT Assets</h5>
-									<span th:text="${deptId}" id="deptId" style="display:none"></span>
-									<span th:text="${userId}" id="userId" style="display:none"></span>
-
-									<div id="completedCPSTable">
-										<table id="CompletedCPSDatatable2"
-											class="table table-striped table-bordered table-hover dataTable" role="grid"
-											style="width:100%">
-											<thead class="thead-dark">
-												<tr>
-													<th>S.NO</th>
-													<th>BUILDING NAME</th>
-													<th>FLOORS</th>
-													<th>STATUS</th>
-													<th>ACTION</th>
-												</tr>
-											</thead>
-											<tbody>
-												<tr>
-													<td>1</td>
-													<td>RIPON BUILDING</td>
-													<td>3</td>
-													<td>COMPLETED</td>
-													<td><span class="badge badge-success" style="cursor:pointer;"
-															onclick="openRoomMappingModal(1, 'RIPON BUILDING')">Add Room
-															Mapping</span></td>
-												</tr>
-												<tr>
-													<td>2</td>
-													<td>GREEN BUILDING</td>
-													<td>2</td>
-													<td>PENDING</td>
-													<td><span class="badge badge-success" style="cursor:pointer;"
-															onclick="openRoomMappingModal(2, 'GREEN BUILDING')">Add Room
-															Mapping</span></td>
-												</tr>
-											</tbody>
-										</table>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-					<!-- Card 2: Other Details -->
-
-
-				</div>
-
-			</div>
-
-		</div>
-	</div>
-	<!-- Modal -->
-	<div class="modal fade" id="roomMappingModal" tabindex="-1" role="dialog" aria-labelledby="roomMappingModalLabel"
-		aria-hidden="true">
-		<div class="modal-dialog modal-xl" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="roomMappingModalLabel">Room Mapping for <span id="buildingName"></span>
-					</h5>
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body">
-					<table class="table table-striped">
-						<thead>
-							<tr>
-								<th>S.NO</th>
-								<th>Floor</th>
-								<th>Room</th>
-								<th>Status</th>
-								<th>Action</th>
-							</tr>
-						</thead>
-						<tbody id="roomMappingBody">
-							<!-- Dynamic Data Will Be Inserted Here -->
-						</tbody>
-					</table>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<!-- Add Room Mapping Modal -->
-	<div class="modal fade" id="addRoomMappingModal" tabindex="-1" role="dialog"
-		aria-labelledby="addRoomMappingModalLabel" aria-hidden="true">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="addRoomMappingModalLabel">Add Room Mapping for <span
-							id="roomFloor"></span> - <span id="roomName"></span></h5>
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body">
-					<table class="table table-striped">
-						<thead>
-							<tr>
-								<th>S.NO</th>
-								<th>Room Type</th>
-								<th>Room Name</th>
-								<th>Status</th>
-								<th>Action</th>
-							</tr>
-						</thead>
-						<tbody id="addRoomMappingBody">
-							<!-- Dynamic Data Will Be Inserted Here -->
-						</tbody>
-					</table>
-				</div>
-			</div>
-		</div>
-	</div>
-	<!-- Asset Mapping Modal -->
-	<div class="modal fade" id="assetMappingModal" tabindex="-1" role="dialog" aria-labelledby="assetMappingModalLabel" aria-hidden="true">
-	  <div class="modal-dialog modal-lg" role="document">
-	    <div class="modal-content">
-	      <div class="modal-header">
-	        <h5 class="modal-title">Asset Mapping for <span id="assetRoomName"></span></h5>
-	        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-	          <span aria-hidden="true">&times;</span>
-	        </button>
-	      </div>
-	      <div class="modal-body">
-	        <table class="table table-striped">
-	          <thead>
-	            <tr>
-	              <th>S.NO</th>
-	              <th>Room Type</th>
-	              <th>Assets</th>
-	              <th>Status</th>
-	              <th>Action</th>
-	            </tr>
-	          </thead>
-	          <tbody id="assetMappingBody"></tbody>
-	        </table>
-	      </div>
-	    </div>
-	  </div>
-	</div>
-
-	<!-- Modal -->
-	<div class="modal fade" id="assetModal" tabindex="-1" role="dialog" aria-labelledby="assetModalLabel"
-		aria-hidden="true">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title">Room Wise Asset Mapping - IT Assets</h5>
-					<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-
-				<div class="modal-body">
-					<div class="row">
-						<!-- Building Dropdown -->
-						<div class="col-md-6">
-							<div class="form-group">
-								<label for="buildingDropdown">Select Building *</label>
-								<select id="buildingDropdown" class="form-control">
-									<option value="">-- Select Building --</option>
-									<option value="building1">Building 1</option>
-									<option value="building2">Building 2</option>
-								</select>
-							</div>
-						</div>
-
-						<!-- Floor Dropdown -->
-						<div class="col-md-6">
-							<div class="form-group">
-								<label for="floorDropdown">Select Floor *</label>
-								<select id="floorDropdown" class="form-control">
-									<option value="">-- Select Floor --</option>
-									<option value="floor1">1st Floor</option>
-									<option value="floor2">2nd Floor</option>
-								</select>
-							</div>
-						</div>
-
-						<!-- Room Type Dropdown -->
-						<div class="col-md-6">
-							<div class="form-group">
-								<label for="roomTypeDropdown">Select Room Type *</label>
-								<select id="roomTypeDropdown" class="form-control">
-									<option value="">-- Select Room Type --</option>
-									<option value="classroom">Classroom</option>
-									<option value="conference">Conference Room</option>
-								</select>
-							</div>
-						</div>
-
-						<!-- Room Dropdown -->
-						<div class="col-md-6">
-							<div class="form-group">
-								<label for="roomDropdown">Select Room *</label>
-								<select id="roomDropdown" class="form-control">
-									<option value="">-- Select Room --</option>
-									<option value="room1">Number 1</option>
-									<option value="room2">Number 2</option>
-								</select>
-							</div>
-						</div>
-
-						<!-- Assets Dropdown -->
-						<div class="col-md-12">
-							<div class="form-group">
-								<label for="assetDropdown">Select Assets *</label>
-								<div class="form-control" id="assetDropdown">
-									<div class="form-check">
-										<input type="checkbox" class="asset-checkbox" value="Computer"> Computer
-									</div>
-									<div class="form-check">
-										<input type="checkbox" class="asset-checkbox" value="Smart TV"> Smart TV
-									</div>
-									<div class="form-check">
-										<input type="checkbox" class="asset-checkbox" value="Projector"> Projector
-									</div>
-									<div class="form-check">
-										<input type="checkbox" class="asset-checkbox" value="Printer"> Printer
-									</div>
-
-								</div>
-							</div>
-						</div>
-
-						<!-- Dynamic Asset Selection Section -->
-						<div class="col-md-12" id="assetContainer"></div>
-					</div>
-
-					<div class="modal-footer">
-						<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-						<button type="button" class="btn btn-primary">Save</button>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-</body>
-
-<script>
-
-
-	$(document).ready(function () {
-		$('#CompletedCPSDatatable1').DataTable({
-			scrollX: true,  // Enables horizontal scrolling
-			autoWidth: false, // Ensures manual column widths are respected
-			responsive: true, // Ensures better mobile view
-			dom: 'Bftip',
-			lengthMenu: [
-				[10, 50, 100, 200, -1],
-				['10 rows', '50 rows', '100 rows', 'Show all']
-			],
-			buttons: [
-				{extend: 'pageLength', className: 'btn btn-warning'},
-				{extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary'},
-				{extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary'},
-				{extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary'},
-				{extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary'}
-			],
-			fixedHeader: true,
-			searching: true,
-			select: false,
-			processing: false
-		});
-		$('#CompletedCPSDatatable2').DataTable();
-	});
-
-
-
-	document.getElementById('buildingDropdown').addEventListener('change', function () {
-		const floorDropdown = document.getElementById('floorDropdown').parentElement;
-		const roomTypeDropdown = document.getElementById('roomTypeDropdown').parentElement;
-		const roomDropdown = document.getElementById('roomDropdown').parentElement;
-		const assetDropdown = document.getElementById('assetDropdown').parentElement;
-
-		if (this.value) {
-			floorDropdown.style.display = 'block';
-			roomTypeDropdown.style.display = 'block';
-			roomDropdown.style.display = 'block';
-		} else {
-			floorDropdown.style.display = 'none';
-			roomTypeDropdown.style.display = 'none';
-			roomDropdown.style.display = 'none';
-			assetDropdown.style.display = 'none';
-		}
-
-		document.getElementById('floorDropdown').value = "";
-		document.getElementById('roomTypeDropdown').value = "";
-		document.getElementById('roomDropdown').value = "";
-	});
-
-	// Show assets only when all dropdowns are selected
-	function checkAllSelections() {
-		const building = document.getElementById('buildingDropdown').value;
-		const floor = document.getElementById('floorDropdown').value;
-		const roomType = document.getElementById('roomTypeDropdown').value;
-		const room = document.getElementById('roomDropdown').value;
-
-		const assetDropdown = document.getElementById('assetDropdown').parentElement;
-
-		if (building && floor && roomType && room) {
-			assetDropdown.style.display = 'block';
-		} else {
-			assetDropdown.style.display = 'none';
-			document.getElementById('assetContainer').innerHTML = ''; // Clear asset selection
-		}
-	}
-
-	document.getElementById('floorDropdown').addEventListener('change', checkAllSelections);
-	document.getElementById('roomTypeDropdown').addEventListener('change', checkAllSelections);
-	document.getElementById('roomDropdown').addEventListener('change', checkAllSelections);
-
-	// Initially hide all dependent dropdowns and asset section
-	window.addEventListener('DOMContentLoaded', function () {
-		document.getElementById('floorDropdown').parentElement.style.display = 'none';
-		document.getElementById('roomTypeDropdown').parentElement.style.display = 'none';
-		document.getElementById('roomDropdown').parentElement.style.display = 'none';
-		document.getElementById('assetDropdown').parentElement.style.display = 'none';
-	});
-
-	// Dynamic Asset Mapping with Quantity Input
-	document.querySelectorAll('.asset-checkbox').forEach(checkbox => {
-		checkbox.addEventListener('change', function () {
-			const assetContainer = document.getElementById('assetContainer');
-			const assetValue = this.value;
-
-			if (this.checked) {
-				const assetDiv = document.createElement('div');
-				assetDiv.classList.add('asset-item');
-				assetDiv.id = `asset-${assetValue}`;
-				assetDiv.innerHTML = `
-            <div class="row"> 
-	            <div class="col-md-6">
-		                <div class="form-group mt-2">
-		                    <label>${assetValue} Quantity *</label>
-		                    <input type="number" class="form-control" placeholder="Enter Quantity" required>
-		                </div>
-	                </div>
-                </div>
-            `;
-				assetContainer.appendChild(assetDiv);
-			} else {
-				const existingDiv = document.getElementById(`asset-${assetValue}`);
-				if (existingDiv) {
-					assetContainer.removeChild(existingDiv);
-				}
-			}
-		});
-	});
-	
-	
-	function openRoomMappingModal(buildingId, buildingName) {
-		$('#buildingName').text(buildingName);
-
-		const data = [
-			{sno: 1, floor: 'G', room: 'CLASSROOMS,LIBRARY', status: 'COMPLETED'},
-			{sno: 2, floor: 'G+1', room: '-', status: 'PENDING'},
-			{sno: 3, floor: 'G+2', room: '-', status: 'PENDING'}
-		];
-
-		$('#roomMappingBody').empty();
-
-		data.forEach((item) => {
-			$('#roomMappingBody').append(`
-      <tr>
-        <td>${item.sno}</td>
-        <td>${item.floor}</td>
-        <td>${item.room}</td>
-        <td>${item.status}</td>
-        <td>
-          <button class="btn btn-success" onclick="openAddRoomMapping('${item.room}', '${item.floor}')">Add Room Mapping</button>
-        </td>
-      </tr>
-    `);
-		});
-
-		$('#roomMappingModal').modal('show');
-	}
-
-	function openAddRoomMapping(roomName, floor) {
-		$('#roomFloor').text(floor);
-		$('#roomName').text(roomName);
-		$('#addRoomMappingModal').modal('show');
-
-		// Example Data (You can replace it with AJAX call)
-		let roomData = [
-			{sno: 1, roomType: 'Lab', roomName: 'Physics Lab', status: 'Pending'},
-			{sno: 2, roomType: 'Classroom', roomName: 'Class 10-A', status: 'Completed'}
-		];
-
-		let tbody = $('#addRoomMappingBody');
-		tbody.empty();
-
-		roomData.forEach((item) => {
-			tbody.append(`
-      <tr>
-        <td>${item.sno}</td>
-        <td>${item.roomType}</td>
-        <td>${item.roomName}</td>
-        <td>${item.status}</td>
-        <td><button class="btn btn-success" onclick="openAssetMappingModal('${item.roomName}', '${item.roomType}')">Add Room Mapping</button></td>
-      </tr>
-    `);
-		});
-	}
-	
-	function openAssetMappingModal(roomName, roomType) {
-	  $('#assetRoomName').text(`${roomName} (${roomType})`);
-
-	  const assetData = [
-	    { sno: 1, roomType: roomType, assets: 'Projector', status: 'Completed' },
-	    { sno: 2, roomType: roomType, assets: 'Whiteboard', status: 'Pending' }
-	  ];
-
-	  $('#assetMappingBody').empty();
-
-	  assetData.forEach((item) => {
-	    $('#assetMappingBody').append(`
-	      <tr>
-	        <td>${item.sno}</td>
-	        <td>${item.roomType}</td>
-	        <td>${item.assets}</td>
-	        <td>${item.status}</td>
-	        <td>
-	          <button class="btn btn-success" onclick="openAssetModal('${roomName}', '${roomType}')">Add Room Mapping</button>
-	        </td>
-	      </tr>
-	    `);
-	  });
-
-	  $('#assetMappingModal').modal('show');
-	}
-
-	// Function to Open Asset Modal
-	function openAssetModal(roomName, roomType) {
-	  // Optional: Pre-fill the room name and type in the modal
-	  $('#roomTypeDropdown').val(roomType.toLowerCase()); 
-	  $('#roomDropdown').val(roomName.toLowerCase());
-
-	  $('#assetModal').modal('show');
-	}
-</script>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/kitchen.html b/src/main/resources/templates/modules/school/kitchen.html
deleted file mode 100644
index 039f5031..00000000
--- a/src/main/resources/templates/modules/school/kitchen.html
+++ /dev/null
@@ -1,1250 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	body {
-		background-color: #f8f9fa;
-		/*  font-family: Arial, sans-serif;*/
-	}
-
-	.header {
-		font-size: 22px;
-		font-weight: bold;
-		margin-bottom: 20px;
-	}
-
-	.table {
-		border: 1px solid #dee2e6;
-	}
-
-	.table th,
-	.table td {
-		border: 1px solid #dee2e6;
-		padding: 10px;
-	}
-
-	.section-title {
-		font-size: 18px;
-		font-weight: bold;
-		margin-top: 20px;
-		border-bottom: 2px solid #007bff;
-		padding-bottom: 5px;
-	}
-
-	.form-group {
-		margin-top: 15px;
-	}
-
-	.radio-group {
-		display: flex;
-		gap: 20px;
-		margin-top: 10px;
-	}
-	.custom-card-wrapper {
-  padding: 0;
-  margin-left: -233px;
-}
-
-#editKitchenModal .modal-body{
-					max-height:70vh;
-					overflow-y:auto; 
-				}
-
-@media (max-width: 768px) {
-  .custom-card-wrapper {
-    margin-left: 0;
-    padding: 0 15px; /* Optional: adds spacing on small screens */
-  }
-}
-.kitchen-data-wrapper {
-  padding: 18px;
-  margin-top: -58px;
-  margin-left: -256px;
-}
-
-@media (max-width: 768px) {
-  .kitchen-data-wrapper {
-    margin-left: 0;
-    padding: 15px;
-  }
-}
-
-	
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="card">
-				<div class="main-content" style="background-color: white;">
-					<div class="container">
-						<!-- Card 2: Other Details -->
-						<div class="col-md-12">
-							<div class="kitchen-data-wrapper">
-
-								<div class="card-header"><b>CMBFS-Kitchen</b></div>
-
-								<div id="kitchenDataContainer" style="display: none; padding: 15px;">
-									<table class="table table-bordered" id="kitchenTable">
-										<tr>
-											<th>CMBFS Present</th>
-											<td id="td_k_cmbfs"></td>
-										
-											<th>CMBFS Building</th>
-											<td id="td_k_cmbfs_building"></td>
-										</tr>
-										<tr>
-											<th>Noon Meal Present</th>
-											<td id="td_k_noon"></td>
-										
-											<th>Noon Meal Building</th>
-											<td id="td_k_noon_building"></td>
-										</tr>
-										<tr>
-											<th>Vegetable Garden</th>
-											<td id="td_k_veg"></td>
-										
-											<th>Anganwadi Present</th>
-											<td id="td_k_ang"></td>
-										</tr>
-										
-									</table>
-									<div class="text-center">
-									<button type="button" class="btn btn-primary" id="editKitchenBtn">Update</button>
-									</div>
-								</div>
-
-							</div>
-
-							<!-- This block wraps the form -->
-							<div id="kitchenFormContainer" style="display: none;">
-								<!-- Card 2: Other Details -->
-								<div class="col-md-12">
-									<div class="custom-card-wrapper">
-										<div class="card-header"><b>CMBFS-Kitchens</b></div>
-										<div class="row" style="    padding: 15px;">
-											<div class="col-md-4 form-group">
-												<label>Is CMBFS-Kitchen Present <span
-														class="text-danger">*</span></label>
-												<div class="radio-group">
-													<input type="radio" id="cmbfskitchenPresentYes"
-														name="cmbfskitchenPresent" value="1"> Yes
-													<input type="radio" id="cmbfskitchenPresentNo"
-														name="cmbfskitchenPresent" value="0"> No
-												</div>
-											</div>
-
-											<div class="col-md-4 form-group" id="CMBFSfield" style="display: none;">
-												<label>Individual Building Present <span
-														class="text-danger">*</span></label>
-												<div class="radio-group">
-													<input type="radio" id="cmbfskitchenBuildingYes"
-														name="cmbfskitchenBuilding" value="1"> Yes
-													<input type="radio" id="cmbfskitchenBuildingNo"
-														name="cmbfskitchenBuilding" value="0"> No
-												</div>
-											</div>
-
-										</div>
-
-
-
-									</div>
-								</div>
-
-								<!-- card 2 -->
-								<div class="col-md-12">
-									<div class="custom-card-wrapper">
-										<div class="card-header"><b>Noon Meal Center</b></div>
-										<div class="row" style="    padding: 15px;">
-											<div class="col-md-4 form-group">
-												<label>Is Noon Meal Kitchen Present <span
-														class="text-danger">*</span></label>
-												<div class="radio-group">
-													<input type="radio" id="noonMealpresentYes" name="noonMealpresent"
-														value="1"> Yes
-													<input type="radio" id="noonMealpresentNo" name="noonMealpresent"
-														value="0"> No
-												</div>
-											</div>
-											<div id="noonMealfield" style="display: none;" class="col-12">
-												<div class="row">
-													<div class="col-md-6 form-group">
-														<label>Individual Building Present <span
-																class="text-danger">*</span></label>
-														<div class="radio-group">
-															<input type="radio" id="noonMealBuildingYes"
-																name="noonMealBuilding" value="1"> Yes
-															<input type="radio" id="noonMealBuildingNo"
-																name="noonMealBuilding" value="0"> No
-														</div>
-													</div>
-													<div class="col-md-6 form-group">
-														<label>Presence of Vegetable Garden <span
-																class="text-danger">*</span></label>
-														<div class="radio-group">
-															<input type="radio" id="vegetableGardenYes"
-																name="vegetableGarden" value="1"> Yes
-															<input type="radio" id="vegetableGardenNo"
-																name="vegetableGarden" value="0"> No
-														</div>
-													</div>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-
-								<!-- card -3 -->
-
-								<div class="col-md-12">
-									<div class="custom-card-wrapper">
-										<div class="card-header mb-3">
-											<b>Anganwadi</b>
-										</div>										
-											<!-- <div class="col-md-4 form-group">
-												<label>Is Anganwadi Present <span class="text-danger">*</span></label>
-												<div class="radio-group">
-													<input type="radio" id="anganwadiPresentYes" name="anganwadiPresent"
-														value="1"> Yes
-													<input type="radio" id="anganwadiPresentNo" name="anganwadiPresent"
-														value="0"> No
-												</div>
-											</div> -->
-											<!-- <div id="anganwadifield" style="display: none" class="col-12">
-												<div class="row">
-													<div class="col-md-6 form-group">
-														<label>Anganwadi unique Number<span
-																class="text-danger">*</span></label>
-														<input type="text" class="form-control"
-															placeholder="Enter Anganwadi unique Number"
-															id="anganwadiNumber" required />
-													</div>
-													<div class="col-md-4 form-group">
-														<label>Individual Building Present <span
-																class="text-danger">*</span></label>
-														<div class="radio-group">
-															<input type="radio" id="anganwadiBuildingYes"
-																name="anganwadiBuilding" value="1"> Yes
-															<input type="radio" id="anganwadiBuildingNo"
-																name="anganwadiBuilding" value="0"> No
-														</div>
-													</div>
-												</div>
-											</div> -->
-
-												<table id="CompletedCPSDatatable"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid" style="width: 100%">
-													<thead class="thead-dark">
-														<tr>
-															<th style="width: 5%;">S.NO</th>
-															<th style="width: 10%;">Room Name</th>
-															<th style="width: 15%;">Building Name</th>
-															<th style="width: 10%;">Floor</th>
-															<th style="width: 15%;">Room Type</th>
-															<th style="width: 10%;">Action</th>
-														</tr>
-													</thead>
-													<tbody>
-
-
-													</tbody>
-												</table>
-
-
-											</div>
-										</div>
-
-
-
-
-									<div class="col-md-12">
-									<div class="custom-card-wrapper">
-									<div class="card-footer text-center">
-											<button type="submit" class="btn btn-primary" id="requestSubmitBtn"><i
-													class="ik ik-save"></i>Submit
-											</button>
-											<button type="reset" class="btn btn-secondary mr-2" id="resetButton"><i
-													class="ik ik-refresh-cw"></i>Reset
-											</button>
-
-										</div>
-										</div>
-									</div>
-									
-									</div>
-								</div>
-
-
-							</div>
-							<div id="pageLoader"
-								style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-								<div style="position: relative; top: 50%; transform: translateY(-50%);">
-									<div class="spinner-border text-primary" role="status"
-										style="width: 3rem; height: 3rem;">
-										<span class="sr-only">Loading...</span>
-									</div>
-									<!-- Add the 'Please wait' text below the spinner -->
-									<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-								</div>
-							</div>
-
-						</div>
-					</div>
-				</div>
-				<!-- Modal -->
-				<div class="modal fade" id="editKitchenModal" tabindex="-1" aria-labelledby="editKitchenModalLabel"
-					aria-hidden="true">
-					<div class="modal-dialog modal-lg">
-						<div class="modal-content">
-							<form id="kitchenForm">
-								<div class="modal-header">
-									<h5 class="modal-title">Edit Kitchen Details</h5>
-									<button type="button" class="close" data-bs-dismiss="modal"
-										aria-label="Close"><span aria-hidden>&times;</span></button>
-								</div>
-								<div class="modal-body">
-
-									<!-- Kitchen Form -->
-									<div class="row mb-3">
-										<div class="col-md-6">
-											<label>Is CMBFS-Kitchen Present? *</label>
-											<div class="radio-group">
-												<input type="radio" name="modalcmbfskitchenPresent" value="1"> Yes
-												<input type="radio" name="modalcmbfskitchenPresent" value="0"> No
-											</div>
-										</div>
-										<div class="col-md-6" id="modalCMBFSfield" style="display: none;">
-											<label>Individual Building Present *</label>
-											<div class="radio-group">
-												<input type="radio" name="modalcmbfskitchenBuilding" value="1"> Yes
-												<input type="radio" name="modalcmbfskitchenBuilding" value="0"> No
-											</div>
-										</div>
-									</div>
-
-									<div class="row mb-3">
-										<div class="col-md-6">
-											<label>Is Noon Meal Kitchen Present? *</label>
-											<div class="radio-group">
-												<input type="radio" name="modalnoonMealpresent" value="1"> Yes
-												<input type="radio" name="modalnoonMealpresent" value="0"> No
-											</div>
-										</div>
-									</div>
-
-									<div class="row mb-3" id="modalnoonMealfield" style="display: none;">
-										<div class="col-md-6">
-											<label>Individual Building Present *</label>
-											<div class="radio-group">
-												<input type="radio" name="modalnoonMealBuilding" value="1"> Yes
-												<input type="radio" name="modalnoonMealBuilding" value="0"> No
-											</div>
-										</div>
-										<div class="col-md-6">
-											<label>Presence of Vegetable Garden *</label>
-											<div class="radio-group">
-												<input type="radio" name="modalvegetableGarden" value="1"> Yes
-												<input type="radio" name="modalvegetableGarden" value="0"> No
-											</div>
-										</div>
-									</div>									
-									
-									<!-- NEW: Placeholder for old Anganwadis -->
-							        <div id="oldAnganwadiSection" class="old-anganwadis-container"></div>
-							
-							        <!-- NEW: Placeholder for new Anganwadis -->
-							        <div id="newAnganwadiSection" class="new-anganwadis-container"></div>
-
-								</div>
-								<div class="modal-footer">
-									<button type="submit" class="btn btn-primary" id="updateSubmitBtn">Submit</button>
-									<button type="reset" class="btn btn-secondary"
-										data-bs-dismiss="modal">Close</button>
-								</div>
-							</form>
-						</div>
-					</div>
-				</div>
-				</div>
-				
-
-
-		<script th:replace="~{fragments/modules/base/script :: script}"></script>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-		<script type="text/javascript">
-
-			$(document).ready(function () {
-
-				document.querySelectorAll('input[name="cmbfskitchenPresent"]').forEach(radio => {
-					radio.addEventListener('change', function () {
-						const CMBFSfieldDiv = document.getElementById('CMBFSfield');
-						if (this.value === '1') {
-							CMBFSfieldDiv.style.display = 'block'; // Show the input field
-						} else {
-							CMBFSfieldDiv.style.display = 'none'; // Hide the input field
-							document.querySelectorAll('input[name="cmbfskitchenBuilding"]').forEach(radio => {
-								radio.checked = false;
-							});
-						}
-					});
-				});
-
-				document.querySelectorAll('input[name="noonMealpresent"]').forEach(radio => {
-					radio.addEventListener('change', function () {
-						const noonMealfieldDiv = document.getElementById('noonMealfield');
-						if (this.value === '1') {
-							noonMealfieldDiv.style.display = 'block'; // Show the input field
-						} else {
-							noonMealfieldDiv.style.display = 'none'; // Hide the input field
-							document.querySelectorAll('input[name="noonMealBuilding"]').forEach(radio => {
-								radio.checked = false;
-							});
-							document.querySelectorAll('input[name="vegetableGarden"]').forEach(radio => {
-								radio.checked = false;
-							});
-						}
-					});
-				});
-
-				document.querySelectorAll('input[name="anganwadiPresent"]').forEach(radio => {
-					radio.addEventListener('change', function () {
-						const anganwadifieldDiv = document.getElementById('anganwadifield');
-						if (this.value === '1') {
-							anganwadifieldDiv.style.display = 'block'; // Show the input field
-						} else {
-							anganwadifieldDiv.style.display = 'none'; // Hide the input field
-							document.querySelectorAll('input[name="anganwadiBuilding"]').forEach(radio => {
-								radio.checked = false;
-							});
-							document.getElementById('anganwadiNumber').value = '';
-						}
-					});
-				});
-				$("input[name='modalcmbfskitchenPresent']").change(function () {
-					if ($(this).val() === "1") {
-						$("#modalCMBFSfield").show();
-					} else {
-						$("#modalCMBFSfield").hide();
-					}
-				});
-
-				// 2. Toggle Noon Meal building and garden fields
-				$("input[name='modalnoonMealpresent']").change(function () {
-					if ($(this).val() === "1") {
-						$("#modalnoonMealfield").show();
-					} else {
-						$("#modalnoonMealfield").hide();
-					}
-				});
-
-				// 3. Toggle Anganwadi fields
-				$("input[name='modalanganwadiPresent']").change(function () {
-					if ($(this).val() === "1") {
-						$("#modalanganwadifield").show();
-					} else {
-						$("#modalanganwadifield").hide();
-					}
-				});
-
-			});
-			
-			
-
-			
-			
-			 function loadSavedAnganwadiDetails(school_id) {
-				$.ajax({
-					url: '/gcc/api/gccschool/schoolproperty/getAnganwadiDetails',
-					type: 'GET',
-					contentType: 'application/json',
-					data: { school_id },
-					success: function (response) {
-						if (response.status === "OK") {
-							
-							
-							$('#CompletedCPSDatatable').DataTable({
-								destroy: true,
-								searching: true,
-								select: false,
-								autoWidth: false,
-								scrollY: '60vh',
-								scrollCollapse: true,
-								processsing: false,
-								responsive: true,
-								paging: true,
-								info: true,
-								data: response.data,
-								columns: [
-									{ data: null, render: (data, type, row, meta) => meta.row + 1, className: 'text-center' },
-									{ data: 'room_name', defaultContent: '-', className: 'text-center' },
-									{ data: 'building_name', defaultContent: '-', className: 'text-center' },
-									{ data: 'floor', defaultContent: '-', className: 'text-center' },
-									{ data: 'room_type', defaultContent: '-', className: 'text-center' },
-									{
-										data: 'anganwadi_unique_number',
-										render: function (data, type, row, meta) {
-											let uniqueId = `anganwadiRadio_${meta.row}`; // Unique ID for each row
-											return `
-												<div class="text-center">
-													<label>
-														<input type="radio" name="${uniqueId}" class="anganwadi-radio" data-unique-number="${data}" value="1"> Yes
-													</label>
-													<label style="margin-left:10px;">
-														<input type="radio" name="${uniqueId}" class="anganwadi-radio" data-unique-number="${data}" value="0"> No
-													</label>
-												</div>`;
-										},
-										className: 'text-center'
-									}
-								],
-							    initComplete: function () {
-							        this.api().columns.adjust().draw();
-							    }
-							});
-							
-							
-						} else {
-							$('#CompletedCPSDatatable tbody').html(`<tr><td colspan="6" class="text-center text-danger">${response.data}</td></tr>`);
-						}
-						
-					},
-					error: function () {
-						Swal.fire("Error", "Something went wrong while fetching Anganwadi details.", "error");
-					}
-				});
-			} 
-			
-			
-
-			$(document).ready(function () {
-				const urlParams = new URLSearchParams(window.location.search);
-				const schoolId = urlParams.get("schoolId");
-				$('input[name="school_id"]').val(schoolId);				
-				
-				loadSavedAnganwadiDetails(schoolId);
-				
-				
-				function toggleField(radioGroup, targetDiv, resetSelectors = []) {
-					document.querySelectorAll(`input[name="${radioGroup}"]`).forEach(radio => {
-						radio.addEventListener('change', function () {
-							if (this.value === '1') {
-								document.getElementById(targetDiv).style.display = 'block';
-							} else {
-								document.getElementById(targetDiv).style.display = 'none';
-								resetSelectors.forEach(sel => {
-									$(sel).prop('checked', false);
-									if ($(sel).is('input[type="text"]')) $(sel).val('');
-								});
-							}
-						});
-					});
-				}
-
-				toggleField('cmbfskitchenPresent', 'CMBFSfield', ['input[name="cmbfskitchenBuilding"]']);
-				toggleField('noonMealpresent', 'noonMealfield', ['input[name="noonMealBuilding"]', 'input[name="vegetableGarden"]']);
-				//toggleField('anganwadiPresent', 'anganwadifield', ['input[name="anganwadiBuilding"]', '#anganwadiNumber']);
-
-				// ---------------- Data Fetch -------------------
-				$.ajax({
-					url: '/gcc/api/gccschool/schoolproperty/checkKitchenDetails',
-					type: 'GET',
-					data: {school_id: schoolId},
-					success: function (response) {
-						if (response && response[0] && response[0].kitchenDetails &&
-							 Object.values(response[0].kitchenDetails).some(value => value !== null && value !== "" && value !== false)
-						) {
-							console.log("hi");
-				            const data = response[0].kitchenDetails;
-
-							//const yesNo = val => val === true ? 'Yes' : 'No';
-							const yesNo = val => val === true ? 'Yes' : val === false ? 'No' : '-';
-
-							$('#td_k_cmbfs').text(yesNo(data.is_cmbfs));
-							$('#td_k_cmbfs_building').text(yesNo(data.is_cmbfsIndividual));
-							$('#td_k_noon').text(yesNo(data.is_noonmeal));
-							$('#td_k_noon_building').text(yesNo(data.is_noonIndividual));
-							$('#td_k_veg').text(yesNo(data.is_vegGarden));							
-							$('#td_k_ang').text(yesNo(data.is_anganwadi));
-							
-							
-							const anganwadiDetails = response[0].anganwadiDetails;
-							const newAnganwadiDetails = response[0].newAnganwadiDetails;
-							const kitchenTable = $('#kitchenTable');
-
-							// Remove old anganwadi rows if any
-							kitchenTable.find('.anganwadi-row').remove();
-
-							if (Array.isArray(anganwadiDetails) && anganwadiDetails.length > 0) {
-							    anganwadiDetails.forEach((item, index) => {
-							        const unique = item.anganwadi_unique || '';
-							        const individual = item.is_anganwadiIndividual === 1 ? 'Yes' : item.is_anganwadiIndividual === 0 ? 'No' : '-';
-
-							        const newRow = `
-							            <tr class="anganwadi-row">
-							                <th>Anganwadi Unique Number</th>
-							                <td>${unique}</td>
-							                <th>Individual Building</th>
-							                <td>${individual}</td>
-							            </tr>
-							        `;
-							        kitchenTable.append(newRow);
-							    });
-							} else {
-							    // Add one empty row
-							    kitchenTable.append(`
-							        <tr class="anganwadi-row">
-							            <th>Anganwadi Unique</th>
-							            <td></td>
-							            <th>Individual Building</th>
-							            <td></td>
-							        </tr>
-							    `);
-							}
-
-							$('#kitchenDataContainer').show();     
-							$('#kitchenFormContainer').hide();     
-							$('#editKitchenBtn').data('kitchenData', {
-							    kitchen: data,
-							    oldanganwadis: response[0].anganwadiDetails,
-							    newanganwadis:response[0].newAnganwadiDetails
-							});
-						} else {
-							$('#kitchenDataContainer').hide();    
-							$('#kitchenFormContainer').show();     
-						}
-					},
-					error: function () {
-						$('#kitchenDataContainer').hide();     // ❌ hide table
-						$('#kitchenFormContainer').show();     // ✅ show form
-					}
-				});
-				/* $('input[name="modalanganwadiPresent"]').on('change', function () {
-				    if (this.value === '1') {
-				        $('#editKitchenModalAnganwadiField').show();
-				    } else {
-				        $('#editKitchenModalAnganwadiField').hide();
-
-				        // Clear the Anganwadi Building radio buttons
-				       $('input[name="modalanganwadiBuilding"]').prop('checked', false);
-
-				        // Clear the Anganwadi Number field
-				      $('#modalanganwadiNumber').val('');
-				    }
-				}); */
-				$('input[name="modalnoonMealpresent"]').on('change', function () {
-					if (this.value === '1') {
-						$('#editKitchenModalNoonField').show();
-					} else {
-						$('#editKitchenModalNoonField').hide();
-						$('input[name="modalnoonMealBuilding"]').prop('checked', false);
-						$('input[name="modalvegetableGarden"]').prop('checked', false);
-					}
-				});
-				$('input[name="modalcmbfskitchenPresent"]').on('change', function () {
-					if (this.value === '1') {
-						$('#editKitchenModalCMBFSfield').show();
-					} else {
-						$('#editKitchenModalCMBFSfield').hide();
-						$('input[name="modalcmbfskitchenBuilding"]').prop('checked', false);
-					}
-				});
-
-
-
-				// ---------------- On Update Button -------------------
-				$('#editKitchenBtn').click(function () {
-					//const data = $(this).data('kitchenData');
-					
-					const allData = $(this).data('kitchenData');
-				    const data = allData.kitchen;
-				    const anganwadis = allData.oldanganwadis;
-				    const newanganwadis =allData.newanganwadis;
-
-
-				    $(`input[name="modalcmbfskitchenPresent"][value="${data.is_cmbfs ? 1 : 0}"]`).prop('checked', true);
-				    $(`input[name="modalcmbfskitchenBuilding"][value="${data.is_cmbfsIndividual ? 1 : 0}"]`).prop('checked', true);
-				    $(`input[name="modalnoonMealpresent"][value="${data.is_noonmeal ? 1 : 0}"]`).prop('checked', true);
-				    $(`input[name="modalnoonMealBuilding"][value="${data.is_noonIndividual ? 1 : 0}"]`).prop('checked', true);
-				    $(`input[name="modalvegetableGarden"][value="${data.is_vegGarden ? 1 : 0}"]`).prop('checked', true);
-				    
-				 // === OLD ANGANWADIS (populate with values) ===
-				    if (Array.isArray(anganwadis) && anganwadis.length > 0) {
-				    	const oldHtml = anganwadis.map((item, index) => {
-				    		const label = `Anganwadi "${item.anganwadi_unique}" has Individual Building *`;
-				    		const groupName = `oldAnganwadi_${index}`;
-				    		const yesChecked = item.is_anganwadiIndividual === 1 ? 'checked' : '';
-				    		const noChecked = item.is_anganwadiIndividual === 0 ? 'checked' : '';
-
-				    		return `
-				    		<div class="row mb-3 old-anganwadis-container">
-				    			<div class="col-md-6">
-				    				<label>${label}</label>
-				    				<div class="radio-group">
-				    					<input type="radio" name="${groupName}" value="1" ${yesChecked}> Yes
-				    					<input type="radio" name="${groupName}" value="0" ${noChecked} style="margin-left: 15px;"> No
-				    				</div>
-				    			</div>
-				    		</div>`;
-				    	}).join('');
-
-				    	$('#oldAnganwadiSection').html(oldHtml);
-				    }
-
-				 // === NEW ANGANWADIS (empty radio buttons) ===
-				    if (Array.isArray(newanganwadis) && newanganwadis.length > 0) {
-				    	const newHtml = newanganwadis.map((item, index) => {
-				    		const label = `Anganwadi "${item.anganwadi_unique_number}" has Individual Building *`;
-				    		const groupName = `newAnganwadi_${index}`;
-
-				    		return `
-				    		<div class="row mb-3 new-anganwadis-container">
-				    			<div class="col-md-6">
-				    				<label>${label}</label>
-				    				<div class="radio-group">
-				    					<input type="radio" name="${groupName}" value="1"> Yes
-				    					<input type="radio" name="${groupName}" value="0" style="margin-left: 15px;"> No
-				    				</div>
-				    			</div>
-				    		</div>`;
-				    	}).join('');
-
-				    	$('#newAnganwadiSection').html(newHtml);
-				    }
-
-					// 👇 Force the toggle to display the dependent fields
-					$(`#editKitchenModal input[name="modalcmbfskitchenPresent"]:checked`).trigger('change');
-					$(`#editKitchenModal input[name="modalnoonMealpresent"]:checked`).trigger('change');
-					
-
-					// Show modal
-					const kitchenModal = new bootstrap.Modal(document.getElementById('editKitchenModal'));
-					kitchenModal.show();
-				});
-				
-				
-
-
-				// --- Toggle logic for modal form fields inside editKitchenModal ---
-				function toggleModalField(radioGroupName, fieldId, resetSelectors = []) {
-					$(`#editKitchenModal input[name="${radioGroupName}"]`).on('change', function () {
-						if (this.value === '1') {
-							$(`#editKitchenModal #${fieldId}`).show();
-						} else {
-							$(`#editKitchenModal #${fieldId}`).hide();
-							resetSelectors.forEach(sel => {
-								$(`#editKitchenModal ${sel}`).prop('checked', false);
-								if ($(sel).is('input[type="text"]')) $(sel).val('');
-							});
-						}
-					});
-				}
-
-				// Apply for each group
-				toggleModalField('cmbfskitchenPresent', 'CMBFSfield', ['input[name="cmbfskitchenBuilding"]']);
-				toggleModalField('noonMealpresent', 'noonMealfield', ['input[name="noonMealBuilding"]', 'input[name="vegetableGarden"]']);
-				toggleModalField('anganwadiPresent', 'anganwadifield', ['input[name="anganwadiBuilding"]', '#anganwadiNumber']);
-
-
-
-				/* document.getElementById('anganwadiNumber').addEventListener('input', function () {
-								    // Keep only alphanumeric characters
-								    this.value = this.value.replace(/[^a-zA-Z0-9]/g, '');
-								}); */
-				/* document.getElementById('modalanganwadiNumber').addEventListener('input', function () {
-				    // Keep only alphanumeric characters
-				    this.value = this.value.replace(/[^a-zA-Z0-9]/g, '');
-				}); */
-
-				$(document).on('click', '#requestSubmitBtn', function () {	
-
-					let cmbfskitchenPresent = $('input[name="cmbfskitchenPresent"]:checked').val();
-					let cmbfskitchenBuilding = null;
-					if (cmbfskitchenPresent === '1') {
-						cmbfskitchenBuilding = $('input[name="cmbfskitchenBuilding"]:checked').val();
-						if (!cmbfskitchenBuilding) {
-							Swal.fire({
-								icon: 'warning',
-								title: 'Validation Error!',
-								text: 'Individual Building Present is required for CMBFS kitchen .',
-								 allowOutsideClick: false, // Disable clicking outside the modal to close it
-				                    allowEscapeKey: false, // Disable escape key to close the modal
-				                    allowEnterKey: false, // Disable enter key to close the modal	                   
-			                        showConfirmButton: true
-							});
-							return;
-						}
-					}
-
-					let noonMealpresent = $('input[name="noonMealpresent"]:checked').val();
-					let noonMealBuilding = null;
-					let vegetableGarden = null;
-					if (noonMealpresent === '1') {
-						noonMealBuilding = $('input[name="noonMealBuilding"]:checked').val();
-						if (!noonMealBuilding) {
-							Swal.fire({
-								icon: 'warning',
-								title: 'Validation Error!',
-								text: 'Individual Building Present is required for Noon Meal Center .',
-								 allowOutsideClick: false, // Disable clicking outside the modal to close it
-				                    allowEscapeKey: false, // Disable escape key to close the modal
-				                    allowEnterKey: false, // Disable enter key to close the modal	                   
-			                        showConfirmButton: true
-							});
-							return;
-						}
-
-						vegetableGarden = $('input[name="vegetableGarden"]:checked').val();
-						if (!vegetableGarden) {
-							Swal.fire({
-								icon: 'warning',
-								title: 'Validation Error!',
-								text: 'Presence of Vegetable Garden is required .',
-								 allowOutsideClick: false, // Disable clicking outside the modal to close it
-				                    allowEscapeKey: false, // Disable escape key to close the modal
-				                    allowEnterKey: false, // Disable enter key to close the modal	                   
-			                        showConfirmButton: true
-							});
-							return;
-						}
-					}
-										
-					/* let anganwadiPresent = $('input[name="anganwadiPresent"]:checked').val();
-					let anganwadiBuilding = null;
-					let anganwadiNumber = null;
-					if (anganwadiPresent === '1') {
-						anganwadiNumber = $('#anganwadiNumber').val();
-						anganwadiBuilding = $('input[name="anganwadiBuilding"]:checked').val();
-						
-					
-
-						if (!anganwadiNumber) {
-							Swal.fire({
-								icon: 'warning',
-								title: 'Validation Error!',
-								text: 'AnganwadiNumber is required',
-								 allowOutsideClick: false, // Disable clicking outside the modal to close it
-				                    allowEscapeKey: false, // Disable escape key to close the modal
-				                    allowEnterKey: false, // Disable enter key to close the modal	                   
-			                        showConfirmButton: true
-							});
-							return;
-						}
-						if (!anganwadiBuilding) {
-							Swal.fire({
-								icon: 'warning',
-								title: 'Validation Error!',
-								text: 'Individual Building Present is required for Anganwadi.',
-								 allowOutsideClick: false, // Disable clicking outside the modal to close it
-				                    allowEscapeKey: false, // Disable escape key to close the modal
-				                    allowEnterKey: false, // Disable enter key to close the modal	                   
-			                        showConfirmButton: true
-							});
-							return;
-						}
-
-					} */
-
-
-				//	let school_id = 1;
-
-
-					/* console.log("cmbfskitchenPresent=", cmbfskitchenPresent);
-					console.log("anganwadiBuilding=", anganwadiBuilding);
-					console.log("noonMealpresent=", noonMealpresent);
-					console.log("noonMealBuilding=", noonMealBuilding);
-					console.log("vegetableGarden=", vegetableGarden);
-					console.log("anganwadiPresent=", anganwadiPresent);
-					console.log("anganwadiNumber=", anganwadiNumber);
-					console.log("anganwadiBuilding=", anganwadiBuilding);
-					console.log("school_id=", schoolId); */
-
-					// Validate inputs
-					let fields = {
-						"Is CMBFS-Kitchen Present": cmbfskitchenPresent,
-						"Is noonMeal-Kitchen Present": noonMealpresent						
-					};
-
-
-					for (let key in fields) {
-						if (!fields[key] || isNaN(fields[key])) {
-							Swal.fire({
-								icon: 'info',
-								title: 'Validation Error',
-								text: `Please enter ${key}.`,
-								 allowOutsideClick: false, // Disable clicking outside the modal to close it
-				                    allowEscapeKey: false, // Disable escape key to close the modal
-				                    allowEnterKey: false, // Disable enter key to close the modal	                   
-			                        showConfirmButton: true
-							});
-							return; // Stop execution if validation fails
-						}
-					}
-					
-					 let selectedAnganwadiData = [];
-
-					    // Get all radio groups by unique name (one group per row)
-					    const totalGroups = new Set();
-					    $('.anganwadi-radio').each(function () {
-					        totalGroups.add($(this).attr('name'));
-					    });
-
-
-					    $('.anganwadi-radio:checked').each(function () {
-					        let uniqueNumber = $(this).data('unique-number');
-					        let selectedValue = $(this).val(); // '1' or '0'
-
-					        selectedAnganwadiData.push({
-					        	anganwadi_unique: uniqueNumber,
-					        	is_anganwadiIndividual: selectedValue === '1'
-					        });
-					    });
-					    
-					    if (selectedAnganwadiData.length !== totalGroups.size) {
-					        Swal.fire({
-					            icon: 'warning',
-					            title: 'Incomplete Selection',
-					            text: 'Please select Yes or No for all rows before submitting.'
-					        });
-					        return;
-					    }
-
-					console.log(selectedAnganwadiData);
-										
-					let requestData ="";
-					
-					// Prepare Data for AJAX
-					requestData = {
-						is_cmbfs: cmbfskitchenPresent === '1',
-						is_cmbfsIndividual: cmbfskitchenPresent === '1' ? (cmbfskitchenBuilding === '1') : null,
-						is_noonmeal: noonMealpresent === '1',
-						is_noonIndividual: noonMealpresent === '1' ? (noonMealBuilding === '1') : null,
-					    is_vegGarden: noonMealpresent === '1' ? (vegetableGarden === '1') : null,
-						school_id: schoolId
-					};
-					
-					let anganwadiPresent="";
-					
-					if(selectedAnganwadiData.length > 0){
-						anganwadiPresent=true;
-						requestData['anganwadi'] = selectedAnganwadiData;
-					}
-					else{
-						anganwadiPresent=false;
-					}
-					
-					requestData['is_anganwadi'] = anganwadiPresent;
-					
-					console.log("requestData to send:", requestData);
-
-					$('#requestSubmitBtn').prop('disabled', true).text('Processing...');
-					$('#pageLoader').show();
-					 $.ajax({
-						url: '/gcc/api/gccschool/schoolproperty/saveKitchen',
-						type: 'POST',
-						contentType: 'application/json',
-						data: JSON.stringify(requestData),						
-						success: function (response) {
-						    $('#pageLoader').hide();
-						    $('#requestSubmitBtn').prop('disabled', false).text('Submit');
-
-						    // response is a JSON object with "status" and "message"
-						    Swal.fire({
-						        icon: response.status === "OK" ? "success" : "error",
-						        title: response.status === "OK" ? "Success" : "Error",
-						        text: response.message,
-						        allowOutsideClick: false,
-						        allowEscapeKey: false,
-						        allowEnterKey: false,
-						        confirmButtonText: 'OK'
-						    }).then(() => {
-						        if (response.status === "OK") {
-						            $("#kitchenForm")[0].reset(); // Reset only if successfully inserted
-						            location.reload(); // Refresh page on success
-						        }
-						    });
-						},
-
-						error: function (xhr, status, error) {
-						    $('#pageLoader').hide();
-						    $('#requestSubmitBtn').prop('disabled', false).text('Submit');
-
-						    let errorResponse;
-						    try {
-						        // Try parsing JSON error response
-						        errorResponse = JSON.parse(xhr.responseText);
-						    } catch (e) {
-						        errorResponse = { message: "An unexpected error occurred." };
-						    }
-
-						    Swal.fire({
-						        icon: 'error',
-						        title: 'Error',
-						        text: errorResponse.message || "Something went wrong.",
-						        allowOutsideClick: false,
-						        allowEscapeKey: false,
-						        allowEnterKey: false,
-						        showConfirmButton: true
-						    });
-
-						    console.error('Error:', xhr.responseText);
-						}
-					}); 
-
-
-
-				});
-
-				function resetFacilityFields() {
-					console.log("Reset button clicked - Facilities");
-
-					// Uncheck all radio buttons
-					$('input[type="radio"]').prop('checked', false);
-
-					// Clear input fields
-					//$('#anganwadiNumber').val('');
-
-					// Hide dependent sections
-					$('#CMBFSfield, #noonMealfield, #anganwadifield').hide();
-				}
-
-				// Event Listener for Reset Button
-				$(document).on('click', '#resetButton', function (event) {
-					event.preventDefault();
-					resetFacilityFields();
-				});
-				$(document).on('click', '#updateSubmitBtn', function (e) {
-					e.preventDefault();
-					submitModalKitchenUpdate();
-				});
-
-
-				function submitModalKitchenUpdate() {
-
-					let cmbfskitchenPresent = $('#editKitchenModal input[name="modalcmbfskitchenPresent"]:checked').val();
-					let cmbfskitchenBuilding = cmbfskitchenPresent === '1' ? $('#editKitchenModal input[name="modalcmbfskitchenBuilding"]:checked').val() : null;
-					
-					if (cmbfskitchenPresent === '1' && !cmbfskitchenBuilding) {
-						return Swal.fire({
-							title: 'Validation Error!',
-							text: 'Individual Building Present is required for CMBFS kitchen.',
-							icon: 'warning',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-					let noonMealpresent = $('#editKitchenModal input[name="modalnoonMealpresent"]:checked').val();
-					let noonMealBuilding = noonMealpresent === '1' ? $('#editKitchenModal input[name="modalnoonMealBuilding"]:checked').val() : null;
-					let vegetableGarden = noonMealpresent === '1' ? $('#editKitchenModal input[name="modalvegetableGarden"]:checked').val() : null;
-					
-					if (noonMealpresent === '1' && (!noonMealBuilding || !vegetableGarden)) {
-						return Swal.fire({
-							title: 'Validation Error!',
-							text: 'Fields under Noon Meal Center are required.',
-							icon: 'warning',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-					
-					 
-				    // === OLD ANGANWADIS ===
-					const oldAnganwadiEdit = [];
-					let isOldAnganwadiValid = true;  // <-- add this flag
-					let hasOldAnganwadi = $('.old-anganwadis-container input[type="radio"]').length > 0;
-					
-					$('[name^="oldAnganwadi_"]').each(function () {
-					    const name = $(this).attr('name');
-					   // const index = name.split('_')[1];
-					    const selected = $(`input[name="${name}"]:checked`).val();
-					
-					    // Check if selected is undefined (i.e., not answered Yes/No)
-					    if (hasOldAnganwadi && selected === undefined) {
-					        isOldAnganwadiValid = false;
-					        return false; // break on first invalid
-					    }
-					
-					    const label = $(`label:contains("Anganwadi")`, $(this).closest('.old-anganwadis-container')).text();
-					    const match = label.match(/"(.+?)"/); // Extract unique ID from label
-					
-					    if (match && selected !== undefined) {
-					        const exists = oldAnganwadiEdit.some(obj => obj.anganwadi_unique === match[1]);
-					        if (!exists) {
-					            oldAnganwadiEdit.push({
-					                anganwadi_unique: match[1],
-					                is_anganwadiIndividual: selected
-					            });
-					        }
-					    }
-					});
-
-				    
-				 // === NEW ANGANWADIS ===
-				    const newAnganwadiEdit = [];
-				    $('[name^="newAnganwadi_"]').each(function () {
-				        const name = $(this).attr('name');
-				        const index = name.split('_')[1];
-				        const selected = $(`input[name="${name}"]:checked`).val();
-				        const label = $(`label:contains("Anganwadi")`, $(this).closest('.new-anganwadis-container')).text();
-				        const match = label.match(/"(.+?)"/);
-
-				        if (match && selected !== undefined) {
-				            const exists = newAnganwadiEdit.some(obj => obj.anganwadi_unique === match[1]);
-				            if (!exists) {
-				                newAnganwadiEdit.push({
-				                    anganwadi_unique: match[1],
-				                    is_anganwadiIndividual: selected
-				                });
-				            }
-				        }
-				    });
-				    
-				    let isValid = true;
-				    let hasNewAnganwadi = $('.new-anganwadis-container input[type="radio"]').length > 0;
-				    // Loop through all new anganwadi groups
-				    if (hasNewAnganwadi) {
-					    $('.new-anganwadis-container').each(function () {
-					        const radioName = $(this).find('input[type="radio"]').first().attr('name');
-					        
-					        // Check if any radio with this name is checked
-					        if (!$(`input[name="${radioName}"]:checked`).val()) {
-					            isValid = false;
-					            return false; // break loop on first invalid
-					        }
-					    });
-				    }
-				    
-				    if (hasOldAnganwadi && !isOldAnganwadiValid) {
-				    	console.log("11111");
-				        return Swal.fire({
-				            icon: 'warning',
-				            title: 'Incomplete Input',
-				            text: 'Please select Yes or No for all Anganwadi entries.'
-				        });
-				    }
-
-				    if (hasNewAnganwadi && !isValid) {
-				    	console.log("2222");
-				        Swal.fire({
-				            icon: 'warning',
-				            title: 'Incomplete Input',
-				            text: 'Please select Yes or No for all Anganwadi entries.'
-				        });
-				        return;
-				    }
-
-				    const kitchenEdit = {
-				            is_cmbfs: cmbfskitchenPresent === '1',
-				            is_cmbfsIndividual: cmbfskitchenPresent === '1' ? (cmbfskitchenBuilding === '1') : null,
-				            is_noonmeal: noonMealpresent === '1',
-				            is_noonIndividual: noonMealpresent === '1' ? (noonMealBuilding === '1') : null,
-				            is_vegGarden:  noonMealpresent === '1' ? (vegetableGarden === '1') : null,
-				            is_anganwadi: (oldAnganwadiEdit.length > 0 || newAnganwadiEdit.length > 0),
-				            school_id: schoolId
-
-				        };
-				    
-				    const payload = {
-				            kitchenEdit,
-				            oldAnganwadiEdit: (oldAnganwadiEdit.length > 0 ? oldAnganwadiEdit : null),
-				            newAnganwadiEdit: (newAnganwadiEdit.length > 0 ? newAnganwadiEdit : null)
-				        };
-				    
-				    console.log("payload=",payload);
-
-					$('#updateSubmitBtn').prop('disabled', true).text('Updating...');
-					$('#pageLoader').show();
-
-					 $.ajax({
-						url: '/gcc/api/gccschool/schoolproperty/updateKitchenDetails',
-						type: 'POST',
-						contentType: 'application/json',
-				        data: JSON.stringify(payload),
-						success: function (response) {
-							$('#pageLoader').hide();
-							
-							$('#updateSubmitBtn').prop('disabled', false).text('Submit');
-							
-							if(response.status === 'OK'){
-							
-							//Swal.fire('Success', response, 'success').
-								Swal.fire({
-								title: 'Success',
-								text:response.message,
-								icon: 'success',
-								allowOutsideClick: false,
-								allowEscapeKey: false,
-								allowEnterKey: false,
-								showConfirmButton: true
-							}).then(() => {
-								$('#editKitchenModal').modal('hide');
-								location.reload();
-							});
-							}
-							else{
-								Swal.fire({
-									title: 'Error',
-									text:response.message,
-									icon: 'error',
-									allowOutsideClick: false,
-									allowEscapeKey: false,
-									allowEnterKey: false,
-									showConfirmButton: true
-								})
-							}
-						},
-						error: function (xhr) {
-							$('#pageLoader').hide();
-							$('#updateSubmitBtn').prop('disabled', false).text('Submit');						
-							Swal.fire({
-								title: 'Error',
-								text: xhr.responseText || 'Failed to update.',
-								icon: 'error',
-								allowOutsideClick: false,
-								allowEscapeKey: false,
-								allowEnterKey: false,
-								showConfirmButton: true
-							});
-						}
-					}); 
-				}
-			});
-			
-			let kitchenContainer = document.getElementById('kitchenFormContainer');
-
-			let observer = new MutationObserver(function (mutations) {
-				mutations.forEach(function (mutation) {
-					if (mutation.attributeName === "style") {
-						const display = window.getComputedStyle(kitchenContainer).display;
-						if (display === "block") {
-							if ($.fn.DataTable.isDataTable('#CompletedCPSDatatable')) {
-								let questionDatatable = $('#CompletedCPSDatatable').DataTable();
-								questionDatatable.columns.adjust().draw();
-							}
-						}
-					}
-				});
-			});
-
-			// Start observing for style changes
-			observer.observe(kitchenContainer, {
-				attributes: true,
-				attributeFilter: ['style']
-			});	
-			
-		</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/otherdetails.html b/src/main/resources/templates/modules/school/otherdetails.html
deleted file mode 100644
index 1f758bf8..00000000
--- a/src/main/resources/templates/modules/school/otherdetails.html
+++ /dev/null
@@ -1,1020 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	body {
-		background-color: #f8f9fa;
-		/*  font-family: Arial, sans-serif;*/
-	}
-
-	.header {
-		font-size: 22px;
-		font-weight: bold;
-		margin-bottom: 20px;
-	}
-
-	.table {
-		border: 1px solid #dee2e6;
-	}
-
-	.table th,
-	.table td {
-		border: 1px solid #dee2e6;
-		padding: 10px;
-	}
-
-	.section-title {
-		font-size: 18px;
-		font-weight: bold;
-		margin-top: 20px;
-		border-bottom: 2px solid #007bff;
-		padding-bottom: 5px;
-	}
-
-	.form-group {
-		margin-top: 15px;
-	}
-
-	.radio-group {
-		display: flex;
-		gap: 20px;
-		margin-top: 10px;
-	}
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content">
-				<div class="container">
-					<div class="header">School Module - Master Details</div>
-
-					<hr style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;">
-
-					<!-- Card 1: School Information -->
-					<div class="col-md-12">
-						<div class="card">
-							<div class="card-header d-flex justify-content-between align-items-center" style="background-color: #404E67; color: white;">
-							    <span>School Information</span>
-							    <button id="studentRegisterBtn" class="btn btn-light btn-sm text-dark">
-							        Student Registration
-							    </button>
-							</div>
-							<table class="table" id="schoolInfoTable" >
-								<!-- Table rows will be dynamically injected -->
-							</table>
-						</div>
-					</div>
-
-
-					<ul class="nav nav-tabs" id="myTab" role="tablist">
-						<li class="nav-item"><a class="nav-link active" id="otherDetailsTab" href="#">Other Details</a>
-						</li>
-						<li class="nav-item"><a class="nav-link" id="staffDetailsTab" data-toggle="tab"
-								href="/gcc/school/staffdetails" role="tab" aria-controls="staffdetails"
-								aria-selected="false">Staff
-								Details</a></li>
-						<li class="nav-item"><a class="nav-link" id="staffDetailsTab" data-toggle="tab"
-								href="/gcc/school/studentdetails" role="tab" aria-controls="staffdetails"
-								aria-selected="false">Student
-								Details</a></li>
-						<li class="nav-item" role="presentation"><a class="nav-link" id="buildingDetailstab"
-								href="#">Buildings</a></li>
-						<li class="nav-item" role="presentation"><a class="nav-link" id="playgroundDetailstab"
-								data-toggle="tab" href="/gcc/school/playground" role="tab" aria-controls="playground"
-								aria-selected="false">Playground</a></li>
-						<li class="nav-item" role="presentation"><a class="nav-link" id="drinkingwaterDetailstab"
-								data-toggle="tab" href="/gcc/school/drinkingwater" role="tab"
-								aria-controls="drinkingwater" aria-selected="false">Drinking
-								Water</a></li>
-						<li class="nav-item" role="presentation"><a class="nav-link" id="tioletsDetailstab"
-								data-toggle="tab" href="/gcc/school/toilets" role="tab" aria-controls="tiolets"
-								aria-selected="false">Toilets</a></li>
-						<li class="nav-item" role="presentation"><a class="nav-link" id="itassestsDetailstab"
-								href="#">School Assets</a></li>
-						</li>
-						<li class="nav-item" role="presentation"><a class="nav-link" id="kitchenDetailstab"
-								data-toggle="tab" href="/gcc/school/kitchen" role="tab" aria-controls="kitchen"
-								aria-selected="false">Kitchen</a></li>
-
-					</ul>
-					<div id="itassestsDetailsSection" style="display: none;">
-						<ul class="nav nav-tabs" id="itAssetsSubTabs">
-							<li class="nav-item"><a class="nav-link active" id="RoomAssetTab"
-									data-url="/gcc/school/roomassets" href="#">Rooms Assets Mapping</a></li>
-							<li class="nav-item"><a class="nav-link" id="AssetManageTab"
-									data-url="/gcc/school/assetmanagement" href="#">IT Asset Management</a></li>
-							<li class="nav-item"><a class="nav-link" id="AddElectricalAssetTab"
-									data-url="/gcc/school/addelectricalasset" href="#">Electrical Asset Management</a></li>
-							<li class="nav-item"><a class="nav-link" id="AddFurnitureAssetTab"
-									data-url="/gcc/school/addfurnitureasset" href="#">Furniture Asset Management</a></li>		
-						</ul>
-
-						<div id="itAssetsContent"></div>
-					</div>
-
-					<!-- This section should be initially hidden -->
-					<div id="buildingDetailsSection" style="display: none;">
-						<!-- Place for sub-tabs -->
-						<ul id="buildingSubTabs" class="nav nav-tabs">
-							<li class="nav-item">
-								<a class="nav-link active" id="buildingListTab" data-url="/gcc/school/building"
-									href="#">Building List</a>
-							</li>
-							<li class="nav-item">
-								<a class="nav-link" id="roomListTab" data-url="/gcc/school/room" href="#">Room List</a>
-							</li>
-						</ul>
-
-						<!-- Content loaded by tab click -->
-						<div id="buildingContent"></div>
-					</div>
-
-
-					<div id="staffDetailsSection" style="display: none;">Loading
-						staff details...</div>
-
-					<div id="playgroundDetailsSection" style="display: none;">
-						Loading playground details...</div>
-					<div id="drinkingwaterDetailsSection" style="display: none;">
-						Loading drinking water details...</div>
-					<div id="toiletsDetailsSection" style="display: none;">
-						Loading toilets details...</div>
-					<div id="itassestsDetailsSection" style="display: none;">
-						Loading IT assets details...</div>
-					<div id="kitchenDetailsSection" style="display: none;">
-						Loading kitchen details...</div>
-
-					<div id="studentRegistrationSection" style="display: none;padding-left: 0px;">
-					    <!-- Content will be loaded here -->Loading Student Register details...
-					</div>
-
-
-
-					<!-- Single Card Wrapper -->
-					<div class="col-md-12" id="otherDetailsSection" style="display: none;">
-						<div class="card" style="padding: 18px; margin-top: 27px;">
-							<div class="card-header">
-								<b>Site & Built Up Area</b>
-							</div>
-
-							<!-- Read-Only View -->
-							<div id="otherDetailsReadOnlyView" style="display: none; text-align: center;">
-								<br>
-								<div style="display: inline-block; width: 100%; max-width: 900px; text-align: left;">
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<td><b> Site Area (In Sq. ft)</b></td>
-												<td id="ro_land_area"></td>
-												<td><b> Built-up Area (Sq. ft)</b></td>
-												<td id="ro_buildup_area"></td>
-											</tr>
-											<tr>
-												<td><b>Compound Wall</b></td>
-												<td id="ro_compoundWall"></td>
-												<td><b>Name Board</b></td>
-												<td id="ro_nameBoard"></td>
-											</tr>
-											<tr>
-												<td><b>PA System</b></td>
-												<td id="ro_paSystem"></td>
-												<td><b>Electric Bell</b></td>
-												<td id="ro_electricBell"></td>
-											</tr>
-											<tr>
-												<td><b>Generator Set</b></td>
-												<td id="ro_generatorSet"></td>
-												<td colspan="2"></td>
-											</tr>
-										</tbody>
-									</table>
-									<div class="text-center">
-										<button type="button" class="btn btn-primary"
-											id="updateOtherDetailsBtn">Update</button>
-									</div>
-								</div>
-							</div>
-
-							<!-- Form View -->
-							<div id="otherDetailsSectionform" style="display: none;">
-								<form id="schoolDetailsForm">
-									<div class="row" style="padding: 15px;">
-										<div class="col-md-6 form-group">
-											<label>Approx Site Area of the School (In Sq. ft) <span class="text-danger">*</span></label>
-											<input type="text" id="land_area" class="form-control"
-												placeholder="Enter in Acre" required />
-										</div>
-										<div class="col-md-6 form-group">
-											<label> Approx Built Up Area of the School (In Sq. ft) <span class="text-danger">*</span></label>
-											<input type="text" id="buildup_area" class="form-control"
-												placeholder="Enter in Sq. ft" required />
-										</div>
-									</div>
-
-									<div class="card-header"><b>Compound & Name Board</b></div>
-									<div class="row" style="padding: 15px;">
-										<div class="col-md-6 form-group">
-											<label>Presence of Compound Wall <span class="text-danger">*</span></label>
-											<div class="radio-group">
-												<input type="radio" name="compoundWall" value="1"> Yes
-												<input type="radio" name="compoundWall" value="0"> No
-												<input type="radio" name="compoundWall" value="2">No space
-											</div>
-										</div>
-										<div class="col-md-6 form-group">
-											<label>Presence of School Name Board (New Board) <span class="text-danger">*</span></label>
-											<div class="radio-group">
-												<input type="radio" name="nameBoard" value="Yes"> Yes
-												<input type="radio" name="nameBoard" value="No"> No
-											</div>
-										</div>
-									</div>
-
-									<div class="card-header"><b>Electrical</b></div>
-									<div class="row" style="padding: 15px;">
-										<div class="col-md-4 form-group">
-											<label>Is PA System Available? <span class="text-danger">*</span></label>
-											<div class="radio-group">
-												<input type="radio" name="paSystem" value="Yes"> Yes
-												<input type="radio" name="paSystem" value="No"> No
-											</div>
-										</div>
-										<div class="col-md-4 form-group">
-											<label>Is Electric Bell Available? <span class="text-danger">*</span></label>
-											<div class="radio-group">
-												<input type="radio" name="electricBell" value="Yes"> Yes
-												<input type="radio" name="electricBell" value="No"> No
-											</div>
-										</div>
-										<div class="col-md-4 form-group">
-											<label>Is Generator Set Available? <span class="text-danger">*</span></label>
-											<div class="radio-group">
-												<input type="radio" name="generatorSet" value="Yes"> Yes
-												<input type="radio" name="generatorSet" value="No"> No
-											</div>
-										</div>
-									</div>
-
-									<div class="card-footer text-center">
-										<button type="submit" class="btn btn-primary" id="requestSubmitBtn"><i
-												class="ik ik-save"></i> Submit</button>
-										<button type="reset" class="btn btn-secondary mr-2" id="resetButton"><i
-												class="ik ik-refresh-cw"></i> Reset</button>
-									</div>
-								</form>
-							</div>
-						</div>
-					</div>
-
-				</div>
-				
-			</div>
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-
-		<!-- Form -->
-		<!-- Modal -->
-		<div class="modal fade" id="otherDetailsModal" tabindex="-1"  data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="otherDetailsModalLabel" 
-			aria-hidden="true" >
-			<div class="modal-dialog modal-lg">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title" id="otherDetailsModalLabel">Update Other
-							Details</h5>
-							<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-													<span aria-hidden="true">&times;</span>
-												</button>
-																</div>
-					<div class="modal-body">
-						<div id="otherDetailsFormWrapper">
-							<form id="updateOtherDetailsForm">
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label> Approx Site Area of the School (In Sq. ft) <span class="text-danger">*</span></label>
-										<input type="text" id="modal_land_area" class="form-control"
-											placeholder="Enter in Acres" required />
-									</div>
-									<div class="col-md-6">
-										<label> Approx Built Up Area of the School (In Sq. ft)
-											<span class="text-danger">*</span></label>
-										<input type="text" id="modal_buildup_area" class="form-control"
-											placeholder="Enter in Sq. ft" required />
-									</div>
-								</div>
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label>Presence of Compound Wall <span class="text-danger">*</span></label>
-										<div>
-											<input type="radio" name="modalcompoundWall" value="1"> Yes
-											<input type="radio" name="modalcompoundWall" value="0"> No
-											<input type="radio" name="modalcompoundWall" value="2"> No space
-										</div>
-									</div>
-									<div class="col-md-6">
-										<label>Presence of School Name Board (New Board)<span class="text-danger">*</span> </label>
-										<div>
-											<input type="radio" name="modalnameBoard" value="1"> Yes
-											<input type="radio" name="modalnameBoard" value="0">
-											No
-										</div>
-									</div>
-								</div>
-								<div class="row mb-3">
-									<div class="col-md-4">
-										<label>Is PA System Available? <span class="text-danger">*</span></label>
-										<div>
-											<input type="radio" name="modalpaSystem" value="1">
-											Yes
-											<input type="radio" name="modalpaSystem" value="0">
-											No
-										</div>
-									</div>
-									<div class="col-md-4">
-										<label>Is Electric Bell Available? <span class="text-danger">*</span></label>
-										<div>
-											<input type="radio" name="modalelectricBell" value="1"> Yes
-											<input type="radio" name="modalelectricBell" value="0"> No
-										</div>
-									</div>
-									<div class="col-md-4">
-										<label>Is Generator Set Available? <span class="text-danger">*</span></label>
-										<div>
-											<input type="radio" name="modalgeneratorSet" value="1"> Yes
-											<input type="radio" name="modalgeneratorSet" value="0"> No
-										</div>
-									</div>
-								</div>
-								<div class="text-center">
-									<button type="submit" class="btn btn-primary" id="requestSubmitBtn">Submit</button>
-									<!--<button type="reset" class="btn btn-secondary btn-gap"
-																			id="resetButton">Reset</button>-->
-								</div>
-							</form>
-						</div>
-
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<script th:replace="~{fragments/modules/base/script :: script}"></script>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-		<script>
-
-			// jQuery or vanilla JS to open the modal
-			$(document).on('click', '#updateOtherDetailsBtn', function () {
-				$('#otherDetailsModal').modal('show');
-			});
-
-
-			const urlParams = new URLSearchParams(window.location.search);
-			const schoolId = urlParams.get("schoolId");
-			$(document).ready(function () {
-				/* const urlParams = new URLSearchParams(window.location.search);
-				const schoolId = urlParams.get("schoolId"); */
-
-				$.ajax({
-					type: 'GET',
-					url: '/gcc/api/gccschool/schoolproperty/getSchoolDetails',
-					data: {schoolId: schoolId},
-					success: function (data) {
-						console.log(data);
-						const html = `
-							<tr><th>School Name:</th><td>${data.school_name}</td><th>UDISE Code:</th><td>${data.udise}</td></tr>
-							<tr><th>Category:</th><td>${data.category}</td><th>Ward:</th><td>${data.division}</td></tr>
-							<tr></td><th>Zone:</th><td>${data.zone}</td>
-							<th>Address:</th><td>${data.address}</td></tr>
-						`;
-						$('#schoolInfoTable').html(html);
-					}
-				});
-				$('.nav-link').click(function (e) {
-					e.preventDefault();
-					let url = $(this).attr(
-						'href');
-					let targetId = $(this)
-						.attr('id');
-
-					// Hide all sections
-					$(
-						'#otherDetailsSection, #staffDetailsSection, #buildingDetailsSection, #playgroundDetailsSection, #drinkingwaterDetailsSection, #toiletsDetailsSection, #itassestsDetailsSection, #kitchenDetailsSection')
-						.hide();
-
-					// Remove active class from all nav links
-					$('.nav-link').removeClass(
-						'active');
-					$(this).addClass('active');
-
-					// Handle Section Display and Load Data
-					switch (targetId) {
-						case 'otherDetailsTab':
-							$('#otherDetailsSection').show();
-								$('#schoolDetailsForm')[0].reset();
-							break;
-						case 'staffDetailsTab':
-							$(
-								'#staffDetailsSection')
-								.show();
-							loadData(url,
-								'#staffDetailsSection');
-							break;
-						case 'buildingDetailstab':
-							$('#buildingDetailsSection').show();
-
-							// Set Building List as default
-							$('#buildingListTab').addClass('active');
-							$('#roomListTab').removeClass('active');
-
-							// Load Building List content
-							$('#buildingContent').html('<p>Loading Building List...</p>');
-							loadData('/gcc/school/building', '#buildingContent');
-							break;
-
-						case 'roomListTab':
-							$('#buildingDetailsSection').show();
-
-							// Reset sub-tab states
-							$('#buildingListTab').removeClass('active');
-							$('#roomListTab').addClass('active');
-
-							// Load Building List by default
-							$('#buildingContent').html('<p>Loading Room List...</p>');
-							loadData('/gcc/school/room', '#buildingContent');
-							break;
-						case 'playgroundDetailstab':
-							$(
-								'#playgroundDetailsSection')
-								.show();
-							loadData(url,
-								'#playgroundDetailsSection');
-							break;
-						case 'drinkingwaterDetailstab':
-							$(
-								'#drinkingwaterDetailsSection')
-								.show();
-							loadData(url,
-								'#drinkingwaterDetailsSection');
-							break;
-						case 'tioletsDetailstab':
-							$(
-								'#toiletsDetailsSection')
-								.show();
-							loadData(url,
-								'#toiletsDetailsSection');
-							break;
-						case 'kitchenDetailstab':
-							$(
-								'#kitchenDetailsSection')
-								.show();
-							loadData(url,
-								'#kitchenDetailsSection');
-							break;
-						case 'itassestsDetailstab':
-							$('#itassestsDetailsSection').show();
-
-							// Set Building List as default
-							$('#RoomAssetTab').addClass('active');
-							$('#AssetManageTab').removeClass('active');
-							$('#AddElectricalAssetTab').removeClass('active');
-							$('#AddFurnitureAssetTab').removeClass('active');
-
-							// Load Building List content
-							$('#itAssetsContent').html('<p>Loading Asset Room List...</p>');
-							loadData('/gcc/school/roomassets', '#itAssetsContent');
-							break;
-						case 'AssetManageTab':
-							$('#itassestsDetailsSection').show();
-
-							// Reset sub-tab states
-							$('#AssetManageTab').addClass('active');
-							$('#RoomAssetTab').removeClass('active');
-							$('#AddElectricalAssetTab').removeClass('active');
-							$('#AddFurnitureAssetTab').removeClass('active');
-
-							// Load Building List by default
-							$('#itAssetsContent').html('<p>Loading Asset List...</p>');
-							loadData('/gcc/school/assetmanagement', '#itAssetsContent');
-							break;
-							case 'AddElectricalAssetTab':
-														$('#itassestsDetailsSection').show();
-
-														// Reset sub-tab states
-														$('#AssetManageTab').removeClass('active');
-														$('#RoomAssetTab').removeClass('active');
-														$('#AddElectricalAssetTab').addClass('active');
-														$('#AddFurnitureAssetTab').removeClass('active');
-
-														// Load Building List by default
-														$('#itAssetsContent').html('<p>Loading Add Electrical Asset content...</p>');
-														loadData('/gcc/school/addelectricalasset', '#itAssetsContent');
-														break;
-														
-													case 'AddFurnitureAssetTab':
-														$('#itassestsDetailsSection').show();
-
-														// Reset sub-tab states
-														$('#AssetManageTab').removeClass('active');
-														$('#RoomAssetTab').removeClass('active');
-														$('#AddElectricalAssetTab').removeClass('active');
-														$('#AddFurnitureAssetTab').addClass('active');
-
-														// Load Building List by default
-														$('#itAssetsContent').html('<p>Loading Add Furniture Asset content...</p>');
-														loadData('/gcc/school/addfurnitureasset', '#itAssetsContent');
-														break;
-					}
-				});
-
-
-				// Handle IT Assets Sub-tabs Click
-				/*$('#itAssetsSubTabs').on('click', '.nav-link', function (e) {
-					e.preventDefault();
-					let url = $(this).attr('href');
-					$('#itAssetsSubTabs .nav-link').removeClass('active');
-					$(this).addClass('active');
-	
-					// Ensure #itAssetsContent is cleared before loading
-					$('#itAssetsContent').html('<p>Loading...</p>');
-					$.get(url, function (data) {
-						$('#itAssetsContent').html(data);
-					}).fail(function () {
-						$('#itAssetsContent').html('<p>Error loading data. Please try again later.</p>');
-					});
-				});*/
-
-				// Click event for Room List Tab
-				/* $(document).on('click', '#roomListTab', function (e) {
-					e.preventDefault();
-	
-					// Show the main building section
-					$('#buildingDetailsSection').show();
-	
-					// Set active tab
-					$('#roomListTab').addClass('active');
-					$('#buildingListTab').removeClass('active');
-	
-					// Load Room List content
-					$('#buildingContent').html('<p>Loading Room List...</p>');
-					loadData('/gcc/school/room', '#buildingContent');
-				}); */
-
-				// Click event for Building List Tab
-				$(document).on('click', '#buildingListTab', function (e) {
-					e.preventDefault();
-
-					// Show the main building section
-					$('#buildingDetailsSection').show();
-
-					// Set active tab
-					$('#buildingListTab').addClass('active');
-					$('#roomListTab').removeClass('active');
-
-					// Load Building List content
-					$('#buildingContent').html('<p>Loading Building List...</p>');
-					loadData('/gcc/school/building', '#buildingContent');
-				});
-
-				$(document).on('click', '#RoomAssetTab', function (e) {
-					e.preventDefault();
-
-					// Show the main building section
-					$('#itassestsDetailsSection').show();
-
-					// Set active tab
-					$('#RoomAssetTab').addClass('active');
-					$('#AssetManageTab').removeClass('active');
-
-					// Load Building List content
-					$('#itAssetsContent').html('<p>Loading Asset Room List...</p>');
-					loadData('/gcc/school/roomassets', '#itAssetsContent');
-				});
-				
-				$(document).on('click', '#studentRegisterBtn', function (e) {
-				    e.preventDefault();
-
-				    // Hide all other content sections
-				    $('#otherDetailsSection, #staffDetailsSection, #buildingDetailsSection, #playgroundDetailsSection, #drinkingwaterDetailsSection, #toiletsDetailsSection, #itassestsDetailsSection, #kitchenDetailsSection, #studentRegistrationSection').hide();
-
-				    document.getElementById("myTab").style.display = "none";
-				    document.getElementById("studentRegisterBtn").style.display = "none";
-				    // Show and load the Student Registration section
-				    $('#studentRegistrationSection').show().html('<p>Loading Student Registration...</p>');
-				    loadData('/gcc/school/studentregistration', '#studentRegistrationSection');
-				});
-
-
-				// 🔁 Delegate Click Event for Building Sub-tabs
-				/*				$(document).on('click', '#buildingSubTabs .nav-link', function (e) {
-									e.preventDefault();
-				
-									// Remove active class from all sub-tabs
-									$('#buildingSubTabs .nav-link').removeClass('active');
-									$(this).addClass('active');
-				
-									// Get the correct API URL from `data-url`
-									let contentUrl = $(this).data('url');
-				
-									// Load content dynamically
-									if (contentUrl) {
-										$('#buildingContent').html('<p>Loading...</p>');
-										$.get(contentUrl, function (data) {
-											$('#buildingContent').html(data);
-										}).fail(function () {
-											$('#buildingContent').html('<p>Error loading data. Please try again later.</p>');
-										});
-									}
-								});*/
-
-			});
-			// Function to load data via AJAX
-			function loadData(url, sectionId) {
-				$.get(url, function (data) {
-					$(sectionId).html(data);
-				}).fail(function () {
-					$(sectionId).html('<p>Error loading data. Please try again later.</p>');
-				});
-			}
-
-
-			document.getElementById('buildup_area').addEventListener('input', function () {
-				// Allow only whole numbers (no decimals)
-				this.value = this.value.replace(/[^0-9]/g, '');
-
-				// Prevent negative values
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-			document.getElementById('modal_buildup_area').addEventListener('input', function () {
-				// Allow only whole numbers (no decimals)
-				this.value = this.value.replace(/[^0-9]/g, '');
-
-				// Prevent negative values
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-
-			document.getElementById('land_area').addEventListener('input', function () {
-				// Remove any non-numeric characters except decimal point
-				this.value = this.value.replace(/[^0-9.]/g, '');
-
-				// Ensure the value is nfot negative
-				if (this.value < 0) {
-					this.value = '';
-				}
-			});
-			document.getElementById('modal_land_area').addEventListener('input', function () {
-				// Remove any non-numeric characters except decimal point
-				this.value = this.value.replace(/[^0-9.]/g, '');
-
-				// Ensure the value is nfot negative
-				if (this.value < 0) {
-					this.value = '';
-				}
-			});
-
-
-			$('#requestSubmitBtn').on('click', function (e) {
-				e.preventDefault();
-
-				let landArea = $('#land_area').val().trim();
-				let buildupArea = $('#buildup_area').val().trim();
-				let isCompound = $('input[name="compoundWall"]:checked').val();
-				let isNameboard = $('input[name="nameBoard"]:checked').val();
-				let isPasystem = $('input[name="paSystem"]:checked').val();
-				let isBell = $('input[name="electricBell"]:checked').val();
-				let isGenerator = $('input[name="generatorSet"]:checked').val();
-
-				//let schoolId = 1; // hardcoded
-
-				// Field validation
-								if (isNaN(parseFloat(landArea)) || landArea <= 0 )  {
-    Swal.fire({
-        icon: 'info',
-        title: 'Validation Error',
-        text: 'Site Area  numbers greater than 0.',
-        allowOutsideClick: false,
-        allowEscapeKey: false,
-        allowEnterKey: false,
-        confirmButtonText: 'OK'
-    });
-    return;
-}
-			if ( isNaN(parseFloat(buildupArea)) || buildupArea < 50) {
-			    Swal.fire({
-			        icon: 'info',
-			        title: 'Validation Error',
-			        text: ' Built-up Area must be numbers greater than 50.',
-			        allowOutsideClick: false,
-			        allowEscapeKey: false,
-			        allowEnterKey: false,
-			        confirmButtonText: 'OK'
-			    });
-			    return;
-			}
-				let fields = {
-					"Site Area of the School": landArea,
-					"Built Up Area of the School": buildupArea,
-					"Compound Wall": isCompound,
-					"School Name Board": isNameboard,
-					"PA System": isPasystem,
-					"Electric Bell": isBell,
-					"Generator Set": isGenerator
-				};
-
-				for (let key in fields) {
-					if (!fields[key] || fields[key] === "") {
-						Swal.fire({
-							icon: 'info',
-							title: 'Validation Error',
-							text: `Please enter/select: ${key}`,
-							 allowOutsideClick: false,
-						        allowEscapeKey: false,
-						        allowEnterKey: false,
-							confirmButtonText: 'OK'
-						});
-						return;
-					}
-				}
-
-				// Check numeric fields
-
-			
-				
-
-
-				// Show loader
-				$('#pageLoader').show();
-		
-				// Prepare form data
-				let formData = {
-					land_area: parseFloat(landArea),
-					buildup_area: parseFloat(buildupArea),
-					//is_compound: isCompound ,
-					is_compound: parseInt(isCompound),
-					is_nameboard: isNameboard,
-					is_pasystem: isPasystem, 
-					is_bell: isBell, 
-					is_generator: isGenerator,
-					school_id: schoolId
-				};
-
-				// AJAX call
-				$.ajax({
-					type: 'POST',
-					url: '/gcc/api/gccschool/schoolproperty/saveSchoolBuildupArea',
-					data: $.param(formData), // Serialize object to x-www-form-urlencoded
-					/*success: function (data) {
-						$('#pageLoader').hide();
-						Swal.fire({
-							title: 'Success!',
-							text: 'School Build-up Area data saved successfully!',
-							icon: 'success',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							confirmButtonText: 'OK'
-						}).then(() => {
-							window.location.reload();
-						});
-					},*/
-					success: function (data) {
-					    $('#pageLoader').hide();
-					    Swal.fire({
-					        icon: data.includes("already") ? 'info' : 'success',
-					        title: data.includes("already") ? 'Information' : 'Success',
-					        text: data,
-					        allowOutsideClick: false,
-					        allowEscapeKey: false,
-					        allowEnterKey: false,
-					        confirmButtonText: 'OK'
-					    }).then(() => {
-					        
-					            window.location.reload();
-					        
-					    });
-					},
-
-					error: function (xhr, status, error) {
-						console.error('AJAX Error:', error);
-						$('#pageLoader').hide();
-						Swal.fire({
-							title: 'Error!',
-							text: 'Something went wrong while saving the data.',
-							icon: 'error',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							confirmButtonText: 'OK'
-						});
-					}
-				});
-			});
-			/*	document.getElementById("resetButton").addEventListener("click", function (event) {
-					event.preventDefault(); // Prevent default reset behavior (which might refresh or reset other logic)
-	
-					// Clear all input fields (text)
-					document.querySelectorAll('input[type="text"]').forEach(input => input.value = "");
-	
-					// Uncheck all radio buttons
-					document.querySelectorAll('input[type="radio"]').forEach(radio => radio.checked = false);
-				});*/
-
-			$(document).ready(function () {
-				$.ajax({
-					url: '/gcc/api/gccschool/buildingasset/getotherdetailsBySchoolId',
-					type: 'GET',
-					data: {schoolId},
-					success: function (response) {
-						if (response.status === 'OK' && response.otherdetailsBySchool.length > 0) {
-							const data = response.otherdetailsBySchool[0];
-
-							const hasValidData =
-								!!data.land_area ||
-								!!data.buildup_area ||
-								data.is_compound !== null ||
-								data.is_nameboard !== null ||
-								data.is_pasystem !== null ||
-								data.is_bell !== null ||
-								data.is_generator !== null;
-
-							if (hasValidData) {
-								// Fill read-only
-								$('#ro_land_area').text(data.land_area || '');
-								$('#ro_buildup_area').text(data.buildup_area || '');
-								//$('#ro_compoundWall').text(data.is_compound ? 'Yes' : 'No');
-								let compoundMap = { 0: 'No', 1: 'Yes', 2: 'No space' };
-								$('#ro_compoundWall').text(compoundMap[data.is_compound] || '');
-								$('#ro_nameBoard').text(data.is_nameboard ? 'Yes' : 'No');
-								$('#ro_paSystem').text(data.is_pasystem ? 'Yes' : 'No');
-								$('#ro_electricBell').text(data.is_bell ? 'Yes' : 'No');
-								$('#ro_generatorSet').text(data.is_generator ? 'Yes' : 'No');
-
-								$('#otherDetailsSection').show();
-								$('#otherDetailsReadOnlyView').show();
-								$('#otherDetailsSectionform').hide();
-							} else {
-								$('#otherDetailsSection').show();
-								$('#otherDetailsReadOnlyView').hide();
-								$('#otherDetailsSectionform').show();
-							}
-						} else {
-							// ✅ No data at all
-							$('#otherDetailsSection').show();
-							$('#otherDetailsReadOnlyView').hide();
-							$('#otherDetailsSectionform').show();
-						}
-					},
-					error: function () {
-						console.error('Error fetching other details');
-						$('#otherDetailsSection').show();
-						$('#otherDetailsReadOnlyView').hide();
-						$('#otherDetailsSectionform').show();
-					}
-				});
-
-				$('#updateOtherDetailsBtn').on('click', function () {
-					console.log("schoolId", schoolId);
-
-					$.ajax({
-						url: '/gcc/api/gccschool/buildingasset/getotherdetailsBySchoolId',
-						type: 'GET',
-						data: {schoolId},
-						success: function (response) {
-							console.log("response");
-							console.log(response);
-							if (response.status === 'OK' && response.otherdetailsBySchool.length > 0) {
-								const data = response.otherdetailsBySchool[0];
-								console.log("land_area:", data.land_area);
-								console.log("buildup_area:", data.buildup_area);
-
-								$('#modal_land_area').val(data.land_area);
-								$('#modal_buildup_area').val(data.buildup_area );
-								
-								
-								//$('#buildup_area').val(data.buildup_area);
-								//$('input[name="modalcompoundWall"][value="' + (data.is_compound ? '1' : '0') + '"]').prop('checked', true);
-								$('input[name="modalcompoundWall"][value="' + data.is_compound + '"]').prop('checked', true);
-								$('input[name="modalnameBoard"][value="' + (data.is_nameboard ? '1' : '0') + '"]').prop('checked', true);
-								$('input[name="modalpaSystem"][value="' + (data.is_pasystem ? '1' : '0') + '"]').prop('checked', true);
-								$('input[name="modalelectricBell"][value="' + (data.is_bell ? '1' : '0') + '"]').prop('checked', true);
-								$('input[name="modalgeneratorSet"][value="' + (data.is_generator ? '1' : '0') + '"]').prop('checked', true);
-								$('#otherDetailsFormWrapper').show();
-								$('#otherDetailsReadOnlyView').show();
-								 $('#otherDetailsModal').modal('show');
-							}
-						}
-					});
-				});
-					$('#updateOtherDetailsForm').on('submit', function (e) {
-						e.preventDefault();
-
-						// Collect values from modal
-						const land_area = parseFloat($('#modal_land_area').val().trim());
-
-						const buildup_area = parseFloat($('#modal_buildup_area').val().trim());
-						const is_compound = $('input[name="modalcompoundWall"]:checked').val();
-						const is_nameboard = $('input[name="modalnameBoard"]:checked').val();
-						const is_pasystem = $('input[name="modalpaSystem"]:checked').val();
-						const is_bell = $('input[name="modalelectricBell"]:checked').val();
-						const is_generator = $('input[name="modalgeneratorSet"]:checked').val();
-						console.log("text");
-						console.log(land_area);
-						console.log(is_bell);
-						
-
-						if (isNaN(land_area) || isNaN(buildup_area)) {
-							Swal.fire("Validation Error", "Please enter valid area values.", "warning");
-							return;
-						}
-						if (isNaN(parseFloat(land_area)) || land_area <= 0 || isNaN(parseFloat(buildup_area)) || buildup_area <= 50) {
-							Swal.fire({
-								icon: 'info',
-								title: 'Validation Error',
-								text: 'Site Area and Built-up Area must be valid numbers.',
-								allowOutsideClick: false,
-								allowEscapeKey: false,
-								allowEnterKey: false,
-								confirmButtonText: 'OK'
-							});
-							return;
-						}
-
-						// Prepare payload
-						const formData = {
-							land_area,
-							buildup_area,
-							//is_compound,
-							 is_compound: parseInt(is_compound),
-							is_nameboard,
-							is_pasystem,
-							is_bell,
-							is_generator,
-							school_id: schoolId // already declared in your script
-						};
-
-						// AJAX call to your controller
-						$.ajax({
-							url: '/gcc/api/gccschool/schoolproperty/updateOtherDetails',
-							type: 'POST',
-							data: formData,
-							success: function (response) {
-							/*	if (response === 'Success') {
-									Swal.fire("Success!", "Other details updated successfully.", "success")
-										.then(() => window.location.reload());
-								} else {
-									Swal.fire("Error", "Something went wrong. Try again.", "error");
-								}
-							},
-							error: function (xhr, status, error) {
-								console.error("AJAX Error:", error);
-								Swal.fire("Error", "Server error occurred.", "error");
-							}*/
-								if (response === 'Success') {
-								    Swal.fire({
-								        title: "Success!",
-								        text: "Other details updated successfully.",
-								        icon: "success",
-								        allowOutsideClick: false,
-								        allowEscapeKey: false,
-								        allowEnterKey: false
-								    }).then(() => window.location.reload());
-								} else {
-								    Swal.fire({
-								        title: "Error",
-								        text: "Something went wrong. Try again.",
-								        icon: "error",
-								        allowOutsideClick: false,
-								        allowEscapeKey: false,
-								        allowEnterKey: false
-								    });
-								}
-								},
-								error: function (xhr, status, error) {
-								    console.error("AJAX Error:", error);
-								    Swal.fire({
-								        title: "Error",
-								        text: "Server error occurred.",
-								        icon: "error",
-								        allowOutsideClick: false,
-								        allowEscapeKey: false,
-								        allowEnterKey: false
-								    });
-								}
-
-						});
-					});
-				});
-		
-
-		</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/playground.html b/src/main/resources/templates/modules/school/playground.html
deleted file mode 100644
index d12fed12..00000000
--- a/src/main/resources/templates/modules/school/playground.html
+++ /dev/null
@@ -1,842 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<title>Playground Details</title>
-	<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
-	
-	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	<style>
-		.radio-group {
-			display: flex;
-			gap: 20px;
-			margin-top: 10px;
-		}
-
-		body {
-			background-color: #f8f9fa;
-		}
-/* Remove background image from the container itself */
-.select2-container--default .select2-selection--multiple {
-    padding-right: 30px;
-    min-height: 38px;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    position: relative; /* important for the ::after */
-    background-image: none;
-}
-
-/* Add the dropdown arrow via a pseudo-element */
-.select2-container--default .select2-selection--multiple::after {
-    content: "";
-    position: absolute;
-    top: 50%;
-    right: 8px;
-    width: 14px;
-    height: 14px;
-    transform: translateY(-50%);
-    background-image: url("data:image/svg+xml;utf8,<svg fill='gray' height='20' viewBox='0 0 24 24' width='20' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/></svg>");
-    background-repeat: no-repeat;
-    background-size: contain;
-    pointer-events: none;
-}
-
-/* Each selected tag */
-.select2-container--default .select2-selection--multiple .select2-selection__choice {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 5px 10px;
-    margin: 4px 4px 0 0;
-    background-color: #f5f5f5;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 13px;
-    line-height: 1.4;
-    max-width: 100%;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-/* The text inside the tag */
-.select2-container--default .select2-selection--multiple .select2-selection__choice__display {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    flex: 1;
-    margin-right: 8px;
-}
-
-/* The "X" close icon */
-.select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
-    position: static;
-    transform: none;
-    color: #333;
-    font-size: 14px;
-    font-weight: bold;
-    cursor: pointer;
-    background: transparent;
-    border: none;
-    line-height: 1;
-}
-
-
-
-
-
-
-		 
-
-
-		
-	</style>
-</head>
-
-<body>
-	<div class="container mt-4">
-				<header th:replace="~{fragments/modules/base/header :: header}"></header>
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-	
-		<form id="playgroundForm">
-			<div class="card p-3">
-				<div class="card-header">
-					<b>Playground</b>
-				</div>
-
-				<div class="row mt-3">
-					<div class="col-md-6 form-group">
-						<label>Presence of Playground <span style="color: red;">*</span></label>
-						<div class="radio-group">
-							<input type="radio" name="hasPlayground" value="Yes"> Yes
-							<input type="radio" name="hasPlayground" value="No"> No
-						</div>
-					</div>
-
-					<div class="col-md-6 form-group" id="playgroundAreaGroup" style="display: none;">
-						<label>Area of Playground (Sq. ft) <span style="color: red;">*</span></label>
-						<input type="number" class="form-control" id="playground_area" min="0">
-					</div>
-				</div>
-
-				<div class="row mt-3">
-					<div class="col-md-6 form-group">
-						<label>Presence of Court <span style="color: red;">*</span></label>
-						<div class="radio-group">
-							<input type="radio" name="hasCourt" value="Yes"> Yes
-							<input type="radio" name="hasCourt" value="No"> No
-						</div>
-					</div>
-
-	<!-- <div class="col-md-6 form-group" id="courtTypeGroup" style="display: none;">
-  <label>Type of Court <span class="text-danger">*</span></label>
-  <div class="custom-select-wrapper">
-    <select id="court_type" class="form-control custom-select-style" multiple="multiple">
-      Options will be added dynamically here 
-    </select>
-    <i class="bi bi-caret-down-fill dropdown-icon"></i>
-  </div>
-</div> -->
-<div class="col-md-6 form-group" id="courtTypeGroup" style="display: none;">
-						<label>Type of Court <span style="color: red;">*</span></label>
-						<select id="court_type" class="form-control " multiple > </select>
-					</div>
-				
- 
-
-
-
-				</div>
-
-				<div class="row mt-3">
-					  <div class="col-md-6 form-group">
-						<label>Inventory Items <span style="color: red;">*</span></label>
-						<select id="inventory" class="form-control" multiple></select>
-						
-					</div>
-	
-					
-				</div>
-
-				<div class="card-footer text-center">
-					<button type="submit" class="btn btn-primary">
-						<i class="ik ik-save"></i> Submit
-					</button>
-					<button type="button" class="btn btn-secondary" id="resetBtn">
-						<i class="ik ik-refresh-cw"></i> Reset
-					</button>
-				</div>
-			</div>
-		</form>
-	</div>
-	<div class="modal fade" id="editPlaygroundModal" tabindex="-1" aria-labelledby="editPlaygroundModalLabel" aria-hidden="true">
-	  <div class="modal-dialog modal-lg">
-	    <div class="modal-content">
-	      <form id="playgroundEditForm">
-	        <div class="modal-header">
-	          <h5 class="modal-title" id="editPlaygroundModalLabel">Playground Details</h5>
-			  <button type="button" class="close" data-bs-dismiss="modal"
-			  						aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	        </div>
-
-	        <div class="modal-body">
-	          <div class="row mt-3">
-	            <div class="col-md-6 form-group">
-	              <label>Presence of Playground <span style="color: red;">*</span></label>
-	              <div class="radio-group">
-	                <input type="radio" name="modalhasPlayground" value="Yes"> Yes
-	                <input type="radio" name="modalhasPlayground" value="No"> No
-	              </div>
-	            </div>
-
-	            <div class="col-md-6 form-group" id="modalplaygroundAreaGroup" style="display: none;">
-	              <label>Area of Playground (Sq. ft) <span style="color: red;">*</span></label>
-	              <input type="number" class="form-control" id="modalplayground_area" min="0">
-	            </div>
-	          </div>
-
-	          <div class="row mt-3">
-	            <div class="col-md-6 form-group">
-	              <label>Presence of Court <span style="color: red;">*</span></label>
-	              <div class="radio-group">
-	                <input type="radio" name="modalhasCourt" value="Yes"> Yes
-	                <input type="radio" name="modalhasCourt" value="No"> No
-	              </div>
-	            </div>
-
-	            <div class="col-md-6 form-group" id="modalcourtTypeGroup" style="display: none;">
-	              <label>Type of Court <span style="color: red;">*</span></label>
-	              <select id="modalcourt_type" class="form-control" multiple="multiple"></select>
-	            </div>
-	          </div>
-
-	          <div class="row mt-3">
-	            <div class="col-md-6 form-group">
-	              <label>Inventory Items <span style="color: red;">*</span></label>
-	              <select id="modalinventory" class="form-control" multiple="multiple"></select>
-	            </div>
-	          </div>
-	        </div>
-
-	        <div class="modal-footer">
-	          <button type="submit" class="btn btn-primary">
-	            <i class="ik ik-save"></i> Submit
-	          </button>
-	         
-	        </div>
-	      </form>
-	    </div>
-	  </div>
-	</div>
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-	<script>
-		$(document).ready(function () {
-			
-			
-			const urlParams = new URLSearchParams(window.location.search);
-			const schoolId = urlParams.get("schoolId");
-			
-			document.getElementById('playground_area').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-
-			console.log("Playground form JS ready.");
-
-			/*$('#court_type, #inventory').select2({width: '100%'});
-			
-
-			// Load dropdown data
-			$.get('/gcc/api/gccschool/dropdown/getCourtData', function (response) {
-				const $court = $('#court_type').empty();
-				$court.append('<option value="">Select Type of court </option>');
-				response.data.forEach(item => {
-					$court.append(`<option value="${item.court_id}">${item.court_type}</option>`);
-				});
-			});*/
-			
-			
-			$.get('/gcc/api/gccschool/dropdown/getCourtData', function (response) {
-			    const $court = $('#court_type');
-			    $court.empty(); // Clear existing options
-			    response.data.forEach(item => {
-			        $court.append(`<option value="${item.court_id}">${item.court_type}</option>`);
-			    });
-
-			    // Destroy any previous select2 instance if reinitializing
-			    if ($court.hasClass("select2-hidden-accessible")) {
-			        $court.select2('destroy');
-			    }
-
-			    $court.select2({
-			        placeholder: "Select Type of Court",
-			        width: '100%',
-			        minimumResultsForSearch: Infinity, // disables typing/search box
-			        closeOnSelect: false // allow multiple selection
-			    });
-			});
-			$('#court_type').on('select2:opening', function() {
-			    setTimeout(() => {
-			        $('.select2-search__field').prop('readonly', true); // disable typing
-			    }, 0);
-			});
-			$.get('/gcc/api/gccschool/dropdown/getEquipmentData', function (response) {
-			    const $equip = $('#inventory').empty();
-			    $equip.append('<option value="">Select Inventory Items </option>');
-			    response.data.forEach(item => {
-			        $equip.append(`<option value="${item.equipment_id}">${item.equipment_type}</option>`);
-			    });
-
-			    $equip.select2({
-			        placeholder: "Select Inventory Items",
-			        width: '100%',
-			        multiple: true,
-			        minimumResultsForSearch: Infinity, // disables search typing
-			        closeOnSelect: false
-			    });
-
-			    // Optional: disable typing in the input
-			    $equip.on('select2:opening', function() {
-			        setTimeout(() => {
-			            $('.select2-search__field').prop('readonly', true);
-			        }, 0);
-			    });
-			});
-			// Populate modal court types
-			/*$.get('/gcc/api/gccschool/dropdown/getCourtData', function (response) {
-			    const $modalCourt = $('#modalcourt_type').empty();
-			    response.data.forEach(item => {
-			        $modalCourt.append(`<option value="${item.court_id}">${item.court_type}</option>`);
-			    });
-
-			    $modalCourt.select2({
-			        placeholder: "Select Type of Court",
-			        width: '100%',
-			        closeOnSelect: false,
-			        minimumResultsForSearch: Infinity
-			    });
-
-			    $modalCourt.on('select2:opening', function () {
-			        setTimeout(() => {
-			            $('.select2-search__field').prop('readonly', true);
-			        }, 0);
-			    });
-			});
-
-			// Populate modal inventory items
-			$.get('/gcc/api/gccschool/dropdown/getEquipmentData', function (response) {
-			    const $modalInventory = $('#modalinventory').empty();
-			    response.data.forEach(item => {
-			        $modalInventory.append(`<option value="${item.equipment_id}">${item.equipment_type}</option>`);
-			    });
-
-			    $modalInventory.select2({
-			        placeholder: "Select Inventory Items",
-			        width: '100%',
-			        closeOnSelect: false,
-			        minimumResultsForSearch: Infinity
-			    });
-
-			    $modalInventory.on('select2:opening', function () {
-			        setTimeout(() => {
-			            $('.select2-search__field').prop('readonly', true);
-			        }, 0);
-			    });
-			});*/
-
-			// Toggle Playground Area based on radio button selection
-			$('input[name="modalhasPlayground"]').on('change', function () {
-				if ($(this).val() === 'Yes') {
-					$('#modalplaygroundAreaGroup').show();
-				} else {
-					$('#modalplaygroundAreaGroup').hide();
-					//$('#modalplayground_area').val(''); // optional: clear input
-				}
-			});
-
-			// Toggle Court Type section based on radio button selection
-			$('input[name="modalhasCourt"]').on('change', function () {
-				if ($(this).val() === 'Yes') {
-					$('#modalcourtTypeGroup').show();
-				} else {
-					$('#modalcourtTypeGroup').hide();
-					//$('#modalcourt_type').val(null).trigger('change'); // ✅ Correct // optional: clear selected items
-				}
-			});
-
-			
-
-
-
-
-			/*$.get('/gcc/api/gccschool/dropdown/getEquipmentData', function (response) {
-				const $equip = $('#inventory').empty();
-				$equip.append('<option value="">Select Inventory Items </option>');
-				response.data.forEach(item => {
-					$equip.append(`<option value="${item.equipment_id}">${item.equipment_type}</option>`);
-				});
-			});*/
-			
-			
-			$.get('/gcc/api/gccschool/schoolproperty/checkPlaygroundDetails', { school_id: schoolId }, function (response) {
-			    const data = response && response[0];
-			   
-			    const pg = data?.playgroundDetails;
-
-			    // Show form if no data or if critical values are missing
-			    if (!pg || Object.keys(pg).length === 0 || pg.is_playground === undefined || pg.is_court === undefined) {
-			      $('#playgroundForm').show();
-			      return;
-			    }
-
-			    
-			    
-			    // Construct comma-separated court and equipment lists
-			    let courtList = data.CourtDetails?.map(cd => cd.court_type).join(", ") || "—";
-			    let equipmentList = data.EquipmentDetails?.map(ed => ed.equipment_type).join(", ") || "—";
-
-			    const table = `
-			      <div class="col-md-12">
-			        <div class="card shadow-sm">
-			          <div class="card-body" id="playgroundTableWrapper">
-			            <h5 class="mb-0"> Playground Details</h5>
-			            <div class="table-responsive">
-			              <table class="table table-bordered">
-			                <tr><th>Playground Present</th><td>${pg.is_playground ? 'Yes' : 'No'}</td></tr>
-			                <tr><th>Playground Area</th><td>${pg.playground_area ?? '—'}</td></tr>
-			                <tr><th>Court Present</th><td>${pg.is_court ? 'Yes' : 'No'}</td></tr>
-			                <tr><th>Type of Court</th><td>${courtList}</td></tr>
-			                <tr><th>Inventory Items</th><td>${equipmentList}</td></tr>
-			              </table>
-			            </div>
-			            <div class="text-center mt-3">
-			              <button id="editPlaygroundBtn" class="btn btn-primary px-4">Update</button>
-			            </div>
-			          </div>
-			        </div>
-			      </div>
-			    `;
-
-			    $('.container.mt-4').prepend(table);
-			    $('#playgroundForm').hide();
-
-			    // Enable Edit mode: fill form and show
-				/*$(document).on('click', '#editPlaygroundBtn', function () {
-				  // Populate fields
-				  $(`input[name="modalhasPlayground"][value="${pg.is_playground ? 'Yes' : 'No'}"]`).prop('checked', true).trigger('change');
-				  $('#modalplayground_area').val(pg.playground_area);
-				  $(`input[name="modalhasCourt"][value="${pg.is_court ? 'Yes' : 'No'}"]`).prop('checked', true).trigger('change');
-
-				  const courtIds = data.CourtDetails?.map(cd => cd.court_id?.toString()) || [];
-
-				  const equipIds = data.EquipmentDetails?.map(ed => ed.equipment_detais_id?.toString()) || [];
-
-				  setTimeout(() => {
-					    $('#modalcourt_type').val(courtIds).trigger('change');
-					    $('#modalinventory').val(equipIds).trigger('change');
-					  }, 200);
-					  const courtIds = data.CourtDetails?.map(cd => cd.Courts_detais_id?.toString()) || [];
-					  const equipIds = data.EquipmentDetails?.map(ed => ed.equipment_detais_id?.toString()) || [];
-
-					  setTimeout(() => {
-					      $('#modalcourt_type').val(courtIds).trigger('change');
-					      $('#modalinventory').val(equipIds).trigger('change');
-					  }, 200);
-
-
-				  $('button[type="submit"]').html('Save changes');
-				  console.log(courtIds);
-
-				  // Show modal
-				  const editModal = new bootstrap.Modal(document.getElementById('editPlaygroundModal'));
-				  editModal.show();
-				});*/
-			    $(document).on('click', '#editPlaygroundBtn', function () {
-			    	 window.modalDrinkingRawResponse = data;
-			        // Store playground ID for use during update
-			        $('#editPlaygroundModal').data('playground_id', pg.playground_id);
-
-			        // Pre-select radio values and playground area
-			        $(`input[name="modalhasPlayground"][value="${pg.is_playground ? 'Yes' : 'No'}"]`).prop('checked', true).trigger('change');
-			        $('#modalplayground_area').val(pg.playground_area);
-			        $(`input[name="modalhasCourt"][value="${pg.is_court ? 'Yes' : 'No'}"]`).prop('checked', true).trigger('change');
-
-			        const $modalCourt = $('#modalcourt_type');
-			        const $modalInventory = $('#modalinventory');
-
-			        // Preload detail row IDs and selection IDs
-			        const courtData = data.CourtDetails?.map(cd => ({
-			            Courts_detais_id: cd.Courts_detais_id,  // ✅ correct DB ID
-			            court_id: cd.court_id.toString()        // ✅ select2 expects string
-			        })) || [];
-
-			        const equipmentData = data.EquipmentDetails?.map(ed => ({
-			            equipment_detais_id: ed.equipment_detais_id,  // ✅ correct DB ID
-			            equipment_id: ed.equipment_id.toString()
-			        })) || [];
-
-			        // Extract just the selected IDs to set values in select2
-			        const courtIds = courtData.map(cd => cd.court_id);
-			        const equipIds = equipmentData.map(ed => ed.equipment_id);
-
-			        console.log("Preselected Court IDs:", courtIds);
-			        console.log("Preselected Equipment IDs:", equipIds);
-
-			        // Fetch dropdown options and then trigger modal
-			        Promise.all([
-			            $.get('/gcc/api/gccschool/dropdown/getCourtData'),
-			            $.get('/gcc/api/gccschool/dropdown/getEquipmentData')
-			        ]).then(([courtResponse, equipResponse]) => {
-			            // COURT
-			            $modalCourt.empty();
-			            courtResponse.data.forEach(item => {
-			                $modalCourt.append(`<option value="${item.court_id}">${item.court_type}</option>`);
-			            });
-			            $modalCourt.select2({
-			                placeholder: "Select Type of Court",
-			                width: '100%',
-			                closeOnSelect: false,
-			                minimumResultsForSearch: Infinity
-			            });
-
-			            // INVENTORY
-			            $modalInventory.empty();
-			            equipResponse.data.forEach(item => {
-			                $modalInventory.append(`<option value="${item.equipment_id}">${item.equipment_type}</option>`);
-			            });
-			            $modalInventory.select2({
-			                placeholder: "Select Inventory Items",
-			                width: '100%',
-			                closeOnSelect: false,
-			                minimumResultsForSearch: Infinity
-			            });
-
-			            // Set preselected values after a slight delay
-			            setTimeout(() => {
-			                $modalCourt.val(courtIds).trigger('change');
-			                $modalInventory.val(equipIds).trigger('change');
-			            }, 150);
-
-			            // Store full detail info for use in form submission (you can also use hidden inputs if needed)
-			            $('#editPlaygroundModal').data('courtDetailData', courtData);
-			            $('#editPlaygroundModal').data('equipDetailData', equipmentData);
-
-			            // Show the modal
-			            setTimeout(() => {
-			                const editModal = new bootstrap.Modal(document.getElementById('editPlaygroundModal'));
-			                editModal.show();
-			            }, 300);
-			        });
-			    });
-
-
-
-
-
-
-				
-			  });
-
-			$('input[name="hasPlayground"]').change(function () {
-			    if ($(this).val() === 'Yes') {
-			        $('#playgroundAreaGroup').show();
-			    } else {
-			        $('#playgroundAreaGroup').hide();
-			        $('#playground_area').val(''); // Clear the input when "No" is selected
-			    }
-			});
-
-
-			$('input[name="hasCourt"]').change(function () {
-			    if ($(this).val() === 'Yes') {
-			        $('#courtTypeGroup').show();
-			    } else {
-			        $('#courtTypeGroup').hide();
-			        $('#court_type').val(null).trigger('change'); // Clears dropdown
-			    }
-			});
-
-
-			$('#playgroundForm').on('submit', function (e) {
-				e.preventDefault();
-				console.log("Submit triggered");
-
-				const hasPlayground = $('input[name="hasPlayground"]:checked').val();
-				const hasCourt = $('input[name="hasCourt"]:checked').val();
-				const playgroundArea = $('#playground_area').val();
-				const courtTypes = $('#court_type').val();
-				const equipmentList = $('#inventory').val();
-				
-				//const schoolId = 1;
-
-				/*if (!hasPlayground) return Swal.fire('Validation Error', 'Select presence of playground.', 'warning');
-				if (hasPlayground === 'Yes' && (!playgroundArea || parseFloat(playgroundArea) < 0))
-					return Swal.fire('Validation Error', 'Enter valid playground area.', 'warning');
-				if (!hasCourt) return Swal.fire('Validation Error', 'Select presence of court.', 'warning');
-				if (hasCourt === 'Yes' && (!courtTypes || courtTypes.length === 0))
-					return Swal.fire('Validation Error', 'Select at least one court type.', 'warning');
-				if (!equipmentList || equipmentList.length === 0)
-					return Swal.fire('Validation Error', 'Select at least one inventory item.', 'warning');*/
-					if (!hasPlayground) {
-						return Swal.fire({
-							title: 'Validation Error',
-							text: 'Select presence of playground.',
-							icon: 'warning',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-					if (hasPlayground === 'Yes' && (!playgroundArea || parseFloat(playgroundArea) < 100)) {
-						return Swal.fire({
-							title: 'Validation Error',
-							text: 'playground area must be numbers greater than 100.',
-							icon: 'warning',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-					if (!hasCourt) {
-						return Swal.fire({
-							title: 'Validation Error',
-							text: 'Select presence of court.',
-							icon: 'warning',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-					if (hasCourt === 'Yes' && (!courtTypes || courtTypes.length === 0)) {
-						return Swal.fire({
-							title: 'Validation Error',
-							text: 'Select at least one court type.',
-							icon: 'warning',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-					if (!equipmentList || equipmentList.length === 0) {
-						return Swal.fire({
-							title: 'Validation Error',
-							text: 'Select at least one inventory item.',
-							icon: 'warning',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-
-				const payload = {
-					is_playground: hasPlayground === 'Yes',
-					playground_area: hasPlayground === 'Yes' ? parseFloat(playgroundArea) : 0,
-					is_court: hasCourt === 'Yes',
-					courtid: courtTypes,
-					equipmentid: equipmentList,
-					school_id: schoolId,
-				
-				};
-
-				console.log("Payload:", payload);
-
-				$.ajax({
-					url: '/gcc/api/gccschool/schoolproperty/savePlayground',
-					method: 'POST',
-					contentType: 'application/json',
-					data: JSON.stringify(payload),
-				/*	success: function (response) {
-						Swal.fire({
-							title: 'Success',
-							text:  'Playground saved successfully!',
-							icon: 'success',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						}).then(() => location.reload());
-					},*/
-					success: function (response) {
-						let title, icon;
-						if (response.status === "OK") {
-							title = "Success";
-							icon = "success";
-						} else if (response.status === "SKIPPED") {
-							title = "Notice";
-							icon = "info";
-						} else {
-							title = "Error";
-							icon = "error";
-						}
-
-						Swal.fire({
-							title: title,
-							text: response.message,
-							icon: icon,
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						}).then(() => location.reload());
-					},
-
-					
-
-					error: function (xhr) {
-						console.error("Error:", xhr);
-						Swal.fire({
-							title: 'Error',
-							text: 'Failed to save playground details.',
-							icon: 'error',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
-
-				});
-			});
-			$('#playgroundEditForm').on('submit', function (e) {
-			    e.preventDefault();
-
-			    const hasPlayground = $('input[name="modalhasPlayground"]:checked').val();
-			    const hasCourt = $('input[name="modalhasCourt"]:checked').val();
-			    const playgroundArea = $('#modalplayground_area').val();
-			    const courtTypes = $('#modalcourt_type').val();  // court_id[]
-			    const equipmentList = $('#modalinventory').val();  // equipment_id[]
-			    const playgroundId = $('#editPlaygroundModal').data('playground_id');
-
-			    if (!hasPlayground) return Swal.fire('Validation Error', 'Select presence of playground.', 'warning');
-			    if (hasPlayground === 'Yes' && (!playgroundArea || parseFloat(playgroundArea) < 100))
-			        return Swal.fire('Validation Error', 'playground area must be numbers greater than 100.', 'warning');
-
-			    if (!hasCourt) return Swal.fire('Validation Error', 'Select presence of court.', 'warning');
-			    if (hasCourt === 'Yes' && (!courtTypes || courtTypes.length === 0))
-			        return Swal.fire('Validation Error', 'Select at least one court type.', 'warning');
-
-			    if (!equipmentList || equipmentList.length === 0)
-			        return Swal.fire('Validation Error', 'Select at least one inventory item.', 'warning');
-
-			    // ✅ Extract preloaded backend data (used to get *_detais_id)
-			    const courtData = courtTypes.map(id => {
-			        const match = window.modalDrinkingRawResponse?.CourtDetails?.find(c => c.court_id == id);
-			        return {
-			            court_id: parseInt(id),
-			            Courts_detais_id: match?.Courts_detais_id || 0
-			        };
-			    });
-
-			    const equipmentData = equipmentList.map(id => {
-			        const match = window.modalDrinkingRawResponse?.EquipmentDetails?.find(e => e.equipment_id == id);
-			        return {
-			            equipment_id: parseInt(id),
-			            equipment_detais_id: match?.equipment_detais_id || 0
-			        };
-			    });
-
-			    const payload = {
-			        is_playground: hasPlayground === 'Yes',
-			        playground_area: hasPlayground === 'Yes' ? parseFloat(playgroundArea) : 0,
-			        is_court: hasCourt === 'Yes',
-			        school_id: parseInt(new URLSearchParams(window.location.search).get("schoolId")),
-			       
-			        playground_id: parseInt(playgroundId),
-			        equipments: equipmentData,
-			        courts: courtData
-					
-			    };
-
-			    console.log("✅ Final Playground Update Payload:", payload);
-
-			    $.ajax({
-			        url: '/gcc/api/gccschool/schoolproperty/updatePlayground',
-			        method: 'POST',
-			        contentType: 'application/json',
-			        data: JSON.stringify(payload),
-			        success: function (res) {
-			            if (res.status === "OK") {
-			               // Swal.fire('Success', res.message || 'Playground updated!', 'success').then(() => location.reload());
-			            	Swal.fire({
-			            		  title: 'Success',
-			            		  text: res.message || 'Playground updated!',
-			            		  icon: 'success',
-			            		  allowOutsideClick: false,
-			            		  allowEscapeKey: false,
-			            		  allowEnterKey: false,
-			            		  showConfirmButton: true
-			            		}).then(() => location.reload());
-
-			            } else {
-			               // Swal.fire('Error', res.message || 'Update failed.', 'error');
-			            	Swal.fire({
-			            		  title: 'Error',
-			            		  text: res.message || 'Update failed.',
-			            		  icon: 'error',
-			            		  allowOutsideClick: false,
-			            		  allowEscapeKey: false,
-			            		  allowEnterKey: false,
-			            		  showConfirmButton: true
-			            		});
-
-			            }
-			        },
-			        error: function (xhr) {
-			            console.error("XHR Error:", xhr);
-			            let msg = xhr.responseText || "Unknown error occurred";
-			            Swal.fire('Error', msg, 'error');
-			        }
-			    });
-			});
-
-
-
-
-			function resetFacilityFields() {
-			    console.log("Reset button clicked - Facilities");
-
-			    // Uncheck all radio buttons
-			    $('input[type="radio"]').prop('checked', false);
-
-			    // Clear input fields
-			    $('#playground_area').val('');
-			    
-
-			    // Clear multi-select dropdowns
-			    $('#court_type').val(null).trigger('change');
-			    $('#inventory').val(null).trigger('change');
-
-			    // Hide conditional sections
-			    $('#playgroundAreaGroup').hide();
-			    $('#courtTypeGroup').hide();
-			}
-
-			// Event Listener for Reset Button
-			$(document).on('click', '#resetBtn', function (event) {
-			    event.preventDefault();
-			    resetFacilityFields();
-			});
-
-		});
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/reportfolder/aeoallschools.html b/src/main/resources/templates/modules/school/reportfolder/aeoallschools.html
deleted file mode 100644
index e3cb7eab..00000000
--- a/src/main/resources/templates/modules/school/reportfolder/aeoallschools.html
+++ /dev/null
@@ -1,646 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-#DetailsModal .modal-body {
-			                max-height: 80vh;  /* Limit the height to 70% of the viewport */
-			                overflow-y: auto;  /* Enable vertical scrolling */
-			            }
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Schools Reports</h5>
-										<span>Reports based on Student Enrollment of all or specific AEO</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">School</li>
-										<li class="breadcrumb-item" aria-current="page">Student Enroll Report</li>
-										<li class="breadcrumb-item active" aria-current="page">AEO School wise</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Reports Filters</span>
-								</div>
-								<div class="card-body">
-									
-									<div class="row">																																								
-										<div class="col-sm-2 mb-2">
-								            <label for="aeodropdown" style="font-size: medium;">Select AEO:</label>
-								            <select id="aeodropdown" class="form-control">
-								            <option value="">All</option>
-								               
-											</select>
-										</div>
-																																																			
-										
-										</div>
-										
-									
-									
-									<!-- <div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div> -->
-									
-								</div>
-							</div>
-						</div>
-					</div>
-			
-					
-					<div class="row mt-4">
-									<div class="col-md-12">
-										<div class="card">
-										<div class="card-header">
-											<span style="font-size: medium;font-weight: bold;">Reports List</span>
-										</div>
-										<div class="card-body">
-												<div class="table-responsive">
-	
-													<table id="ReportDatatable"
-														class="table table-striped table-bordered table-hover dataTable"
-														role="grid">
-														<thead class="thead-dark">
-															<tr role="row">
-																<th class="text-center no-sort">S.No</th>
-																<th class="text-center">UDISE code</th>
-																<th class="text-center" style="width: 100px;">AEO</th>
-																<th class="text-center">Zone</th>
-																<th class="text-center">Division</th>
-																<th class="text-center">School Name</th>
-																<th class="text-center">HM Name</th>
-																<th class="text-center">HM Mobile no</th>																
-																<th class="text-center">Total Students</th>															
-																<th class="text-center">Enrolled Students</th>	
-																<th class="text-center">Pending Students</th>														
-															</tr>
-														</thead>
-														<tbody>
-	
-														</tbody>
-													</table>
-												</div>
-										</div>
-									 </div>
-									</div>
-								</div>
-					
-				</div>
-
-			</div>
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-<div class="modal fade" id="DetailsModal" tabindex="-1" aria-labelledby="DetailsLabel" aria-hidden="true">
-	    <div class="modal-dialog modal-xl">
-	        <div class="modal-content">
-	            <div class="modal-header">
-	                <h5 class="modal-title" id="DeatilsModalTitle">Details</h5>
-	                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			                    <span aria-hidden="true">&times;</span>
-			                </button>
-	            </div>
-	            <div class="modal-body">
-	                
-	                <table id="DetailsDatatable" class="table table-striped table-bordered table-hover dataTable"
-					role="grid">
-	                   <thead class="thead-dark">
-				        <tr role="row">
-				            <th class="text-center">S.no</th>
-				            <th class="text-center">Reg Date</th>
-				            <th class="text-center">Student Name</th>
-				            <th class="text-center">Class</th>
-				            <th class="text-center">EMIS no</th>				            				            				            
-				            
-				        </tr>			        
-				        </thead>
-				        <tbody>
-				
-				
-				        </tbody>
-	                </table>
-	                
-	            </div>
-	        </div>
-	    </div>
-	</div>
-
-
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	
-	<script type="text/javascript">
-	document.addEventListener("DOMContentLoaded", function () {
-		
-		 const urlParams = new URLSearchParams(window.location.search);
-		 const aoeParam = urlParams.get('aoe');
-		 console.log("Transfer aeo="+aoeParam);
-		
-		//fetchAEOStudentData([]);
-	    
-	    let aeoDropdown = document.getElementById('aeodropdown');
-	    	    
-	    fetch('/gcc/api/gccschool/report/getAEOList') 
-	        .then(response => response.json())
-	        .then(data => {
-	            // Clear existing options
-	            aeoDropdown.innerHTML = `<option value="">All</option>`;
-
-	            let matchedValue = null;
-	            
-	            // Add options from the API response
-	            data.data.forEach(aeo => {
-	            	
-	            	// Check if aoeParam matches aeo.aeo_num
-	                if (aoeParam && aeo.aeo_num === aoeParam) {
-	                    matchedValue = aeo.udise;
-	                    aeoDropdown.innerHTML += `<option value="${aeo.udise}" selected>${aeo.aeo_num}</option>`;
-	                } else {
-	                    aeoDropdown.innerHTML += `<option value="${aeo.udise}">${aeo.aeo_num}</option>`;
-	                }
-	            	
-	            });
-	            
-	         	// Trigger change event if a match was found
-	            if (matchedValue) {
-	                aeoDropdown.dispatchEvent(new Event('change'));
-	            } else {
-	                fetchAEOStudentData([]); // fallback if no match or no param
-	            }
-	         	
-	        })
-	        .catch(error => {
-	            console.error('Error fetching in AEO List:', error);
-	        });
-	    
-	    document.getElementById('aeodropdown').addEventListener('change', function (e) {
-  	 	    let aeovalue = this.value; // single selection
-
-  	 	    if (!aeovalue) {
-  	 	    	fetchAEOStudentData([]);
-  	 	    	return;
-  	 	    }
-
-  	 	    // If selected, call fetchAEOStudentData with selected value
-  	 	    fetchAEOStudentData([aeovalue]); // wrap in array if your method expects array
-  	 	});
-	    
-	    
-	});
-	
-	 $(document).ready(function() {
-
-		 var table = $('#ReportDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '80vh',
-             scrollX: true,
-             
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: true,
-             responsive: false,
-             searching: true,
-             select: false,
-             processing: false
-         });
-     	   
-  	   
-  	 	/* document.getElementById('resetBtn').addEventListener('click', function () {
-      	event.preventDefault();
-      	
-      		location.reload();
-      	
-      	}); */
-  	 	
-/*   	 	document.getElementById('searchBtn').addEventListener('click', function (e) {
-  	 		
-  	 		let aeoDropdown = document.getElementById('aeodropdown');
-	
-  	 		
-  		  
-  		    let aeovalue = Array.from(aeoDropdown.selectedOptions).map(opt => opt.value);
-  		  	    	         	   
-    	   	console.log("aeovalue: ",aeovalue);
-
-    	   
-    	   if (!aeovalue || aeovalue.length === 0) {
-    	        Swal.fire({
-    	            icon: 'info',
-    	            title: 'Info',
-    	            text: 'Please Select AEO',
-    	            showConfirmButton: true,
-    	            timer: 3000
-    	        });
-    	        e.preventDefault(); 
-    	        return; 
-    	    }
-    	   
-    	   fetchAEOStudentData(aeovalue);  	   
-    	   
-  	 	}); */
-  	 	
-  	// Handle onchange of the dropdown
-  	 	
-      	$('#ReportDatatable tbody').off('click').on('click', 'td .clickable-students', function () {
-      	    let udise = $(this).data('udise');
-      	  	let schname = $(this).data('schname');
-      	  
-      	    console.log("Clicked UDISE:", udise,"school=",schname);
-
-      	  openRegisteredDetails(udise,schname); 
-      	});
-  	 	
-     	
-     });
-	 
-	 function openRegisteredDetails(udise,schname){
-		 
-		 $('#pageLoader').show();
-		 
-		 $.ajax({
-			    url: '/gcc/api/gccschool/report/getRegisteredStud',
-			    method: 'GET',
-			    data: {
-			    	udise: udise			        
-			    },
-			    success: function (response) {
-
-			    	$('#pageLoader').hide();
-			    	console.log("Details:", response);
-			    	if(response.Message==="Success"){
-			        if (Array.isArray(response.Data) && response.Data.length > 0){
-			        	
-			        	let table = $('#DetailsDatatable').DataTable({
-         	            	 destroy: true,
-        	                searching: true,
-        	                autoWidth: true,           	                
-        	                paging: true,
-        	                info: true,
-         	                data: response.Data,       	             	
-         	                columns: [
-         	                	{ 
-          	                        data: null, 
-          	                        render: (data, type, row, meta) => meta.row + 1, 
-          	                        className: 'text-center' 
-          	                    },
-          	                  {
-          	                      data: 'cDate',
-          	                      render: function (data, type, row) {
-          	                        if (!data) return '-';
-
-          	                        const date = new Date(data);
-          	                        const day = String(date.getDate()).padStart(2, '0');
-          	                        const month = String(date.getMonth() + 1).padStart(2, '0');
-          	                        const year = date.getFullYear();
-          	                        return `${day}/${month}/${year}`;
-          	                      },
-          	                      className: 'text-center'
-          	                    },
-			                    { data: 'student_name' ,className: 'text-center'},
-			                    { data: 'std' ,className: 'text-center'}, 
-			                    { data: 'emis_no' ,className: 'text-center'}
-       	                    
-         	                              	                      
-         	                ],
-         	                dom: 'Bfrtip',
-         	                buttons: [
-	      		                  {
-	      		                      extend: 'pageLength',
-	      		                      className: 'btn btn-warning'
-	      		                  },
-	      		                  {
-	      		                      title: 'Data export',
-	      		                      extend: 'copyHtml5',
-	      		                      text: 'Copy',
-	      		                      className: 'btn btn-secondary',
-	      		                      id: 'copyBtn'
-	      		                  },
-	      		                  {
-	      		                      extend: 'excelHtml5',
-	      		                      text: 'Excel',
-	      		                      className: 'btn btn-secondary',
-	      		                      id: 'excelBtn'
-	      		                  },
-	      		                  {
-	      		                      extend: 'csvHtml5',
-	      		                      text: 'CSV',
-	      		                      className: 'btn btn-secondary',
-	      		                      id: 'csvBtn'
-	      		                  },
-	      		                  {
-	      		                      extend: 'pdfHtml5',
-	      		                      text: 'PDF',
-	      		                      className: 'btn btn-secondary',
-	      		                      id: 'pdfBtn'
-	      		                  }
-	      		              ],
-	      		             columnDefs: [
-	      		                { targets: 'no-sort', orderable: false }
-	      		            ],
-	      		            lengthMenu: [
-	      		                [50, 100, 200, 500, -1],
-	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-	      		            ],
-	      		         scrollY: '50vh',
-	      		            scrollX: false,   	      		            
-	      		       		responsive: false,
-	                		searching: true
-	      		            });
-			        	
-			        	
-			        	
-			        	
-			        	$('#DeatilsModalTitle').text(schname +' Students Details');
-			        	$('#DetailsModal').modal('show');
-			        	$('#DetailsModal').on('shown.bs.modal', function () {
-			        	    $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
-			        	});
-			        }
-			    }
-			        else if (response.Message === "Error") {
-			        	$('#pageLoader').hide();
-			      		//alert("No data available.");
-			        	Swal.fire({
-			 	            icon: 'error',
-			 	            title: 'Error',
-			 	            text: response.Error,
-			 	            showConfirmButton: true,
-			 	            timer: 3000
-			 	        });
-			        	
-		     	         
-			        } 
-			        
-			        else {
-			        	$('#pageLoader').hide();
-			            //alert("Error: " + response.message);
-			        	Swal.fire({
-			 	            icon: 'error',
-			 	            title: 'Error',
-			 	            text: 'Error',
-			 	            showConfirmButton: true,
-			 	            timer: 3000
-			 	        });
-		      	    	
-		      	    	 
-		     	        
-			        }
-			        
-			    },
-			    error: function (xhr, status, error) {
-			    	$('#pageLoader').hide();
-			        //alert("Request failed: " + error);
-			    	Swal.fire({
-		 	            icon: 'error',
-		 	            title: 'Error',
-		 	            text: error,
-		 	            showConfirmButton: true,
-		 	            timer: 3000
-		 	        });
-		  	    	
-		  	    	 
-		 	        
-			    }
-			});
-	 }
-	 
-	 function fetchAEOStudentData(aeovalue)
-	 {
-		 let url = `/gcc/api/gccschool/report/getAEOStudentData`;
-		    
-		 if (aeovalue.length > 0) {
-		        const params = new URLSearchParams();
-		        aeovalue.forEach(val => {
-		            console.log("Appending udise:", val);
-		            params.append("udise", val);
-		        });
-		        url += `?${params.toString()}`;
-		    } else {
-		        // Explicitly send empty udise
-		        url += `?udise=`;
-		    }
-  	   
-  	   $('#pageLoader').show();
-  	   $.ajax({
-             type: "GET",
-             url: url,
-             contentType: "application/json",
-             success: function (response) {
-          	    console.log("API Response:", response);
-          	    $('#pageLoader').hide();
-          	    if (response.Message === "Success") {
-          	        console.log("Details Array:", response.data);
-          	        // Ensure details is an array and has at least one entry
-          	        if (Array.isArray(response.data) && response.data.length > 0) {
-          	        	 let scrollHeight = response.data.length <= 50 ? 'auto' : '80vh';
-          	        	
-          	            let table = $('#ReportDatatable').DataTable({
-          	            	 destroy: true,
-         	                searching: true,
-         	                autoWidth: true,           	                
-         	                paging: true,
-         	                info: true,
-          	                data: response.data,            	             	
-          	                columns: [
-          	                    { 
-          	                        data: null, 
-          	                        render: (data, type, row, meta) => meta.row + 1, 
-          	                        className: 'text-center' 
-          	                    },
-          	                  	{ data: 'udise', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'aeo_num', defaultContent: '-', className: 'text-center' },
-          	                  	{ data: 'zone', defaultContent: '-', className: 'text-center' },
-          	                	{ data: 'division', defaultContent: '-', className: 'text-center' },
-          	                  	{ data: 'school_name', defaultContent: '-', className: 'text-center' },
-          	                	{ data: 'hm_name', defaultContent: '-', className: 'text-center' },
-          	              		{ data: 'hm_mobile', defaultContent: '-', className: 'text-center' },          	                    
-          	                    { data: 'total_students', defaultContent: '-', className: 'text-center' },
-          	                    
-          	                  {
-          	                      data: 'students_registered',
-          	                      defaultContent: '-',
-          	                      className: 'text-center',
-          	                      render: function (data, type, row) {
-          	                        if (parseInt(data) > 0) {
-          	                          return `<span class="clickable-students text-primary" style="cursor: pointer; text-decoration: underline;" data-udise="${row.udise}"data-schname="${row.school_name}">${data}</span>`;
-          	                        } else {
-          	                          return data;
-          	                        }
-          	                      }
-          	                    },
-          	                    
-          	                  	{ data: 'pending', defaultContent: '-', className: 'text-center' }
-          	                    
-          	                              	                      
-          	                ],
-          	                dom: 'Bfrtip',
-          	                buttons: [
- 	      		                  {
- 	      		                      extend: 'pageLength',
- 	      		                      className: 'btn btn-warning'
- 	      		                  },
- 	      		                  {
- 	      		                      title: 'Data export',
- 	      		                      extend: 'copyHtml5',
- 	      		                      text: 'Copy',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'copyBtn'
- 	      		                  },
- 	      		                  {
- 	      		                      extend: 'excelHtml5',
- 	      		                      text: 'Excel',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'excelBtn'
- 	      		                  },
- 	      		                  {
- 	      		                      extend: 'csvHtml5',
- 	      		                      text: 'CSV',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'csvBtn'
- 	      		                  },
- 	      		                  {
- 	      		                      extend: 'pdfHtml5',
- 	      		                      text: 'PDF',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'pdfBtn'
- 	      		                  }
- 	      		              ],
- 	      		             columnDefs: [
- 	      		                { targets: 'no-sort', orderable: false }
- 	      		            ],
- 	      		            lengthMenu: [
- 	      		                [50, 100, 200, 500, -1],
- 	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
- 	      		            ],
- 	      		         scrollY: '80vh',
-	      		            scrollX: true,   	      		            
-	      		       		responsive: false,
-	                		searching: true
- 	      		            });
-          	        }
-          	        
-          	    }
-          	    else if (response.Message === "No Data") {
-      	        	$('#pageLoader').hide();
-      	            Swal.fire({
-      	                icon: 'warning',
-      	                title: response.data,
-      	                text: 'No data available for the selected criteria.'
-      	            });
-      	        }           	    
-          	    else {
-          	    	$('#pageLoader').hide();
-          	        Swal.fire({
-          	            icon: 'error',
-          	            title: 'Error',
-          	            text: response.message || 'Something went wrong!'
-          	        });
-          	    }
-          	},
-
-             error: function (error) {
-             	$('#pageLoader').hide();
-             	Swal.fire({
-  	            icon: 'error',
-  	            title: 'Error',
-  	            text: response.message || 'Something went wrong!'
-  	        });
-             }
-         });
-	 }
-	
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/reportfolder/aeolist.html b/src/main/resources/templates/modules/school/reportfolder/aeolist.html
deleted file mode 100644
index 04ba4aa2..00000000
--- a/src/main/resources/templates/modules/school/reportfolder/aeolist.html
+++ /dev/null
@@ -1,316 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-    .clickable-link {
-        color: blue;
-        text-decoration: underline;
-        cursor: pointer;
-    }
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Schools Reports</h5>
-										<span>Reports based on Student Enrollment in AEO wise</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">School</li>
-										<li class="breadcrumb-item" aria-current="page">Student Enroll Report</li>
-										<li class="breadcrumb-item active" aria-current="page">AEO Wise</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<!-- <div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Reports Filters</span>
-								</div>
-								<div class="card-body">
-									
-								</div>
-							</div>
-						</div>
-					</div> -->
-			
-					
-					<div class="row mt-4">
-									<div class="col-md-12">
-										<div class="card">
-										<div class="card-header">
-											<span style="font-size: medium;font-weight: bold;">AEO List</span>
-										</div>
-										<div class="card-body">
-												<div class="table-responsive">
-	
-													<table id="ReportDatatable"
-														class="table table-striped table-bordered table-hover dataTable"
-														role="grid">
-														<thead class="thead-dark">
-															<tr role="row">
-																<th class="text-center">S.No</th>
-																<th class="text-center">AEO</th>
-																<th class="text-center">Total Schools</th>
-																<th class="text-center">Total Students</th>															
-																<th class="text-center">Enrolled Students</th>	
-																<th class="text-center">Pending Students</th>														
-															</tr>
-														</thead>
-														<tbody>
-															
-														</tbody>
-													</table>
-												</div>
-										</div>
-									 </div>
-									</div>
-								</div>
-					
-				</div>
-
-			</div>
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	
-	<script type="text/javascript">
-	
-	 $(document).ready(function() {
-		 
-		 fetchAEOStudentData();
-
-	      	var table = $('#ReportDatatable').DataTable({
-	             dom: 'Bftip',
-	             columnDefs: [
-	                 { targets: 'no-sort', orderable: false }
-	             ],
-	             lengthMenu: [
-	                 [50, 100, 200, 500, -1],
-	                 ['50 rows', '100 rows', '200 rows', 'Show all']
-	             ],
-	             scrollY: '80vh',
-	             scrollX: false,            
-	             buttons: [
-	                 {
-	                     extend: 'pageLength',
-	                     className: 'btn btn-warning'
-	                 },
-	                 {
-	                     title: 'Data export',
-	                     extend: 'copyHtml5',
-	                     text: 'Copy',
-	                     className: 'btn btn-secondary',
-	                     id: 'copyBtn'
-	                 },
-	                 {
-	                     extend: 'excelHtml5',
-	                     text: 'Excel',
-	                     className: 'btn btn-secondary',
-	                     id: 'excelBtn'
-	                 },
-	                 {
-	                     extend: 'csvHtml5',
-	                     text: 'CSV',
-	                     className: 'btn btn-secondary',
-	                     id: 'csvBtn'
-	                 },
-	                 {
-	                     extend: 'pdfHtml5',
-	                     text: 'PDF',
-	                     className: 'btn btn-secondary',
-	                     id: 'pdfBtn'
-	                 }
-	             ],
-	             fixedHeader: false,
-	             autoWidth: false,
-	             responsive: false,
-	             searching: true,
-	             select: false,
-	             processing: false
-	         });
-	      	
-	      	$('#ReportDatatable').on('click', '.clickable-link', function () {
-	      		const aoeName = $(this).text().trim();
-	      	    window.location.href = `/gcc/school/aeoschoolentry/aeoallschools?aoe=${aoeName}`;
-	      	    
-	      	});
-	     	   	     	
-	     });
-		 
-		 
-	 
-	 function fetchAEOStudentData()
-	 {
-		  	   
-  	   $('#pageLoader').show();
-  	   $.ajax({
-             type: "GET",
-             url: "/gcc/api/gccschool/report/getAEOStudentsCount" ,
-             contentType: "application/json",
-             success: function (response) {
-          	    console.log("API Response:", response);
-          	    $('#pageLoader').hide();
-          	    if (response.Message === "Success") {
-          	        console.log("Details Array:", response.data);
-          	        // Ensure details is an array and has at least one entry
-          	        if (Array.isArray(response.data) && response.data.length > 0) {
-          	        	 let scrollHeight = response.data.length <= 50 ? 'auto' : '80vh';
-          	        	
-          	            let table = $('#ReportDatatable').DataTable({
-          	                destroy: true,
-          	              	fixedHeader: false,
-          	                searching: true,
-          	                autoWidth: true,          	                
-          	                paging: true,
-          	                info: true,
-          	                data: response.data,            	             	
-          	                columns: [
-          	                    { 
-          	                        data: null, 
-          	                        render: (data, type, row, meta) => meta.row + 1, 
-          	                        className: 'text-center' 
-          	                    },
-          	                  {
-          	                      data: 'aoe',
-          	                      defaultContent: '-',
-          	                      className: 'text-center',
-          	                      render: function (data, type, row, meta) {
-          	                          if (!data) return '-';
-          	                          return `<span class="clickable-link">${data}</span>`;
-          	                      }
-          	                  },
-          	                    { data: 'school_count', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'total_students', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'student_registered', defaultContent: '-', className: 'text-center' },
-          	                  	{ data: 'pending', defaultContent: '-', className: 'text-center' }
-          	                             	                    
-          	                      
-          	                ],
-          	                dom: 'Bfrtip',
-          	                buttons: [
- 	      		                  {
- 	      		                      extend: 'pageLength',
- 	      		                      className: 'btn btn-warning'
- 	      		                  },
- 	      		                  {
- 	      		                      title: 'Data export',
- 	      		                      extend: 'copyHtml5',
- 	      		                      text: 'Copy',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'copyBtn'
- 	      		                  },
- 	      		                  {
- 	      		                      extend: 'excelHtml5',
- 	      		                      text: 'Excel',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'excelBtn'
- 	      		                  },
- 	      		                  {
- 	      		                      extend: 'csvHtml5',
- 	      		                      text: 'CSV',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'csvBtn'
- 	      		                  },
- 	      		                  {
- 	      		                      extend: 'pdfHtml5',
- 	      		                      text: 'PDF',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'pdfBtn'
- 	      		                  }
- 	      		              ],
- 	      		             columnDefs: [
- 	      		                { targets: 'no-sort', orderable: false }
- 	      		            ],
- 	      		            lengthMenu: [
- 	      		                [50, 100, 200, 500, -1],
- 	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
- 	      		            ],
- 	      		            scrollY: scrollHeight,
- 	      		            scrollX: false,   	      		            
- 	      		       		responsive: false,
- 	                		searching: true
- 	      		            });
-          	        }
-          	        
-          	    }
-          	    else if (response.Message === "No Data") {
-      	        	$('#pageLoader').hide();
-      	            Swal.fire({
-      	                icon: 'warning',
-      	                title: 'No Data',
-      	                text: 'No data available.'
-      	            });
-      	        }           	    
-          	    else {
-          	    	$('#pageLoader').hide();
-          	        Swal.fire({
-          	            icon: 'error',
-          	            title: 'Error',
-          	            text:'Something went wrong!'
-          	        });
-          	    }
-          	},
-
-             error: function (error) {
-             	$('#pageLoader').hide();
-             	Swal.fire({
-  	            icon: 'error',
-  	            title: 'Error',
-  	            text: 'Something went wrong!'
-  	        });
-             }
-         });
-	 }
-	
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/reports.html b/src/main/resources/templates/modules/school/reports.html
deleted file mode 100644
index 1048914c..00000000
--- a/src/main/resources/templates/modules/school/reports.html
+++ /dev/null
@@ -1,478 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
-
-</head>
-<style>
-
-</style>
-<body>
-	<div class="wrapper">
-
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-
-
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Schools Reports</h5>
-										
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">school</li>
-										<li class="breadcrumb-item active" aria-current="page">Reports</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					
-					<div class="row mt-4">
-						<div class="col-12">
-							<div class="card">
-								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Reports Filters</span>
-								</div>
-								<div class="card-body">
-									<div class="row">																																								
-										<div class="col-sm-2 mb-2">
-								            <label for="aeodropdown" style="font-size: medium;">AEO:</label>
-								            <select id="aeodropdown" class="form-control">
-								            <option value="">Select</option>
-								               
-											</select>
-										</div>
-																																	
-										
-										<div class="col-sm-2 mb-2">
-											<label for="zonedropdown" style="font-size: medium;">Zone:</label>
-						                    <select id="zonedropdown" class="form-control">
-						                    <option value="">Select</option>
-						                    
-
-											</select>
-										</div>
-										
-										<div class="col-sm-2 mb-2">
-											<label for="warddropdown" style="font-size: medium;">Ward:</label>
-						                    <select id="warddropdown" class="form-control">
-						                    <option value="">Select</option>
-						                    
-
-											</select>
-										</div>
-										
-										</div>
-										
-									
-									
-									<div class="row mt-4">
-										<div class="col-12 d-flex justify-content-center">
-											<button type="submit" id="searchBtn"
-												class="btn btn-primary mx-2">Search</button>
-
-											<button class="btn btn-danger mx-2" id="resetBtn"
-												name="reset" type="reset">Reset</button>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-			
-					
-					<div class="row mt-4">
-									<div class="col-md-12">
-										<div class="card">
-										<div class="card-header">
-											<span style="font-size: medium;font-weight: bold;">Reports List</span>
-										</div>
-										<div class="card-body">
-											<div class="table-responsive">
-
-												<table id="ReportDatatable"
-													class="table table-striped table-bordered table-hover dataTable"
-													role="grid">
-													<thead class="thead-dark">
-														<tr role="row">
-															<th class="text-center no-sort">S.No</th>
-															<th class="text-center" style="width: 100px;">AEO</th>
-															<th class="text-center">Zone</th>
-															<th class="text-center">Ward</th>
-															<th class="text-center">UDISE code</th>
-															<th class="text-center">Other Details</th>															
-															<th class="text-center">Staff Details</th>
-															<th class="text-center">Student Details</th>
-															<th class="text-center">Buildings</th>
-															<th class="text-center">Playground</th>	
-															<th class="text-center">Drinking Water</th>													
-															<th class="text-center">Toilets</th>
-															<th class="text-center">School Assets</th>																															
-															<th class="text-center">Kitchen</th>																																																									
-															<th class="text-center">Overall status</th>
-														</tr>
-													</thead>
-													<tbody>
-
-													</tbody>
-												</table>
-											</div>
-										</div>
-									 </div>
-									</div>
-								</div>
-					
-				</div>
-
-			</div>
-
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--  sweet alert -->
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-	
-	<script type="text/javascript">
-	document.addEventListener("DOMContentLoaded", function () {
-		
-		fetchAEOSchoolData([], '', '');
-	    
-	    let aeoDropdown = document.getElementById('aeodropdown');
-	    let zoneDropdown = document.getElementById('zonedropdown');
-	    let wardDropdown = document.getElementById('warddropdown');	    
-	    
-
-	    fetch('/gcc/api/gccschool/report/getAEOList') 
-	        .then(response => response.json())
-	        .then(data => {
-	            // Clear existing options
-	            aeoDropdown.innerHTML = `<option value="">Select</option>`;
-
-	            // Add options from the API response
-	            data.data.forEach(aeo => {
-	            	aeoDropdown.innerHTML += `<option value="${aeo.udise}">${aeo.aeo_num}</option>`;
-	            });
-	        })
-	        .catch(error => {
-	            console.error('Error fetching in AEO List:', error);
-	        });
-	    
-	    aeoDropdown.addEventListener('change', function () {
-	        const selectedGroup = aeoDropdown.value;
-
-	        if (selectedGroup) {
-	            
-	            fetch(`/gcc/api/gccschool/report/getAEOZone?udise=${encodeURIComponent(selectedGroup)}`)
-	                .then(response => response.json())
-	                .then(data => {
-	                    // Clear existing options
-	                    zoneDropdown.innerHTML = `<option value="">Select</option>`;
-
-	                    // Add options from the API response
-	                    data.data.forEach(zone => {
-	                        zoneDropdown.innerHTML += `<option value="${zone}">${zone}</option>`;
-	                    });
-	                    
-	                    wardDropdown.innerHTML = `<option value="">Select</option>`;
-	                    
-	                })
-	                .catch(error => {
-	                    console.error('Error fetching zone for aeo:', error);
-	                });
-	        } else {
-	            
-	            zoneDropdown.innerHTML = `<option value="">Select</option>`;
-	            wardDropdown.innerHTML = `<option value="">Select</option>`;
-	        }
-	    });
-	    
-	    zoneDropdown.addEventListener('change', function () {
-	        const selectedAeo = aeoDropdown.value;
-	        const selectedZone= zoneDropdown.value;
-
-	        if (selectedAeo && selectedZone) {
-	            
-	            fetch(`/gcc/api/gccschool/report/getAEOWard?udise=${encodeURIComponent(selectedAeo)}&zone=${encodeURIComponent(selectedZone)}`)
-	                .then(response => response.json())
-	                .then(data => {
-	                    // Clear existing options
-	                    wardDropdown.innerHTML = `<option value="">Select</option>`;
-
-	                    // Add options from the API response
-	                    data.data.forEach(Ward => {
-	                    	wardDropdown.innerHTML += `<option value="${Ward}">${Ward}</option>`;
-	                    });
-	                })
-	                .catch(error => {
-	                    console.error('Error fetching ward for aeo:', error);
-	                });
-	        } else {
-	            
-	        	wardDropdown.innerHTML = `<option value="">Select</option>`;
-	        }
-	    });
-
-	   
-	    
-	});
-	
-	 $(document).ready(function() {
-
-/*      	var table = $('#ReportDatatable').DataTable({
-             dom: 'Bftip',
-             columnDefs: [
-                 { targets: 'no-sort', orderable: false }
-             ],
-             lengthMenu: [
-                 [50, 100, 200, 500, -1],
-                 ['50 rows', '100 rows', '200 rows', 'Show all']
-             ],
-             scrollY: '80vh',
-             scrollX: true,            
-             buttons: [
-                 {
-                     extend: 'pageLength',
-                     className: 'btn btn-warning'
-                 },
-                 {
-                     title: 'Data export',
-                     extend: 'copyHtml5',
-                     text: 'Copy',
-                     className: 'btn btn-secondary',
-                     id: 'copyBtn'
-                 },
-                 {
-                     extend: 'excelHtml5',
-                     text: 'Excel',
-                     className: 'btn btn-secondary',
-                     id: 'excelBtn'
-                 },
-                 {
-                     extend: 'csvHtml5',
-                     text: 'CSV',
-                     className: 'btn btn-secondary',
-                     id: 'csvBtn'
-                 },
-                 {
-                     extend: 'pdfHtml5',
-                     text: 'PDF',
-                     className: 'btn btn-secondary',
-                     id: 'pdfBtn'
-                 }
-             ],
-             fixedHeader: true,
-             autoWidth: true,
-             responsive: false,
-             searching: true,
-             select: false,
-             processing: false
-         }); */
-     	   
-  	   
-  	 	document.getElementById('resetBtn').addEventListener('click', function () {
-      	event.preventDefault();
-      	
-      		location.reload();
-      	
-      	});
-  	 	
-  	 	document.getElementById('searchBtn').addEventListener('click', function (e) {
-  	 		
-  	 		let aeoDropdown = document.getElementById('aeodropdown');
-  		    let zoneDropdown = document.getElementById('zonedropdown');
-  		    let wardDropdown = document.getElementById('warddropdown');	
-  	 		
-  		  // ✅ Extract selected values from a multi-select dropdown as an array
-  		    let aeovalue = Array.from(aeoDropdown.selectedOptions).map(opt => opt.value);
-  		  	//let aeovalue =aeoDropdown.value;
-  	    	let zonevalue = zoneDropdown.value;
-  	    	let wardvalue = wardDropdown.value;
-     	         	   
-    	   console.log("aeovalue: ",aeovalue);
-    	   console.log("zonevalue: ",zonevalue);
-    	   console.log("wardvalue: ",wardvalue);
-    	   
-    	   if (!aeovalue || aeovalue.length === 0) {
-    	        Swal.fire({
-    	            icon: 'info',
-    	            title: 'Info',
-    	            text: 'Please Select AEO',
-    	            showConfirmButton: true,
-    	            timer: 3000
-    	        });
-    	        e.preventDefault(); 
-    	        return; 
-    	    }
-    	   
-    	   fetchAEOSchoolData(aeovalue, zonevalue, wardvalue);  	   
-    	   
-  	 	});
-  	 	
-  	 	
-     	
-     });
-	 
-	 function fetchAEOSchoolData(aeovalue, zonevalue, wardvalue)
-	 {
-		 const params = new URLSearchParams();
-		aeovalue.forEach(val =>{ console.log("Appending udise:", val);
-			params.append("udise", val)}); // Use 'udiseList' as repeated query parameter
-  	   params.append("zone", zonevalue);
-  	   params.append("ward", wardvalue);
-  	   
-  	   $('#pageLoader').show();
-  	   $.ajax({
-             type: "GET",
-             url: `/gcc/api/gccschool/report/getAEOSchoolData?${params.toString()}`, // Append query string to URL
-             contentType: "application/json",
-             success: function (response) {
-          	    console.log("API Response:", response);
-          	    $('#pageLoader').hide();
-          	    if (response.message === "Success") {
-          	        console.log("Details Array:", response.data);
-          	        // Ensure details is an array and has at least one entry
-          	        if (Array.isArray(response.data) && response.data.length > 0) {
-          	        	 let scrollHeight = response.data.length <= 50 ? 'auto' : '80vh';
-          	        	
-          	            let table = $('#ReportDatatable').DataTable({
-          	                destroy: true,
-          	                searching: true,
-          	                autoWidth: true,          	                
-          	                paging: true,
-          	                info: true,
-          	                data: response.data,          	              
-          	                columns: [
-          	                    { 
-          	                        data: null, 
-          	                        render: (data, type, row, meta) => meta.row + 1, 
-          	                        className: 'text-center' 
-          	                    },
-          	                    { data: 'aeo_num', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'zone', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'division', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'udise', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'other_details', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'staff_details', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'students_details', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'buildings', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'playground_details', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'drinkingwater_details', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'toilet_details', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'school_assets', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'kitchen_details', defaultContent: '-', className: 'text-center' },
-          	                    { data: 'overall_status', defaultContent: '-', className: 'text-center' }
-          	                    
-          	                      
-          	                ],
-          	                dom: 'Bfrtip',
-          	                buttons: [
- 	      		                  {
- 	      		                      extend: 'pageLength',
- 	      		                      className: 'btn btn-warning'
- 	      		                  },
- 	      		                  {
- 	      		                      title: 'Data export',
- 	      		                      extend: 'copyHtml5',
- 	      		                      text: 'Copy',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'copyBtn'
- 	      		                  },
- 	      		                  {
- 	      		                      extend: 'excelHtml5',
- 	      		                      text: 'Excel',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'excelBtn'
- 	      		                  },
- 	      		                  {
- 	      		                      extend: 'csvHtml5',
- 	      		                      text: 'CSV',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'csvBtn'
- 	      		                  },
- 	      		                  {
- 	      		                      extend: 'pdfHtml5',
- 	      		                      text: 'PDF',
- 	      		                      className: 'btn btn-secondary',
- 	      		                      id: 'pdfBtn'
- 	      		                  }
- 	      		              ],
- 	      		             columnDefs: [
- 	      		                { targets: 'no-sort', orderable: false }
- 	      		            ],
- 	      		            lengthMenu: [
- 	      		                [50, 100, 200, 500, -1],
- 	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
- 	      		            ],
- 	      		            scrollY: scrollHeight,
- 	      		            scrollX: true,   	      		            
- 	      		       		responsive: false,
- 	                		searching: true
- 	      		            });
-          	        }
-          	        
-          	    }
-          	    else if (response.message === "NoData") {
-      	        	$('#pageLoader').hide();
-      	            Swal.fire({
-      	                icon: 'warning',
-      	                title: response.data,
-      	                text: 'No data available for the selected criteria.'
-      	            });
-      	        }           	    
-          	    else {
-          	    	$('#pageLoader').hide();
-          	        Swal.fire({
-          	            icon: 'error',
-          	            title: 'Error',
-          	            text: response.message || 'Something went wrong!'
-          	        });
-          	    }
-          	},
-
-             error: function (error) {
-             	$('#pageLoader').hide();
-             	Swal.fire({
-  	            icon: 'error',
-  	            title: 'Error',
-  	            text: response.message || 'Something went wrong!'
-  	        });
-             }
-         });
-	 }
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/room.html b/src/main/resources/templates/modules/school/room.html
deleted file mode 100644
index 11bdb1c5..00000000
--- a/src/main/resources/templates/modules/school/room.html
+++ /dev/null
@@ -1,1015 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	body {
-		background-color: #f8f9fa;
-		/*  font-family: Arial, sans-serif;*/
-	}
-
-	.header {
-		font-size: 22px;
-		font-weight: bold;
-		margin-bottom: 20px;
-	}
-
-	.table {
-		border: 1px solid #dee2e6;
-	}
-
-	.table th,
-	.table td {
-		border: 1px solid #dee2e6;
-		padding: 10px;
-	}
-
-	.section-title {
-		font-size: 18px;
-		font-weight: bold;
-		margin-top: 20px;
-		border-bottom: 2px solid #007bff;
-		padding-bottom: 5px;
-	}
-
-	.form-group {
-		margin-top: 15px;
-	}
-
-	.radio-group {
-		display: flex;
-		gap: 20px;
-		margin-top: 10px;
-	}
-
-	#assetModal .modal-body {
-		max-height: 80vh;
-		overflow-y: auto;
-	}
-
-	#floordetailsModal .modal-body {
-		max-height: 80vh;
-		overflow-y: auto;
-	}
-
-	#roomMappingModal .modal-body {
-		max-height: 80vh;
-		overflow-y: auto;
-		min-height: 40vh;
-	}
-	/* Default desktop view */
-/*.responsive-section {
-  margin-left: -256px;
-}*/
-
-/* Wider negative margin if needed */
-/*.responsive-section-wide {
-  margin-left: -281px;
-}*/
-
-/* Mobile responsiveness */
-@media (max-width: 768px) {
-  .responsive-section,
-  .responsive-section-wide {
-    margin-left: 0 !important;
-    padding: 0 10px;
-  }
-
-  .btn.mb-2 {
-    width: 100%;
-    margin-top: 10px;
-  }
-
-  .d-flex.justify-content-between {
-    flex-direction: column;
-    align-items: flex-start;
-  }
-
-  .table {
-    display: block;
-    width: 100%;
-    overflow-x: auto;
-    white-space: nowrap;
-  }
-}
-	
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content" style="margin-top: 6px; padding-left: 0px;">
-				<div class="container">
-					
-					<div class="col-md-12">
-						<div class="d-flex justify-content-between align-items-center responsive-section">
-							<!--  <h4 style="margin-left: -256px;">Rooms</h4>-->
-							 <h4 >Rooms</h4>
-							<button type="button" class="btn btn-primary mb-2 add-room-btn" id="addRoomBtn"
-								style="background-color: #0D587B; border: none; border-radius: 6px; padding: 6px 16px;"
-								data-bs-toggle="modal" data-bs-target="#addRoomModal">
-								<i class="bi bi-plus-lg"></i>Add Room
-							</button>
-						</div>
-
-						<hr class="responsive-section"
-							style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;"    >
-					</div>
-
-					
-					<div class="row mt-4 responsive-section-wide">
-						<div class="col-md-12">
-							<div class="card">
-								<div class="card-block">
-
-									<table id="CompletedCPSDatatable"
-										class="table table-striped table-bordered table-hover dataTable" role="grid"
-										style="width: 100%">
-										<thead class="thead-dark">
-											<tr>
-												<th style="width: 5%;">S.NO</th>
-												<th style="width: 10%;">Room Name</th>
-												<th style="width: 15%;">Building Name</th>
-												<th style="width: 10%;">Floor</th>
-												<th style="width: 15%;">Room Type</th>
-												<th style="width: 10%;">Action</th>
-											</tr>
-										</thead>
-										<tbody>
-
-
-										</tbody>
-									</table>
-
-								</div>
-							</div>
-						</div>
-					</div>
-
-
-
-					<!-- Card 2: Other Details -->
-
-
-				</div>
-
-			</div>
-
-		</div>
-	</div>
-
-
-
-	<!-- Modal -->
-
-
-
-	<!-- Floor Details Modal -->
-	<div class="modal fade" id="floordetailsModal" tabindex="-1" role="dialog" aria-labelledby="floordetailsModalLabel"
-		aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="detailsModalLabel">Floor Details</h5>
-					<button type="button" class="close" data-dismiss="modal"
-						onclick="$('#floordetailsModal').modal('hide');" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body">
-					<table class="table table-striped table-bordered" id="floorDetailsTable">
-						<thead class="thead-dark">
-							<tr>
-								<th class="text-center">S.No</th>
-								<th class="text-center">Room Name</th>
-								<th class="text-center">Building Name</th>
-								<th class="text-center">Floor</th>
-								<th class="text-center">Room Type</th>
-								<th class="text-center">Action</th>
-							</tr>
-						</thead>
-						<tbody>
-							<!-- Data will be inserted here -->
-						</tbody>
-					</table>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-dismiss="modal"
-						onclick="$('#floordetailsModal').modal('hide');">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-
-
-	<div class="modal fade" id="viewRoomModal" tabindex="-1" aria-labelledby="viewRoomModalLabel"    data-bs-backdrop="static" data-bs-keyboard="false" aria-hidden="true">
-		<div class="modal-dialog modal-md">
-			<div class="modal-content">
-				<div class="modal-header bg-primary text-white">
-					<h5 class="modal-title">View Room Details</h5>
-					<button type="button" class="close" data-bs-dismiss="modal"
-											aria-label="Close"><span aria-hidden="true">&times;</span></button>
-										
-													</div>
-
-				<div class="modal-body">
-					<div class="row mb-3">
-						<div class="col-md-6">
-							<label class="form-label">Room Name</label> <input type="text" id="viewRoomName"
-								class="form-control" readonly>
-						</div>
-						<div class="col-md-6">
-							<label class="form-label">Building Name</label> <input type="text" id="viewBuildingName"
-								class="form-control" readonly>
-						</div>
-					</div>
-
-					<div class="row mb-3">
-						<div class="col-md-6">
-							<label class="form-label">Floor</label> <input type="text" id="viewFloor"
-								class="form-control" readonly>
-						</div>
-						<div class="col-md-6">
-							<label class="form-label">Room Type</label> <input type="text" id="viewRoomType"
-								class="form-control" readonly>
-						</div>
-						
-					</div>
-					<div class="row mb-3" id="view_Aun_div" style="display: none;">
-						<div class="col-md-6" >
-							<label class="form-label">Anganwadi Unique Number</label> <input type="text" id="viewAUN"
-								class="form-control" readonly>
-						</div>
-					</div>
-				</div>
-
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<!-- Edit Room Modal -->
-	<div class="modal fade" id="editRoomModal" tabindex="-1" aria-labelledby="editRoomModalLabel"    data-bs-backdrop="static" data-bs-keyboard="false" aria-hidden="true">
-		<div class="modal-dialog modal-md">
-			<div class="modal-content">
-				<div class="modal-header bg-success text-white">
-					<h5 class="modal-title">Edit Room Details</h5>
-					<button type="button" class="close" data-bs-dismiss="modal"
-											aria-label="Close"><span aria-hidden="true">&times;</span></button>
-				</div>
-
-				<div class="modal-body">
-
-
-					<div class="row mb-3">
-						<div class="col-md-6">
-							<label class="form-label">Room Name<span style="color: red;">*</span></label> <input type="text" id="editRoomName"
-								class="form-control"> <input type="hidden" id="editRoomId">
-
-						</div>
-						<div class="col-md-6">
-							<label class="form-label">Building<span style="color: red;">*</span></label> <select id="editBuildingId" class="form-control" disabled>
-								<option value="">Select Building</option>
-							</select>
-
-						</div>
-					</div>
-
-					<div class="row mb-3">
-						<div class="col-md-6">
-							<label class="form-label">Floor<span style="color: red;">*</span></label> <select id="editFloorId" class="form-control">
-								<option value="">Select Floor</option>
-							</select>
-						</div>
-						<div class="col-md-6">
-							<label class="form-label">Room Type<span style="color: red;">*</span></label> <select id="editRoomTypeId"
-								class="form-control">
-								<option value="">Select Room Type</option>
-							</select>
-						</div>
-					</div>
-					
-					<div class="row mb-3" id="edit_Aun_div" style="display: none;">
-						<div class="col-md-6">
-							<label class="form-label">Anganwadi Unique Number<span style="color: red;">*</span></label>
-							<input type="text" class="form-control" id="editAUN">								
-						</div>						
-					</div>
-				</div>
-
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-					<button type="button" class="btn btn-success" id="saveEditRoom">Save
-						Changes</button>
-						<button type="button" class="btn btn-danger" id="roomDelete">Delete</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div class="modal fade" id="addRoomModal" tabindex="-1"
-     data-bs-backdrop="static" data-bs-keyboard="false"
-     aria-labelledby="addRoomModalLabel" aria-hidden="true">
-		<div class="modal-dialog modal-lg">
-			<div class="modal-content">
-				<div class="modal-header bg-primary text-white">
-					<h5 class="modal-title">Add New Room</h5>
-					<button type="button" class="close" data-bs-dismiss="modal"
-											aria-label="Close"><span aria-hidden="true">&times;</span></button>
-														</div>
-				<div class="modal-body">
-					<div class="row mb-3">
-						<div class="col-md-6">
-							<label class="form-label">Building<span style="color: red;">*</span></label> <select id="addBuildingId" class="form-control">
-								<option value="">Select Building</option>
-							</select>
-						</div>
-						<div class="col-md-6">
-							<label class="form-label">Floor<span style="color: red;">*</span></label> <select id="addFloorId" class="form-control">
-								<option value="">Select Floor</option>
-							</select>
-						</div>
-
-					</div>
-
-					<div class="row mb-3">
-						<div class="col-md-6">
-							<label class="form-label">Room Type<span style="color: red;">*</span></label> <select id="addRoomTypeId" class="form-control">
-								<option value="">Select Room Type</option>
-							</select>
-						</div>
-						
-						<div class="col-md-6">
-							<label class="form-label">Room Name<span style="color: red;">*</span></label> <input type="text" id="addRoomName"
-								class="form-control">
-						</div>
-						
-						<div id="anganwadiNumberDiv" class="col-md-6 mt-3" style="display: none;">
-							<label class="form-label">Anganwadi Unique Number<span style="color: red;">*</span></label>
-							<input type="text" class="form-control" id="anganwadiUniqueNumber" placeholder="Enter Anganwadi Unique Number">
-						</div>
-
-					</div>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-					<button type="button" class="btn btn-primary" id="saveAddRoom">Save Room</button>
-				</div>
-
-
-			</div>
-		</div>
-	</div>
-
-
-
-
-
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-</body>
-
-<script>
-
-window.schoolId = window.schoolId || new URLSearchParams(window.location.search).get('schoolId');
-if (!window.schoolId) {
-    Swal.fire("Missing School ID", "No schoolId found in the URL", "warning");
-    throw new Error("Missing schoolId");
-}
-
-
-function loadSavedRoomDetails(school_id) {
-	$.ajax({
-		url: '/gcc/api/gccschool/buildingasset/getRoomDetails',
-		type: 'GET',
-		contentType: 'application/json',
-		data: { school_id },
-		success: function (response) {
-			if (response.status === "OK") {
-				$('#CompletedCPSDatatable').DataTable({
-					destroy: true,
-					searching: true,
-					select: false,
-					autoWidth: true,
-					scrollY: '60vh',
-					scrollCollapse: true,
-					processsing: false,
-					responsive: true,
-					paging: true,
-					info: true,
-					data: response.data,
-					columns: [
-						{ data: null, render: (data, type, row, meta) => meta.row + 1, className: 'text-center' },
-						{ data: 'room_name', defaultContent: '-', className: 'text-center' },
-						{ data: 'building_name', defaultContent: '-', className: 'text-center' },
-						{ data: 'floor', defaultContent: '-', className: 'text-center' },
-						{ data: 'room_type', defaultContent: '-', className: 'text-center' },
-						{
-							data: 'room_id',
-							render: function (data, type, row) {
-								return `
-								<div class="text-center">
-									<button class="btn btn-sm btn-primary me-1 view-btn2" data-room-id="${data}" title="View">
-										<i class="bi bi-eye"></i>
-									</button>
-									<button class="btn btn-sm btn-success edit-btn2" data-room-id="${data}" data-building-id="${row.building_id}" title="Edit">
-										<i class="bi bi-pencil"></i>
-									</button>
-								</div>`;
-							},
-							className: 'text-center'
-						}
-					]
-				});
-			} else {
-				$('#CompletedCPSDatatable tbody').html(`<tr><td colspan="6" class="text-center text-danger">${response.data}</td></tr>`);
-			}
-		},
-		error: function () {
-			Swal.fire("Error", "Something went wrong while fetching room details.", "error");
-		}
-	});
-}
-
-function loadBuildingsDropdown(schoolId, selectedBuildingId = null) {
-	$.ajax({
-		url: '/gcc/api/gccschool/dropdown/getBuildingsBySchoolId',
-		type: 'GET',
-		data: { school_id: schoolId },
-		success: function (response) {
-			const dropdown = $('#editBuildingId');
-			dropdown.empty().append('<option value="">Select Building</option>');
-			if (response.status === "OK") {
-				response.data.forEach(building => {
-					const selected = building.buildng_id == selectedBuildingId ? 'selected' : '';
-					dropdown.append(`<option value="${building.buildng_id}" ${selected}>${building.building_name}</option>`);
-				});
-			}
-		},
-		error: function () {
-			Swal.fire("Error", "Unable to load buildings", "error");
-		}
-	});
-}
-
-function loadRoomTypesDropdown() {
-	$.ajax({
-		url: '/gcc/api/gccschool/dropdown/getRooms',
-		type: 'GET',
-		success: function (response) {
-			const dropdown = $('#editRoomTypeId');
-			dropdown.empty().append('<option value="">Select Room Type</option>');
-			if (response.status === 'OK') {
-				response.data.forEach(room => {
-					dropdown.append(`<option value="${room.room_master_id}">${room.room_type}</option>`);
-				});
-			}
-		}
-	});
-}
-
-function loadBuildingsDropdownForAdd(schoolId) {
-	$.get('/gcc/api/gccschool/dropdown/getBuildingsBySchoolId', { school_id: schoolId }, function (response) {
-		const dropdown = $('#addBuildingId');
-		dropdown.empty().append('<option value="">Select Building</option>');
-		if (response.status === 'OK') {
-			response.data.forEach(building => {
-				dropdown.append(`<option value="${building.buildng_id}">${building.building_name}</option>`);
-			});
-		}
-	});
-}
-
-function loadRoomTypesDropdownForAdd() {
-	$.get('/gcc/api/gccschool/dropdown/getRooms', function (response) {
-		const dropdown = $('#addRoomTypeId');
-		dropdown.empty().append('<option value="">Select Room Type</option>');
-		if (response.status === 'OK') {
-			response.data.forEach(room => {
-				dropdown.append(`<option value="${room.room_master_id}">${room.room_type}</option>`);
-			});
-		}
-	});
-}
-
-$('#addRoomModal').on('show.bs.modal', function () {
-	$('#addBuildingId').val('');
-	$('#addFloorId').val('');
-	$('#addRoomTypeId').val('');
-	$('#addRoomName').val('');
-});
-
-$(document).ready(function () {
-	loadRoomTypesDropdown();
-	loadRoomTypesDropdownForAdd();
-	loadBuildingsDropdownForAdd(schoolId);
-	loadSavedRoomDetails(schoolId);
-	
-	$('#addRoomTypeId').on('change', function () {
-	    const selectedRoomId = $(this).val();
-
-	    if (selectedRoomId === "32") {
-	        $('#anganwadiNumberDiv').show();
-	    } else {
-	        $('#anganwadiNumberDiv').hide();
-	        $('#anganwadiUniqueNumber').val(''); 
-	    }
-	});
-	
-	$('#editRoomTypeId').on('change', function () {
-	    const selectedRoomId2 = $(this).val();
-
-	    if (selectedRoomId2 === "32") {
-	        $('#edit_Aun_div').show();
-	        $('#editAUN').val('');
-	    } else {
-	        $('#edit_Aun_div').hide();
-	        $('#editAUN').val(''); 
-	    }
-	});
-	
-	document.getElementById('anganwadiUniqueNumber').addEventListener('input', function () {
-	    // Keep only alphanumeric characters
-	    this.value = this.value.replace(/[^a-zA-Z0-9]/g, '');
-	});
-	document.getElementById('editAUN').addEventListener('input', function () {
-	    // Keep only alphanumeric characters
-	    this.value = this.value.replace(/[^a-zA-Z0-9]/g, '');
-	});
-	
-});
-
-$(document).on('click', '.view-btn2', function () {
-	const roomId = $(this).data('room-id');
-	$.ajax({
-		url: `/gcc/api/gccschool/buildingasset/getRoomById`,
-		method: 'GET',
-		data: { room_id: roomId },
-		success: function (response) {
-			if (response.status === 'OK' && response.data) {
-				const room = response.data;
-				$('#viewRoomName').val(room.room_name || '');
-				$('#viewBuildingName').val(room.building_name || '');
-				$('#viewFloor').val(room.floor || '');
-				$('#viewRoomType').val(room.room_type || '');
-				
-				if(room.room_master_id === 32){
-					$('#viewAUN').val(room.anganwadi_unique_number || '');
-					$('#view_Aun_div').show();
-				}
-				else{
-					$('#view_Aun_div').hide();
-				}
-				
-				$('#viewRoomModal').modal('show');
-			} else {
-				Swal.fire("Error", response.data || "Room data not found", "error");
-			}
-		},
-		error: function () {
-			Swal.fire("Error", "Failed to load room details", "error");
-		}
-	});
-});
-
-
-$(document).on('click', '.edit-btn2', function () {
-	const roomId = $(this).data('room-id');
-	const buildingIdFromAttr = $(this).data('building-id');
-
-	$.ajax({
-		url: '/gcc/api/gccschool/buildingasset/getRoomById',
-		method: 'GET',
-		data: { room_id: roomId },
-		success: function (response) {
-			if (response.status === 'OK') {
-				const room = response.data;
-				$('#editRoomId').val(room.room_id);
-				$('#editRoomName').val(room.room_name);
-				loadBuildingsDropdown(room.school_id, buildingIdFromAttr);
-				loadFloorDropdown(buildingIdFromAttr, room.floors_id);
-				$('#editRoomTypeId').val(room.room_master_id);
-				
-				if(room.room_master_id === 32){
-					$('#editAUN').val(room.anganwadi_unique_number || '');
-					$('#edit_Aun_div').show();
-				}
-				else{
-					$('#edit_Aun_div').hide();
-				}
-				
-				$('#editRoomModal').modal('show');
-			} else {
-				Swal.fire("Error", response.data || "Room not found", "error");
-			}
-		},
-		error: function () {
-			Swal.fire("Error", "Failed to load room details", "error");
-		}
-	});
-});
-
-$('#saveEditRoom').on('click', function () {
-	
-	let  edit_room_id = $('#editRoomId').val();
-	let  edit_room_num = $('#editRoomName').val();
-	let  edit_building_id = $('#editBuildingId').val();
-	let  edit_floors_id = $('#editFloorId').val();
-	let  edit_room_type= $('#editRoomTypeId').val();
-	let  edit_AnganwadiNumber= $('#editAUN').val();
-	let  edit_school_id= schoolId;
-	
-	if (!edit_floors_id) {
-	    Swal.fire({
-	        icon: 'warning',
-	        title: 'Floor Required',
-	        text: 'Please select a floor .',
-	        allowOutsideClick: false,
-	        allowEscapeKey: false,
-	        allowEnterKey: false,
-	        showConfirmButton: true
-	    });
-	    return;
-	}
-
-	if (!edit_room_type) {
-	    Swal.fire({
-	        icon: 'warning',
-	        title: 'Room Type Required',
-	        text: 'Please select a room type.',
-	        allowOutsideClick: false,
-	        allowEscapeKey: false,
-	        allowEnterKey: false,
-	        showConfirmButton: true
-	    });
-	    return;
-	}
-
-	if (!edit_room_num) {
-	    Swal.fire({
-	        icon: 'warning',
-	        title: 'Room Name Required',
-	        text: 'Please enter a room name .',
-	        allowOutsideClick: false,
-	        allowEscapeKey: false,
-	        allowEnterKey: false,
-	        showConfirmButton: true
-	    });
-	    return;
-	}
-	
-	let rooms = {
-		room_id: $('#editRoomId').val(),
-		room_num: $('#editRoomName').val(),
-		building_id: $('#editBuildingId').val(),
-		floors_id: $('#editFloorId').val(),
-		room_type: $('#editRoomTypeId').val(),
-		school_id: schoolId
-	};
-	
-	if (edit_room_type === "32") {
-		
-		if(!edit_AnganwadiNumber){
-			 Swal.fire({
-			        icon: 'warning',
-			        title: 'Required',
-			        text: 'Please Enter a Anganwadi Unique Number.',
-			        allowOutsideClick: false,
-			        allowEscapeKey: false,
-			        allowEnterKey: false,
-			        showConfirmButton: true
-			    });
-			    return;
-			
-		}
-		
-		rooms['anganwadiUniqueNumber'] = edit_AnganwadiNumber;
-		rooms['anganwadi_check']=false;
-	}
-	
-	//console.log("hiii");
-	console.log("updatedRoom=:",rooms );
-
-	 $.ajax({
-		url: '/gcc/api/gccschool/buildingasset/editRoom',
-		method: 'POST',
-		contentType: 'application/json',
-		data: JSON.stringify(rooms),
-		success: function (response) {
-			if (response === 'Rooms Edited Sucessfully') {
-				$('#editRoomModal').modal('hide');
-				Swal.fire({
-			        icon: 'success',
-			        title: 'Success',
-			        text: 'Room updated successfully',
-			        allowOutsideClick: false,
-			        allowEscapeKey: false,
-			        allowEnterKey: false,
-			        showConfirmButton: true
-			    }).then(() => {
-			        loadSavedRoomDetails(schoolId);
-			    });
-			} 			
-			else if (response === 'Duplicate') {
-				
-				Swal.fire({
-					title: "Anganwadi Number Already Exists",
-					text: "Duplicate Anganwadi Number Found for this school",
-					icon: "error",
-					allowOutsideClick: false, 
-                    allowEscapeKey: false, 
-                    allowEnterKey: false, 	                   
-                    showConfirmButton: true
-				});
-			}
-			else {
-			    Swal.fire({
-			        icon: 'error',
-			        title: 'Error',
-			        text: response || "Update failed",
-			        allowOutsideClick: false,
-			        allowEscapeKey: false,
-			        allowEnterKey: false,
-			        showConfirmButton: true
-			    });
-			}
-			},
-			error: function () {
-			    Swal.fire({
-			        icon: 'error',
-			        title: 'Error',
-			        text: "Something went wrong while saving changes",
-			        allowOutsideClick: false,
-			        allowEscapeKey: false,
-			        allowEnterKey: false,
-			        showConfirmButton: true
-			    });
-			}
-	}); 
-});
-
-$('#saveAddRoom').on('click', function () {
-	
-	const buildingId = $('#addBuildingId').val();
-		const floorId = $('#addFloorId').val();
-		const roomType = $('#addRoomTypeId').val();
-		const roomName = $('#addRoomName').val().trim();
-		const anganwadiUniqueNumber= $('#anganwadiUniqueNumber').val().trim();
-		
-		
-		if (!buildingId) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Building Required',
-		        text: 'Please select a building .',
-		        allowOutsideClick: false,
-		        allowEscapeKey: false,
-		        allowEnterKey: false,
-		        showConfirmButton: true
-		    });
-		    return;
-		}
-
-		if (!floorId) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Floor Required',
-		        text: 'Please select a floor .',
-		        allowOutsideClick: false,
-		        allowEscapeKey: false,
-		        allowEnterKey: false,
-		        showConfirmButton: true
-		    });
-		    return;
-		}
-
-		if (!roomType) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Room Type Required',
-		        text: 'Please select a room type.',
-		        allowOutsideClick: false,
-		        allowEscapeKey: false,
-		        allowEnterKey: false,
-		        showConfirmButton: true
-		    });
-		    return;
-		}
-
-		if (!roomName) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Room Name Required',
-		        text: 'Please enter a room name .',
-		        allowOutsideClick: false,
-		        allowEscapeKey: false,
-		        allowEnterKey: false,
-		        showConfirmButton: true
-		    });
-		    return;
-		}
-		
-		let payload = {
-					room_num: $('#addRoomName').val(),
-					building_id: $('#addBuildingId').val(),
-					floors_id: $('#addFloorId').val(),
-					room_type: $('#addRoomTypeId').val(),
-					school_id: schoolId
-				};
-		
-		if (roomType === "32") {
-			
-			if(!anganwadiUniqueNumber){
-				 Swal.fire({
-				        icon: 'warning',
-				        title: 'Required',
-				        text: 'Please Enter a Anganwadi Unique Number.',
-				        allowOutsideClick: false,
-				        allowEscapeKey: false,
-				        allowEnterKey: false,
-				        showConfirmButton: true
-				    });
-				    return;
-				
-			}
-			
-			payload['anganwadiUniqueNumber'] = anganwadiUniqueNumber;
-			payload['anganwadi_check']=false;
-		}
-	 
-	 console.log("Payload to send:", payload);
-
-	 $.ajax({
-		url: '/gcc/api/gccschool/buildingasset/saveRoom',
-		type: 'POST',
-		contentType: 'application/json',
-		data: JSON.stringify(payload),
-		success: function (response) {
-			if (response === 'Saved sucessfully') {
-				$('#addRoomModal').modal('hide');
-				Swal.fire({
-					title: "Success",
-					text: "Room added successfully",
-					icon: "success",
-					allowOutsideClick: false, 
-                    allowEscapeKey: false, 
-                    allowEnterKey: false, 	                   
-                    showConfirmButton: true
-				}).then(() => {
-					location.reload(); 
-				});}
-			else if (response === 'Duplicate') {				
-				Swal.fire({
-					title: "Anganwadi Number Already Exists",
-					text: "Duplicate Anganwadi Number Found for this school",
-					icon: "error",
-					allowOutsideClick: false, 
-                    allowEscapeKey: false, 
-                    allowEnterKey: false, 	                   
-                    showConfirmButton: true
-				});
-				}
-			else {
-				Swal.fire({
-			        icon: 'error',
-			        title: 'Error',
-			        text: response || 'Save failed',
-			        allowOutsideClick: false,
-			        allowEscapeKey: false,
-			        allowEnterKey: false,
-			        showConfirmButton: true
-			    });
-			}
-		},
-		error: function () {
-		    Swal.fire({
-		        icon: 'error',
-		        title: 'Error',
-		        text: 'Something went wrong while saving',
-		        allowOutsideClick: false,
-		        allowEscapeKey: false,
-		        allowEnterKey: false,
-		        showConfirmButton: true
-		    });
-		}
-	}); 
-});
-
-function loadFloorDropdown(buildingId, selectedFloorId = null) {
-	$.ajax({
-		url: '/gcc/api/gccschool/dropdown/getFloorsByBuilding',
-		type: 'GET',
-		data: { building_id: buildingId },
-		success: function (response) {
-			const dropdown = $('#editFloorId');
-			dropdown.empty().append('<option value="">Select Floor</option>');
-			if (response.status === 'OK') {
-				response.data.forEach(floor => {
-					const selected = floor.floors_id == selectedFloorId ? 'selected' : '';
-					dropdown.append(`<option value="${floor.floors_id}" ${selected}>${floor.floor_name}</option>`);
-				});
-			}
-		},
-		error: function () {
-			Swal.fire("Error", "Failed to load floors", "error");
-		}
-	});
-}
-$('#addBuildingId').on('change', function () {
-	const buildingId = $(this).val();
-	$.get('/gcc/api/gccschool/dropdown/getFloorsByBuilding', { building_id: buildingId }, function (response) {
-		const dropdown = $('#addFloorId');
-		dropdown.empty().append('<option value="">Select Floor</option>');
-		if (response.status === 'OK') {
-			response.data.forEach(floor => {
-				dropdown.append(`<option value="${floor.floors_id}">${floor.floor_name}</option>`);
-			});
-		}
-	});
-});
-
-$('#roomDelete').on('click', function () {
-    const roomId = $('#editRoomId').val();
-    const isDelete = true;
-
-    Swal.fire({
-        title: 'Are you sure?',
-        text: "Do you really want to delete this room?",
-        icon: 'warning',
-        showCancelButton: true,
-        confirmButtonColor: '#d33',
-        cancelButtonColor: '#3085d6',
-        confirmButtonText: 'Yes, delete it!',
-        cancelButtonText: 'No, cancel',
-        allowOutsideClick: false,
-        allowEscapeKey: false,
-        allowEnterKey: false,
-        showConfirmButton: true
-    }).then((result) => {
-        if (result.isConfirmed) {
-            // Call AJAX only if user confirms
-            $.ajax({
-                url: '/gcc/api/gccschool/buildingasset/deleteRoom',
-                method: 'POST',
-                data: {
-                    room_id: roomId,
-                    is_delete: isDelete
-                },
-                success: function (response) {
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Success',
-                        text: response,
-                        allowOutsideClick: false,
-                        allowEscapeKey: false,
-                        allowEnterKey: false,
-                        confirmButtonText: 'OK'
-                    }).then(() => {
-                        location.reload();
-                    });
-                },
-                error: function () {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Failed to delete the room.',
-                        allowOutsideClick: false,
-                        allowEscapeKey: false,
-                        allowEnterKey: false,
-                        showConfirmButton: true
-                    });
-                }
-            });
-        } else if (result.dismiss === Swal.DismissReason.cancel) {
-            // Show info alert when cancelled
-            Swal.fire({
-                icon: 'info',
-                title: 'Cancelled',
-                text: 'No changes were made.',
-                allowOutsideClick: false,
-                allowEscapeKey: false,
-                allowEnterKey: false,
-                showConfirmButton: true
-            });
-        }
-    });
-});
-
-
-
-
-
-
-</script>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/roomassets.html b/src/main/resources/templates/modules/school/roomassets.html
deleted file mode 100644
index 47821033..00000000
--- a/src/main/resources/templates/modules/school/roomassets.html
+++ /dev/null
@@ -1,1589 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-#RoomAssetViewModal .modal-body {
-    max-height: 500px; 
-    overflow-y: auto; 
-}
-
-#RoomAssetEditModal .modal-body {
-    max-height: 500px; 
-    overflow-y: auto; 
-}
-
-
-#AddAssetModal .modal-body {
-    max-height: 500px; 
-    overflow-y: auto; 
-}
-.custom-card-wrapper {
-  padding: 0;
-  margin-top: -58px;
-  margin-left: -233px;
-}
-
-@media (max-width: 768px) {
-  .custom-card-wrapper {
-    margin-left: 0;
-    margin-top: 0;
-    padding: 10px;
-  }
-}
-
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="card">
-				<div class="main-content" style="background-color: white;">
-					<div class="container">
-						<!-- Card 2: Other Details -->
-						<div class="col-md-12">
-						<div class="custom-card-wrapper">
-						<!--  	<div style="margin-top:-58px;margin-left: -233px;">-->
-								<div class="card-header"><b>Room List</b></div>
-								<div class="card-body">
-									<table id="RoomAssetDatatable"
-										class="table table-striped table-bordered table-hover dataTable" role="grid"
-										style="width: 100%">
-										<thead class="thead-dark">
-											<tr>
-												<th>S.NO</th>
-												<th>Room Name</th>
-												<th>Building Name</th>
-												<th>Floor</th>
-												<th>Room Type</th>
-												<th>Action</th>
-											</tr>
-										</thead>
-										<tbody>
-										
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</div>
-
-						
-
-
-						
-
-					</div>
-					
-					<div id="pageLoader"
-						style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-						<div style="position: relative; top: 50%; transform: translateY(-50%);">
-							<div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-								<span class="sr-only">Loading...</span>
-							</div>
-							<!-- Add the 'Please wait' text below the spinner -->
-							<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-						</div>
-					</div>
-
-				</div>
-			</div>
-		</div>
-		</div>
-		
-		
-		
-		<!-- Modal -->
-		<div class="modal fade" id="RoomAssetViewModal" tabindex="-1" role="dialog" aria-labelledby="RoomAssetViewLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-			<div class="modal-dialog modal-lg" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-						    <span id="roomTitleView"></span> - Room Assets
-						</h5>
-						<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-	
-					<div class="modal-body">
-						
-						<span id="VroomId" style="display: none;"></span>
-						<div class="row pb-2">
-                            <div class="col-md-6"><strong>Room Name:</strong><span id="roomNameView"></span></div>
-                            <div class="col-md-6"><strong>Room Type:</strong><span id="roomTypeView"></span></div>
-                        </div>
-                        <div class="row pb-2">
-                            <div class="col-md-6"><strong>Building Name:</strong><span id="buildingNameView"></span></div>
-                            <div class="col-md-6"><strong>Floor:</strong><span id="floorView"></span></div>
-                        </div>
-                        
-                        <!-- Tabs navigation -->
-						<ul class="nav nav-tabs mt-3" id="assetTabs" role="tablist">
-							<li class="nav-item">
-								<a class="nav-link active" id="view-itasset-tab" data-bs-toggle="tab" href="#view-itasset" role="tab">IT Assets</a>
-							</li>
-							<li class="nav-item">
-								<a class="nav-link" id="view-furniture-tab" data-bs-toggle="tab" href="#view-furniture" role="tab">Furniture Assets</a>
-							</li>
-							<li class="nav-item">
-								<a class="nav-link" id="view-electrical-tab" data-bs-toggle="tab" href="#view-electrical" role="tab">Electrical Assets</a>
-							</li>
-						</ul>
-						
-						<div class="tab-content p-3 border border-top-0" id="assetTabsContent">
-							<div class="tab-pane fade show active" id="view-itasset" role="tabpanel" aria-labelledby="view-itasset-tab">
-								<div id="viewItAssetContainer">Loading IT Assets...</div>
-							</div>
-							<div class="tab-pane fade" id="view-furniture" role="tabpanel" aria-labelledby="view-furniture-tab">
-								<div id="viewFurnitureAssetContainer">Loading Furniture Assets...</div>
-							</div>
-							<div class="tab-pane fade" id="view-electrical" role="tabpanel" aria-labelledby="view-electrical-tab">
-								<div id="viewElectricalAssetContainer">Loading Electrical Assets...</div>
-							</div>
-						</div>
-
-                        	
-						
-					</div>
-					<div class="modal-footer">
-							<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>							
-						</div>
-					
-				</div>
-			</div>
-		</div>
-		
-		<div class="modal fade" id="RoomAssetEditModal" tabindex="-1" role="dialog" aria-labelledby="RoomAssetEditLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-			<div class="modal-dialog modal-lg" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-						    <span id="roomTitleEdit"></span> - Edit Room Assets
-						</h5>
-						<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-	
-					<div class="modal-body">
-						
-						
-						<span id="Eschool_id" style="display: none;"></span>
-						<span id="Ebuilding_id" style="display: none;"></span>
-						<span id="Efloors_id" style="display: none;"></span>
-						<span id="EroomId" style="display: none;"></span>
-						
-						<div class="row pb-2">
-                            <div class="col-md-6"><strong>Room Name:</strong><span id="roomNameEdit"></span></div>
-                            <div class="col-md-6"><strong>Room Type:</strong><span id="roomTypeEdit"></span></div>
-                        </div>
-                        <div class="row pb-2">
-                            <div class="col-md-6"><strong>Building Name:</strong><span id="buildingNameEdit"></span></div>
-                            <div class="col-md-6"><strong>Floor:</strong><span id="floorEdit"></span></div>
-                        </div>
-                        
-                        <!-- Tabs navigation -->
-						<ul class="nav nav-tabs mt-3" id="assetTabsEdit" role="tablist">
-							<li class="nav-item" role="presentation">
-						        <a class="nav-link active" id="edit-itasset-tab" data-bs-toggle="tab" href="#edit-itasset" role="tab">IT Assets</a>
-						    </li>
-						    <li class="nav-item" role="presentation">
-						        <a class="nav-link" id="edit-furniture-tab" data-bs-toggle="tab" href="#edit-furniture" role="tab">Furniture Assets</a>
-						    </li>
-						    <li class="nav-item" role="presentation">
-						        <a class="nav-link" id="edit-electrical-tab" data-bs-toggle="tab" href="#edit-electrical" role="tab">Electrical Assets</a>
-						    </li>
-						    
-						</ul>
-                        
-                        
-                        <!-- Tabs content -->
-						<div class="tab-content p-3 border border-top-0" id="assetTabsContentEdit">
-								<div class="tab-pane fade show active" id="edit-itasset" role="tabpanel" aria-labelledby="edit-itasset-tab">							        
-							        <div class="col-md-12" id="editItAssetContainer"></div>
-							    </div>
-							    <div class="tab-pane fade " id="edit-furniture" role="tabpanel" aria-labelledby="edit-furniture-tab">
-							        
-							        <div class="col-md-12" id="editFurnitureAssetContainer"></div>
-							    </div>
-							    <div class="tab-pane fade" id="edit-electrical" role="tabpanel" aria-labelledby="edit-electrical-tab">
-							       
-							        <div class="col-md-12" id="editElectricalAssetContainer"></div>
-							    </div>
-						    
-						</div>
-                        
-						<div class="row pb-2 mt-4">
-							<div class="col-12 d-flex justify-content-center">								
-								<button type="button" class="btn btn-primary" id="addAssetMapping">Add Asset Mapping</button>
-							</div>
-						</div>
-						
-						
-					</div>
-					
-					<div class="modal-footer">
-							<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>							
-						</div>
-					
-				</div>
-			</div>
-		</div>
-		
-		
-		<div class="modal fade" id="AddAssetModal" tabindex="-1" role="dialog" aria-labelledby="AddAssetModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-			<div class="modal-dialog modal-lg" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-						    <span id="roomTitleAdd"></span> Room - Add Assets Mapping
-						</h5>
-						<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					</div>
-	
-					<div class="modal-body">
-						<span id="Sschool_id" style="display: none;"></span>
-						<span id="Sbuilding_id" style="display: none;"></span>
-						<span id="Sfloors_id" style="display: none;"></span>
-						<span id="SroomId" style="display: none;"></span>
-					<div class="row">
-						<div class="form-group col-6">
-						    <label for="assetType">Asset Type</label>
-						    <select id="assetType" class="form-control">
-						        <option value="">Select Asset Type</option>
-						    </select>
-						</div>
-						
-						<div class="form-group col-6" style="display: none;" id="subAssetTypeContainer">
-						    <label for="subAssetType">Sub Asset Type</label>
-						    <select id="subAssetType" class="form-control">
-						        <option value="">Select Sub Asset Type</option>
-						    </select>
-						</div>	    	
-						</div>
-						<div class="row">
-							<div class="col-12">
-								<div id="AddingAssetContainer1" style="display: none;">									
-								</div>
-								<div id="AddingAssetContainer2" style="display: none;">									
-								</div>
-							</div>
-						</div>
-						
-						<div class="row pb-2 mt-4" style="display: none;" id="savingAssetContainer1">
-							<div class="col-12 d-flex justify-content-center">								
-								<button type="button" class="btn btn-primary" id="savingItAssetButton">Save</button>
-							</div>
-						</div>
-						<div class="row pb-2 mt-4" style="display: none;" id="savingAssetContainer2">
-							<div class="col-12 d-flex justify-content-center">								
-								<button type="button" class="btn btn-primary" id="savingotherAssetButton">Save</button>
-							</div>
-						</div>
-					</div>
-					<div class="modal-footer">
-							<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>							
-					</div>
-					
-				</div>
-			</div>
-		</div>
-		
-
-		<script th:replace="~{fragments/modules/base/script :: script}"></script>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-		<script type="text/javascript">
-
-		console.log("hi..Room asset");
-		
-		
-			$(document).ready(function () {
-				// Extract schoolId from URL
-				let RoomAsseturlParams = new URLSearchParams(window.location.search);
-				let RoomAssetschoolId = RoomAsseturlParams.get("schoolId");
-				
-				//let globalRoomId = null;
-				let currentAssetTypeEdit = ''; // stores 'furnitureasset' or 'electricalasset'
-				let currentTargetContainerEdit = ''; // stores container ID
-								
-			loadSavedBuildingRm(RoomAssetschoolId);
-			
-			/* $(document).off('click', '.view-btn').on('click', '.view-btn', handleView);
-			$(document).off('click', '.edit-btn').on('click', '.edit-btn', handleEdit);
-			
-			$(document).off('click', '.del-btn').on('click', '.del-btn', handleDelete);
-			$(document).off('click', '#addAssetMapping').on('click', '#addAssetMapping', addAssetMapping); */
-			
-			if (!window.assetMappingEventsBound) {
-			    $(document).on('click', '.view-btn', handleView);
-			    $(document).on('click', '.edit-btn', handleEdit);
-			    $(document).on('click', '.del-btn', handleDelete);
-			    $(document).on('click', '#addAssetMapping', addAssetMapping);
-			    
-			    $(document).on('click', '#savingItAssetButton', saveItAsset);
-			    
-			    $(document).on('click', '#savingotherAssetButton', saveOtherAsset);
-
-			    $(document).on('change', '#assetType', function () {
-					
-			    	const isassetTypeText = $('#assetType option:selected').text().trim();
-			    	
-			    	if(isassetTypeText==='Select Asset Type'){
-			        	 $('#AddingAssetContainer1').show().html('');
-			        	 $('#AddingAssetContainer2').show().html('');
-			        	 $('#subAssetTypeContainer').hide();
-			        	 return;
-			        }
-			    	
-					$('#subAssetTypeContainer').show();
-				    const assetId = $(this).val();
-				    
-				    $('#subAssetType').empty().append('<option value="">Select Sub Asset Type</option>');
-
-				    if (assetId) {
-				        $.ajax({
-				            url: '/gcc/api/gccschool/dropdown/getSubAssetType',
-				            type: 'GET',
-				            data: { assetid: assetId },
-				            success: function (response) {
-				                if (response.status === 'OK') {
-				                    response.data.forEach(item => {
-				                        $('#subAssetType').append(`<option value="${item.sub_asset_id}">${item.asset_name}</option>`);
-				                    });
-				                    if (response.status === 'Failed') {			                
-						            	 $('#subAssetType').empty().append('<option value="">No Data Found</option>');			               
-						            }
-						        }
-				            },
-							    error: function (xhr, status, error) {
-							        console.error("Error fetching sub asset types:", status, error);
-							        $('#subAssetType').empty().append('<option value="">Error loading data</option>');
-							        alert("Something went wrong while fetching sub asset types.");
-							    }
-				        });
-				    }
-				});
-			    
-			    $(document).on('change', '#subAssetType', function () {
-			        const selectedOption = $(this).find('option:selected');
-			        const assetName = selectedOption.text().trim();  // Get the text (name)
-			        const subAssetId = $(this).val();                // In case you need ID too
-			        
-			        console.log("assetName="+assetName);
-			       
-
-			        // Get school ID from the span
-			        const schoolId = $('#Eschool_id').text().trim();
-			        console.log("schoolId="+schoolId);
-			        const assetTypeText = $('#assetType option:selected').text().trim();
-			        console.log("assetTypeText="+assetTypeText);
-			        
-			        if(assetTypeText==='Select Asset Type'|| subAssetId ==''){
-			        	 $('#AddingAssetContainer1').show().html('');
-			        	 $('#AddingAssetContainer2').show().html('');
-			        }
-
-			        if (subAssetId && assetName) {
-			            // Show the container
-			           // $('#AddingAssetContainer1').show().html('<p>Loading...</p>');
-			            $('#AddingAssetContainer1, #AddingAssetContainer2').hide();
-			            $('#savingAssetContainer1, #savingAssetContainer2').hide();
-
-			            if (assetTypeText === 'IT Asset') {
-			                // IT Asset section
-			                $('#AddingAssetContainer1').show().html('<p>Loading...</p>');
-			                //$('#savingAssetContainer1').show();
-			                
-					            $.ajax({
-					                url: '/gcc/api/gccschool/buildingasset/getSchoolAsset',
-					                type: 'GET',
-					                data: {
-					                    school_id: schoolId,
-					                    type: assetName
-					                },
-					                success: function (response) {
-					                    if (response.status === 'Success') {
-					                       
-					                        
-					                        if (response.data.length === 0) {
-								                $('#AddingAssetContainer1').html('<p class="text-muted">No assets found.</p>');
-								                $('#savingAssetContainer1').hide();
-								                return;
-								            }
-					                        const dataAdding=response.data;
-					                        const tableHtml3 = `
-							                    <table id="AddAssetDatatable" class="table table-bordered table-striped table-hover" style="width:100%;">
-							                        <thead class="thead-dark">
-							                            <tr>
-							                            	<th>Select</th>
-							                                <th>S.No</th>
-							                                <th>Asset Code</th>
-							                                <th>Name</th>
-							                                <th>Source</th>
-							                                <th>Serial Number</th>
-							                            </tr>
-							                        </thead>
-							                        <tbody></tbody>
-							                    </table>
-							                `;
-							                $('#AddingAssetContainer1').html(tableHtml3);
-		
-							                // Destroy existing instance if exists
-							                if ($.fn.DataTable.isDataTable('#AddAssetDatatable')) {
-							                    $('#AddAssetDatatable').DataTable().clear().destroy(true);
-							                }
-		
-							                // Prepare DataTable buttons (same format as your existing function)
-							                const buttons = [
-							                    {
-							                        extend: 'pageLength',
-							                        className: 'btn btn-warning'
-							                    },
-							                    {
-							                        title: 'IT Asset List',
-							                        extend: 'copyHtml5',
-							                        text: 'Copy',
-							                        className: 'btn btn-secondary'
-							                    },
-							                    {
-							                        extend: 'excelHtml5',
-							                        text: 'Excel',
-							                        className: 'btn btn-secondary',
-							                        title: 'IT Asset List'
-							                    },
-							                    {
-							                        extend: 'csvHtml5',
-							                        text: 'CSV',
-							                        className: 'btn btn-secondary',
-							                        title: 'IT Asset List'
-							                    },
-							                    {
-							                        extend: 'pdfHtml5',
-							                        text: 'PDF',
-							                        className: 'btn btn-secondary',
-							                        title: 'IT Asset List'
-							                    },
-							                    {
-							                        extend: 'print',
-							                        text: 'Print',
-							                        className: 'btn btn-secondary',
-							                        title: 'IT Asset List',
-							                        exportOptions: {
-							                            columns: ':visible'
-							                        }
-							                    }
-							                ];
-		
-							                // Initialize DataTable
-							                $('#AddAssetDatatable').DataTable({
-							                    data: dataAdding,
-							                    columns: [
-							                    	{
-							                    	    data: 'it_details_id',
-							                    	    render: function (data, type, row, meta) {
-							                    	        return `<input type="checkbox" class="asset-checkbox" value="${data}">`;
-							                    	    },
-							                    	    orderable: false,
-							                    	    searchable: false, className: 'text-center'
-							                    	},
-							                        { data: null, render: (d, t, r, m) => m.row + 1 , className: 'text-center'},
-							                        { data: 'asset_name' , className: 'text-center'},
-							                        { data: 'hardware_type' , className: 'text-center'},
-							                        { data: 'source_of_asset' , className: 'text-center'},
-							                        { data: 'serial_no' , className: 'text-center'}
-							                    ],
-							                    lengthMenu: [
-							                        [25, 50, 100, -1],
-							                        ['25 rows', '50 rows', '100 rows', 'Show all']
-							                    ],
-							                    dom: 'Bfrtip',
-							                    buttons: buttons,
-							                    scrollX: true,
-							                    scrollY: '300px',			                    
-							                    autoWidth: true,
-							                    paging: true,
-							                    info: true,
-							                    responsive: true,
-							                    language: {
-							                        emptyTable: '<span class="text-danger">No IT assets found</span>'
-							                    }
-							                });
-							                $('#savingAssetContainer1').show();
-					                        
-					                    } else {
-					                        $('#AddingAssetContainer1').html('<p>No data found.</p>');
-					                    }
-					                },
-					                error: function (xhr, status, error) {
-					                    console.error("Error fetching assets by type:", status, error);
-					                    $('#AddingAssetContainer1').html('<p>Error loading data.</p>');
-					                    alert("Something went wrong while fetching assets.");
-					                }
-					            });
-					            
-			            }
-			            else if (assetTypeText === 'Electrical Asset' || assetTypeText === 'Furniture Asset') {
-			                // Show input section for Electrical/Furniture
-			                $('#AddingAssetContainer2').show().html(`
-			                    <div class="form-group col-6">
-			                        <label for="addAssetQuantity">Enter Quantity for ${assetName}</label>
-			                        <input type="number" id="addAssetQuantity" class="form-control" placeholder="Enter quantity">
-			                    </div>
-			                `);
-			                $('#savingAssetContainer2').show();
-			            }
-			        } 
-			            
-			        else {
-			        	$('#AddingAssetContainer1, #AddingAssetContainer2').hide();
-			            $('#savingAssetContainer1, #savingAssetContainer2').hide();
-			        }
-			    });
-
-							
-				
-				/*$(document).on('click', '#updateAssetType', function () {
-							        let assetDataArray = [];
-							        let emptyAssetName = null;
-							        let validationFailed = false;
-
-							        $(currentTargetContainerEdit).find('.col-md-6').each(function () {
-							            let mapId = $(this).data('map-id');
-							            let assetName = $(this).data('assetname');
-							            let originalQty = parseInt($(this).data('original-qty'), 10);
-							            let assetQtyStr = $(this).find('input').val().trim();
-
-							            if (assetQtyStr === "") {
-							                emptyAssetName = assetName;
-							                Swal.fire({
-							                    icon: 'warning',
-							                    title: 'Missing Quantity',
-							                    text: Please enter quantity for: ${emptyAssetName}
-							                });
-							                validationFailed = true;
-							                return false; // Break out of each loop
-							            }
-
-							            let assetQty = parseInt(assetQtyStr, 10);
-							            let flag = '0';
-							            if (assetQty > originalQty) {
-							                flag = '+1';
-							            } else if (assetQty < originalQty) {
-							                flag = '-1';
-							            }
-							            console.log(flag);
-
-							            if (mapId && !isNaN(assetQty)) {
-							                assetDataArray.push({
-							                    assetType: currentAssetTypeEdit,
-							                    id: mapId,
-							                    qty: assetQty,
-							                    flag: flag,
-							                    originalQty:originalQty
-							                });
-							            }
-							        });
-
-							        if (validationFailed) {
-							            return;
-							        }
-							       
-
-							        console.log(assetDataArray); // Inspect before sending
-
-							        // Send to server
-							        $.ajax({
-							            url: '/gcc/api/gccschool/buildingasset/updateassets',
-							            type: 'POST',
-							            contentType: 'application/json',
-							            data: JSON.stringify(assetDataArray),
-							            success: function (response) {
-							                if (response === "Sucess") {
-							                    Swal.fire({
-							                        icon: 'success',
-							                        title: 'Updated!',
-							                        text: 'Asset quantities updated successfully.',
-							                        confirmButtonColor: '#3085d6'
-							                    }).then((result) => {
-							                        if (result.isConfirmed) {
-							                            location.reload();  // ✅ Page will reload after OK
-							                        }
-							                    });
-							                } else {
-							                    Swal.fire({
-							                        icon: 'error',
-							                        title: 'Update Failed',
-							                        text: 'Something went wrong while updating the assets. Please try again.',
-							                        confirmButtonColor: '#d33'
-							                    });
-							                }
-							            },
-							            error: function (xhr, status, error) {
-							                console.error('Error saving assets:', error);
-							                Swal.fire({
-							                    icon: 'error',
-							                    title: 'Server Error',
-							                    text: 'Unable to reach the server or an internal error occurred.',
-							                    confirmButtonColor: '#d33'
-							                });
-							            }
-							        });
-							    });*/
-								$(document).on('click', '#updateAssetType', function () {
-												    let assetDataArray = [];
-												    let emptyAssetName = null;
-												   
-													//console.log("lets see");
-												    
-												    $(currentTargetContainerEdit).find('.col-md-6').each(function () {
-														console.log("sgsg")
-												    	console.log(this);
-												        let mapId = $(this).data('map-id');
-												        let assetName = $(this).data('assetname');
-														let assetQtyStr = $(this).find('input').val().trim();
-														let assetQty = parseInt(assetQtyStr, 10);
-														let originalQty = parseInt($(this).data('original-qty'), 10);
-														let subAssetId = $(this).data('sub_asset_id'); // Make sure this attribute exists
-														let schoolId = $(this).data('schoolid'); // Make sure this attribute exists
-														console.log("subsetid")
-												        console.log(subAssetId);
-														console.log("schoolid");
-														console.log(schoolId);
-												        if (assetQty === "") {
-												            emptyAssetName = assetName;
-												            if (emptyAssetName) {
-												                Swal.fire({
-												                    icon: 'warning',
-												                    title: 'Missing Quantity',
-												                    text: 'Please enter quantity for: ${emptyAssetName}'
-												                });
-												                return;
-												            }
-												        }
-														
-							            let flag = '0';
-							            if (assetQty > originalQty) {
-							                flag = '+1';
-							            } else if (assetQty < originalQty) {
-							                flag = '-1';
-							            }
-							            console.log(flag);
-
-
-												        if (mapId && assetQty) {
-												            assetDataArray.push({
-												            	assetType: currentAssetTypeEdit,     // from outer scope
-												                id: mapId,                 // either furniture_map_id or electrical_map_id
-												                qty: assetQty,
-																flag: flag,
-																originalQty:originalQty,	
-																															subid: subAssetId, // new field
-																               schid: schoolId // new field
-												            });
-												        }
-												    });
-
-												    console.log(assetDataArray); // Inspect before sending
-
-												    // Send to server
-												     $.ajax({
-												        url: '/gcc/api/gccschool/buildingasset/updateassets',
-												        type: 'POST',
-												        contentType: 'application/json',
-												        data: JSON.stringify(assetDataArray),
-												        success: function (response) {
-												        	//console.log("Response:", response);
-												         /*   if (response === "Sucess") {
-												                Swal.fire({
-												                    icon: 'success',
-												                    title: 'Updated!',
-												                    text: 'Asset quantities updated successfully.',
-												                    confirmButtonColor: '#3085d6'
-												                });
-												            }*/
-												            if (response === "Sucess") {
-												                Swal.fire({
-												                    icon: 'success',
-												                    title: 'Updated!',
-												                    text: 'Asset quantities updated successfully.',
-												                    confirmButtonColor: '#3085d6'
-												                }).then((result) => {
-												                    if (result.isConfirmed) {
-												                        location.reload();  // ✅ Page will reload after OK
-												                    }
-												                });
-												            }
-															else if (response === 'Add Sufficient Master Quantity') {
-																					                Swal.fire({
-																					                    icon: 'info',
-																					                    title: 'Out of Range',
-																					                    text: response, // Show the response text
-																					                    allowOutsideClick: false,
-																					                    allowEscapeKey: false,
-																					                    allowEnterKey: false,
-																					                    showConfirmButton: true
-																					                });
-																					            } 
-
-												            else {
-												                Swal.fire({
-												                    icon: 'error',
-												                    title: 'Update Failed',
-												                    text: 'Something went wrong while updating the assets. Please try again.',
-												                    confirmButtonColor: '#d33'
-												                });
-												            }
-												        },
-												        error: function (xhr, status, error) {
-												        	console.error('Error saving assets:', error);
-												            Swal.fire({
-												                icon: 'error',
-												                title: 'Server Error',
-												                text: 'Unable to reach the server or an internal error occurred.',
-												                confirmButtonColor: '#d33'
-												            });
-												           
-												        }
-												    }); 
-												    
-												    
-												});
-			    
-			    window.assetMappingEventsBound = true;
-			}
-						
-			
-			function loadSavedBuildingRm(RoomAssetschoolId) {
-				
-				var buttons = [
-					{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-					{
-						title: 'Data export',
-						extend: 'copyHtml5',
-						text: 'Copy',
-						className: 'btn btn-secondary',
-						id: 'copyBtn'
-					},
-					{
-						extend: 'excelHtml5',
-						text: 'Excel',
-						className: 'btn btn-secondary',
-						id: 'excelBtn',
-						title: 'Petition List'
-					},
-					{
-						extend: 'csvHtml5',
-						text: 'CSV',
-						className: 'btn btn-secondary',
-						id: 'csvBtn',
-						title: 'Petition List'
-					},
-					{
-						extend: 'pdfHtml5',
-						text: 'PDF',
-						className: 'btn btn-secondary',
-						id: 'pdfBtn',
-						title: 'Petition List'
-					},
-					{
-						extend: 'print',
-						text: 'Print',
-						className: 'btn btn-secondary',
-						id: 'printBtn',
-						title: 'Petition List',
-						exportOptions: {
-							columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-						}
-					}
-				];
-				
-			    $.get('/gcc/api/gccschool/buildingasset/getRoomDetails', {school_id: RoomAssetschoolId}, res => {
-			        if ($.fn.DataTable.isDataTable('#RoomAssetDatatable')) {
-			            $('#RoomAssetDatatable').DataTable().clear().destroy(true);
-			        }
-
-			        let tableData = [];
-			        if (res.status === "OK" && Array.isArray(res.data)) {
-			            tableData = res.data;
-			        }
-
-			        $('#RoomAssetDatatable').DataTable({
-			            data: tableData,
-			            columns: [
-			                {data: null, render: (d, t, r, m) => m.row + 1},
-			                {data: 'room_name'},
-			                {data: 'building_name'},
-			                {data: 'floor'},
-			                {data: 'room_type'},
-			                {
-			                    data: 'building_id',
-			                    render: (data, t, row) => `
-			                        <div class="text-center">
-			                            <button class="btn btn-sm btn-primary view-btn" data-building_name="${row.building_name}" data-floor="${row.floor}" data-room_type="${row.room_type}" data-room-id="${row.room_id}" data-room-name="${row.room_name}"><i class="ik ik-eye" style="font-size:medium;margin-left:5px;"></i></button>
-			                            <button class="btn btn-sm btn-success edit-btn" data-building_name="${row.building_name}" data-floor="${row.floor}" data-room_type="${row.room_type}" data-room-id="${row.room_id}" data-room-name="${row.room_name}" data-building_id="${row.building_id}" data-floors_id="${row.floors_id}" data-school_id="${row.school_id}"><i class="ik ik-edit-2" style="font-size:medium;margin-left:5px;"></i></button>
-			                        </div>`
-			                }
-			            ],
-			            lengthMenu: [
-			                [50, 100, 200, 500, -1],
-			                ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-			            ],
-			            dom: 'Bftip',			          
-			            //fixedColumns: {left: 0, right: 0},
-			            scrollY: '60vh',
-			            scrollX: true,
-			            autoWidth: true,           	                
-    	                paging: true,
-    	                info: true,
-			            buttons: buttons,
-			            responsive: false,
-			            searching: true,
-			            select: false,
-			            processing: false,
-			            language: {
-			                emptyTable: '<span class="text-danger">No Details found</span>'
-			            }
-			        });
-			        
-			    });
-			}
-			
-			
-			function handleView() {
-				let roomName = $(this).data('room-name');
-				let roomId = $(this).data('room-id');
-				let buildingName= $(this).data('building_name');
-				let Floor= $(this).data('floor');
-				let roomType= $(this).data('room_type');
-				
-				//globalRoomId = roomId;
-				
-				// Update modal title
-			    $('#roomTitleView').text(roomName);
-			    $('#roomNameView').text(roomName);
-				$('#buildingNameView').text(buildingName);
-				$('#floorView').text(Floor);
-				$('#roomTypeView').text(roomType);
-				
-				$('#VroomId').text(roomId);
-								
-				let roomIdV=$('#VroomId').text().trim();
-			    
-				$('#RoomAssetViewModal').modal('show');
-				$('#view-itasset-tab').tab('show');
-				
-				// Clear previous content before loading new one
-				$('#viewItAssetContainer, #viewFurnitureAssetContainer, #viewElectricalAssetContainer').html('');
-				
-				// Load default (IT Assets)
-			    loadAssetTab('itasset',roomIdV);
-				
-			}
-			
-			// Tab click event to fetch data based on clicked tab
-/* 			$('#assetTabs a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-			    const assetType = $(e.target).attr('href').substring(1); // e.g. 'furniture'
-			    loadAssetTab(assetType);
-			}); */
-			
-			$('#assetTabs a[data-bs-toggle="tab"]').on('shown.bs.tab', function (e) {
-			    const tabIdToAssetTypeMap = {
-			        'view-itasset': 'itasset',
-			        'view-furniture': 'furnitureasset',
-			        'view-electrical': 'electricalasset'
-			    };
-
-			    const tabId = $(e.target).attr('href').substring(1); // e.g. 'view-furniture'
-			    const assetType = tabIdToAssetTypeMap[tabId];
-
-			    if (assetType) {
-			    	//console.log("assetType="+assetType);
-			    	let roomIdV=$('#VroomId').text().trim();
-			        loadAssetTab(assetType,roomIdV);
-			    }
-			});
-			
-			$('#assetTabsEdit a[data-bs-toggle="tab"]').on('shown.bs.tab', function (e) {
-			    const tabIdToAssetTypeEditMap = {
-			        'edit-itasset': 'itasset',
-			        'edit-furniture': 'furnitureasset',
-			        'edit-electrical': 'electricalasset'
-			    };
-
-			    const EdittabId = $(e.target).attr('href').substring(1); // e.g. 'view-furniture'
-			    const EditassetType = tabIdToAssetTypeEditMap[EdittabId];
-
-			    if (EditassetType) {
-			    	//console.log("EditassetType="+EditassetType);
-			    	 let roomIdE = $('#EroomId').text().trim();
-			        loadEditAssetTab(EditassetType,roomIdE);
-			    }
-			});
-			
-			// Tab click event to fetch data based on clicked tab
-			/* $('#assetTabsEdit a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-			    const editassetType = $(e.target).attr('href').substring(1); // e.g. 'furniture'
-			    loadEditAssetTab(editassetType);
-			}); */
-			
-			
-			// Reusable function for AJAX loading of asset tab content
-			function loadAssetTab(assetType,roomIdV) {
-			    const assetMap = {
-			        itasset: '#viewItAssetContainer',
-			        furnitureasset: '#viewFurnitureAssetContainer',
-			        electricalasset: '#viewElectricalAssetContainer'
-			    };
-			   
-			    const targetContainer = assetMap[assetType];
-			    $(targetContainer).html('<p>Loading...</p>');
-			
-			    $.get('/gcc/api/gccschool/buildingasset/getItAssetMapping', { room_id: roomIdV, assetType: assetType }, res => {
-			    	//console.log("===");
-			        if (res.Status === "OK") {
-			        	//console.log(res.data);
-			            const data = res.data;
-			
-			            if (data.length === 0) {
-			                $(targetContainer).html('<p class="text-muted">No assets found.</p>');
-			                return;
-			            }
-			
-			            if (assetType === 'itasset') {
-			                
-			            	// Clear and re-insert the table structure dynamically
-			                const tableHtml = `
-			                    <table id="ItAssetDatatable" class="table table-bordered table-striped table-hover" style="width:100%;">
-			                        <thead class="thead-dark">
-			                            <tr>
-			                                <th>S.No</th>
-			                                <th>Asset Code</th>
-			                                <th>Name</th>
-			                                <th>Source</th>
-			                                <th>Serial Number</th>
-			                            </tr>
-			                        </thead>
-			                        <tbody></tbody>
-			                    </table>
-			                `;
-			                $(targetContainer).html(tableHtml);
-
-			                // Destroy existing instance if exists
-			                if ($.fn.DataTable.isDataTable('#ItAssetDatatable')) {
-			                    $('#ItAssetDatatable').DataTable().clear().destroy(true);
-			                }
-
-			                // Prepare DataTable buttons (same format as your existing function)
-			                const buttons = [
-			                    {
-			                        extend: 'pageLength',
-			                        className: 'btn btn-warning'
-			                    },
-			                    {
-			                        title: 'IT Asset List',
-			                        extend: 'copyHtml5',
-			                        text: 'Copy',
-			                        className: 'btn btn-secondary'
-			                    },
-			                    {
-			                        extend: 'excelHtml5',
-			                        text: 'Excel',
-			                        className: 'btn btn-secondary',
-			                        title: 'IT Asset List'
-			                    },
-			                    {
-			                        extend: 'csvHtml5',
-			                        text: 'CSV',
-			                        className: 'btn btn-secondary',
-			                        title: 'IT Asset List'
-			                    },
-			                    {
-			                        extend: 'pdfHtml5',
-			                        text: 'PDF',
-			                        className: 'btn btn-secondary',
-			                        title: 'IT Asset List'
-			                    },
-			                    {
-			                        extend: 'print',
-			                        text: 'Print',
-			                        className: 'btn btn-secondary',
-			                        title: 'IT Asset List',
-			                        exportOptions: {
-			                            columns: ':visible'
-			                        }
-			                    }
-			                ];
-
-			                // Initialize DataTable
-			                $('#ItAssetDatatable').DataTable({
-			                    data: data,
-			                    columns: [
-			                        { data: null, render: (d, t, r, m) => m.row + 1 },
-			                        { data: 'asset_name' },
-			                        { data: 'hardware_type' },
-			                        { data: 'source_of_asset' },
-			                        { data: 'serial_no' }
-			                    ],
-			                    lengthMenu: [
-			                        [25, 50, 100, -1],
-			                        ['25 rows', '50 rows', '100 rows', 'Show all']
-			                    ],
-			                    dom: 'Bfrtip',
-			                    buttons: buttons,
-			                    scrollX: true,
-			                    scrollY: '300px',			                    
-			                    autoWidth: true,
-			                    paging: true,
-			                    info: true,
-			                    responsive: true,
-			                    language: {
-			                        emptyTable: '<span class="text-danger">No IT assets found</span>'
-			                    }
-			                });
-			            	
-			            }
-			            else if (assetType === 'furnitureasset'|| assetType === 'electricalasset') {
-			            	
-			                // Render furniture/electrical: only show assetname and asset_qty
-			                let html = data.map(item => {
-			                    return `
-			                    <div class="row p-2 mb-2">
-				                    <div class="col-md-6">
-				                        <strong>${item.assetname}:</strong>
-				                        <input value="${item.asset_qty}" class="form-control" readonly>
-				                    </div>				                    
-			                	</div>
-			                    `;
-			                }).join('');
-			                $(targetContainer).html(html);
-			            }
-			            else{
-			            	$(targetContainer).html('<p class="text-danger">No asset data.</p>');
-			            }
-			            
-			            
-			
-			        } else {
-			            $(targetContainer).html('<p class="text-danger">Error fetching asset data.</p>');
-			        }
-			    });
-			}
-			
-			
-			function handleEdit() {
-				
-				let roomName = $(this).data('room-name');
-				let roomId = $(this).data('room-id');
-				let buildingName= $(this).data('building_name');
-				let Floor= $(this).data('floor');
-				let roomType= $(this).data('room_type');
-								
-				let Ebuilding_id= $(this).data('building_id');
-				let Efloors_id= $(this).data('floors_id');
-				let Eschool_id= $(this).data('school_id');
-				let EroomId = $(this).data('room-id');
-				
-				//console.log("Ebuilding_id="+Ebuilding_id);
-				//console.log("Efloors_id="+Efloors_id);
-				//console.log("Eschool_id="+Eschool_id);
-				//console.log("EroomId="+EroomId);
-				
-				//globalRoomId = roomId;
-				//console.log("globalRoomId="+globalRoomId);
-				
-				$('#roomTitleEdit').text(roomName);
-				$('#roomNameEdit').text(roomName);
-				$('#buildingNameEdit').text(buildingName);
-				$('#floorEdit').text(Floor);
-				$('#roomTypeEdit').text(roomType);
-				
-				$('#Eschool_id').text(Eschool_id);
-				$('#Ebuilding_id').text(Ebuilding_id);
-				$('#Efloors_id').text(Efloors_id);
-				$('#EroomId').text(EroomId);
-				
-				$('#RoomAssetEditModal').modal('show');
-				$('#edit-itasset-tab').tab('show');
-				
-				// Load default (IT Assets)
-			    loadEditAssetTab('itasset',EroomId);
-				
-			}
-			
-			function loadEditAssetTab(EditassetType,EroomId){
-				
-				 const assetMapEdit = {
-					        itasset: '#editItAssetContainer',
-					        furnitureasset: '#editFurnitureAssetContainer',
-					        electricalasset: '#editElectricalAssetContainer'
-					    };
-				 
-				 currentAssetTypeEdit = EditassetType;
-				 currentTargetContainerEdit = assetMapEdit[EditassetType]; // save globally
-				 
-				 const targetContainerEdit = assetMapEdit[EditassetType];
-				 $(targetContainerEdit).html('<p>Loading...</p>');
-				 				
-				 
-				 $.get('/gcc/api/gccschool/buildingasset/getItAssetMapping', { room_id: EroomId, assetType: EditassetType }, result => {
-				        if (result.Status === "OK") {
-				        	console.log(result.data);
-				            const data2 = result.data;
-							console.log(data2);
-				
-				            if (data2.length === 0) {
-				                $(targetContainerEdit).html('<p class="text-muted">No assets found.</p>');
-				                return;
-				            }
-				
-				            if (EditassetType === 'itasset') {
-				                
-				            	// Clear and re-insert the table structure dynamically
-				                const tableHtml2 = `
-				                    <table id="ItAssetDatatable2" class="table table-bordered table-striped table-hover" style="width:100%;">
-				                        <thead class="thead-dark">
-				                            <tr>
-				                                <th class="text-center">S.No</th>
-				                                <th class="text-center">Asset Code</th>
-				                                <th class="text-center">Name</th>
-				                                <th class="text-center">Source</th>
-				                                <th class="text-center">Serial Number</th>
-				                                <th class="text-center">Action</th>
-				                            </tr>
-				                        </thead>
-				                        <tbody></tbody>
-				                    </table>
-				                `;
-				                $(targetContainerEdit).html(tableHtml2);
-
-				                // Destroy existing instance if exists
-				                if ($.fn.DataTable.isDataTable('#ItAssetDatatable2')) {
-				                    $('#ItAssetDatatable2').DataTable().clear().destroy(true);
-				                }
-
-				                // Prepare DataTable buttons (same format as your existing function)
-				                const Ebuttons = [
-				                    {
-				                        extend: 'pageLength',
-				                        className: 'btn btn-warning'
-				                    },
-				                    {
-				                        title: 'IT Asset List',
-				                        extend: 'copyHtml5',
-				                        text: 'Copy',
-				                        className: 'btn btn-secondary'
-				                    },
-				                    {
-				                        extend: 'excelHtml5',
-				                        text: 'Excel',
-				                        className: 'btn btn-secondary',
-				                        title: 'IT Asset List'
-				                    },
-				                    {
-				                        extend: 'csvHtml5',
-				                        text: 'CSV',
-				                        className: 'btn btn-secondary',
-				                        title: 'IT Asset List'
-				                    },
-				                    {
-				                        extend: 'pdfHtml5',
-				                        text: 'PDF',
-				                        className: 'btn btn-secondary',
-				                        title: 'IT Asset List'
-				                    },
-				                    {
-				                        extend: 'print',
-				                        text: 'Print',
-				                        className: 'btn btn-secondary',
-				                        title: 'IT Asset List',
-				                        exportOptions: {
-				                            columns: ':visible'
-				                        }
-				                    }
-				                ];
-
-				                // Initialize DataTable
-				                $('#ItAssetDatatable2').DataTable({
-				                    data: data2,
-				                    columns: [
-				                        { data: null, render: (d, t, r, m) => m.row + 1 , className: 'text-center'},
-				                        { data: 'asset_name', className: 'text-center' },
-				                        { data: 'hardware_type' , className: 'text-center'},
-				                        { data: 'source_of_asset' , className: 'text-center' },
-				                        { data: 'serial_no' , className: 'text-center'},
-				                        {
-				                        	data: 'it_map_id',
-				                        	render: (data, t, row) => `
-				                                <div class="text-center">
-				                                    <button class="btn btn-sm btn-primary del-btn" data-deleteid="${row.it_map_id}">
-				                                        <i class="ik ik-trash-2"></i>Delete
-				                                    </button>
-				                                </div>`
-				                        }
-				                    ],
-				                    lengthMenu: [
-				                        [25, 50, 100, -1],
-				                        ['25 rows', '50 rows', '100 rows', 'Show all']
-				                    ],
-				                    dom: 'Bfrtip',
-				                    buttons: Ebuttons,
-				                    scrollX: true,
-				                    scrollY: '30vh',
-				                    autoWidth: true,
-				                    paging: true,
-				                    info: true,
-				                    responsive: true,
-				                    language: {
-				                        emptyTable: '<span class="text-danger">No IT assets found</span>'
-				                    }
-				                });
-				            	
-				            }
-				            else if (EditassetType === 'furnitureasset'|| EditassetType === 'electricalasset') {
-				            	
-				            	// Start the row container
-				                let html = `<div class="row p-2 mb-2">`;
-
-				                // Add each asset as a col inside that row
-				                html += data2.map(item => {
-				                    const mapId = EditassetType === 'furnitureasset' ? item.furniture_map_id : item.electrical_map_id;
-									console.log("item");
-									console.log(item);
-
-				                    return `
-									<div class="col-md-6" data-map-id="${mapId}" data-assetname="${item.assetname}" data-original-qty="${item.asset_qty}" 
-									data-Schoolid="${item.school_id}" data-sub_asset_id="${item.sub_asset_id}">
-												            	            <strong>${item.assetname}:</strong>
-												            	            <input value="${item.asset_qty}" class="form-control">
-												            	        </div>
-				                    `;
-				                }).join('');
-
-				                // Close the row
-				                html += `</div>`;
-
-				                // Add the update button outside the row
-				                html += `
-				                    <div class="col-12 d-flex justify-content-center">
-				                        <button type="button" class="btn btn-info" id="updateAssetType">Update</button>
-				                    </div>
-				                `;
-
-				                $(targetContainerEdit).html(html);
-				            }
-				            else{
-				            	$(targetContainerEdit).html('<p class="text-danger">No asset data.</p>');
-				            }
-				            				            
-				
-				        } else {
-				            $(targetContainerEdit).html('<p class="text-danger">Error fetching asset data.</p>');
-				        }
-				    });
-				 
-				 
-			}
-			
-			
-			function handleDelete() {
-				//let deleteId = $(this).data('deleteId');
-				let deleteId = $(this).attr('data-deleteid');
-				
-				const row = $(this).closest('tr');
-				
-				//console.log("deleteId = " + deleteId);
-			    // You can now make an AJAX call to delete or show confirmation
-			    
-				$.ajax({
-			        url: '/gcc/api/gccschool/buildingasset/deleteAssetMapping',
-			        type: 'POST',
-			        data:{it_map_id: deleteId,is_delete:1},
-			        success: function (response) {
-			            if (response.status === 'Sucess') {
-			            	Swal.fire({
-			  	                icon: 'success',
-			  	                title: 'Success',
-			  	                text: response.data,
-			  	               	allowOutsideClick: false,
-			  	              	allowEscapeKey: false,
-			  	              	allowEnterKey: false,
-			  	                confirmButtonText: 'OK'
-			  	            }).then((result) => {
-		                        if (result.isConfirmed) {		                        	
-		                        	
-		                            //console.log("Continue clicked");
-		                            
-		                            const Rtable = $('#ItAssetDatatable2').DataTable();
-			                        
-			                        // Remove the row
-			                        Rtable.row(row).remove();
-
-			                        // Reorder S.No column
-			                        Rtable.rows().every(function (index) {
-			                            const row = this.node();
-			                            $(row).find('td:first-child').text(index + 1); // Update S.No
-			                        });
-
-			                        // Redraw the table
-			                        Rtable.draw(false);
-		                        }
-	  	            		});
-			            }
-			            else {			                
-			            	 		               
-			            }
-			        },
-				    error: function (xhr, status, error) {
-				        console.error("Error deleting asset:", status, error);
-				       
-				        alert("Something went wrong while deleting asset.");
-				    }
-			    	
-			    });
-			    
-			    
-			    
-			}
-			
-			function addAssetMapping(){
-				
-				// Get values from hidden spans
-			    let AschoolId = $('#Eschool_id').text().trim();
-			    let AbuildingId = $('#Ebuilding_id').text().trim();
-			    let AfloorId = $('#Efloors_id').text().trim();
-			    let AroomId = $('#EroomId').text().trim();
-			    
-			   /* console.log("School ID:", AschoolId);
-			    console.log("Building ID:", AbuildingId);
-			    console.log("Floor ID:", AfloorId);
-			    console.log("Room ID:", AroomId); */
-				
-				let AddroomName = $('#roomTitleEdit').text();
-				$('#roomTitleAdd').text(AddroomName);
-				$('#RoomAssetEditModal').modal('hide');
-				
-				$('#subAssetTypeContainer').hide();
-				
-				$('#Sschool_id').text(AschoolId);
-				$('#Sbuilding_id').text(AbuildingId);
-				$('#Sfloors_id').text(AfloorId);
-				$('#SroomId').text(AroomId);
-				
-				$('#AddAssetModal').modal('show');
-				
-				$('#AddingAssetContainer1').hide();
-				$('#AddingAssetContainer2').hide();
-				
-				$('#savingAssetContainer1').hide();
-				$('#savingAssetContainer2').hide();
-				
-				// Clear previous dropdowns
-			    $('#assetType').empty().append('<option value="">Select Asset Type</option>');
-			    $('#subAssetType').empty().append('<option value="">Select Sub Asset Type</option>');
-			    
-			    // Load Asset Types via AJAX
-			    $.ajax({
-			        url: '/gcc/api/gccschool/dropdown/getAssetType',
-			        type: 'GET',
-			        success: function (response) {
-			            if (response.status === 'OK') {
-			                response.data.forEach(item => {
-			                    $('#assetType').append(`<option value="${item.asset_master_id}">${item.asset_type}</option>`);
-			                });
-			            }
-			            if (response.status === 'Failed') {			                
-			            	 $('#assetType').empty().append('<option value="">No Data Found</option>');			               
-			            }
-			        },
-				    error: function (xhr, status, error) {
-				        console.error("Error fetching asset types:", status, error);
-				        $('#assetType').empty().append('<option value="">Error loading data</option>');
-				        alert("Something went wrong while fetching asset types.");
-				    }
-			    	
-			    });
-				
-			}
-			
-			function saveItAsset(){
-				
-				let schoolId1 = $('#Sschool_id').text().trim();
-			    let buildingId1 = $('#Sbuilding_id').text().trim();
-			    let floorId1 = $('#Sfloors_id').text().trim();
-			    let roomId1 = $('#SroomId').text().trim();
-			    
-			    let selectedAssets = [];
-			    $('.asset-checkbox:checked').each(function () {
-			        let itDetailsId = $(this).val();
-
-			        selectedAssets.push({
-			            it_details_id: itDetailsId,
-			            school_id: schoolId1,
-			            building_id: buildingId1,
-			            floor_id: floorId1,
-			            room_id: roomId1
-			        });
-			    });
-			    
-			    if (selectedAssets.length === 0) {
-			        Swal.fire("Please select at least one asset.");
-			        return;
-			    }
-			    
-			    console.log("Submitting these assets:", selectedAssets);
-			    
-			    $.ajax({
-			        url: '/gcc/api/gccschool/buildingasset/mapAssets',
-			        type: 'POST',
-			        contentType: 'application/json',
-			        data: JSON.stringify(selectedAssets),
-			        success: function (response) {
-			        	if(response ==='Success'){
-			        		Swal.fire({
-			                	allowOutsideClick: false,
-			  	              	allowEscapeKey: false,
-			  	              	allowEnterKey: false,
-			                    icon: 'success',
-			                    title: 'Success!',
-			                    text: 'IT Assets have been mapped successfully.'
-			                }).then(() => {
-			                    			                  			                    
-			                    location.reload();
-			                });
-			        		//Swal.fire("Success!", "IT Assets have been mapped successfully.", "success");
-				            //$('#AddAssetModal').modal('hide');
-			        	}
-			        	else if (response==='Error'){
-			        		Swal.fire("Error", "Error in saving asset Mapping", "error");
-			        	}
-			        	else{
-			        		Swal.fire("Error", "Something went wrong!", "error");
-			        	}
-			            // Optionally reload or refresh the page/table here
-			        },
-			        error: function (xhr, status, error) {
-			            console.error("Save error:", status, error);
-			            Swal.fire("Error!", "Something went wrong while saving.", "error");
-			        }
-			    });
-			}
-			
-			
-			function saveOtherAsset(){
-				let schoolId2 = $('#Sschool_id').text().trim();
-			    let buildingId2 = $('#Sbuilding_id').text().trim();
-			    let floorId2 = $('#Sfloors_id').text().trim();
-			    let roomId2 = $('#SroomId').text().trim();
-			    
-			    
-			    let assetTypeText = $('#assetType option:selected').text().trim();
-			    let savingAssetType=null;
-			    if(assetTypeText==='Furniture Asset'){
-			    	savingAssetType='furnitureasset'
-			    }
-			    if(assetTypeText==='Electrical Asset'){
-			    	savingAssetType='electricalasset'
-			    }
-			    let subAssetTypeId = $('#subAssetType').val();
-			    let addAssetQuantity = $('#addAssetQuantity').val()?.trim();
-
-			    if (!subAssetTypeId || !schoolId2 || !buildingId2 || !floorId2 || !roomId2 || !savingAssetType) {
-			        //Swal.fire("Error", "Please make sure all fields are filled correctly.", "error");
-			           Swal.fire({
-        icon: 'error',
-        title: 'Error',
-        text: 'Please make sure all fields are filled correctly.',
-        allowOutsideClick: false,
-        allowEscapeKey: false,
-        allowEnterKey: false,
-        showConfirmButton: true
-    });
-			        return;
-			    }
-			    
-			    if(!addAssetQuantity){
-			    	  Swal.fire({
-			    	        icon: 'info',
-			    	        title: 'Info',
-			    	        text: 'Enter quantity',
-			    	        allowOutsideClick: false,
-			    	        allowEscapeKey: false,
-			    	        allowEnterKey: false,
-			    	        showConfirmButton: true
-			    	    });
-			    	 return;
-			    }
-			    
-			    $.ajax({
-			        url: '/gcc/api/gccschool/buildingasset/addFurAsset',
-			        type: 'POST',
-			        data: {
-			            sub_asset_id: subAssetTypeId,
-			            asset_qty: addAssetQuantity,
-			            room_id: roomId2,
-			            building_id: buildingId2,
-			            floor_id: floorId2,
-			            school_id: schoolId2,
-			            assetType: savingAssetType
-			        },
-			        success: function (response) {
-			            if (response === 'Sucess') {
-			            	
-			            	Swal.fire({
-			                	allowOutsideClick: false,
-			  	              	allowEscapeKey: false,
-			  	              	allowEnterKey: false,
-			                    icon: 'success',
-			                    title: 'Success!',
-			                    text: 'Assets have been mapped successfully.'
-			                }).then(() => {
-			                    			                  			                    
-			                    location.reload();
-			                	 $('#addAssetQuantity').val('');
-			                     $('#assetType').val('');
-			                     $('#subAssetTypeContainer').hide();
-			                     $('#subAssetType').empty().append('<option value="">Select Sub Asset Type</option>');
-			                     $('#AddingAssetContainer2, #savingAssetContainer2').hide();
-			                     $('#AddingAssetContainer1, #savingAssetContainer1').hide();
-			                    // $('#AddAssetModal').hide();
-			                     
-			                });
-			            				                			                
-			            } /*else {
-			                Swal.fire("Error", "Failed to add asset.", "error");
-			            }*/
-						else if (response === 'Add Sufficient Quantity') {
-						                Swal.fire({
-						                    icon: 'info',
-						                    title: 'InSufficient Quantity',
-						                    text: response, // Show the response text
-						                    allowOutsideClick: false,
-						                    allowEscapeKey: false,
-						                    allowEnterKey: false,
-						                    showConfirmButton: true
-						                });
-						            } else {
-						                Swal.fire("Error", "Failed to add asset.", "error");
-						            }
-			        },
-			        error: function (xhr, status, error) {
-			            console.error("Error while mapping asset:", status, error);
-			            Swal.fire("Error", "Something went wrong. Please try again.", "error");
-			        }
-			    });
-			    
-			}
-			
-			});
-		</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/staffdetails.html b/src/main/resources/templates/modules/school/staffdetails.html
deleted file mode 100644
index a04ae966..00000000
--- a/src/main/resources/templates/modules/school/staffdetails.html
+++ /dev/null
@@ -1,1148 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr" xmlns:th="http://www.thymeleaf.org">
-  <head th:replace="~{fragments/modules/base/head :: head}">
-    <meta charset="UTF-8" />
-    <title>Staff Strength Management</title>
-    <style>
-      body {
-        background-color: #f8f9fa;
-      }
-
-      .header {
-        font-size: 22px;
-        font-weight: bold;
-        margin-bottom: 20px;
-      }
-
-      .table {
-        border: 1px solid #dee2e6;
-      }
-
-      .table th,
-      .table td {
-        border: 1px solid #dee2e6;
-        padding: 10px;
-      }
-
-      .section-title {
-        font-size: 18px;
-        font-weight: bold;
-        margin-top: 20px;
-        border-bottom: 2px solid #007bff;
-        padding-bottom: 5px;
-      }
-
-      .form-group {
-        margin-top: 15px;
-      }
-      
-      .radio-group {
-        display: flex;
-        gap: 20px;
-        margin-top: 10px;
-      }
-      
-      /* Optional: styling update button gap */
-      .btn-gap {
-        margin-left: 1rem;
-      }
-      .select2-container--default .select2-selection--multiple {
-    padding-right: 30px;
-    min-height: 38px;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    position: relative;
-    background-image: none;
-}
-
-.select2-container--default .select2-selection--multiple::after {
-    content: "";
-    position: absolute;
-    top: 50%;
-    right: 8px;
-    width: 14px;
-    height: 14px;
-    transform: translateY(-50%);
-    background-image: url("data:image/svg+xml;utf8,<svg fill='gray' height='20' viewBox='0 0 24 24' width='20' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/></svg>");
-    background-repeat: no-repeat;
-    background-size: contain;
-    pointer-events: none;
-}
-    </style>
-    <!-- jQuery -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <!-- Bootstrap CSS (you may already have it from your fragments) -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" />
-    <!-- Bootstrap JS Bundle -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-  </head>
-  
-  <style>
-  #staffUpdateModal .modal-body{
-					max-height:70vh;
-					overflow-y:auto; 
-				}
-  </style>
-  
-  <body>
-  	<div class="container mt-4">
-  				<header th:replace="~{fragments/modules/base/header :: header}"></header>
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-	
-	
-			<div class="card p-3">
-				
-		
-		<div id="staffReadOnlyView" class="container mt-4" style="display: none;   "></div>
-            <!-- Update Button for Staff (if record exists) -->
-            <div class="text-center mt-3" id="updateStaffContainer" style="display: none;">
-              <button type="button" class="btn btn-primary" id="updateStaffBtn">Update</button>
-            </div>
-            <!-- Container for Editable Staff Form -->
-            <div id="staffFormContainer">
-              <form id="staffStrengthForm" novalidate>
-                <!-- SG Teachers -->
-                <div class="col-md-12">
-                  <div class="card" style="background-color: lightgrey; padding: 20px;">
-                    <div class="card-header">
-                      <b>1. SG Teachers<span class="text-danger">*</span></b>
-                    </div>
-                    <div class="row mt-3">
-                      <div class="col-md-3">
-                        <label>No of Regular Teachers</label>
-                        <input type="number" class="form-control" name="sgRegTeacher" id="sgRegTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Smc Teachers</label>
-                        <input type="number" class="form-control" name="sgTempTeacher" id="sgTempTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Part-time Teachers</label>
-                        <input type="number" class="form-control" name="sgPtTeacher" id="sgPtTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of NGO Teachers</label>
-                        <input type="number" class="form-control" name="sgNgoTeacher" id="sgNgoTeacher" placeholder="Enter Value" required />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
-                <!-- BT Teachers -->
-                <div class="col-md-12">
-                  <div class="card" style="background-color: aliceblue;  padding: 20px; ">
-                    <div class="card-header">
-                      <b>2. BT Teachers <span class="text-danger">*</span></b>
-                    </div>
-                    <div class="row mt-3">
-                      <div class="col-md-3">
-                        <label>No of Regular Teachers</label>
-                        <input type="number" class="form-control" name="btRegTeacher" id="btRegTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Smc Teachers</label>
-                        <input type="number" class="form-control" name="btTempTeacher" id="btTempTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Part-time Teachers</label>
-                        <input type="number" class="form-control" name="btPtTeacher" id="btPtTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of NGO Teachers</label>
-                        <input type="number" class="form-control" name="btNgoTeacher" id="btNgoTeacher" placeholder="Enter Value" required />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
-                <!-- PG Teachers -->
-                <div class="col-md-12">
-                  <div class="card" style="background-color: cornsilk; padding: 20px;">
-                    <div class="card-header">
-                      <b>3. PG Teachers<span class="text-danger">*</span></b>
-                    </div>
-                    <div class="row mt-3">
-                      <div class="col-md-3">
-                        <label>No of Regular Teachers</label>
-                        <input type="number" class="form-control" name="pgRegTeacher" id="pgRegTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Smc Teachers</label>
-                        <input type="number" class="form-control" name="pgTempTeacher" id="pgTempTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Part-time Teachers</label>
-                        <input type="number" class="form-control" name="pgPtTeacher" id="pgPtTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of NGO Teachers</label>
-                        <input type="number" class="form-control" name="pgNgoTeacher" id="pgNgoTeacher" placeholder="Enter Value" required />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-md-12">
-                 <div class="card mt-3" style="background-color: lavender; padding: 20px;">
-
-                    <div class="card-header">
-                      <b>4. PET Teachers<span class="text-danger">*</span></b>
-                    </div>
-                    <div class="row mt-3">
-                      <div class="col-md-3">
-                        <label>No of Regular Teachers</label>
-                        <input type="number" class="form-control" name="petRegTeacher" id="petRegTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Smc Teachers</label>
-                        <input type="number" class="form-control" name="petTempTeacher" id="petTempTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Grade 1 Teachers</label>
-                        <input type="number" class="form-control" name="petGrade1Teacher" id="petGrade1Teacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Grade 2 Teachers</label>
-                        <input type="number" class="form-control" name="petGrade2Teacher" id="petGrade2Teacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3 pt-3">
-                        <label>No of Part-time Teachers</label>
-                        <input type="number" class="form-control" name="petPtTeacher" id="petPtTeacher" placeholder="Enter Value" required />
-                      </div>
-                    </div>
-                  </div>
-                  </div>
-                  
-                         <div class="col-md-12">
-                 <div class="card mt-3" style="background-color: honeydew; padding: 20px; ">
-
-                    <div class="card-header">
-                      <b>5. kG Teachers<span class="text-danger">*</span></b>
-                    </div>
-                    <div class="row mt-3">
-                      <div class="col-md-3">
-                        <label>No of Regular Teachers</label>
-                        <input type="number" class="form-control" name="kgRegTeacher" id="kgRegTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Smc Teachers</label>
-                        <input type="number" class="form-control" name="kgTempTeacher" id="kgTempTeacher" placeholder="Enter Value" required />
-                      </div>
-                     
-                    </div>
-                  </div>
-                  </div>
-                  
-                  <div class="col-md-12">
-                 <div class="card mt-3" style="background-color: #ecc6c6; padding: 20px; ">
-
-                    <div class="card-header">
-                      <b>6. Special Teachers<span class="text-danger">*</span></b>
-                    </div>
-                    <div class="row mt-3">
-                      <div class="col-md-3">
-                        <label>No of Regular Teachers</label>
-                        <input type="number" class="form-control" name="stRegTeacher" id="stRegTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of Part-time Teachers</label>
-                        <input type="number" class="form-control" name="stPtTeacher" id="stPtTeacher" placeholder="Enter Value" required />
-                      </div>
-                     <div class="col-md-3">
-                        <label>Special Course</label>                       
-                     	
-						 <select  class="form-control" name="stspTeacher" id="stspTeacher" multiple></select>   
-						    
-						
-                      </div>
-                    </div>
-                  </div>
-                  </div>
-                  
-                  <div class="col-md-12">
-                 <div class="card mt-3" style="background-color: #e6ffb3; padding: 20px; ">
-
-                    <div class="card-header">
-                      <b>7. HM Availability<span class="text-danger">*</span></b>
-                    </div>
-                    <div class="row mt-3">
-                      <div class="col-md-3">
-                        <label>HM Availability</label>
-                        <div class="radio-group">
-							<input type="radio" name="hmAvailability" value="1"> Yes
-							<input type="radio" name="hmAvailability" value="0"> No							
-						</div>
-                      </div>
-                                          
-                    </div>
-                  </div>
-                  </div>
-
-                <!-- Other Details -->
-                <div class="col-md-12">
-                  <div class="card" style="padding: 20px; background-color: #f8f9fa; margin-top: 10px;">
-                    <div class="card-header">
-                      <b>8. Other Details <span class="text-danger">*</span></b>
-                    </div>
-                    <div class="row mt-3">
-                    <!--   <div class="col-md-3">
-                        <label>No of KG Teachers</label>
-                        <input type="number" class="form-control" name="kgTeacher" id="kgTeacher" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>No of PT Teachers</label>
-                        <input type="number" class="form-control" name="petTeacher" id="petTeacher" placeholder="Enter Value" required />
-                      </div>--> 
-                      <div class="col-md-3">
-                        <label>Total No of OA</label>
-                        <input type="number" class="form-control" name="totOa" id="totOa" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3">
-                        <label>KG Ayah</label>
-                        <input type="number" class="form-control" name="kgAyah" id="kgAyah" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3 mt-3">
-                        <label>Computer Assistance</label>
-                        <input type="number" class="form-control" name="compAss" id="compAss" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3 mt-3">
-                        <label>Watchman</label>
-                        <!-- <input type="number" class="form-control" name="watchmen" id="watchmen" placeholder="Enter Value" required /> -->
-                     	<select class="form-control" name="watchmen" id="watchmen" required>
-						    <option value="" disabled selected>Select Value</option>
-						    <option value="Not Available">Not Available</option>
-						    <option value="Not Applicable">Not Applicable</option>
-						    <option value="1">1</option>
-						    <option value="2">2</option>
-						    <option value="3">3</option>
-						    <option value="4">4</option>
-						    <option value="5">5</option>
-						 </select>
-                      </div>
-                      <div class="col-md-3 mt-3">
-                        <label>Scavengers</label>
-                        <input type="number" class="form-control" name="scavengers" id="scavengers" placeholder="Enter Value" required />
-                      </div>
-                      <div class="col-md-3 mt-3">
-                        <label>Sweeper</label>
-                        <input type="number" class="form-control" name="maintenanceWork" id="maintenanceWork" placeholder="Enter Value" required />
-                      </div>
-                    </div>
-                    <div class="card-footer text-center mt-3">
-                      <button type="submit" class="btn btn-primary" id="requestSubmitBtn">
-                        <i class="ik ik-save"></i> Submit
-                      </button>
-                      <button type="reset" class="btn btn-secondary ml-2" id="resetButton">
-                        <i class="ik ik-refresh-cw"></i> Reset
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <!-- End of Staff Form -->
-
-            <!-- Page Loader -->
-            <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-              <div style="position: relative; top: 50%; transform: translateY(-50%);">
-                <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                  <span class="sr-only">Loading...</span>
-                </div>
-                <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-              </div>
-            </div>
-          </div>
-	
-	</div>
-      </div>
-    </div>
-    
-
-
-    <!-- Staff Update Modal -->
-    <div class="modal fade" id="staffUpdateModal" tabindex="-1">
-  <div class="modal-dialog modal-xl">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Update Staff Strength</h5>
-        <button type="button" class="close" data-bs-dismiss="modal"
-						aria-label="Close"><span aria-hidden="true">&times;</span></button>
-      </div>
-      <div class="modal-body">
-        <div class="row g-3">
-          <!-- SG Section -->
-          <div class="col-md-3"><label>SG - Regular Teachers <span class="text-danger">*</span></label><input type="number" id="modal_sgRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>SG - Smc Teachers <span class="text-danger">*</span></label><input type="number" id="modal_sgTempTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>SG - Part-time Teachers <span class="text-danger">*</span></label><input type="number" id="modal_sgPtTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>SG - NGO Teachers <span class="text-danger">*</span></label><input type="number" id="modal_sgNgoTeacher" class="form-control" /></div>
-
-          <!-- BT Section -->
-          <div class="col-md-3"><label>BT - Regular Teachers <span class="text-danger">*</span></label><input type="number" id="modal_btRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>BT - Smc Teachers <span class="text-danger">*</span></label><input type="number" id="modal_btTempTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>BT - Part-time Teachers <span class="text-danger">*</span></label><input type="number" id="modal_btPtTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>BT - NGO Teachers <span class="text-danger">*</span></label><input type="number" id="modal_btNgoTeacher" class="form-control" /></div>
-
-          <!-- PG Section -->
-          <div class="col-md-3"><label>PG - Regular Teachers <span class="text-danger">*</span></label><input type="number" id="modal_pgRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PG - Smc Teachers <span class="text-danger">*</span></label><input type="number" id="modal_pgTempTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PG - Part-time Teachers <span class="text-danger">*</span></label><input type="number" id="modal_pgPtTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PG - NGO Teachers <span class="text-danger">*</span></label><input type="number" id="modal_pgNgoTeacher" class="form-control" /></div>
-  <!-- PET Section -->
-
- 		  <div class="col-md-3"><label>PET - Regular Teachers <span class="text-danger">*</span></label><input type="number" id="modal_petRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PET - Smc Teachers <span class="text-danger">*</span></label><input type="number" id="modal_petTempTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PET - Grade 1 Teachers <span class="text-danger">*</span></label><input type="number" id="modal_petg1Teacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PET - Grade 2 Teachers <span class="text-danger">*</span></label><input type="number" id="modal_petg2Teacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PET - Part-time Teachers <span class="text-danger">*</span></label><input type="number" id="modal_petptTeacher" class="form-control" /></div>
-          
-       <!-- kg Section -->   
-          <div class="col-md-3"><label>KG - Regular Teachers <span class="text-danger">*</span></label><input type="number" id="modal_kgRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>KG - Smc Teachers <span class="text-danger">*</span></label><input type="number" id="modal_kgTempTeacher" class="form-control" /></div>
-        
- 
-          <div class="col-md-3"><label>Special -Regular Teachers<span class="text-danger">*</span></label><input type="number" id="modal_stRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>Special -Part-time Teachers<span class="text-danger">*</span></label><input type="number" id="modal_stPtTeacher" class="form-control" /></div>
-          <div class="col-md-6">
-			<label>Special Course</label><select id="modal_special_course" class="form-control" multiple="multiple"></select>
-		  </div>
-			
-          <div class="col-md-3">
-			  <label>HM Availability <span class="text-danger">*</span></label>
-			  <div class="radio-group">
-			    <div class="form-check form-check-inline">
-			      <input class="form-check-input" type="radio" name="is_hmAvailability" id="hmYes" value="1">
-			      <label class="form-check-label" for="hmYes">Yes</label>
-			    </div>
-			    <div class="form-check form-check-inline">
-			      <input class="form-check-input" type="radio" name="is_hmAvailability" id="hmNo" value="0">
-			      <label class="form-check-label" for="hmNo">No</label>
-			    </div>
-			  </div>
-			</div>
-			
-			
-        
-          <!-- Other Section -->
-      
-          <div class="col-md-3"><label>Total OA <span class="text-danger">*</span></label><input type="number"  id="modal_totOa" class="form-control" /></div>
-          <div class="col-md-3"><label>KG Ayah <span class="text-danger">*</span></label><input type="number"  id="modal_kgAyah" class="form-control" /></div>
-          <div class="col-md-3"><label>Computer Assistance <span class="text-danger">*</span></label><input type="number" id="modal_compAss" class="form-control" /></div>
-          <div class="col-md-3"><label>Watchmen <span class="text-danger">*</span></label><!-- <input type="number" id="modal_watchmen" class="form-control" /> -->
-          <select class="form-control" name="modal_watchmen" id="modal_watchmen" required>
-						    <option value="" disabled selected>Select Value</option>
-						    <option value="Not Available">Not Available</option>
-						    <option value="Not Applicable">Not Applicable</option>
-						    <option value="1">1</option>
-						    <option value="2">2</option>
-						    <option value="3">3</option>
-						    <option value="4">4</option>
-						    <option value="5">5</option>
-						 </select>
-          </div>
-          
-          <div class="col-md-3"><label>Scavengers <span class="text-danger">*</span></label><input type="number" id="modal_scavengers" class="form-control" /></div>
-          <div class="col-md-3"><label>Sweeper <span class="text-danger">*</span></label><input type="number" id="modal_maintenanceWork" class="form-control" /></div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button class="btn btn-primary" id="saveStaffModalUpdate">Save Changes</button>
-      
-      </div>
-    </div>
-  </div>
-</div>
-<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-
-    <!-- Scripts -->
-    <script>
-    
-    $(document).ready(function () {
-    	  function toggleSpecialCourseAccess() {
-    	    const stRegTeacherVal = parseInt($('#stRegTeacher').val()) || 0;
-    	    const stPtTeacherVal = parseInt($('#stPtTeacher').val()) || 0;
-
-    	    // Enable if either value is greater than 1
-    	    if (stRegTeacherVal > 0 || stPtTeacherVal > 0) {
-    	      $('#stspTeacher').prop('disabled', false);
-    	    } else {
-    	      $('#stspTeacher').prop('disabled', true);
-    	    }
-    	    
-    	    if (stRegTeacherVal === 0 && stPtTeacherVal === 0) {
-    	    	$('#stspTeacher').val(null).trigger('change');
-      	    }
-    	  }
-
-    	  // Run on page load
-    	  toggleSpecialCourseAccess();
-
-    	  // Listen for input changes
-    	  $('#stRegTeacher, #stPtTeacher').on('input', toggleSpecialCourseAccess);
-    	  
-    	  
-    	  function toggleSpecialCourseAccess2() {
-      	    const stRegTeacherVal2 = parseInt($('#modal_stRegTeacher').val()) || 0;
-      	    const stPtTeacherVal2 = parseInt($('#modal_stPtTeacher').val()) || 0;
-
-      	    // Enable if either value is greater than 1
-      	    if (stRegTeacherVal2 > 0 || stPtTeacherVal2 > 0) {
-      	      $('#modal_special_course').prop('disabled', false);
-      	    } else {
-      	      $('#modal_special_course').prop('disabled', true);
-      	    }
-      	    
-      	  if (stRegTeacherVal2 === 0 || stPtTeacherVal2 === 0) {
-      			$('#modal_special_course').val(null).trigger('change');
-      	    }
-      	    
-      	  }
-
-      	  // Run on page load
-      	  toggleSpecialCourseAccess2();
-
-      	  // Listen for input changes
-      	  $('#modal_stRegTeacher, #modal_stPtTeacher').on('input', toggleSpecialCourseAccess2);
-    	  
-    	  
-    	  
-    	});
-
-    
-    
-      $(document).ready(function () {
-        const urlParams = new URLSearchParams(window.location.search);
-        const schoolId = urlParams.get("schoolId");
-
-        // Allow only whole positive numbers in number fields
-        document.querySelectorAll('input[type="number"]').forEach(function (input) {
-          input.addEventListener("input", function () {
-            this.value = this.value.replace(/[^0-9]/g, "");
-            if (parseInt(this.value) < 0) {
-              this.value = "";
-            }
-          });
-        });
-        
-        
-        /* let spDropdown =document.getElementById('stspTeacher');
-
-        
-        fetch('/gcc/api/gccschool/dropdown/getSpecialCategory') 
-	    .then(response => response.json())
-	    .then(data => {
-	        // Clear existing options
-	        spDropdown.innerHTML = `<option value="">Choose...</option>`;
-	
-	        // Add options from the API response
-	        data.data.forEach(item => {
-	        	spDropdown.innerHTML += `<option value="${item.special_category}">${item.special_category}</option>`;
-	        });
-	    })
-	    .catch(error => {
-	        console.error('Error fetching in Special Category Dropdown:', error);
-	    }); */
-        
-        $.get('/gcc/api/gccschool/dropdown/getSpecialCategory', function (response) {
-		    const $equip = $('#stspTeacher').empty();
-		    //$equip.append('<option value="">Select Special Courses </option>');
-		    response.data.forEach(item => {
-		        $equip.append(`<option value="${item.special_category_id}">${item.special_category}</option>`);
-		    });
-
-		    $equip.select2({
-		        //placeholder: "Select Special Courses",
-		        width: '100%',
-		        multiple: true,
-		        minimumResultsForSearch: Infinity, // disables search typing
-		        closeOnSelect: false
-		    });
-
-		    // Optional: disable typing in the input
-		    $equip.on('select2:opening', function() {
-		        setTimeout(() => {
-		            $('.select2-search__field').prop('readonly', true);
-		        }, 0);
-		    });
-		});
-
-        // Fetch staff data against schoolId
-        $.ajax({
-          url: '/gcc/api/gccschool/buildingasset/getStaffStrengthBySchoolId',
-          type: 'GET',
-          data: { schoolId },
-          success: function (response) {
-            console.log(response);
-            if (response.status === 'OK' && response.staffStrength.length > 0) {
-              const data = response.staffStrength[0];
-              
-              let specialCourses = '';
-
-              if (response.special_category && response.special_category.length > 0) {
-                specialCourses = response.special_category.map(item => item.sc_names).join(', ');
-              }
-              
-              // Build a read-only table with fetched staff data
-   const tableHtml = `
-	   <h6 class="text-left mb-3"><b>Staff Strength Details</b></h6>
-	   <hr>
-	   <!-- SG Teachers -->
-  <h6><b>1. SG Teachers <span class="text-danger">*</span></b></h6>
-  <table class="table">
-    <tbody>
-      <tr><td>No of Regular Teachers</td><td>${data.sg_reg_teacher || 0}</td></tr>
-      <tr><td>No of Smc Teachers</td><td>${data.sg_temp_teacher || 0}</td></tr>
-      <tr><td>No of Part-time Teachers</td><td>${data.sg_pt_teacher || 0}</td></tr>
-      <tr><td>No of NGO Teachers</td><td>${data.sg_ngo_teacher || 0}</td></tr>
-    </tbody>
-  </table>
-
-  <!-- BT Teachers -->
-  <h6><b>2. BT Teachers <span class="text-danger">*</span></b></h6>
-  <table class="table">
-    <tbody>
-      <tr><td>No of Regular Teachers</td><td>${data.bt_reg_teacher || 0}</td></tr>
-      <tr><td>No of Smc Teachers</td><td>${data.bt_temp_teacher || 0}</td></tr>
-      <tr><td>No of Part-time Teachers</td><td>${data.bt_pt_teacher || 0}</td></tr>
-      <tr><td>No of NGO Teachers</td><td>${data.bt_ngo_teacher || 0}</td></tr>
-    </tbody>
-  </table>
-
-  <!-- PG Teachers -->
-  <h6><b>3. PG Teachers <span class="text-danger">*</span></b></h6>
-  <table class="table">
-    <tbody>
-      <tr><td>No of Regular Teachers</td><td>${data.pg_reg_teacher || 0}</td></tr>
-      <tr><td>No of Smc Teachers</td><td>${data.pg_temp_teacher || 0}</td></tr>
-      <tr><td>No of Part-time Teachers</td><td>${data.pg_pt_teacher || 0}</td></tr>
-      <tr><td>No of NGO Teachers</td><td>${data.pg_ngo_teacher || 0}</td></tr>
-    </tbody>
-  </table>
-  
-  <!-- PG Teachers -->
-  <h6><b>4.  PET Teachers <span class="text-danger">*</span></b></h6>
-  <table class="table">
-    <tbody>
-      <tr><td>No of Regular Teachers</td><td>${data.pet_reg_teacher || 0}</td></tr>
-      <tr><td>No of Smc Teachers</td><td>${data.pet_temp_teacher || 0}</td></tr>
-      <tr><td>No of Grade 1 Teachers</td><td>${data.pet_grade1_teacher || 0}</td></tr>
-      <tr><td>No of Grade 2 Teachers</td><td>${data.pet_grade2_teacher || 0}</td></tr>
-      <tr><td>No of Part-time Teachers</td><td>${data.pet_pt_teacher || 0}</td></tr>
-    </tbody>
-  </table>
-  
-  
- 
-  
-  <h6><b>5. kG Teachers <span class="text-danger">*</span></b></h6>
-  <table class="table">
-    <tbody>
-      <tr><td>No of Regular Teachers</td><td>${data.kg_reg_teacher || 0}</td></tr>
-      <tr><td>No of Smc Teachers</td><td>${data.kg_temp_teacher || 0}</td></tr>
-   
-    </tbody>
-  </table>
-  
-  <h6><b>6.Special Teachers <span class="text-danger">*</span></b></h6>
-  <table class="table">
-    <tbody>
-      <tr><td>No of Regular Teachers</td><td>${data.st_reg_teacher }</td></tr>
-      <tr><td>No of Part-time Teachers</td><td>${data.st_pt_teacher }</td></tr>
-      <tr><td>Special course</td><td>${specialCourses}</td></tr> 
-    </tbody>
-  </table>
-  
-  <h6><b>7. HM Availability <span class="text-danger">*</span></b></h6>
-  <table class="table">
-    <tbody>
-    <tr><td>HM Availability</td><td>${data.is_hm === 1 ? 'Yes' : 'No'}</td></tr>
-    </tbody>
-  </table>
-
-  <!-- Other Details -->
-  <h6><b>8. Other Details <span class="text-danger">*</span></b></h6>
-  <table class="table">
-    <tbody>
-
-      <tr><td>Total OA</td><td>${data.tot_oa || 0}</td></tr>
-      <tr><td>KG Ayah</td><td>${data.kg_ayah || 0}</td></tr>
-      <tr><td>Computer Assistance</td><td>${data.comp_ass || 0}</td></tr>
-      <tr><td>Watchmen</td><td>${data.watchmen || 0}</td></tr>
-      <tr><td>Scavengers</td><td>${data.scavengers || 0}</td></tr>
-      <tr><td>Sweeper</td><td>${data.maintenance_work || 0}</td></tr>
-    </tbody>
-  </table>
-`;
-
-
-
-              // Populate read-only view and hide staff form
-              $('#staffReadOnlyView').html(tableHtml).show();
-              $('#staffFormContainer').hide();
-              $('#updateStaffContainer').show();
-
-              // Bind Update button click event to open the modal with prefilled values
-              $('#updateStaffBtn').click(() => {
-            	  $('#modal_sgRegTeacher').val(data.sg_reg_teacher);
-            	  $('#modal_sgTempTeacher').val(data.sg_temp_teacher);
-            	  $('#modal_sgPtTeacher').val(data.sg_pt_teacher);
-            	  $('#modal_sgNgoTeacher').val(data.sg_ngo_teacher);
-
-            	  $('#modal_btRegTeacher').val(data.bt_reg_teacher);
-            	  $('#modal_btTempTeacher').val(data.bt_temp_teacher);
-            	  $('#modal_btPtTeacher').val(data.bt_pt_teacher);
-            	  $('#modal_btNgoTeacher').val(data.bt_ngo_teacher);
-
-            	  $('#modal_pgRegTeacher').val(data.pg_reg_teacher);
-            	  $('#modal_pgTempTeacher').val(data.pg_temp_teacher);
-            	  $('#modal_pgPtTeacher').val(data.pg_pt_teacher);
-            	  $('#modal_pgNgoTeacher').val(data.pg_ngo_teacher);
-            	  
-            	  $('#modal_petRegTeacher').val(data.pet_reg_teacher);
-            	  $('#modal_petTempTeacher').val(data.pet_temp_teacher);
-            	  $('#modal_petg1Teacher').val(data.pet_grade1_teacher);
-            	  $('#modal_petg2Teacher').val(data.pet_grade2_teacher);
-            	  $('#modal_petptTeacher').val(data.pet_pt_teacher);
-            	  
-            	  $('#modal_kgRegTeacher').val(data.kg_reg_teacher);
-            	  $('#modal_kgTempTeacher').val(data.kg_temp_teacher);
-            	  
-            	  $('#modal_stRegTeacher').val(data.st_reg_teacher);
-            	  $('#modal_stPtTeacher').val(data.st_pt_teacher);
-            	  
-            	// Parse values separately
-            	  let reg = parseInt(data.st_reg_teacher) || 0;
-            	  let pt = parseInt(data.st_pt_teacher) || 0;
-
-            	  // Enable or disable based on either value > 0
-            	  if (reg > 0 || pt > 0) {
-            	      $('#modal_special_course').prop('disabled', false);
-            	  } else {
-            	      $('#modal_special_course').prop('disabled', true);
-            	  }
-            	  
-            	  const $specialCourseSelect = $('#modal_special_course');
-
-            	    // Step 1: Get selected special category IDs from API
-            	    const specialCategoryData = response.special_category || [];
-            	    const selectedCategoryIds = specialCategoryData.map(sc => sc.special_category_id.toString());
-
-            	    // Step 2: Fetch full dropdown list
-            	    $.get('/gcc/api/gccschool/dropdown/getSpecialCategory', function (response) {
-            	        $specialCourseSelect.empty();
-
-            	        // Populate options
-            	        response.data.forEach(item => {
-            	            $specialCourseSelect.append(
-            	                `<option value="${item.special_category_id}">${item.special_category}</option>`
-            	            );
-            	        });
-
-            	        // Initialize select2
-            	        $specialCourseSelect.select2({
-            	            //placeholder: "Select Special Courses",
-            	            width: '100%',
-            	            multiple: true,
-            	            closeOnSelect: false,
-            	            minimumResultsForSearch: Infinity
-            	        });
-
-            	        // Disable typing
-            	        $specialCourseSelect.on('select2:opening', function () {
-            	            setTimeout(() => {
-            	                $('.select2-search__field').prop('readonly', true);
-            	            }, 0);
-            	        });
-
-            	        // Step 3: Pre-select based on API response
-            	        setTimeout(() => {
-            	            $specialCourseSelect.val(selectedCategoryIds).trigger('change');
-            	        }, 100); // small delay to ensure select2 initializes
-            	    });
-            	  
-            	  
-            	  $('input[name="is_hmAvailability"][value="' + data.is_hm + '"]').prop('checked', true);
-            	  
-
-            	  $('#modal_totOa').val(data.tot_oa);
-            	  $('#modal_kgAyah').val(data.kg_ayah);
-            	  $('#modal_compAss').val(data.comp_ass);
-            	  //$('#modal_watchmen').val(data.watchmen);
-            	  $('#modal_watchmen').val(String(data.watchmen));
-            	  $('#modal_scavengers').val(data.scavengers);
-            	  $('#modal_maintenanceWork').val(data.maintenance_work);
-
-            	  $('#staffUpdateModal').modal('show');
-            	});
-
-            } else {
-              // No staff data found – show form for entry
-              $('#staffReadOnlyView').hide();
-              $('#staffFormContainer').show();
-              $('#updateStaffContainer').hide();
-            }
-          }
-        });
-
-        // Staff Form submission event
-        $("#staffStrengthForm").submit(function (event) {
-          event.preventDefault();
-          console.log("Submit button clicked for Staff");
-          console.log("SchoolId:", schoolId);
-
-          const requiredFields = {
-        		  sgRegTeacher: 'SG - Regular Teachers',
-        		  sgTempTeacher: 'SG - Smc Teachers',
-        		  sgPtTeacher: 'SG - Part-time Teachers',
-        		  sgNgoTeacher: 'SG - NGO Teachers',
-
-        		  btRegTeacher: 'BT - Regular Teachers',
-        		  btTempTeacher: 'BT - Smc Teachers',
-        		  btPtTeacher: 'BT - Part-time Teachers',
-        		  btNgoTeacher: 'BT - NGO Teachers',
-
-        		  pgRegTeacher: 'PG - Regular Teachers',
-        		  pgTempTeacher: 'PG - Smc Teachers',
-        		  pgPtTeacher: 'PG - Part-time Teachers',
-        		  pgNgoTeacher: 'PG - NGO Teachers',
-
-        		  petRegTeacher: 'PET - Regular Teachers',
-        		  petTempTeacher: 'PET - Smc Teachers',
-        		  petGrade1Teacher: 'PET - Grade 1 Teachers',
-        		  petGrade2Teacher: 'PET - Grade 2 Teachers',
-        		  petPtTeacher: 'PET - Part-time Teachers',
-
-        		  kgRegTeacher: 'KG - Regular Teachers',
-        		  kgTempTeacher: 'KG - Smc Teachers',
-        		  
-        		  stRegTeacher:'Special Teacher - Regular Teachers',
-        		  stPtTeacher:'Special Teacher - Part-time Teachers',        		 
-        		  
-        		  hmAvailability:'HM Availability',
-
-        		  totOa: 'Total OA',
-        		  kgAyah: 'KG Ayah',
-        		  compAss: 'Computer Assistance',
-        		  watchmen: 'Watchman',
-        		  scavengers: 'Scavengers',
-        		  maintenanceWork: 'Sweeper'
-        		};
-          
-          const payload = {};
-
-
-          for (let fieldId in requiredFields) {
-        	  let value;
-
-        	  // Handle radio button for 'hmAvailability'
-        	  if (fieldId === 'hmAvailability') {
-        	    value = $(`input[name="${fieldId}"]:checked`).val();
-        	  } else {
-        	    value = $(`#${fieldId}`).val();
-        	  }
-
-          	   
-        	  if (value === undefined || value === null || (typeof value === 'string' && value.trim() === "")) {
-              	    Swal.fire({
-              	      icon: 'warning',
-              	      title: 'Missing Input',
-              	      text: `Please enter a "${requiredFields[fieldId]}"`,
-              	      allowOutsideClick: false,
-              	      allowEscapeKey: false,
-              	      allowEnterKey: false,
-              	      showConfirmButton: true
-              	    });
-              	    return;
-              	  }
-        		  
-          	  
-
-        	  // Extra numeric validation for all except 'watchmen'
-        	  if (fieldId !== 'watchmen' && fieldId !== 'hmAvailability'  && (isNaN(Number(value)) || parseInt(value) < 0)) {
-        	    Swal.fire({
-        	      icon: 'warning',
-        	      title: 'Invalid Input',
-        	      text: `Please enter a valid number for "${requiredFields[fieldId]}"`,
-        	      allowOutsideClick: false,
-        	      allowEscapeKey: false,
-        	      allowEnterKey: false,
-        	      showConfirmButton: true
-        	    });
-        	    return;
-        	  }
-        	  
-        	  if (fieldId === 'hmAvailability') {
-        		  payload[fieldId] = value === "1" ? true : false;
-        		} else {
-        		  payload[fieldId] = value;
-        		}
-        	}
-          
-          const spCourseList = $('#stspTeacher').val();
-          
-          const stRegTeacherValue = parseInt($('#stRegTeacher').val());
-          const stPtTeacherValue = parseInt($('#stPtTeacher').val());
-          const totalSpecialTeachers =stRegTeacherValue + stPtTeacherValue;
-          
-           if ( totalSpecialTeachers >0 && spCourseList.length === 0) {
-				return Swal.fire({
-					title: 'Validation Error',
-					text: 'Select Special Teacher - Special Course.',
-					icon: 'warning',
-					allowOutsideClick: false,
-					allowEscapeKey: false,
-					allowEnterKey: false,
-					showConfirmButton: true
-				});
-			} 
-
-
-          // Show loader before submitting
-         $('#pageLoader').show();
-
-          
-             payload['specialCategoryId'] = spCourseList;
-    		payload['schoolId'] = schoolId;
-
-    		console.log("Payload to send:", payload);
-
-          // Submit via AJAX
-            $.ajax({
-            type: "POST",
-            url: "/gcc/api/gccschool/schoolproperty/saveStaffStrength",
-            data: JSON.stringify(payload),
-            contentType: "application/json",
-            processData: false,          
-            success: function (response) {
-            	  $("#pageLoader").hide();
-            	  //console.log("Data Submitted Successfully:", response);
-            	  Swal.fire({
-                      icon: response === "Staff Details Saved Sucessfully" ? "success" :
-                            response === "Error" ? "error" : "info",
-                      title: response === "Staff Details Saved Sucessfully" ? "Success!" :
-                             response === "Error" ? "Error!" : "Notice",
-                      text: response,                    
-                      allowOutsideClick: false,
-                      allowEscapeKey: false,
-                      allowEnterKey: false,
-                      showConfirmButton: true
-                  }).then(() => {                     
-                          location.reload();                 
-                  });
-            	},
-
-            	error: function (xhr, status, error) {
-                    $("#pageLoader").hide();
-                    console.error("Submission Error:", xhr.responseText);
-                    Swal.fire({
-                        icon: "error",
-                        title: "Error!",
-                        text: "Something went wrong. Please try again.",
-                        allowOutsideClick: false,
-                        allowEscapeKey: false,
-                        allowEnterKey: false,
-                        confirmButtonColor: "#d33"
-                    });
-                }
-          });  
-        });
-        function resetStaffFields() {
-        	  console.log("Reset button clicked");
-        	  $('#staffStrengthForm input[type="number"]').val('');
-        	  $('#staffStrengthForm select').prop('selectedIndex', 0);
-        	  $('#staffStrengthForm input[type="radio"]').prop('checked', false);
-        	}
-     
-        $(document).on('click', '#resetButton', function (event) {
-          event.preventDefault();
-          resetStaffFields();
-        });
-
-
-
-        // Reset Button click event
-      /*  $("#resetButton").click(function () {
-          Swal.fire({
-            title: "Are you sure?",
-            text: "This will reset all form fields!",
-            icon: "warning",
-            showCancelButton: true,
-            confirmButtonColor: "#3085d6",
-            cancelButtonColor: "#d33",
-            confirmButtonText: "Yes, reset!"
-          }).then((result) => {
-            if (result.isConfirmed) {
-              $("input[type='number']").val("");
-              Swal.fire("Reset!", "Form has been cleared.", "success");
-            }
-          });
-        });*/
-
-        // Handle Save from Staff Update Modal
-        $("#saveStaffModalUpdate").on('click', function () {
-			const modalRequiredFields = {
-			        			  modal_sgRegTeacher: 'SG - Regular Teachers',
-			        			  modal_sgTempTeacher: 'SG - Smc Teachers',
-			        			  modal_sgPtTeacher: 'SG - Part-time Teachers',
-			        			  modal_sgNgoTeacher: 'SG - NGO Teachers',
-
-			        			  modal_btRegTeacher: 'BT - Regular Teachers',
-			        			  modal_btTempTeacher: 'BT - Smc Teachers',
-			        			  modal_btPtTeacher: 'BT - Part-time Teachers',
-			        			  modal_btNgoTeacher: 'BT - NGO Teachers',
-
-			        			  modal_pgRegTeacher: 'PG - Regular Teachers',
-			        			  modal_pgTempTeacher: 'PG - Smc Teachers',
-			        			  modal_pgPtTeacher: 'PG - Part-time Teachers',
-			        			  modal_pgNgoTeacher: 'PG - NGO Teachers',
-
-			        			  modal_petRegTeacher: 'PET - Regular Teachers',
-			        			  modal_petTempTeacher: 'PET - Smc Teachers',
-			        			  modal_petg1Teacher: 'PET - Grade 1 Teachers',
-			        			  modal_petg2Teacher: 'PET - Grade 2 Teachers',
-			        			  modal_petptTeacher:'PET - Part-time  Teachers',
-
-			        			  modal_kgRegTeacher: 'KG - Regular Teachers',
-			        			  modal_kgTempTeacher: 'KG - Smc Teachers',
-			        			  
-			        			  modal_stRegTeacher:'Special - Regular Teachers',
-			        			  modal_stPtTeacher:'Special - Part-time Teachers',
-			        			  
-			        			  is_hmAvailability:'HM Availability',
-
-			        			  modal_totOa: 'Total OA',
-			        			  modal_kgAyah: 'KG Ayah',
-			        			  modal_compAss: 'Computer Assistance',
-			        			  modal_watchmen: 'Watchmen',
-			        			  modal_scavengers: 'Scavengers',
-			        			  modal_maintenanceWork: 'Sweeper'
-			        			};
-			
-							const payload={};
-			        	
-			        		  for (let fieldId in modalRequiredFields) {
-			        			  let value;
-
-			                	  // Handle radio button for 'hmAvailability'
-			                	  if (fieldId === 'is_hmAvailability') {
-			                	    value = $(`input[name="${fieldId}"]:checked`).val();
-			                	  } else {
-			                	    value = $(`#${fieldId}`).val();
-			                	  }
-
-			        			  
-			                	  if (value === undefined || value === null || (typeof value === 'string' && value.trim() === "")){
-			        				  Swal.fire({
-			        				      icon: 'warning',
-			        				      title: 'Missing Input',
-			        				      text: `Please enter a "${modalRequiredFields[fieldId]}"`,
-			        				      allowOutsideClick: false,
-			        				      allowEscapeKey: false,
-			        				      allowEnterKey: false,
-			        				      showConfirmButton: true
-			        				    });
-			        				    return;
-			        			  }
-
-			        			  //if (fieldId !== 'modal_watchmen' && (isNaN(Number(value)) || parseInt(value) < 0))
-			        			  if (fieldId !== 'modal_watchmen' && fieldId !== 'is_hmAvailability'  && (isNaN(Number(value)) || parseInt(value) < 0))
-			        			  {
-			        		      Swal.fire({
-			        		        icon: 'warning',
-			        		        title: 'Invalid Input',
-			        		        text: `Please enter a valid number for "${modalRequiredFields[fieldId]}"`,
-			        		        allowOutsideClick: false,
-			        		        allowEscapeKey: false,
-			        		        allowEnterKey: false,
-			        		        showConfirmButton: true
-			        		      });
-			        		      return false; // Prevent further execution if validation fails
-			        		    }
-			        			 
-			        			  if (fieldId === 'is_hmAvailability') {
-			                		  payload[fieldId] = value === "1" ? true : false;
-			                		} else {
-			                		  payload[fieldId] = value;
-			                		}
-			        			  
-			        		  }
-			        		  
-			        const editspCourseList = $('#modal_special_course').val();
-			        
-			        const modal_stRegTeacherValue = parseInt($('#modal_stRegTeacher').val());
-			          const modal_stPtTeacherValue = parseInt($('#modal_stPtTeacher').val());
-			          const modal_totalSpecialTeachers =modal_stRegTeacherValue + modal_stPtTeacherValue;
-			          
-			           if ( modal_totalSpecialTeachers > 0 && editspCourseList.length === 0) {
-			        	   
-			        	   Swal.fire({
-								title: 'Validation Error',
-								text: 'Select Special Teacher - Special Course.',
-								icon: 'warning',
-								allowOutsideClick: false,
-								allowEscapeKey: false,
-								allowEnterKey: false,
-								showConfirmButton: true
-							});
-			        	   return;
-			        	   
-			           }
-        	 
-        	 payload['specialCategoryId'] = editspCourseList;
-     		payload['schoolId'] = schoolId;
-     		
-     		console.log("Payload to sendEdit:", payload);
-
-
-          $('#pageLoader').show();
-          $.ajax({
-            url: '/gcc/api/gccschool/schoolproperty/updateStaffDetails',
-            type: 'POST',
-            data: JSON.stringify(payload),
-            contentType: "application/json",
-            processData: false,
-            success: function (response) {
-          	  $("#pageLoader").hide();
-          	  console.log("Data Submitted Successfully:", response);
-          	  Swal.fire({
-                    icon: response === "Staff Details Updated Sucessfully" ? "success" :
-                          response === "Error" ? "error" : "info",
-                    title: response === "Staff Details Updated Sucessfully" ? "Success!" :
-                           response === "Error" ? "Error!" : "Notice",
-                    text: response,                    
-                    allowOutsideClick: false,
-                    allowEscapeKey: false,
-                    allowEnterKey: false,
-                    showConfirmButton: true
-                }).then(() => {                     
-                        location.reload();                 
-                });
-          	},
-
-          	error: function (xhr, status, error) {
-                  $("#pageLoader").hide();
-                  console.error("Submission Error:", xhr.responseText);
-                  Swal.fire({
-                      icon: "error",
-                      title: "Error!",
-                      text: "Something went wrong. Please try again.",
-                      allowOutsideClick: false,
-                      allowEscapeKey: false,
-                      allowEnterKey: false,
-                      confirmButtonColor: "#d33"
-                  });
-              }
-          }); 
-          
-        });
-      });
-      
-      $(document).ready(function () {
-    	  
-    	});
-      
-    </script>
-    
-  </body>
-</html>
diff --git a/src/main/resources/templates/modules/school/studentdetails.html b/src/main/resources/templates/modules/school/studentdetails.html
deleted file mode 100644
index f1feceac..00000000
--- a/src/main/resources/templates/modules/school/studentdetails.html
+++ /dev/null
@@ -1,747 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	body {
-		background-color: #f8f9fa;
-		/*  font-family: Arial, sans-serif;*/
-	}
-
-
-
-	.header {
-		font-size: 22px;
-		font-weight: bold;
-		margin-bottom: 20px;
-	}
-
-	.table {
-		border: 1px solid #dee2e6;
-	}
-
-	.table th,
-	.table td {
-		border: 1px solid #dee2e6;
-		padding: 10px;
-	}
-
-	.section-title {
-		font-size: 18px;
-		font-weight: bold;
-		margin-top: 20px;
-		border-bottom: 2px solid #007bff;
-		padding-bottom: 5px;
-	}
-
-	.form-group {
-		margin-top: 15px;
-	}
-
-	.radio-group {
-		display: flex;
-		gap: 20px;
-		margin-top: 10px;
-	}
-
-	.info-table {
-		width: 100%;
-		border-collapse: collapse;
-		margin-top: 10px;
-	}
-
-	.info-table td,
-	.info-table th {
-		border: 1px solid #ddd;
-		padding: 10px;
-		vertical-align: middle;
-	}
-
-	.info-table td:first-child {
-		font-weight: bold;
-		width: 50%;
-	}
-
-	.info-table td:last-child {
-		color: #555;
-	}
-
-	.btn-gap {
-		margin-left: 1rem;
-		/* or any value you like */
-	}
-	.student-data-wrapper {
-  padding: 0px;
-  margin-top: -58px;
-  margin-left: -186px;
-  width: 120%;
-}
-
-@media (max-width: 768px) {
-  .student-data-wrapper {
-    margin-left: 0;
-    width: 100%;
-    padding: 0 15px; /* Optional horizontal spacing */
-  }
-}
-	
-</style>
-
-<body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="card">
-				<div class="main-content" style="background-color: white;">
-					<!--  <div class="container">
-
-						
-						<div>
-							 <div style="padding: 0px;margin-top:-58px;margin-left: -233px;width:120%;">
-	
-
-
-
-
-
-							
-								<div class="row" style="    padding: 15px;">
-									<div class="col-md-6 form-group">
-										<label>Total No of Students <span class="text-danger">*</span></label>
-										<input type="text" class="form-control" placeholder="Enter the value"
-											id="total_students" required />
-									</div>
-									
-
-								</div>
-								<div class="row" style="    padding: 15px;">
-
-									<div class="col-md-4 form-group">
-										<label>No of Boys <span class="text-danger">*</span></label>
-										<input type="text" class="form-control" placeholder="Enter the value"
-											id="total_boys" required />
-									</div>
-									<div class="col-md-4 form-group">
-										<label>No of Girls <span class="text-danger">*</span></label>
-										<input type="text" class="form-control" placeholder="Enter the value"
-											id="total_girls" required />
-									</div>
-									<div class="col-md-4 form-group">
-										<label>Others <span class="text-danger">*</span></label>
-										<input type="text" class="form-control" placeholder="Enter the value"
-											id="others" required />
-									</div>
-								</div>
-
-
-
-								<div class="card-footer text-center" >
-									<button type="submit" class="btn btn-primary" id="StudentSubmitBtn"><i
-											class="ik ik-save"></i>Submit
-									</button>
-									<button type="reset" class="btn btn-secondary mr-2" id="StudentresetButton"><i
-											class="ik ik-refresh-cw"></i>Reset
-									</button>
-
-								</div>
-							</div>-->
-						<div class="student-data-wrapper">
-
-						<div class="card-header d-flex justify-content-between align-items-center">
-							<b>Student Details</b>
-
-						</div>
-
-						<!-- Read-only View -->
-						<div id="studentReadOnlyView" style="display: none;">
-							<table class="info-table">
-								<tr>
-									<td>Total No of Students</td>
-									<td id="readonly_total_students">-</td>
-								</tr>
-								<tr>
-									<td>No of Boys</td>
-									<td id="readonly_total_boys">-</td>
-								</tr>
-								<tr>
-									<td>No of Girls</td>
-									<td id="readonly_total_girls">-</td>
-								</tr>
-								<tr>
-									<td>Transgender</td>
-									<td id="readonly_others">-</td>
-								</tr>
-								<tr>
-									<td>Special Child</td>
-									<td id="readonly_sp_child">-</td>
-								</tr>
-							</table>
-							<br>
-							<div class=" text-center">
-								<button type="button" class="btn btn-primary" id="processupdate"
-									style="display:none;">Update</button>
-
-							</div>
-						</div>
-
-						<!-- Editable Form -->
-						<div id="studentEntryForm" style="display: none;">
-							<div class="row p-3">
-								<div class="col-md-6 form-group">
-									<label>Total No of Student <span class="text-danger">*</span></label>
-									<input type="text" class="form-control" id="total_students" required />
-								</div>
-							</div>
-							<div class="row p-3">
-								<div class="col-md-3 form-group">
-									<label>No of Boys <span class="text-danger">*</span></label>
-									<input type="text" class="form-control" id="total_boys" required />
-								</div>
-								<div class="col-md-3 form-group">
-									<label>No of Girls <span class="text-danger">*</span></label>
-									<input type="text" class="form-control" id="total_girls" required />
-								</div>
-								<div class="col-md-3 form-group">
-									<label>Transgender <span class="text-danger">*</span></label>
-									<input type="text" class="form-control" id="others" required />
-								</div>
-								<div class="col-md-3 form-group">
-									<label>Special Child <span class="text-danger">*</span></label>
-									<input type="text" class="form-control" id="sp_child" required />
-								</div>
-							</div>
-							<div class="card-footer text-center">
-								<button type="submit" class="btn btn-primary" id="StudentSubmitBtn"><i
-										class="ik ik-save"></i> Submit</button>
-								<button type="reset" class="btn btn-secondary" id="StudentresetButton"><i
-										class="ik ik-refresh-cw"></i> Reset</button>
-							</div>
-						</div>
-
-						<!-- Modal for Update -->
-						<div class="modal fade" id="studentUpdateModal" tabindex="-1">
-							<div class="modal-dialog">
-								<div class="modal-content">
-									<div class="modal-header">
-										<h5 class="modal-title">Update Student Details</h5>
-										<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-											<span aria-hidden="true">&times;</span>
-										</button>
-									</div>
-									<div class="modal-body">
-										<div class="form-group"><label>Total Students *</label><input
-												id="modal_total_students" class="form-control"></div>
-										<div class="form-group"><label>No of Boys *</label><input id="modal_total_boys"
-												class="form-control"></div>
-										<div class="form-group"><label>No of Girls *</label><input
-												id="modal_total_girls" class="form-control"></div>
-										<div class="form-group"><label>Transgender *</label><input id="modal_others"
-												class="form-control"></div>
-										<div class="form-group"><label>Special Child *</label><input id="modal_sp_child"
-												class="form-control"></div>
-									</div>
-									<div class="modal-footer">
-										<button type="button" class="btn btn-primary" id="saveModalUpdate">Save
-											Changes</button>
-										<button type="button" class="btn btn-secondary"
-											data-bs-dismiss="modal">Close</button>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-
-
-					<div id="pageLoader"
-						style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-						<div style="position: relative; top: 50%; transform: translateY(-50%);">
-							<div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-								<span class="sr-only">Loading...</span>
-							</div>
-							<!-- Add the 'Please wait' text below the spinner -->
-							<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-						</div>
-					</div>
-
-				</div>
-
-			</div>
-		</div>
-	</div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-	<script type="text/javascript">
-
-		$(document).ready(function () {
-			const urlParams = new URLSearchParams(window.location.search);
-			const schoolId = urlParams.get("schoolId");
-
-
-
-
-
-			document.getElementById('total_students').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-
-			document.getElementById('total_boys').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-
-			document.getElementById('total_girls').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-
-			document.getElementById('others').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-			
-			document.getElementById('sp_child').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-			document.getElementById('modal_total_students').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-
-			document.getElementById('modal_total_boys').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-
-			document.getElementById('modal_total_girls').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-
-			document.getElementById('modal_others').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-			
-			document.getElementById('modal_sp_child').addEventListener('input', function () {
-				this.value = this.value.replace(/[^0-9]/g, '');
-				if (parseInt(this.value) < 0) {
-					this.value = '';
-				}
-			});
-
-			/* $.ajax({
-						url: '/gcc/api/gccschool/buildingasset/getStudentStrengthBySchoolId',
-						type: 'GET',
-						data: {schoolId},
-						success: function (response) {
-							console.log(response);
-						 if (response.status === 'OK') {
-								if(response.studentStrength.length > 0){
-										  const data = response.studentStrength[0]; // Get the first object from the array
-			
-										  // Show the update button (assuming it's an ID, use #)
-										  $('#processupdate').show();
-									//$('.card-footer').hide();
-									 $('#StudentSubmitBtn').hide();
-									 $('#StudentresetButton').hide();
-									   $('#refreshButton').show();
-										  
-										  // Populate values into the respective HTML elements
-										  $('#total_students').val(data.total_students || 0);
-										  $('#total_boys').val(data.total_boys || 0);
-										  $('#total_girls').val(data.total_girls || 0);
-										  $('#others').val(data.others || 0);
-									}else
-									{
-										// Optional: handle the case where studentStrength is empty
-										$('#total_students').text('');
-										$('#total_boys').text('');
-										$('#total_girls').text('');
-										$('#others').text('');
-										$('#processupdate').hide(); // hide update button if no data
-								    
-								}
-						}
-						   else if(response.status==='NEW'){
-					   
-							   $('#processupdate').hide();
-							 $('#refreshButton').hide();
-							 $('.card-footer').show();
-				   }
-						}
-			 });*/
-			$.ajax({
-				url: '/gcc/api/gccschool/buildingasset/getStudentStrengthBySchoolId',
-				type: 'GET',
-				data: {schoolId},
-				success: function (response) {
-					if (response.status === 'OK' && response.studentStrength.length > 0) {
-						const data = response.studentStrength[0];
-						$('#readonly_total_students').text(data.total_students || 0);
-						$('#readonly_total_boys').text(data.total_boys || 0);
-						$('#readonly_total_girls').text(data.total_girls || 0);
-						$('#readonly_others').text(data.others || 0);
-						$('#readonly_sp_child').text(data.special_child);
-
-						$('#studentReadOnlyView').show();
-						$('#studentEntryForm').hide();
-						$('#processupdate').show();
-						$('#refreshButton').show();
-					} else {
-						$('#studentReadOnlyView').hide();
-						$('#studentEntryForm').show();
-						$('.card-footer').show();
-						$('#processupdate').hide();
-						$('#refreshButton').hide();
-					}
-				}
-			});
-
-			$('#processupdate').on('click', function () {
-				$('#modal_total_students').val($('#readonly_total_students').text());
-				$('#modal_total_boys').val($('#readonly_total_boys').text());
-				$('#modal_total_girls').val($('#readonly_total_girls').text());
-				$('#modal_others').val($('#readonly_others').text());
-				$('#modal_sp_child').val($('#readonly_sp_child').text());
-				$('#studentUpdateModal').modal('show');
-			});
-
-			$('#saveModalUpdate').on('click', function () {
-				let requestData = {
-					total_students: parseInt($('#modal_total_students').val()) || 0,
-					total_boys: parseInt($('#modal_total_boys').val()) || 0,
-					total_girls: parseInt($('#modal_total_girls').val()) || 0,
-					others: parseInt($('#modal_others').val()) || 0,
-					special_child: parseInt($('#modal_sp_child').val()) || 0,
-					school_id: schoolId
-				};
-				if (!$('#modal_total_students').val().trim()) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Please enter Total No of Students.',
-						allowOutsideClick: false,
-						allowEscapeKey: false,
-						allowEnterKey: false,
-						showConfirmButton: true
-					});
-					return;
-				}
-
-				if (!$('#modal_total_boys').val().trim()) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Please enter No of Boys.',
-						allowOutsideClick: false,
-						allowEscapeKey: false,
-						allowEnterKey: false,
-						showConfirmButton: true
-					});
-					return;
-				}
-
-				if (!$('#modal_total_girls').val().trim()) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Please enter No of Girls.',
-						allowOutsideClick: false,
-						allowEscapeKey: false,
-						allowEnterKey: false,
-						showConfirmButton: true
-					});
-					return;
-				}
-
-				if (!$('#modal_others').val().trim()) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Please enter No of Transgender.',
-						allowOutsideClick: false,
-						allowEscapeKey: false,
-						allowEnterKey: false,
-						showConfirmButton: true
-					});
-					return;
-				}
-				
-				if (!$('#modal_sp_child').val().trim()) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Please enter  No of Special Child.',
-						allowOutsideClick: false,
-						allowEscapeKey: false,
-						allowEnterKey: false,
-						showConfirmButton: true
-					});
-					return;
-				}
-
-				if (requestData.total_students !== (requestData.total_boys + requestData.total_girls + requestData.others + requestData.special_child)) {
-					Swal.fire('Validation Error', 'Total should equal Boys + Girls + Transgender + Special Child.', 'warning');
-					return;
-				}
-
-				$('#pageLoader').show();
-				$.ajax({
-					url: '/gcc/api/gccschool/schoolproperty/updateStudentDetails',
-					type: 'POST',
-					contentType: 'application/x-www-form-urlencoded', // important
-					data: $.param(requestData), // flatten the object correctly
-					success: function (res) {
-						console.log("res:" + res);
-						$('#pageLoader').hide();
-						$('#studentUpdateModal').modal('hide');
-						// Swal.fire('Updated!', res, 'success').then(() => location.reload());
-						Swal.fire({
-							title: 'Updated!',
-							text: 'Student strength details updated successfully!',
-							icon: 'success',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						}).then(() => location.reload());
-
-					},
-					error: function (err) {
-						$('#pageLoader').hide();
-						Swal.fire({
-							title: 'Error',
-							text: err.responseText,
-							icon: 'error',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-
-						// Swal.fire('Error', err.responseText, 'error');
-					}
-				});
-			});
-
-
-
-
-
-			$(document).on('click', '#StudentSubmitBtn', function () {
-
-				//parseInt($('#tot_staff').val()) || 0;
-				let total_students = parseInt($('#total_students').val()) || 0;
-				let total_boys = parseInt($('#total_boys').val()) || 0;
-				let total_girls = parseInt($('#total_girls').val()) || 0;
-				let others = parseInt($('#others').val()) || 0;
-				let sp_child = parseInt($('#sp_child').val()) || 0;
-				//let school_id = 1;
-
-				console.log("total_students=", total_students);
-				console.log("total_boys=", total_boys);
-				console.log("total_girls=", total_girls);
-				console.log("others=", others);
-				console.log("school_id=", schoolId);
-				console.log("sp_child=",sp_child );
-				if (!$('#total_students').val().trim()) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Please enter Total No of Students.',
-						allowOutsideClick: false,
-						allowEscapeKey: false,
-						allowEnterKey: false,
-						showConfirmButton: true
-					});
-					return;
-				}
-
-				if (!$('#total_boys').val().trim()) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Please enter No of Boys.',
-						allowOutsideClick: false,
-						allowEscapeKey: false,
-						allowEnterKey: false,
-						showConfirmButton: true
-					});
-					return;
-				}
-
-				if (!$('#total_girls').val().trim()) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Please enter No of Girls.',
-						allowOutsideClick: false,
-						allowEscapeKey: false,
-						allowEnterKey: false,
-						showConfirmButton: true
-					});
-					return;
-				}
-
-				if (!$('#others').val().trim()) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Please enter No of Transgender.',
-						allowOutsideClick: false,
-						allowEscapeKey: false,
-						allowEnterKey: false,
-						showConfirmButton: true
-					});
-					return;
-				}
-				
-				
-				
-				if (!$('#sp_child').val().trim()) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Please enter No of Special Child.',
-						allowOutsideClick: false,
-						allowEscapeKey: false,
-						allowEnterKey: false,
-						showConfirmButton: true
-					});
-					return;
-				}
-
-
-				// Validate inputs
-				let fields = {
-					"Total No of Students": total_students,
-					"No of Boys": total_boys,
-					"No of Girls": total_girls,
-					"Others": others,
-					"Special Child":sp_child
-				};
-
-
-				/*for (let key in fields) {
-					if (!fields[key] || isNaN(fields[key])) {
-						Swal.fire({
-							icon: 'info',
-							title: 'Validation Error',
-							text: `Please enter ${key}` + " , IF No means Enter 0",
-							confirmButtonText: 'OK'
-						});
-						return; // Stop execution if validation fails
-					}
-				}*/
-
-				if (total_students !== (total_boys + total_girls + others + sp_child)) {
-					Swal.fire({
-						icon: 'warning',
-						title: 'Validation Error',
-						text: 'Total Students must be equal to the sum of No of Boys, No of Girls,Transgender and Special Child.',
-						allowOutsideClick: false, // Disable clicking outside the modal to close it
-						allowEscapeKey: false, // Disable escape key to close the modal
-						allowEnterKey: false, // Disable enter key to close the modal	                   
-						showConfirmButton: true
-					});
-					return;
-				}
-
-
-				// Prepare Data for AJAX
-				let requestData = {
-					total_students: total_students,
-					total_boys: total_boys,
-					total_girls: total_girls,
-					school_id: schoolId,
-					others: others,
-					special_child:sp_child
-				};
-
-				$('#StudentSubmitBtn').prop('disabled', true).text('Processing...');
-				$('#pageLoader').show();
-				 $.ajax({
-					url: '/gcc/api/gccschool/schoolproperty/saveStudentStrength',
-					type: 'POST',
-					contentType: 'application/x-www-form-urlencoded',
-					data: $.param(requestData),					
-					success: function (response) {
-					    $('#pageLoader').hide();
-					    $('#StudentSubmitBtn').prop('disabled', false).text('Submit');
-					    Swal.fire({
-					        icon: response.includes("already") ? 'info' : 'success',
-					        title: response.includes("already") ? 'Information' : 'Success',
-					        text: response,
-					        allowOutsideClick: false,
-					        allowEscapeKey: false,
-					        allowEnterKey: false,
-					        confirmButtonText: 'OK'
-					    }).then((result) => {
-					       
-					        	$('#StudentSubmitBtn').prop('disabled', false).text('Submit');
-					            location.reload();
-					        
-					    });
-					},
-
-					error: function (xhr, status, error) {
-						$('#pageLoader').hide();
-						$('#StudentSubmitBtn').prop('disabled', false).text('Submit');
-						let errorMessage = xhr.responseText;
-
-						Swal.fire({
-							icon: 'error',
-							title: 'Error',
-							text: errorMessage,
-							confirmButtonText: 'OK'
-						});
-						console.error('Error:', xhr.responseText);
-					}
-				}); 
-
-
-
-			});
-
-			function resetStudentFields() {
-				console.log("Reset button clicked");
-				$('#total_students, #total_boys, #total_girls, #others').val('');
-			}
-
-			// Event Listener for Reset Button
-			$(document).on('click', '#StudentresetButton', function (event) {
-				event.preventDefault();
-				resetStudentFields();
-			});
-			$('#refreshButton').on('click', function (e) {
-				e.preventDefault(); // prevent default reset behavior, optional
-				location.reload();
-			});
-		});
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/studentregister.html b/src/main/resources/templates/modules/school/studentregister.html
deleted file mode 100644
index 987ae0a7..00000000
--- a/src/main/resources/templates/modules/school/studentregister.html
+++ /dev/null
@@ -1,3704 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr" xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	body {
-		background-color: #f8f9fa;
-		/*  font-family: Arial, sans-serif;*/
-	}
-
-#AddStudentModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#StudentListModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#EditStudentListModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-#SpecificStudentModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-	
-}
-
-#AadharFileModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-.border-bottom label{
-	font-weight: bold;
-}
-
-.border-bottom span{
-	padding-left: 10px;	
-} 
-.mb-3 span{
-	padding-left: 10px;	
-}
-/* .sno-column {
-    width: 10%; 
-  }
- .action-column{
- 	 width: 60%; 
-  } */
-  
-  #info_container label{
-  	font-weight: bold;
-  }
-</style>
-
-<body>
-	<div class="card">
-		<div class="card-header">
-			<b>Student Registration for Class</b><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
-		</div>
-		<div class="card-body">
-		
-		<div class="row mb-4 p-2" style="border: 2px solid gray;border-radius: 10px;" id="info_container">
-			<div class="col-4">
-				<label for="tot_stu_count">Total Student count:</label>
-				<input type="text" class="form-control" id="tot_stu_count" readonly="readonly">
-			</div>
-			<div class="col-4">
-				<label for="aadhar_enroll_count">Aadhar Enrolled student count:</label>
-				<input type="text" class="form-control" id="aadhar_enroll_count" readonly="readonly">
-			</div>
-			<div class="col-4">
-				<label for="pending_enroll_count">Pending Enroll student count:</label>
-				<input type="text" class="form-control" id="pending_enroll_count" readonly="readonly">
-			</div>
-		</div>
-
-			<table id="StudentEntrytable"
-				class="table table-striped table-bordered table-hover dataTable"
-				role="grid" style="width: 100%">
-				<thead class="thead-dark">
-					<tr>
-						<th class="text-center">S.NO</th>
-						<th class="text-center">Standard</th>
-						<th class="text-center">Students Enrolled</th>
-						<th class="text-center">Action</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-
-					</tr>
-
-				</tbody>
-			</table>
-
-		</div>
-		<div class="card-footer text-center">
-			<button  class="btn btn-secondary" id="studentBackBtn">Back</button>
-		</div>
-		
-	</div>
-	
-	
-	<!-- Add Student Modal -->
-		<div class="modal fade" id="AddStudentModal" tabindex="-1" aria-labelledby="AddStudentModalLabel" aria-hidden="true" >
-			<div class="modal-dialog modal-lg">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title" id="AddStudentModalTitle">Add Student</h5>
-							<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-								<span aria-hidden="true">&times;</span>
-							</button>
-					</div>
-					<div class="modal-body">
-						<div id="student_id" style="display: none;"></div>						
-				    <div id="raw_father_file" style="display: none;"></div>
-				     <div id="raw_mother_file" style="display: none;"></div>
-				      <div id="raw_guardian_file" style="display: none;"></div>
-				       <div id="raw_student_file" style="display: none;"></div>
-				       
-				       <div id="previous_father_aadhar" style="display: none;"></div>
-				       <div id="previous_mother_aadhar" style="display: none;"></div>
-				       <div id="previous_guardian_aadhar" style="display: none;"></div>
-				       <div id="previous_student_aadhar" style="display: none;"></div>
-				       				      
-						<form id="studentForm">
-			                <div class="form-row">
-			                    <div class="form-group col-md-6">
-			                        <label for="studentName">Student Name<span style="color: red;">*</span></label>
-			                        <input type="text" class="form-control" id="studentName" placeholder="Enter student name">
-			                    </div>
-			                    <div class="form-group col-md-6">
-			                        <label for="EmisNumber">Student EMIS Number<span style="color: red;">*</span></label>
-			                        <input type="number" class="form-control" id="EmisNumber" placeholder="Enter EMIS number">
-			                    </div>
-			                </div>
-			                
-			                 <div class="form-row">
-			                 
-			                 	<div class="form-group col-md-6">
-			                        <label for="standard">Standard</label>
-			                        <input type="text" class="form-control" id="standard" readonly="readonly">
-			                    </div>
-			                    
-			                    <div class="form-group col-md-6">
-			                        <label for="section">Section<span style="color: red;">*</span></label>
-			                        <!-- <input type="text" class="form-control" id="section"> -->
-			                        <select class="form-control" id="sectionDropdown">
-							            <option selected disabled>Choose...</option>						           
-							        </select>
-			                    </div>
-			                 
-			                 </div>
-			
-			                <div class="form-row">
-			                
-			                
-			                	<div class="form-group col-md-6">
-							        <label for="medium">Medium<span style="color: red;">*</span></label>
-							        <select class="form-control" id="medium">
-							            <option selected disabled>Choose...</option>						           
-							        </select>
-							    </div>
-			                
-			                	 <div class="form-group col-md-6">
-							        <label for="gender">Gender<span style="color: red;">*</span></label>
-							        <select class="form-control" id="gender">
-							            <option selected disabled>Choose...</option>
-							            <option value="boy">Boy</option>
-							            <option value="girl">Girl</option>
-							            <option value="transgender">Transgender</option>
-							        </select>
-							    </div>
-			                   
-			                   
-			                    
-			                </div>
-			                
-			                <div class="form-row">
-			                
-			               		<div class="form-group col-md-6">
-			                        <label for="dob">Date of Birth<span style="color: red;">*</span></label>
-			                        <input type="date" class="form-control" id="dob" onclick="this.showPicker()">
-			                    </div>
-			                    <div class="form-group col-md-6">
-			                        <label for="age">Age</label>
-			                        <input type="number" class="form-control" id="age"  readonly="readonly">
-			                    </div>
-						    
-						    </div>
-						    
-						    
-						    
-						    <div class="form-row">
-			                
-			                	 <div class="form-group col-md-6">
-							        <label for="parentType">Select Parent Type<span style="color: red;">*</span></label>
-							        <select class="form-control" id="parentType">
-							            <option value="" disabled>--Select--</option>
-							            <option value="Parent">Parent</option>
-							            <option value="SingleParent_Father">Single Parent/Father</option>
-							            <option value="SingleParent_Mother">Single Parent/Mother</option>
-							            <option value="Guardian">Guardian</option>
-							        </select>
-							    </div>			                   			                  
-			                    
-			                </div>
-			                
-			                <div id="singleParentFatherDiv" style="display: none;">
-			                	
-			                	
-			                	<div class="form-row">
-			                    
-				                    <div class="form-group col-md-6">
-				                        <label for="sfatherName">Father Name<span style="color: red;">*</span></label>
-				                        <input type="text" class="form-control" id="sfatherName" placeholder="Enter father name">
-				                    </div>
-				                    <div class="form-group col-md-6">
-				                        <label for="sfatherMobile">Father Mobile Number<span style="color: red;">*</span></label>
-				                        <input type="number" class="form-control" id="sfatherMobile" placeholder="Enter father mobile">
-				                    </div>
-				                </div>
-			                    
-			                    <div class="form-row">
-			                    
-				                    <div class="form-group col-md-6">
-				                        <label for="sfatherAadhar">Father Aadhar Number<span style="color: red;">*</span></label>
-				                        <input type="number" class="form-control" id="sfatherAadhar" placeholder="Enter father Aadhar number">
-				                    </div>
-				                     <div class="form-group col-md-6">
-				                        <label for="sfatherAadharUpload">Father Aadhar Upload<span style="color: red;">*</span></label>
-				                        <input type="file" class="form-control-file" id="sfatherAadharUpload">
-				                        <div id="sFatherAadharPreview" class="mt-2" style="display: none;"></div>
-				                    </div>
-			               
-			                  </div>
-			                
-			                </div>
-			                
-			                <div id="singleParentMotherDiv" style="display: none;">
-			                	
-			                	
-			                	<div class="form-row">
-			                    				                    
-				                    <div class="form-group col-md-6">
-				                        <label for="smotherName">Mother Name<span style="color: red;">*</span></label>
-				                        <input type="text" class="form-control" id="smotherName" placeholder="Enter mother name">
-				                    </div>
-				                     <div class="form-group col-md-6">
-				                        <label for="smotherMobile">Mother Mobile Number<span style="color: red;">*</span></label>
-				                        <input type="number" class="form-control" id="smotherMobile" placeholder="Enter mother mobile">
-			                    	</div>
-			                	</div>
-			                	
-			                	<div class="form-row">
-			                    			                    
-				                    <div class="form-group col-md-6">
-				                        <label for="smotherAadhar">Mother Aadhar Number<span style="color: red;">*</span></label>
-				                        <input type="number" class="form-control" id="smotherAadhar" placeholder="Enter mother Aadhar number">
-				                    </div>
-				                    
-				                    <div class="form-group col-md-6">
-				                        <label for="smotherAadharUpload">Mother Aadhar Upload<span style="color: red;">*</span></label>
-				                        <input type="file" class="form-control-file" id="smotherAadharUpload">
-				                         <div id="sMotherAadharPreview" class="mt-2" style="display: none;"></div>
-				                    </div>
-			                    
-			                	</div>
-			                
-			                </div>
-						    
-						    <div id="guardianDiv" style="display: none;">
-			                
-			              
-			                
-			                <div class="form-row">
-			                    				                    
-				                    <div class="form-group col-md-6">
-				                        <label for="guardianName">Guardian Name<span style="color: red;">*</span></label>
-				                        <input type="text" class="form-control" id="guardianName" placeholder="Enter mother name">
-				                    </div>
-				                     <div class="form-group col-md-6">
-				                        <label for="guardianMobile">Guardian Mobile Number<span style="color: red;">*</span></label>
-				                        <input type="number" class="form-control" id="guardianMobile" placeholder="Enter mother mobile">
-			                    	</div>
-			                	</div>
-			                	
-			                	<div class="form-row">
-			                    			                    
-				                    <div class="form-group col-md-6">
-				                        <label for="guardianAadhar">Guardian Aadhar Number<span style="color: red;">*</span></label>
-				                        <input type="number" class="form-control" id="guardianAadhar" placeholder="Enter mother Aadhar number">
-				                    </div>
-				                    
-				                    <div class="form-group col-md-6">
-				                        <label for="guardianAadharUpload">Guardian Aadhar Upload<span style="color: red;">*</span></label>
-				                        <input type="file" class="form-control-file" id="guardianAadharUpload">
-				                        <div id="GuardianAadharPreview" class="mt-2" style="display: none;"></div>
-				                        				                        
-				                    </div>
-			                    
-			                	</div>
-			                	
-			                	<div class="form-row">
-			                    
-			                    <div class="form-group col-md-6">
-			                        <label for="gfatherName">Father Name</label>
-			                        <input type="text" class="form-control" id="gfatherName" placeholder="Enter father name">
-			                    </div>
-			                    <div class="form-group col-md-6">
-			                        <label for="gmotherName">Mother Name</label>
-			                        <input type="text" class="form-control" id="gmotherName" placeholder="Enter mother name">
-			                    </div>
-			                </div>
-			
-			                <div class="form-row">
-			                    <div class="form-group col-md-6">
-			                        <label for="gfatherMobile">Father Mobile Number</label>
-			                        <input type="number" class="form-control" id="gfatherMobile" placeholder="Enter father mobile">
-			                    </div>
-			                    <div class="form-group col-md-6">
-			                        <label for="gmotherMobile">Mother Mobile Number</label>
-			                        <input type="number" class="form-control" id="gmotherMobile" placeholder="Enter mother mobile">
-			                    </div>
-			                </div>
-			
-			                <div class="form-row">
-			                    
-			                    <div class="form-group col-md-6">
-			                        <label for="gfatherAadhar">Father Aadhar Number</label>
-			                        <input type="number" class="form-control" id="gfatherAadhar" placeholder="Enter father Aadhar number">
-			                    </div>
-			                    <div class="form-group col-md-6">
-			                        <label for="gmotherAadhar">Mother Aadhar Number</label>
-			                        <input type="number" class="form-control" id="gmotherAadhar" placeholder="Enter mother Aadhar number">
-			                    </div>
-			                </div>
-			
-			                <div class="form-row">
-			                    
-			                    <div class="form-group col-md-6">
-			                        <label for="gfatherAadharUpload">Father Aadhar Upload</label>
-			                        <input type="file" class="form-control-file" id="gfatherAadharUpload">
-			                        <div id="gFatherAadharPreview" class="mt-2" style="display: none;"></div>
-			                    </div>
-			                    <div class="form-group col-md-6">
-			                        <label for="gmotherAadharUpload">Mother Aadhar Upload</label>
-			                        <input type="file" class="form-control-file" id="gmotherAadharUpload">
-			                        <div id="gMotherAadharPreview" class="mt-2" style="display: none;"></div>
-			                    </div>
-			                </div>			                			           		                
-			                
-			                </div>
-						    
-							<div id="parentDiv" style="display: none;">
-							
-							<p style="color:orange;margin-bottom: 0px;">You can enter either Father’s / Mother’s or both their details (If available).</p>
-							
-			                <div class="form-row">
-			                    
-			                    <div class="form-group col-md-6">
-			                        <label for="fatherName">Father Name<span style="color: red;">*</span></label>
-			                        <input type="text" class="form-control" id="fatherName" placeholder="Enter father name">
-			                    </div>
-			                    <div class="form-group col-md-6">
-			                        <label for="motherName">Mother Name<span style="color: red;">*</span></label>
-			                        <input type="text" class="form-control" id="motherName" placeholder="Enter mother name">
-			                    </div>
-			                </div>
-			
-			                <div class="form-row">
-			                    <div class="form-group col-md-6">
-			                        <label for="fatherMobile">Father Mobile Number</label>
-			                        <input type="number" class="form-control" id="fatherMobile" placeholder="Enter father mobile">
-			                    </div>
-			                    <div class="form-group col-md-6">
-			                        <label for="motherMobile">Mother Mobile Number</label>
-			                        <input type="number" class="form-control" id="motherMobile" placeholder="Enter mother mobile">
-			                    </div>
-			                </div>
-			
-			                <div class="form-row">
-			                    
-			                    <div class="form-group col-md-6">
-			                        <label for="fatherAadhar">Father Aadhar Number</label>
-			                        <input type="number" class="form-control" id="fatherAadhar" placeholder="Enter father Aadhar number">
-			                    </div>
-			                    <div class="form-group col-md-6">
-			                        <label for="motherAadhar">Mother Aadhar Number</label>
-			                        <input type="number" class="form-control" id="motherAadhar" placeholder="Enter mother Aadhar number">
-			                    </div>
-			                </div>
-			
-			                <div class="form-row">
-			                    
-			                    <div class="form-group col-md-6">
-			                        <label for="fatherAadharUpload">Father Aadhar Upload</label>
-			                        <input type="file" class="form-control-file" id="fatherAadharUpload">
-			                         <div id="FatherAadharPreview" class="mt-2" style="display: none;"></div>
-			                    </div>
-			                    <div class="form-group col-md-6">
-			                        <label for="motherAadharUpload">Mother Aadhar Upload</label>
-			                        <input type="file" class="form-control-file" id="motherAadharUpload">
-			                         <div id="MotherAadharPreview" class="mt-2" style="display: none;"></div>
-			                    </div>
-			                </div>
-			                
-			                </div>
-			                
-			                <div class="form-row">
-			                
-		               		 	<div class="form-group col-md-6">
-			                        <label for="studentAadhar">Student Aadhar Number</label>
-			                        <input type="number" class="form-control" id="studentAadhar" placeholder="Enter father Aadhar number">
-			                    </div>
-			                     <div class="form-group col-md-6">
-			                        <label for="studentAadharUpload">Student Aadhar Upload</label>
-			                        <input type="file" class="form-control-file" id="studentAadharUpload">
-			                         <div id="studentAadharPreview" class="mt-2" style="display: none;"></div>
-			                    </div>
-						    
-						    </div>
-			
-			                <div class="form-row ">
-			                    <div class="col-12 d-flex justify-content-center mt-4 mb-4">
-			                    	<button type="button" class="btn btn-primary" id="saveStudentdDetails">Save</button>
-			                    	<button type="button" class="btn btn-primary" id="updateStudentdDetails" style="display: none;">Update</button>
-			                    </div>			           
-			                </div>
-			            </form>
-
-					</div>
-				</div>
-			</div>
-		</div>
-		
-		
-		<!-- View Students List -->
-		<div class="modal fade" id="StudentListModal" tabindex="-1" aria-labelledby="StudentListModalLabel" aria-hidden="true">
-	    <div class="modal-dialog modal-lg">
-	        <div class="modal-content">
-	            <div class="modal-header">
-	                <h5 class="modal-title" id="StudentListModalTitle">Student List</h5>
-	                
-	                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-								<span aria-hidden="true">&times;</span>
-							</button>
-	            </div>
-	            <div class="modal-body">
-	                
-	             <table id="StudentListDatatable"
-						class="table table-striped table-bordered table-hover dataTable"
-						role="grid" style="width: 100%">
-						<thead class="thead-dark">
-							<tr>
-								<th class="text-center">S.NO</th>
-								<th class="text-center">Name</th>
-								<th class="text-center">EMIS Number</th>
-								<th class="text-center no-sort">Action</th>
-							</tr>
-						</thead>
-						<tbody>
-
-		
-						</tbody>
-					</table>  
-	                
-	            </div>
-	        </div>
-	    </div>
-	</div>
-	
-	
-	<!-- Particular Student Details -->
-	<div class="modal fade" id="SpecificStudentModal" tabindex="-1" aria-labelledby="SpecificStudentModalLabel" aria-hidden="true">
-	    <div class="modal-dialog modal-xl">
-	        <div class="modal-content">
-	            <div class="modal-header">
-	                <h5 class="modal-title" id="SpecificStudentModalTitle">Student Details</h5>
-	                
-	                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-								<span aria-hidden="true">&times;</span>
-							</button>
-	            </div>
-	            <div class="modal-body">
-	                
-	              <div class="container-fluid">
-					    <!-- Student Info -->
-					    <div class="mb-3 border-bottom pb-2">
-					        <h5 class="text-primary">Student Information</h5>
-					        <div class="row">
-					            <div class="col-md-4"><label>Name:</label> <span id="viewstudentName"></span></div>
-					            <div class="col-md-4"><label>EMIS No:</label> <span id="viewEmisNumber"></span></div>
-					            <div class="col-md-4"><label>Gender:</label> <span id="viewgender"></span></div>
-					        </div>
-					        <div class="row mt-2">
-					            <div class="col-md-4"><label>Standard:</label> <span id="viewstandard"></span></div>
-					            <div class="col-md-4"><label>Date of Birth:</label> <span id="viewdob"></span></div>
-					            <div class="col-md-4"><label>Age:</label> <span id="viewage"></span></div>
-					        </div>
-					        <div class="row mt-2">					         			   				    				 
-				    			<div class="col-md-4"><label>Section:</label> <span id="viewsection"></span></div>
-				    			<div class="col-md-4"><label>Medium:</label> <span id="viewmedium"></span></div>
-					            <div class="col-md-4"><label>Student Aadhar Number:</label> <span id="viewstudentAadharNumber"></span></div>
-					        </div>
-					    </div>
-					
-					    <!-- Parent Info -->
-					    <div class="mb-3 border-bottom pb-2">
-					        <h5 class="text-primary">Parent/Guardian Information</h5>
-					         <div class="row">
-					            <div class="col-md-4"><label>Parent Type:</label> <span id="viewparentType"></span></div>					            
-					        </div>
-					        <div class="row">
-					            <div class="col-md-4"><label>Father Name:</label> <span id="viewfatherName"></span></div>
-					            <div class="col-md-4"><label>Mother Name:</label> <span id="viewmotherName"></span></div>
-					            <div class="col-md-4"><label>Guardian Name:</label> <span id="viewguardianName"></span></div>
-					        </div>
-					        <div class="row mt-2">
-					            <div class="col-md-4"><label>Father Mobile:</label> <span id="viewfatherMobile"></span></div>
-					            <div class="col-md-4"><label>Mother Mobile:</label> <span id="viewmotherMobile"></span></div>
-					            <div class="col-md-4"><label>Guardian Mobile:</label> <span id="viewguardianMobile"></span></div>
-					        </div>
-					        <div class="row mt-2">
-					            <div class="col-md-4"><label>Father Aadhar:</label> <span id="viewfatherAadhar"></span></div>
-					            <div class="col-md-4"><label>Mother Aadhar:</label> <span id="viewmotherAadhar"></span></div>
-					            <div class="col-md-4"><label>Guardian Aadhar:</label> <span id="viewguardianAadhar"></span></div>
-					        </div>
-					    </div>
-					
-					    <!-- Aadhar File Views -->
-					    <div class="mb-3">
-					        <h5 class="text-primary">Aadhar File Uploads</h5>
-					        <div class="row">
-					            <div class="col-md-4"><label>Father Aadhar File:</label> <span id="viewfatherAadharUpload"></span></div>
-					            <div class="col-md-4"><label>Mother Aadhar File:</label> <span id="viewmotherAadharUpload"></span></div>
-					            <div class="col-md-4"><label>Guardian Aadhar File:</label> <span id="viewguardianAadharUpload"></span></div>
-					        </div>
-					        <div class="row mt-2">
-					            <div class="col-md-4"><label>Student Aadhar File:</label> <span id="viewstudentAadharUpload"></span></div>
-					        </div>
-					    </div>
-					</div>
-	              
-	                
-	            </div>
-	        </div>
-	    </div>
-	</div>
-	
-	
-
- 			<div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
-				  <div class="modal-dialog modal-dialog-scrollable modal-xl">
-				    <div class="modal-content border-0">
-				     <div class="modal-header">
-				        <h5 class="modal-title">Aadhar Document</h5>
-				        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-				          <span aria-hidden="true">&times;</span>
-				        </button>
-				      </div>
-				      <div class="modal-body p-0 text-center" style="background-color: #f8f9fa;">
-				        <div id="docContainer" style="max-height: 90vh; overflow: auto;"></div>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-				
-				
-		<!-- View Students List -->
-		<!-- <div class="modal fade" id="EditStudentListModal" tabindex="-1" aria-labelledby="EditStudentListModalLabel" aria-hidden="true">
-	    <div class="modal-dialog modal-lg">
-	        <div class="modal-content">
-	            <div class="modal-header">
-	                <h5 class="modal-title" id="EditStudentListModalTitle">Student List</h5>
-	                
-	                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-								<span aria-hidden="true">&times;</span>
-							</button>
-	            </div>
-	            <div class="modal-body">
-	                
-	             <table id="EditStudentListDatatable"
-						class="table table-striped table-bordered table-hover dataTable"
-						role="grid" style="width: 100%">
-						<thead class="thead-dark">
-							<tr>
-								<th class="text-center">S.NO</th>
-								<th class="text-center">Name</th>								
-								<th class="text-center">EMIS Number</th>
-								<th class="text-center">Action</th>
-							</tr>
-						</thead>
-						<tbody>
-
-		
-						</tbody>
-					</table>  
-	                
-	            </div>
-	        </div>
-	    </div>
-	</div> -->
-	
-			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-	
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-	
-	<script>
-	
-let globalUdise = "";	
-const srurlParams = new URLSearchParams(window.location.search);
-const srschoolId = srurlParams.get("schoolId");
-let userId = document.getElementById('userIdSpan').textContent;
-console.log("userId="+userId);
-$(document).ready(function () {
-	
-	
-	$.ajax({
-		type: 'GET',
-		url: '/gcc/api/gccschool/schoolproperty/getSchoolDetails',
-		data: {schoolId: srschoolId},
-		success: function (data) {
-			//console.log(data);
-			if(data.udise){
-				globalUdise = data.udise;
-				loadSavedStandards(globalUdise);
-				
-				displayinfo(srschoolId,globalUdise);
-			}
-			else{
-				console.log("No UDISE Found");
-			}
-		},
-		error: function () {
-	        alert("Error calling in display standards API!");
-	    }
-	});
-	
-	
-	
-	
-		let mediumDropdown = document.getElementById('medium');	
-	
-		fetch('/gcc/api/gccschool/studentInfo/getMedium') 
-	    .then(response => response.json())
-	    .then(data => {
-	        // Clear existing options
-	        mediumDropdown.innerHTML = `<option value="">Choose...</option>`;
-	
-	        // Add options from the API response
-	        data.Data.forEach(medium => {
-	        	mediumDropdown.innerHTML += `<option value="${medium.medium_type}">${medium.medium_type}</option>`;
-	        });
-	    })
-	    .catch(error => {
-	        console.error('Error fetching in Medium Dropdown:', error);
-	    });
-		
-		
-		let sectionDropdown = document.getElementById('sectionDropdown');	
-		
-		fetch('/gcc/api/gccschool/studentInfo/getSections') 
-	    .then(response => response.json())
-	    .then(data => {
-	        // Clear existing options
-	        sectionDropdown.innerHTML = `<option value="">Choose...</option>`;
-	
-	        // Add options from the API response
-	        data.Data.forEach(section => {
-	        	sectionDropdown.innerHTML += `<option value="${section.section}">${section.section}</option>`;
-	        });
-	    })
-	    .catch(error => {
-	        console.error('Error fetching in Section Dropdown:', error);
-	    });
-		    
-
-	    $('#parentType').change(function () {
-	        const selectedType = $(this).val();
-
-	         $('#singleParentFatherDiv,#singleParentMotherDiv, #guardianDiv, #parentDiv').hide().each(function () {
-	            // Reset all input, select, and textarea fields inside each div
-	            $(this).find('input, select, textarea').each(function () {
-	                if ($(this).attr('type') === 'file') {
-	                    // Replace file input with its clone to clear safely
-	                    //$(this).replaceWith($(this).clone());
-	                     $(this).val(''); // Better than replacing
-	                } else {
-	                    $(this).val('');
-	                }
-	            });
-	        }); 
-	        
-
-	        // Show the selected one
-	        if (selectedType === 'Parent') {
-	            $('#parentDiv').show();
-	            $('#FatherAadharPreview').hide();
-	            $('#MotherAadharPreview').hide();
-	        } else if (selectedType === 'SingleParent_Father') {
-	            $('#singleParentFatherDiv').show();	            
-	            $('#sFatherAadharPreview').hide();
-	        } else if (selectedType === 'SingleParent_Mother') {
-	            $('#singleParentMotherDiv').show();	            
-	            $('#sMotherAadharPreview').hide();
-	        } else if (selectedType === 'Guardian') {
-	            $('#guardianDiv').show();	            
-	            $('#GuardianAadharPreview').hide();
-	            $('#gFatherAadharPreview').hide();
-	            $('#gMotherAadharPreview').hide();
-	        }
-	        else{
-	        	 $('#parentType').val('');
-	        }
-	    });
-	    
-	    $(document).on('change', '#fatherAadharUpload, #motherAadharUpload, #sfatherAadharUpload, #smotherAadharUpload, #gfatherAadharUpload, #guardianAadharUpload, #gmotherAadharUpload, #studentAadharUpload', function () {
-	        let file = this.files[0];
-
-	        if (file) {
-	        	//console.log("file="+file);
-	            const allowedTypes = ['application/pdf', 'image/jpeg', 'image/jpg'];
-	            const fileType = file.type.toLowerCase();
-	            const maxSize = 3 * 1024 * 1024;
-
-	            if (!allowedTypes.includes(fileType)) {
-	                Swal.fire({
-	                    icon: 'error',
-	                    title: 'Invalid File Type',
-	                    text: 'Only PDF, JPG, or JPEG files are allowed.'
-	                });
-
-	                // Clear the invalid file
-	                $(this).val('');   
-	                return;
-	            }
-	            
-	            if (file.size > maxSize) {
-	                Swal.fire({
-	                    icon: 'warning',
-	                    title: 'File Too Large',
-	                    text: 'File size should not exceed 3 MB.'
-	                });
-	                $(this).val(''); // Clear large file
-	                return;
-	            }
-	            
-	        }
-	    });
-	    
-	    $(document).on('input', '#fatherMobile, #motherMobile, #EmisNumber, #sfatherMobile, #smotherMobile, #guardianMobile, #gfatherMobile, #gmotherMobile', function () {
-	        let val = $(this).val();
-
-	        // Remove non-digit characters just in case and limit to 10 digits
-	        val = val.replace(/\D/g, '').slice(0, 10);
-	        
-	        $(this).val(val);
-	    });
-	    
-	    $(document).on('input', '#studentName, #fatherName, #motherName, #sfatherName, #smotherName, #guardianName,#gfatherName,#gmotherName', function () {
-	        let val = $(this).val();
-
-	        // Allow only letters (a-z, A-Z), space, and dot
-	        val = val.replace(/[^a-zA-Z\s.]/g, '');
-	        
-	        $(this).val(val);
-	    });
-	    
-	    $(document).on('input', '#fatherAadhar, #motherAadhar, #sfatherAadhar, #smotherAadhar, #guardianAadhar, #gfatherAadhar, #gmotherAadhar,#studentAadhar', function () {
-	        let val = $(this).val();
-
-	        // Remove non-digit characters just in case and limit to 10 digits
-	        val = val.replace(/\D/g, '').slice(0, 12);
-	        
-	        $(this).val(val);
-	    });
-	    
-	    
-	     
-	});
-	
-
-
-  function openDocModal(fileUrl) {
-      const container = document.getElementById('docContainer');
-      const ext = fileUrl.split('.').pop().toLowerCase();
-
-      if (ext === 'pdf') {
-          container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
-      } else {
-          container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;">`;
-      }
-
-      $('#docModal').modal('show');
-  }  
-
-	let buttons1 = [
-		{
-			extend: 'pageLength',
-			className: 'btn btn-warning'
-		},
-		{
-			title: 'Data export',
-			extend: 'copyHtml5',
-			text: 'Copy',
-			className: 'btn btn-secondary',
-			id: 'copyBtn'
-		},
-		{
-			extend: 'excelHtml5',
-			text: 'Excel',
-			className: 'btn btn-secondary',
-			id: 'excelBtn',
-			title: 'School Standard List'
-		},
-		{
-			extend: 'csvHtml5',
-			text: 'CSV',
-			className: 'btn btn-secondary',
-			id: 'csvBtn',
-			title: 'School Standard List'
-		},
-		{
-			extend: 'pdfHtml5',
-			text: 'PDF',
-			className: 'btn btn-secondary',
-			id: 'pdfBtn',
-			title: 'School Standard List'
-		},
-		{
-			extend: 'print',
-			text: 'Print',
-			className: 'btn btn-secondary',
-			id: 'printBtn',
-			title: 'School Standard List',
-			exportOptions: {
-				columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-			}
-		}
-	];
-	
-	function loadSavedStandards(globalUdise) {
-		//console.log("start");
-		$.get('/gcc/api/gccschool/studentInfo/getStandards', {udise: globalUdise}, res => {
-			
-
-			if (res.Message === "Success") {
-				//console.log("res="+res);
-				if ($.fn.DataTable.isDataTable('#StudentEntrytable')) {
-					$('#StudentEntrytable').DataTable().clear().destroy(true);
-				}
-
-				$('#StudentEntrytable').DataTable({
-					data: res.Data,
-					columns: [
-						{data: null, render: (d, t, r, m) => m.row + 1,class:"text-center"},
-						{data: 'Designation',class:"text-center"},
-						{data: 'Student_Count',class:"text-center"},
-						{
-				            data: 'Designation',
-				            render: (designation) => `
-				                <div class="text-center">
-				                    <button class="btn btn-sm btn-primary schooladd-btn" data-design-name="${designation}">
-				                        <i class="ik ik-plus"></i>Add
-				                    </button>
-				                    <button class="btn btn-sm btn-success ml-2 schoolview-btn" data-designs-name="${designation}">
-				                        <i class="ik ik-eye"></i>View
-				                    </button>				                      
-				                </div>`
-				        }
-					],
-					lengthMenu: [
-						[50, 100, 200, 500, -1],
-						['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-					],
-
-					dom: 'Bftip',
-					autoWidth: false,
-					fixedColumns: {left: 0, right: 0},
-					scrollY: '60vh',
-					scrollCollapse: true,
-					buttons: [buttons1],
-					responsive: false,
-					searching: true,
-					select: false,
-					processing: false,
-				});
-			} else {
-				$('#StudentEntrytable tbody').html('<tr><td colspan="3" class="text-center text-danger">No Data found</td></tr>');
-			}
-		});
-	}
-	
-function displayinfo(srschoolId,globalUdise){
-		
-		$.ajax({
-			type: 'GET',
-			url: '/gcc/api/gccschool/studentInfo/checkStudent',
-			data: {schoolId: srschoolId,udise:globalUdise},
-			success: function (data) {
-				if (data.Status === "Sucess") {
-		            $("#tot_stu_count").val(data.Student_Strength);
-		            $("#aadhar_enroll_count").val(data.Aadhar_strength);
-		            $("#pending_enroll_count").val(data.Allowable_strength);
-		        } else {
-		            //alert("Failed to fetch student info!");
-		        	Swal.fire({
-	                    icon: 'error',
-	                    title: data.Status,
-	                    text: data.Message
-	                });
-		        }
-			},
-			error: function () {
-		        alert("Error calling in display info API!");
-		    }
-		});
-		
-	}
-	
-	$(document).on('click', '.schooladd-btn', function () {
-		
-		let allow=$("#pending_enroll_count").val();
-		if (allow>0){
-			let standard = $(this).data('design-name');
-			sentAddStudent(standard);
-		}
-		else{
-			Swal.fire({
-		        icon: 'warning',
-		        title: 'Entry Restricted',
-		        text: 'The maximum student entry for the school has been exceeded. To add new data, you must first update the Student Count Master.'
-		    });
-		}
-					
-	}); 
-	$(document).on('click', '.schoolview-btn', function () {
-		let viewstandard = $(this).data('designs-name');
-		sentViewStudentList(viewstandard,globalUdise);
-					
-	});
-	
-	/* $(document).on('click', '.schooledit-btn', function () {
-		let editstandard = $(this).data('designs-name');
-		sentEditStudentList(editstandard,globalUdise);
-					
-	});  */
-	
-	$(document).on('click', '.view-student-btn', function () {
-		let studentview = $(this).data('student-id');
-		sentStudentDetails(studentview);
-					
-	});
-	
-	$(document).on('click', '.edit-student-btn', function () {
-		let studentedit = $(this).data('student-id');
-		sentEditStudentDetails(studentedit);
-					
-	});
-	$(document).on('click', '.delete-student-btn', function () {
-		let studentdelete = $(this).data('student-id');
-		let studentdeletename = $(this).data('student-name');
-		
-		Swal.fire({
-        	allowOutsideClick: false, 
-            allowEscapeKey: false, 
-            allowEnterKey: false, 
-            title: `Are you sure to delete "${studentdeletename}" Details ?`,
-		    icon: 'warning',
-		    showCancelButton: true,
-		    confirmButtonColor: 'blue',
-		    cancelButtonColor: 'grey',
-		    confirmButtonText: 'Yes', // Confirm button text
-		    cancelButtonText: 'No', // Cancel button text		    
-		}).then((result) => {
-            if (result.isConfirmed) {
-            	sentDeleteStudentDetails(studentdelete);
-            } 
-        });		
-		
-					
-	});
-	
-	
-$(document).on('click', '#saveStudentdDetails', function (e) {
-	
-		//console.log("Father Aadhar Input Exists:", $('#fatherAadharUpload').length);
-		//console.log("Mother Aadhar Input Exists:", $('#motherAadharUpload').length);
-			
-		let studentName = $('#studentName').val().trim();
-	    let EmisNumber = $('#EmisNumber').val().trim();
-	    let gender = $('#gender').val();
-	    let section = $('#sectionDropdown').val();
-	    let medium = $('#medium').val();                  
-	    let dob = $('#dob').val();
-	    let age = $('#age').val();
-	    let parentType = $('#parentType').val();
-	    let sentstandard = $('#standard').val();
-	    let studentAadhar = $('#studentAadhar').val();
-	    let studentAadharUpload = $('#studentAadharUpload')[0].files[0];
-	    
-	    //console.log(" medium  section"+medium ,section);
-	    
-	    if (!studentName || !EmisNumber || !gender || !dob || !parentType || !medium || !section) {
-	        Swal.fire('Validation Error', 'Please fill in all required fields marked with *', 'warning');
-	        return;
-	    }
-	    
-	    if (!/^[A-Za-z\s.]+$/.test(studentName) ) {				
-			 Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Name should contain only alphabets.'
-			    });
-			    return;
-		}
-	    
-	    if (!/^\d{10}$/.test(EmisNumber)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Please enter 10-digit EMIS number.'
-		    });
-		    return;
-		}
-	    
-	    if (!/^[A-Za-z0-9-]{1,4}$/.test(section)) {
-	        Swal.fire({
-	            icon: 'warning',
-	            title: 'Validation Error',
-	            text: 'Section can have 1 to 4 characters, using only letters, numbers, or hyphens(-).'
-	        });
-	        return;
-	    }
-	    
-	    if(studentAadhar){
-	    	
-	    	if (!/^\d{12}$/.test(studentAadhar)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Please enter a valid 12-digit Aadhar number.'
-			    });
-			    return;
-			}
-	    }
-	    
-	    
-	    const formData = new FormData();
-
-	    // Required fields
-	    formData.append("student_name", studentName);
-	    formData.append("emis_no", EmisNumber);
-	    formData.append("gender", gender);
-	    formData.append("std", sentstandard);
-	    formData.append("dob", dob);
-	    formData.append("age", age);
-	    formData.append("parent_type", parentType);
-	    formData.append("section",section);
-	    formData.append("medium",medium);
-	    
-	    formData.append("student_aadhar", studentAadhar);
-	    formData.append("student_aadhar_file", studentAadharUpload);
-	    formData.append("udise", globalUdise);
-	    
-	 // Conditional: Parent details
-	    if (parentType === 'Parent') {
-	        let fatherName = $('#fatherName').val().trim();
-	        let motherName = $('#motherName').val().trim();
-	        let fatherMobile = $('#fatherMobile').val().trim();
-	        let motherMobile = $('#motherMobile').val().trim();
-	        let fatherAadhar = $('#fatherAadhar').val().trim();
-	        let motherAadhar = $('#motherAadhar').val().trim();
-	        let fatherAadharUpload = $('#fatherAadharUpload')[0].files[0];	        							
-	        let motherAadharUpload = $('#motherAadharUpload')[0].files[0]; 
-	        
-	        
-	        let fatherAadharUploads = document.getElementById("fatherAadharUpload")?.files?.[0] ;
-	        let motherAadharUploads = document.getElementById("motherAadharUpload")?.files?.[0] ;
-
-	        //console.log("Father Aadhar Upload File: ", fatherAadharUploads);
-	        //console.log("Mother Aadhar Upload File: ", motherAadharUploads);
-	        							 
-	        //console.log("Parent Details:");
-	        //console.log("Father Name: ", fatherName);
-	        //console.log("Mother Name: ", motherName);
-	        //console.log("Father Mobile: ", fatherMobile);
-	        //console.log("Mother Mobile: ", motherMobile);
-	        //console.log("Father Aadhar: ", fatherAadhar);
-	        //console.log("Mother Aadhar: ", motherAadhar);
- 	        //console.log("Father Aadhar Upload File: ", fatherAadharUpload);
-	        //console.log("Mother Aadhar Upload File: ", motherAadharUpload); 
-	        
-		    
-
-/* 	        if (!fatherName || !motherName || !fatherMobile || !motherMobile || !fatherAadhar || !motherAadhar || !fatherAadharUpload || !motherAadharUpload) {
-	            Swal.fire('Error', 'Please complete parent details including Aadhar uploads.', 'error');
-	            return;
-	        }  */
-	        
-	        if(!fatherName || !motherName){
-	        	Swal.fire('Error', 'Please enter both father and mother name', 'error');
-	            return;
-	        }
-	        
-	        if (!/^[A-Za-z\s.]+$/.test(fatherName)  ||   !/^[A-Za-z\s.]+$/.test(motherName) ) {				
-				 Swal.fire({
-				        icon: 'warning',
-				        title: 'Validation Error',
-				        text: 'Name should contain only alphabets.'
-				    });
-				    return;
-			}
-	        
-	        formData.append("father_name", fatherName);
-	        formData.append("mother_name", motherName);
-	        
-	        if(fatherMobile || motherMobile){
-	        	
-	        	if(fatherMobile){
-	        		
-	        		if (!/^\d{10}$/.test(fatherMobile)) {
-	    			    Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Validation Error',
-	    			        text: 'Please enter a valid 10-digit Father mobile number.'
-	    			    });
-	    			    return;
-	    			}
-	    		    
-	    		    if (/^0{10}$/.test(fatherMobile)) {
-	    			    Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Validation Error',
-	    			        text: 'Father Mobile number cannot be all zeros.'
-	    			    });
-	    			    return;
-	    			}
-
-	    			if (fatherMobile.startsWith('0')) {
-	    			    Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Validation Error',
-	    			        text: 'Father Mobile number cannot start with zero.'
-	    			    });
-	    			    return;
-	    			}
-
-	    			if (/^(\d)\1{9}$/.test(fatherMobile)) {
-	    			    Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Validation Error',
-	    			        text: 'Father Mobile number cannot have all digits the same.'
-	    			    });
-	    			    return;
-	    			}
-	    			
-	    			formData.append("father_mobile", fatherMobile);
-	    			
-	        		
-	        		if(!fatherAadhar){
-	        			Swal.fire('warning', 'Please enter father aadhar number', 'warning');
-	    	            return;
-	        		}
-	        		if(fatherAadhar){
-	        			
-	        			if (!/^\d{12}$/.test(fatherAadhar)) {
-		    			    Swal.fire({
-		    			        icon: 'warning',
-		    			        title: 'Validation Error',
-		    			        text: 'Please enter a valid 12-digit Father Aadhar number.'
-		    			    });
-		    			    return;
-		    			}
-	        			
-	        			formData.append("father_aadhar", fatherAadhar);
-	        			
-	        			if(!fatherAadharUpload){
-	        				Swal.fire('warning', 'Please upload father aadhar file', 'warning');
-		    	            return;
-	        			}
-	        			
-	        		}
-	        		
-	        		
-	        	}
-	        	
-	        	if(motherMobile){
-	        		
-	        			        			        	    	        
-	    	        if (!/^\d{10}$/.test(motherMobile)) {
-	    			    Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Validation Error',
-	    			        text: 'Please enter a valid 10-digit Mother mobile number.'
-	    			    });
-	    			    return;
-	    			}
-	    		    
-	    		    if (/^0{10}$/.test(motherMobile)) {
-	    			    Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Validation Error',
-	    			        text: 'Mother Mobile number cannot be all zeros.'
-	    			    });
-	    			    return;
-	    			}
-
-	    			if (motherMobile.startsWith('0')) {
-	    			    Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Validation Error',
-	    			        text: 'Mother Mobile number cannot start with zero.'
-	    			    });
-	    			    return;
-	    			}
-
-	    			if (/^(\d)\1{9}$/.test(motherMobile)) {
-	    			    Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Validation Error',
-	    			        text: 'Mother Mobile number cannot have all digits the same.'
-	    			    });
-	    			    return;
-	    			}
-	    			
-	    			formData.append("mother_mobile", motherMobile);
-	    			
-	    			if(!motherAadhar){
-	        			Swal.fire('warning', 'Please enter mother aadhar number', 'warning');
-	    	            return;
-	        		}
-	        		if(motherAadhar){
-	        			
-	        			if (!/^\d{12}$/.test(motherAadhar)) {
-		    			    Swal.fire({
-		    			        icon: 'warning',
-		    			        title: 'Validation Error',
-		    			        text: 'Please enter a valid 12-digit Mother Aadhar number.'
-		    			    });
-		    			    return;
-		    			}
-	        			
-	        			formData.append("mother_aadhar", motherAadhar);
-	        			
-	        			if(!motherAadharUpload){
-	        				Swal.fire('warning', 'Please upload mother aadhar file', 'warning');
-		    	            return;
-	        			}
-	        			
-	        		}
-	        		
-	        	}
-	        }
-	        else{
-	        	Swal.fire('warning', 'Please enter atleast anyone  mobile number', 'warning');
-	            return;
-	        }
-	        
-	        
-	        
-	        /* if (!/^\d{10}$/.test(fatherMobile) || !/^\d{10}$/.test(motherMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Please enter a valid 10-digit mobile number.'
-			    });
-			    return;
-			}
-		    
-		    if (/^0{10}$/.test(fatherMobile) || /^0{10}$/.test(motherMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot be all zeros.'
-			    });
-			    return;
-			}
-
-			if (fatherMobile.startsWith('0') ||  motherMobile.startsWith('0')) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot start with zero.'
-			    });
-			    return;
-			}
-
-			if (/^(\d)\1{9}$/.test(fatherMobile) || /^(\d)\1{9}$/.test(motherMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot have all digits the same.'
-			    });
-			    return;
-			}
-			
-			if (!/^\d{12}$/.test(fatherAadhar) || !/^\d{12}$/.test(motherAadhar)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Please enter a valid 12-digit Aadhar number.'
-			    });
-			    return;
-			} */
-			  
-	        
-	        formData.append("father_aadhar_file", fatherAadharUpload);
-	        formData.append("mother_aadhar_file", motherAadharUpload);
-
-	    }
-
-	    // Conditional: Single Parent - Father
-	    else if (parentType === 'SingleParent_Father') {
-	        let sfatherName = $('#sfatherName').val().trim();
-	        let sfatherMobile = $('#sfatherMobile').val().trim();
-	        let sfatherAadhar = $('#sfatherAadhar').val().trim();
-	        let sfatherAadharUpload = $('#sfatherAadharUpload')[0].files[0];
-
-/* 	        if (sfatherAadharUpload) {
-		        console.log("Father Aadhar File:", sfatherAadharUpload.name, "-", sfatherAadharUpload.type);
-		    } else {
-		        console.log("Father Aadhar File: Not uploaded");
-		    }
- */	        
-	        if (!sfatherName || !sfatherMobile || !sfatherAadhar || !sfatherAadharUpload) {
-	            Swal.fire('Error', 'Please complete single father details including Aadhar upload.', 'error');
-	            return;
-	        }
-	        if (!/^[A-Za-z\s.]+$/.test(sfatherName)) {				
-				 Swal.fire({
-				        icon: 'warning',
-				        title: 'Validation Error',
-				        text: 'Name should contain only alphabets.'
-				    });
-				    return;
-			}
-	        
-	        if (!/^\d{10}$/.test(sfatherMobile) ) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Please enter a valid 10-digit mobile number.'
-			    });
-			    return;
-			}
-		    
-		    if (/^0{10}$/.test(sfatherMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot be all zeros.'
-			    });
-			    return;
-			}
-
-			if ( sfatherMobile.startsWith('0') ) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot start with zero.'
-			    });
-			    return;
-			}
-
-			if (/^(\d)\1{9}$/.test(sfatherMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot have all digits the same.'
-			    });
-			    return;
-			}
-			
-			if ( !/^\d{12}$/.test(sfatherAadhar) ) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Please enter a valid 12-digit Aadhar number.'
-			    });
-			    return;
-			}
-			
-			formData.append("father_name", sfatherName);
-	        formData.append("father_mobile", sfatherMobile);
-	        formData.append("father_aadhar", sfatherAadhar);
-	        formData.append("father_aadhar_file", sfatherAadharUpload);
-	    }
-
-	    // Conditional: Single Parent - Mother
-	    else if (parentType === 'SingleParent_Mother') {
-	        let smotherName = $('#smotherName').val().trim();
-	        let smotherMobile = $('#smotherMobile').val().trim();
-	        let smotherAadhar = $('#smotherAadhar').val().trim();
-	       
-	        let smotherAadharUpload = $('#smotherAadharUpload')[0].files[0];
-
-	        if (!smotherName || !smotherMobile || !smotherAadhar || !smotherAadharUpload) {
-	            Swal.fire('Error', 'Please complete single mother details including Aadhar upload.', 'error');
-	            return;
-	        }
-	        
-	        
-	        if (!/^[A-Za-z\s.]+$/.test(smotherName)) {				
-				 Swal.fire({
-				        icon: 'warning',
-				        title: 'Validation Error',
-				        text: 'Name should contain only alphabets.'
-				    });
-				    return;
-			}
-	        
-	        if (!/^\d{10}$/.test(smotherMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Please enter a valid 10-digit mobile number.'
-			    });
-			    return;
-			}
-		    
-		    if (/^0{10}$/.test(smotherMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot be all zeros.'
-			    });
-			    return;
-			}
-
-			if ( smotherMobile.startsWith('0')) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot start with zero.'
-			    });
-			    return;
-			}
-
-			if (/^(\d)\1{9}$/.test(smotherMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot have all digits the same.'
-			    });
-			    return;
-			}
-			
-			if (!/^\d{12}$/.test(smotherAadhar)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Please enter a valid 12-digit Aadhar number.'
-			    });
-			    return;
-			}
-			
-			formData.append("mother_name", smotherName);
-	        formData.append("mother_mobile", smotherMobile);
-	        formData.append("mother_aadhar", smotherAadhar);
-	        formData.append("mother_aadhar_file", smotherAadharUpload);
-
-	    }
-
-	    // Conditional: Guardian
-	    else if (parentType === 'Guardian') {
-	        let guardianName = $('#guardianName').val().trim();
-	        let guardianMobile = $('#guardianMobile').val().trim();
-	        let guardianAadhar = $('#guardianAadhar').val().trim();
-	        let guardianFileInput = document.getElementById('guardianAadharUpload');
-	        let guardianAadharUpload = guardianFileInput ? guardianFileInput.files[0] : null;
-
-	        if (!guardianName || !guardianMobile || !guardianAadhar || !guardianAadharUpload) {
-	            Swal.fire('Error', 'Please complete guardian details including guardian Aadhar upload.', 'error');
-	            return;
-	        }
-	         
-	        if (!/^[A-Za-z\s.]+$/.test(guardianName)) {				
-				 Swal.fire({
-				        icon: 'warning',
-				        title: 'Validation Error',
-				        text: 'Name should contain only alphabets.'
-				    });
-				    return;
-			}
-	        
-	        if (!/^\d{10}$/.test(guardianMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Please enter a valid 10-digit mobile number.'
-			    });
-			    return;
-			}
-		    
-		    if ( /^0{10}$/.test(guardianMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot be all zeros.'
-			    });
-			    return;
-			}
-
-			if (guardianMobile.startsWith('0')) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot start with zero.'
-			    });
-			    return;
-			}
-
-			if (/^(\d)\1{9}$/.test(guardianMobile)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Mobile number cannot have all digits the same.'
-			    });
-			    return;
-			}
-			
-			if (!/^\d{12}$/.test(guardianAadhar)) {
-			    Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Please enter a valid 12-digit Aadhar number.'
-			    });
-			    return;
-			}
-			
-			
-			formData.append("guardian_name", guardianName);
-	        formData.append("guardian_mobile", guardianMobile);
-	        formData.append("guardian_aadhar", guardianAadhar);
-	        formData.append("guardian_aadhar_file", guardianAadharUpload);
-	        
-	        let gfatherName = $('#gfatherName').val().trim();
-	        let gfatherMobile = $('#gfatherMobile').val().trim();
-	        let gfatherAadhar = $('#gfatherAadhar').val().trim();
-	        let gfatherAadharUpload = $('#gfatherAadharUpload')[0].files[0];
-
-	        // Check if any one is filled
-	        let anyGfatherFieldFilled = gfatherName || gfatherMobile || gfatherAadhar || gfatherAadharUpload;
-
-	        if (anyGfatherFieldFilled) {
-	            if (!gfatherName || !gfatherMobile || !gfatherAadhar || !gfatherAadharUpload) {
-	                Swal.fire('Error', 'Please complete all Father details including Aadhar upload.', 'error');
-	                return;
-	            }
-
-	            // Append only if all are filled
-	            formData.append("father_name", gfatherName);
-	            formData.append("father_mobile", gfatherMobile);
-	            formData.append("father_aadhar", gfatherAadhar);
-	            formData.append("father_aadhar_file", gfatherAadharUpload);
-	        }
-	        
-	        let gmotherName = $('#gmotherName').val().trim();
-	        let gmotherMobile = $('#gmotherMobile').val().trim();
-	        let gmotherAadhar = $('#gmotherAadhar').val().trim();
-	        let gmotherAadharUpload = $('#gmotherAadharUpload')[0].files[0];
-
-	        // Check if any one is filled
-	        let anyGmotherFieldFilled = gmotherName || gmotherMobile || gmotherAadhar || gmotherAadharUpload;
-
-	        if (anyGmotherFieldFilled) {
-	            if (!gmotherName || !gmotherMobile || !gmotherAadhar || !gmotherAadharUpload) {
-	                Swal.fire('Error', 'Please complete all Mother details including Aadhar upload.', 'error');
-	                return;
-	            }
-
-	            // Append only if all are filled
-	            formData.append("mother_name", gmotherName);
-	            formData.append("mother_mobile", gmotherMobile);
-	            formData.append("mother_aadhar", gmotherAadhar);
-	            formData.append("mother_aadhar_file", gmotherAadharUpload);
-	        }
-
-	    }
-	    
-	    let aadharInputs = {
-	    	    studentAadhar: $('#studentAadhar').val().trim(),
-	    	    fatherAadhar: $('#fatherAadhar').val().trim(),
-	    	    motherAadhar: $('#motherAadhar').val().trim(),
-	    	    sfatherAadhar: $('#sfatherAadhar').val().trim(),
-	    	    smotherAadhar: $('#smotherAadhar').val().trim(),
-	    	    guardianAadhar: $('#guardianAadhar').val().trim(),
-	    	    gfatherAadhar: $('#gfatherAadhar').val().trim(),
-	    	    gmotherAadhar: $('#gmotherAadhar').val().trim()
-	    	};
-
-	    	// Friendly names for display
-	    	let fieldLabels = {
-	    	    studentAadhar: 'Student',
-	    	    fatherAadhar: 'Father',
-	    	    motherAadhar: 'Mother',
-	    	    sfatherAadhar: 'Father',
-	    	    smotherAadhar: 'Mother',
-	    	    guardianAadhar: 'Guardian',
-	    	    gfatherAadhar: 'Father',
-	    	    gmotherAadhar: 'Mother'
-	    	};
-	    	
-	    	// Map values to their corresponding field keys
-	    	let valueMap = {};
-	    	for (let key in aadharInputs) {
-	    	    let val = aadharInputs[key];
-	    	    if (val !== '') {
-	    	        valueMap[val] = valueMap[val] ? [...valueMap[val], key] : [key];
-	    	    }
-	    	}
-
-	    	// Find duplicates
-	    	let duplicateEntries = Object.entries(valueMap).filter(([val, keys]) => keys.length > 1);
-
-	    	if (duplicateEntries.length > 0) {
-/* 	    	    let message = '';
-
-	    	    duplicateEntries.forEach(([val, keys]) => {
-	    	        let fieldList = keys.map(k => `• ${fieldLabels[k] || k}`).join('<br>');
-	    	        message += `<strong>Aadhar:</strong> ${val}<br><em>Used in:</em><br>${fieldList}<br><br>`;
-	    	    }); */
-
-	    	    Swal.fire({
-	    	        icon: 'warning',
-	    	        title: 'Duplicate Aadhar Numbers Found',
-	    	        //html: message
-	    	    });
-
-	    	    return; // Stop further processing
-	    	}
-	    	
-			
-	    	//Map input IDs to friendly labels
-	    	let fileFields = {
-	    	    studentAadharUpload: 'Student',
-	    	    fatherAadharUpload: 'Father',
-	    	    motherAadharUpload: 'Mother',
-	    	    sfatherAadharUpload: 'Father',
-	    	    smotherAadharUpload: 'Mother',
-	    	    guardianAadharUpload: 'Guardian',
-	    	    gfatherAadharUpload: 'Father',
-	    	    gmotherAadharUpload: 'Mother'
-	    	};
-
-	    	// On form submit or trigger point
-	    	function checkDuplicateFileNames() {
-	    	    let fileNameMap = {};
-
-	    	    for (let id in fileFields) {
-	    	        let input = document.getElementById(id);
-	    	        if (input && input.files.length > 0) {
-	    	            let fileName = input.files[0].name.trim();
-
-	    	            if (fileNameMap[fileName]) {
-	    	                fileNameMap[fileName].push(fileFields[id]);
-	    	            } else {
-	    	                fileNameMap[fileName] = [fileFields[id]];
-	    	            }
-	    	        }
-	    	    }
-
-	    	    // Find duplicates
-	    	    let duplicates = Object.entries(fileNameMap).filter(([name, fields]) => fields.length > 1);
-
-	    	    if (duplicates.length > 0) {
-	    	        /* let message = '';
-	    	        duplicates.forEach(([name, fields]) => {
-	    	            let usedIn = fields.map(f => `• ${f}`).join('<br>');
-	    	            message += `<strong>File:</strong> ${name}<br><em>Used in:</em><br>${usedIn}<br><br>`;
-	    	        }); */
-
-	    	        Swal.fire({
-	    	            icon: 'error',
-	    	            title: 'Duplicate Aadhar Files Found',
-	    	            //html: message
-	    	        });
-
-	    	        return false; // stop form submission or further processing
-	    	    }
-
-	    	    return true; // no duplicates
-	    	}
-	    	
-	    	
-	    	if (!checkDuplicateFileNames()) {
-	            e.preventDefault(); // stop form submit
-	            return;
-	        }
-	    
-	    // Send AJAX request
- 	   $('#saveStudentdDetails').prop('disabled', true).text('Saving...');
- 	  $('#pageLoader').show();
-	     $.ajax({
-	        url: '/gcc/api/gccschool/studentInfo/saveStudent', 
-	        type: 'POST',
-	        data: formData,
-	        contentType: false,
-	        processData: false,
-	        success: function (response) {
-	        	$('#pageLoader').hide();
-	        	$('#saveStudentdDetails').prop('disabled', false).text('Save');
-	        	if (response.Message === 'Saved Sucessfully' && response.Data === 'Success') {
-	                Swal.fire({
-	                    icon: 'success',
-	                    title: 'Success',
-	                    allowOutsideClick: false, // Disable clicking outside the modal to close it
-	                    allowEscapeKey: false, // Disable escape key to close the modal
-	                    allowEnterKey: false, // Disable enter key to close the modal
-	                    showConfirmButton: true, // Ensure the confirm button is visible
-	                    text: 'Student details saved successfully!'
-	                }).then((result) => {
-	                    if (result.isConfirmed) {
-	                    		                    	
-	                    	location.reload();
-	                    	
-	                    	
-	                    }
-	                });
-	                
-	            } 
-	        	
-	        	else if (response.Message === 'Duplicate') {
-	                Swal.fire({
-	                    icon: 'warning',
-	                    title: 'Warning',
-	                    text: response.Error || 'An unknown error occurred.'
-	                });
-	            }
-	        	
-	        	else if (response.Message === 'Error') {
-	                Swal.fire({
-	                    icon: 'error',
-	                    title: 'Error',
-	                    text: response.Error || 'An unknown error occurred.'
-	                });
-	            } else {
-	            	 let errorMessage = 'An error occurred while saving student details.';
-	            	    if (xhr.responseJSON && xhr.responseJSON.Error) {
-	            	        errorMessage = xhr.responseJSON.Error;
-	            	    }
-	            	    Swal.fire({
-	            	        icon: 'error',
-	            	        title: 'Error',
-	            	        text: errorMessage
-	            	    });
-	            	    console.error('AJAX error:', error);
-	            }
-	            
-	        },
-	        error: function () {
-	        	$('#pageLoader').hide();
-	        	$('#saveStudentdDetails').prop('disabled', false).text('Save');
-	            Swal.fire({
-	                icon: 'error',
-	                title: 'Error',
-	                text: 'Something went wrong while saving.'
-	            });
-	        }
-	    }); 
-	    
-	}); 
-
-
-	
-$(document).on('click', '#updateStudentdDetails', function (e) {
-	
-	//console.log("Hiiiiii");
-	let student_id = $('#student_id').text();
-	//console.log("student_id=" + student_id);
-	
-	let studentNameEdit = $('#studentName').val().trim();
-    let EmisNumberEdit = $('#EmisNumber').val().trim();
-    let genderEdit = $('#gender').val();
-    let sectionEdit = $('#sectionDropdown').val().trim();
-    let mediumEdit = $('#medium').val();                  
-    let dobEdit = $('#dob').val();
-    let ageEdit = $('#age').val();
-    let parentTypeEdit = $('#parentType').val();
-    let sentstandardEdit = $('#standard').val();
-    let studentAadharEdit = $('#studentAadhar').val();
-    let studentAadharUploadEdit = $('#studentAadharUpload')[0].files[0];
-    
-    let FatherAadharPreview = $('#FatherAadharPreview');
-    let MotherAadharPreview= $('#MotherAadharPreview');
-    let sFatherAadharPreview= $('#sFatherAadharPreview');
-    let sMotherAadharPreview = $('#sMotherAadharPreview');
-    let GuardianAadharPreview = $('#GuardianAadharPreview');
-    let gFatherAadharPreview = $('#gFatherAadharPreview');
-    let gMotherAadharPreview = $('#gMotherAadharPreview');
-    let studentAadharPreview =$('#studentAadharPreview');
-    
-
-    
-    let raw_father_file_update = $('#raw_father_file').text();
-    let raw_mother_file_update = $('#raw_mother_file').text();
-    let raw_guardian_file_update = $('#raw_guardian_file').text();
-    let raw_student_file_update = $('#raw_student_file').text();
-    
-    let previous_father_aadhar = $('#previous_father_aadhar').text();
-    let previous_mother_aadhar = $('#previous_mother_aadhar').text();
-    let previous_guardian_aadhar = $('#previous_guardian_aadhar').text();
-    let previous_student_aadhar = $('#previous_student_aadhar').text();
-    
-    //console.log("previous_father_aadhar =",previous_father_aadhar );
-    
-/*  console.log("raw_father_file_update =", raw_father_file_update);
-    console.log("raw_mother_file_update =", raw_mother_file_update);
-    console.log("raw_guardian_file_update =", raw_guardian_file_update);
-    console.log("raw_student_file_update =", raw_student_file_update); */
-    
-   // console.log(" medium  section"+mediumEdit ,sectionEdit);
-    
-    if (!studentNameEdit || !EmisNumberEdit || !genderEdit || !dobEdit || !parentTypeEdit || !mediumEdit || !sectionEdit) {
-        Swal.fire('Validation Error', 'Please fill in all required fields marked with *', 'warning');
-        return;
-    }
-    
-    if (!/^[A-Za-z\s.]+$/.test(studentNameEdit) ) {				
-		 Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Name should contain only alphabets.'
-		    });
-		    return;
-	}
-    
-    if (!/^\d{10}$/.test(EmisNumberEdit)) {
-	    Swal.fire({
-	        icon: 'warning',
-	        title: 'Validation Error',
-	        text: 'Please enter 10-digit EMIS number.'
-	    });
-	    return;
-	}
-    
-    if (!/^[A-Za-z0-9-]{1,4}$/.test(sectionEdit)) {
-        Swal.fire({
-            icon: 'warning',
-            title: 'Validation Error',
-            text: 'Section can have 1 to 4 characters, using only letters, numbers, or hyphens(-).'
-        });
-        return;
-    }
-    
-    
-    const formData1 = new FormData();
-    
-    formData1.append("student_id",student_id);
-    formData1.append("user_id",userId);
-    formData1.append("action_type",'EDIT');
-    
- 	if(studentAadharEdit){
- 		
-    	
-    	if (!/^\d{12}$/.test(studentAadharEdit)) {
-    		
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Please enter a valid 12-digit Student Aadhar number.'
-		    });
-		    return;
-		}
-    	
-    	formData1.append("student_aadhar", studentAadharEdit); 
-    }
-    else{
-    	
-    	formData1.append("student_aadhar", "");
-    }
-
-    // Required fields
-    formData1.append("student_name", studentNameEdit);
-    formData1.append("emis_no", EmisNumberEdit);
-    formData1.append("gender", genderEdit);
-    formData1.append("std", sentstandardEdit);
-    formData1.append("dob", dobEdit);
-    formData1.append("age", ageEdit);
-    formData1.append("parent_type", parentTypeEdit);
-    formData1.append("section",sectionEdit);
-    formData1.append("mediums",mediumEdit);
-    
-   
-         
-    formData1.append("udise", globalUdise);
-    
-    if(studentAadharPreview.html().trim() !== ''){
-    	if(studentAadharUploadEdit){
-   		 formData1.append("student_aadhar_file", studentAadharUploadEdit);
-       }
-    	else{
-    		if(raw_student_file_update){
-    			formData1.append("raw_student_aadhar", raw_student_file_update);
-    		}
-    	}
-    }
-    else{
-    	if(studentAadharUploadEdit){
-   		 formData1.append("student_aadhar_file", studentAadharUploadEdit);
-       }
-    	
-    }
-    
-	
-	
-	
-	if (parentTypeEdit === 'Parent') {
-        let fatherNameEdit = $('#fatherName').val().trim();
-        let motherNameEdit = $('#motherName').val().trim();
-        let fatherMobileEdit = $('#fatherMobile').val().trim();
-        let motherMobileEdit = $('#motherMobile').val().trim();
-        let fatherAadharEdit = $('#fatherAadhar').val().trim();
-        let motherAadharEdit = $('#motherAadhar').val().trim();
-        let fatherAadharUploadEdit = $('#fatherAadharUpload')[0].files[0];	        							
-        let motherAadharUploadEdit = $('#motherAadharUpload')[0].files[0]; 
-        
-        							 
-/*         console.log("Parent Details:");
-        console.log("Father Name: ", fatherNameEdit);
-        console.log("Mother Name: ", motherNameEdit);
-        console.log("Father Mobile: ", fatherMobileEdit);
-        console.log("Mother Mobile: ", motherMobileEdit);
-        console.log("Father Aadhar: ", fatherAadharEdit);
-        console.log("Mother Aadhar: ", motherAadharEdit);
-	    console.log("Father Aadhar Upload File: ", fatherAadharUploadEdit);
-        console.log("Mother Aadhar Upload File: ", motherAadharUploadEdit);  */
-        
-        
-        if(!fatherNameEdit || !motherNameEdit){
-        	Swal.fire('Error', 'Please enter both father and mother name', 'error');
-            return;
-        }
-        
-        if (!/^[A-Za-z\s.]+$/.test(fatherNameEdit)  ||   !/^[A-Za-z\s.]+$/.test(motherNameEdit) ) {				
-			 Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Name should contain only alphabets.'
-			    });
-			    return;
-		}
-        
-        formData1.append("father_name", fatherNameEdit);
-        formData1.append("mother_name", motherNameEdit);
-        
-        if(fatherMobileEdit || motherMobileEdit){
-        	
-        	if(fatherMobileEdit){
-        		
-        		if (!/^\d{10}$/.test(fatherMobileEdit)) {
-    			    Swal.fire({
-    			        icon: 'warning',
-    			        title: 'Validation Error',
-    			        text: 'Please enter a valid 10-digit Father mobile number.'
-    			    });
-    			    return;
-    			}
-    		    
-    		    if (/^0{10}$/.test(fatherMobileEdit)) {
-    			    Swal.fire({
-    			        icon: 'warning',
-    			        title: 'Validation Error',
-    			        text: 'Father Mobile number cannot be all zeros.'
-    			    });
-    			    return;
-    			}
-
-    			if (fatherMobileEdit.startsWith('0')) {
-    			    Swal.fire({
-    			        icon: 'warning',
-    			        title: 'Validation Error',
-    			        text: 'Father Mobile number cannot start with zero.'
-    			    });
-    			    return;
-    			}
-
-    			if (/^(\d)\1{9}$/.test(fatherMobileEdit)) {
-    			    Swal.fire({
-    			        icon: 'warning',
-    			        title: 'Validation Error',
-    			        text: 'Father Mobile number cannot have all digits the same.'
-    			    });
-    			    return;
-    			}
-    			
-    			formData1.append("father_mobile", fatherMobileEdit);
-    			
-        		
-        		if(!fatherAadharEdit){
-        			Swal.fire('warning', 'Please enter father aadhar number', 'warning');
-    	            return;
-        		}
-        		if(fatherAadharEdit){
-        			
-        			if (!/^\d{12}$/.test(fatherAadharEdit)) {
-	    			    Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Validation Error',
-	    			        text: 'Please enter a valid 12-digit Father Aadhar number.'
-	    			    });
-	    			    return;
-	    			}       			        			
-        			
-        			formData1.append("father_aadhar", fatherAadharEdit);
-        			
-        			if(FatherAadharPreview.html().trim() !== ''){
-        				       				
-        				
-        				if(fatherAadharUploadEdit){
-            				formData1.append("father_aadhar_file", fatherAadharUploadEdit);
-            			}
-        				else{
-        					
-        					if(fatherAadharEdit != previous_father_aadhar){
-                  				 Swal.fire({
-           	    			        icon: 'warning',
-           	    			        title: 'Upload Father Aadhar',
-           	    			        text: 'You Changed father aadhar number.So,Please Upload New Father Aadhar File.'
-           	    			    });
-           	    			    return;
-                  			}
-        					
-        					formData1.append("raw_father_aadhar", raw_father_file_update);
-        				}
-        			}
-        			else{
-        				
-        				if(fatherAadharUploadEdit){
-            				formData1.append("father_aadhar_file", fatherAadharUploadEdit);
-            				
-            			}
-        				else{
-        					Swal.fire('warning', 'Please upload father aadhar file', 'warning');
-    	    	            return;
-        				}
-        			}
-        			        			
-        			
-        		}
-        		
-        		
-        	}
-        	
-        	else{
-        		formData1.append("father_mobile", "");
-        		
-        		if(fatherAadharEdit){
-        			Swal.fire('warning', 'Enter all father details or remove all father details', 'warning');
-    	            return;
-        		}
-        		else{
-        			formData1.append("father_aadhar", "");
-        			
-        			if(FatherAadharPreview.html().trim() !== ''){
-        				if(fatherAadharUploadEdit){
-        					Swal.fire('warning', 'Enter all father details or remove all father details', 'warning');
-            	            return;
-            			}
-        				else{
-        					formData1.append("father_aadhar_file", "");
-        					formData1.append("raw_father_aadhar", "");
-        				}
-        			}
-        			else{
-        				if(fatherAadharUploadEdit){
-        					Swal.fire('warning', 'Enter all father details or remove all father details', 'warning');
-            	            return;
-            			}
-        			}
-        		}
-        	}
-        	
-        	if(motherMobileEdit){ 
-        		
-        			        			        	    	        
-    	        if (!/^\d{10}$/.test(motherMobileEdit)) {
-    			    Swal.fire({
-    			        icon: 'warning',
-    			        title: 'Validation Error',
-    			        text: 'Please enter a valid 10-digit Mother mobile number.'
-    			    });
-    			    return;
-    			}
-    		    
-    		    if (/^0{10}$/.test(motherMobileEdit)) {
-    			    Swal.fire({
-    			        icon: 'warning',
-    			        title: 'Validation Error',
-    			        text: 'Mother Mobile number cannot be all zeros.'
-    			    });
-    			    return;
-    			}
-
-    			if (motherMobileEdit.startsWith('0')) {
-    			    Swal.fire({
-    			        icon: 'warning',
-    			        title: 'Validation Error',
-    			        text: 'Mother Mobile number cannot start with zero.'
-    			    });
-    			    return;
-    			}
-
-    			if (/^(\d)\1{9}$/.test(motherMobileEdit)) {
-    			    Swal.fire({
-    			        icon: 'warning',
-    			        title: 'Validation Error',
-    			        text: 'Mother Mobile number cannot have all digits the same.'
-    			    });
-    			    return;
-    			}
-    			
-    			formData1.append("mother_mobile", motherMobileEdit);
-    			
-    			if(!motherAadharEdit){
-        			Swal.fire('warning', 'Please enter mother aadhar number', 'warning');
-    	            return;
-        		}
-        		if(motherAadharEdit){
-        			
-        			if (!/^\d{12}$/.test(motherAadharEdit)) {
-	    			    Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Validation Error',
-	    			        text: 'Please enter a valid 12-digit Mother Aadhar number.'
-	    			    });
-	    			    return;
-	    			}
-        			
-        			formData1.append("mother_aadhar", motherAadharEdit);
-        			
-					if(MotherAadharPreview.html().trim() !== ''){
-        				
-        				if(motherAadharUploadEdit){
-            				formData1.append("mother_aadhar_file", motherAadharUploadEdit);
-            			}
-        				else{
-        					
-        					if(motherAadharEdit != previous_mother_aadhar){
-                 				 Swal.fire({
-          	    			        icon: 'warning',
-          	    			        title: 'Upload Mother Aadhar',
-          	    			        text: 'You Changed mother aadhar number.So,Please Upload New Mother Aadhar File.'
-          	    			    });
-          	    			    return;
-                 			}
-        					
-        					formData1.append("raw_mother_aadhar", raw_mother_file_update);
-        				}
-        			}
-        			else{
-        				
-        				if(motherAadharUploadEdit){
-            				formData1.append("mother_aadhar_file", motherAadharUploadEdit);
-            			}
-        				else{
-        					Swal.fire('warning', 'Please upload mother aadhar file', 'warning');
-    	    	            return;
-        				}
-        			}
-        			        			
-        			
-        		}
-        		
-        	}
-			else{
-        		
-        		
-				formData1.append("mother_mobile", "");
-        		
-        		if(motherAadharEdit){
-        			Swal.fire('warning', 'Enter all mother details or remove all mother details', 'warning');
-    	            return;
-        		}
-        		else{
-        			formData1.append("mother_aadhar", "");
-        			
-        			if(MotherAadharPreview.html().trim() !== ''){
-        				if(motherAadharUploadEdit){
-        					Swal.fire('warning', 'Enter all mother details or remove all mother details', 'warning');
-            	            return;
-            			}
-        				else{
-        					formData1.append("mother_aadhar_file", "");
-        					formData1.append("raw_mother_aadhar", "");
-        					
-        				}
-        			}
-        			else{
-        				if(motherAadharUploadEdit){
-        					Swal.fire('warning', 'Enter all mother details or remove all mother details', 'warning');
-            	            return;
-            			}
-        			}
-        		}
-        	}
-        }
-        else{
-        	Swal.fire('warning', 'Please enter atleast anyone  mobile number', 'warning');
-            return;
-        }
-        
-    }
-	
-	else if (parentTypeEdit === 'SingleParent_Father') {
-        let sfatherNameEdit = $('#sfatherName').val().trim();
-        let sfatherMobileEdit = $('#sfatherMobile').val().trim();
-        let sfatherAadharEdit = $('#sfatherAadhar').val().trim();
-        let sfatherAadharUploadEdit = $('#sfatherAadharUpload')[0].files[0];
-
-/*         if (sfatherAadharUploadEdit) {
-	        console.log("Father Aadhar File:", sfatherAadharUpload.name, "-", sfatherAadharUpload.type);
-	    } else {
-	        console.log("Father Aadhar File: Not uploaded");
-	    } */
-        
-        if (!sfatherNameEdit || !sfatherMobileEdit || !sfatherAadharEdit) {
-            Swal.fire('Error', 'Please complete single father details.', 'error');
-            return;
-        }
-        if (!/^[A-Za-z\s.]+$/.test(sfatherNameEdit)) {				
-			 Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Name should contain only alphabets.'
-			    });
-			    return;
-		}
-        
-        if (!/^\d{10}$/.test(sfatherMobileEdit) ) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Please enter a valid 10-digit mobile number.'
-		    });
-		    return;
-		}
-	    
-	    if (/^0{10}$/.test(sfatherMobileEdit)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Mobile number cannot be all zeros.'
-		    });
-		    return;
-		}
-
-		if ( sfatherMobileEdit.startsWith('0') ) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Mobile number cannot start with zero.'
-		    });
-		    return;
-		}
-
-		if (/^(\d)\1{9}$/.test(sfatherMobileEdit)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Mobile number cannot have all digits the same.'
-		    });
-		    return;
-		}
-		
-		if ( !/^\d{12}$/.test(sfatherAadharEdit) ) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Please enter a valid 12-digit Aadhar number.'
-		    });
-		    return;
-		}
-		
-		formData1.append("father_name", sfatherNameEdit);
-        formData1.append("father_mobile", sfatherMobileEdit);
-        formData1.append("father_aadhar", sfatherAadharEdit);
-        if(sFatherAadharPreview.html().trim() === ''){
-	        if(sfatherAadharUploadEdit){
-	        	formData1.append("father_aadhar_file", sfatherAadharUploadEdit);
-	        }
-	        else{
-	        	 Swal.fire('Error', 'Please complete single Father details including Aadhar upload.', 'error');
-		            return;
-	        }
-        }
-        else
-        {
-        	if(sfatherAadharUploadEdit){
-	        	formData1.append("father_aadhar_file", sfatherAadharUploadEdit);
-	        }
-        	else{
-        		
-        		if(sfatherAadharEdit != previous_father_aadhar){
-    				 Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Upload Father Aadhar',
-	    			        text: 'You Changed father aadhar number.So,Please Upload New Father Aadhar File.'
-	    			    });
-	    			    return;
-    			}
-        		
-        		formData1.append("raw_father_aadhar", raw_father_file_update);
-        	}
-        }
-        
-        
-    }
-	
-	else if (parentTypeEdit === 'SingleParent_Mother') {
-        let smotherNameEdit = $('#smotherName').val().trim();
-        let smotherMobileEdit = $('#smotherMobile').val().trim();
-        let smotherAadharEdit = $('#smotherAadhar').val().trim();
-       
-        let smotherAadharUploadEdit = $('#smotherAadharUpload')[0].files[0];
-
-        if (!smotherNameEdit || !smotherMobileEdit || !smotherAadharEdit) {
-            Swal.fire('Error', 'Please complete single mother details.', 'error');
-            return;
-        }
-        
-        
-        if (!/^[A-Za-z\s.]+$/.test(smotherNameEdit)) {				
-			 Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Name should contain only alphabets.'
-			    });
-			    return;
-		}
-        
-        if (!/^\d{10}$/.test(smotherMobileEdit)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Please enter a valid 10-digit mobile number.'
-		    });
-		    return;
-		}
-	    
-	    if (/^0{10}$/.test(smotherMobileEdit)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Mobile number cannot be all zeros.'
-		    });
-		    return;
-		}
-
-		if ( smotherMobileEdit.startsWith('0')) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Mobile number cannot start with zero.'
-		    });
-		    return;
-		}
-
-		if (/^(\d)\1{9}$/.test(smotherMobileEdit)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Mobile number cannot have all digits the same.'
-		    });
-		    return;
-		}
-		
-		if (!/^\d{12}$/.test(smotherAadharEdit)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Please enter a valid 12-digit Aadhar number.'
-		    });
-		    return;
-		}
-		
-		formData1.append("mother_name", smotherNameEdit);
-        formData1.append("mother_mobile", smotherMobileEdit);
-        formData1.append("mother_aadhar", smotherAadharEdit);
-        
-       
-        if(sMotherAadharPreview.html().trim() === ''){
-	        if(smotherAadharUploadEdit){
-	        	formData1.append("mother_aadhar_file", smotherAadharUploadEdit);
-	        }
-	        else{
-	        	 Swal.fire('Error', 'Please complete single Mother details including Aadhar upload.', 'error');
-		            return;
-	        }
-        }
-        else
-        {
-        	if(smotherAadharUploadEdit){
-	        	formData1.append("mother_aadhar_file", smotherAadharUploadEdit);
-	        }  
-        	else{
-        		
-        		if(smotherAadharEdit != previous_mother_aadhar){
-   				 Swal.fire({
-	    			        icon: 'warning',
-	    			        title: 'Upload Mother Aadhar',
-	    			        text: 'You Changed mother aadhar number.So,Please Upload New Mother Aadhar File.'
-	    			    });
-	    			    return;
-   			}
-        		
-        		formData1.append("raw_mother_aadhar", raw_mother_file_update);	
-        	}
-        }
-
-    }
-	
-	else if (parentTypeEdit === 'Guardian') {
-        let guardianNameEdit = $('#guardianName').val().trim();
-        let guardianMobileEdit = $('#guardianMobile').val().trim();
-        let guardianAadharEdit = $('#guardianAadhar').val().trim();
-        let guardianFileInputEdit = document.getElementById('guardianAadharUpload');
-        let guardianAadharUploadEdit = guardianFileInputEdit ? guardianFileInputEdit.files[0] : null;
-
-        if (!guardianNameEdit || !guardianMobileEdit || !guardianAadharEdit) {
-            Swal.fire('Error', 'Please complete guardian details.', 'error');
-            return;
-        }
-         
-        if (!/^[A-Za-z\s.]+$/.test(guardianNameEdit)) {				
-			 Swal.fire({
-			        icon: 'warning',
-			        title: 'Validation Error',
-			        text: 'Name should contain only alphabets.'
-			    });
-			    return;
-		}
-        
-        if (!/^\d{10}$/.test(guardianMobileEdit)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Please enter a valid 10-digit mobile number.'
-		    });
-		    return;
-		}
-	    
-	    if ( /^0{10}$/.test(guardianMobileEdit)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Mobile number cannot be all zeros.'
-		    });
-		    return;
-		}
-
-		if (guardianMobileEdit.startsWith('0')) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Mobile number cannot start with zero.'
-		    });
-		    return;
-		}
-
-		if (/^(\d)\1{9}$/.test(guardianMobileEdit)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Mobile number cannot have all digits the same.'
-		    });
-		    return;
-		}
-		
-		if (!/^\d{12}$/.test(guardianAadharEdit)) {
-		    Swal.fire({
-		        icon: 'warning',
-		        title: 'Validation Error',
-		        text: 'Please enter a valid 12-digit Aadhar number.'
-		    });
-		    return;
-		}
-		
-		
-		formData1.append("guardian_name", guardianNameEdit);
-        formData1.append("guardian_mobile", guardianMobileEdit);
-        formData1.append("guardian_aadhar", guardianAadharEdit);
-        
-        
-        if(GuardianAadharPreview.html().trim() === ''){
-        	if(guardianAadharUploadEdit){
-        		formData1.append("guardian_aadhar_file", guardianAadharUploadEdit);
-	        }
-	        else{
-	        	 Swal.fire('Error', 'Please complete Guardian details including Aadhar upload.', 'error');
-		            return;
-	        }
-        }
-        else
-        {
-        	if(guardianAadharUploadEdit){
-        		formData1.append("guardian_aadhar_file", guardianAadharUploadEdit);
-	        }  
-        	else{
-        		
-        		if(guardianAadharEdit != previous_guardian_aadhar){
-      				 Swal.fire({
-   	    			        icon: 'warning',
-   	    			        title: 'Upload Guardian Aadhar',
-   	    			        text: 'You Changed guardian aadhar number.So,Please Upload New Guardian Aadhar File.'
-   	    			    });
-   	    			    return;
-      			}
-        		
-        		formData1.append("raw_guardian_aadhar", raw_guardian_file_update);	
-        	}
-        }
-             
-        let gfatherNameEdit = $('#gfatherName').val().trim();
-        let gfatherMobileEdit = $('#gfatherMobile').val().trim();
-        let gfatherAadharEdit = $('#gfatherAadhar').val().trim();
-        let gfatherAadharUploadEdit = $('#gfatherAadharUpload')[0].files[0];
-
-        // Check if any one is filled
-        let anyGfatherFieldFilledEdit = gfatherNameEdit || gfatherMobileEdit || gfatherAadharEdit;
-
-        if (anyGfatherFieldFilledEdit) {
-            if (!gfatherNameEdit || !gfatherMobileEdit || !gfatherAadharEdit) {
-                Swal.fire('Error', 'Please complete all Father details.', 'error');
-                return;
-            }
-
-            // Append only if all are filled
-            formData1.append("father_name", gfatherNameEdit);
-            formData1.append("father_mobile", gfatherMobileEdit);
-            formData1.append("father_aadhar", gfatherAadharEdit);                  
-            
-        }
-        
-        if(gfatherNameEdit && gfatherMobileEdit && gfatherAadharEdit)
-        {
-	        if(gFatherAadharPreview.html().trim() !== ''){
-	        	if(gfatherAadharUploadEdit){
-	        		formData1.append("father_aadhar_file", gfatherAadharUploadEdit);
-	        	}  
-	        	else{
-	        		
-	        		if(gfatherAadharEdit != previous_father_aadhar){
-	      				 Swal.fire({
-	   	    			        icon: 'warning',
-	   	    			        title: 'Upload Father Aadhar',
-	   	    			        text: 'You Changed father aadhar number.So,Please Upload New Father Aadhar File.'
-	   	    			    });
-	   	    			    return;
-	      			}
-	        		
-	        		formData1.append("raw_father_aadhar", raw_father_file_update);
-	        	}
-	        }
-	        else{	        	
-	        	if(!gfatherAadharUploadEdit){
-	        		Swal.fire('Error', 'Please complete all Father details including Aadhar upload.', 'error');
-	                return;
-	        	}
-	        	if(gfatherAadharUploadEdit){
-	        		formData1.append("father_aadhar_file", gfatherAadharUploadEdit);
-	        	}
-	        }
-        }
-        else{
-        	if(gFatherAadharPreview.html().trim() === ''){
-        		if(gfatherAadharUploadEdit){
-        			Swal.fire('Error', 'Please complete all Father details including Aadhar upload.', 'error');
-	                return;
-	        	}        		
-        		
-        	}
-        	else{
-        		if(!gfatherAadharUploadEdit){
-        			formData1.append("father_aadhar_file", "");
-        			formData1.append("raw_father_aadhar", "");
-        		}
-        		else{
-        			Swal.fire('Error', 'Please complete all Father details including Aadhar upload.', 'error');
-	                return;
-        		}
-        	}
-        }
-        
-        
-        
-        
-        let gmotherNameEdit= $('#gmotherName').val().trim();
-        let gmotherMobileEdit = $('#gmotherMobile').val().trim();
-        let gmotherAadharEdit = $('#gmotherAadhar').val().trim();
-        let gmotherAadharUploadEdit = $('#gmotherAadharUpload')[0].files[0];
-
-        // Check if any one is filled
-        let anyGmotherFieldFilledEdit = gmotherNameEdit || gmotherMobileEdit || gmotherAadharEdit;
-
-        if (anyGmotherFieldFilledEdit) {
-            if (!gmotherNameEdit || !gmotherMobileEdit || !gmotherAadharEdit) {
-                Swal.fire('Error', 'Please complete all Mother details.', 'error');
-                return;
-            }
-
-            // Append only if all are filled
-            formData1.append("mother_name", gmotherNameEdit);
-            formData1.append("mother_mobile", gmotherMobileEdit);
-            formData1.append("mother_aadhar", gmotherAadharEdit);           
-        }
-        
-        if(gmotherNameEdit && gmotherMobileEdit && gmotherAadharEdit)
-        {
-	        if(gMotherAadharPreview.html().trim() !== ''){
-	        	if(gmotherAadharUploadEdit){
-	        		formData1.append("mother_aadhar_file", gmotherAadharUploadEdit);
-	        	} 
-	        	else{
-	        		
-	        		if(gmotherAadharEdit != previous_mother_aadhar){
-	      				 Swal.fire({
-	   	    			        icon: 'warning',
-	   	    			        title: 'Upload Mother Aadhar',
-	   	    			        text: 'You Changed mother aadhar number.So,Please Upload New Mother Aadhar File.'
-	   	    			    });
-	   	    			    return;
-	      			}
-	        		
-	        		formData1.append("raw_mother_aadhar", raw_mother_file_update);
-	        	}
-	        }
-	        else{	        	
-	        	if(!gmotherAadharUploadEdit){
-	        		Swal.fire('Error', 'Please complete all Mother details including Aadhar upload.', 'error');
-	                return;
-	        	}
-	        	if(gmotherAadharUploadEdit){
-	        		formData1.append("mother_aadhar_file", gmotherAadharUploadEdit);
-	        	}
-	        }
-        }
-        else{
-        	if(gMotherAadharPreview.html().trim() === ''){
-        		if(gmotherAadharUploadEdit){
-        			Swal.fire('Error', 'Please complete all Mother details including Aadhar upload.', 'error');
-	                return;
-	        	}        		
-        		
-        	}
-        	else{
-        		if(!gmotherAadharUploadEdit){
-        			formData1.append("mother_aadhar_file", "");
-        			formData1.append("raw_mother_aadhar", "");
-        		}
-        		else{
-        			Swal.fire('Error', 'Please complete all Mother details including Aadhar upload.', 'error');
-	                return;
-        		}
-        	}
-        }
-
-    }
-	
-	
-	let aadharInputs = {
-    	    studentAadhar: $('#studentAadhar').val().trim(),
-    	    fatherAadhar: $('#fatherAadhar').val().trim(),
-    	    motherAadhar: $('#motherAadhar').val().trim(),
-    	    sfatherAadhar: $('#sfatherAadhar').val().trim(),
-    	    smotherAadhar: $('#smotherAadhar').val().trim(),
-    	    guardianAadhar: $('#guardianAadhar').val().trim(),
-    	    gfatherAadhar: $('#gfatherAadhar').val().trim(),
-    	    gmotherAadhar: $('#gmotherAadhar').val().trim()
-    	};
-
-    	// Friendly names for display
-    	let fieldLabels = {
-    	    studentAadhar: 'Student',
-    	    fatherAadhar: 'Father',
-    	    motherAadhar: 'Mother',
-    	    sfatherAadhar: 'Father',
-    	    smotherAadhar: 'Mother',
-    	    guardianAadhar: 'Guardian',
-    	    gfatherAadhar: 'Father',
-    	    gmotherAadhar: 'Mother'
-    	};
-    	
-    	// Map values to their corresponding field keys
-    	let valueMap = {};
-    	for (let key in aadharInputs) {
-    	    let val = aadharInputs[key];
-    	    if (val !== '') {
-    	        valueMap[val] = valueMap[val] ? [...valueMap[val], key] : [key];
-    	    }
-    	}
-
-    	// Find duplicates
-    	let duplicateEntries = Object.entries(valueMap).filter(([val, keys]) => keys.length > 1);
-
-    	if (duplicateEntries.length > 0) {
-    	   /*  let message = '';
-
-    	    duplicateEntries.forEach(([val, keys]) => {
-    	        let fieldList = keys.map(k => `• ${fieldLabels[k] || k}`).join('<br>');
-    	        message += `<strong>Aadhar:</strong> ${val}<br><em>Used in:</em><br>${fieldList}<br><br>`;
-    	    }); */
-
-    	    Swal.fire({
-    	        icon: 'warning',
-    	        title: 'Duplicate Aadhar Numbers Found',
-    	        //html: message
-    	    });
-
-    	    return; // Stop further processing
-    	}
-    	
-    	//Map input IDs to friendly labels
-    	let fileFieldsEdit = {
-    	    studentAadharUpload: 'Student',
-    	    fatherAadharUpload: 'Father',
-    	    motherAadharUpload: 'Mother',
-    	    sfatherAadharUpload: 'Father',
-    	    smotherAadharUpload: 'Mother',
-    	    guardianAadharUpload: 'Guardian',
-    	    gfatherAadharUpload: 'Father',
-    	    gmotherAadharUpload: 'Mother'
-    	};
-
-    	// On form submit or trigger point
-    	function checkDuplicateFileNamesEdit() {
-    		//console.log("hiiiiii-2");
-    	    let fileNameMap = {};
-
-    	    for (let id in fileFieldsEdit) {
-    	        let input = document.getElementById(id);
-    	        if (input && input.files.length > 0) {
-    	            let fileName = input.files[0].name.trim();
-    	            
-    	         // Add this debug log to check file name
-
-    	            if (fileNameMap[fileName]) {
-    	                fileNameMap[fileName].push(fileFieldsEdit[id]);
-    	            } else {
-    	                fileNameMap[fileName] = [fileFieldsEdit[id]];
-    	            }
-    	        }
-    	    }
-
-    	    // Find duplicates
-    	    let duplicates = Object.entries(fileNameMap).filter(([name, fields]) => fields.length > 1);
-				
-    	    //console.log("duplicates.length==="+duplicates.length);
-    	    if (duplicates.length > 0) {
-    	    	
-    	        /* let message = '';
-    	        duplicates.forEach(([name, fields]) => {
-    	            let usedIn = fields.map(f => `• ${f}`).join('<br>');
-    	            message += `<strong>File:</strong> ${name}<br><em>Used in:</em><br>${usedIn}<br><br>`;
-    	        }); */
-
-    	        Swal.fire({
-    	            icon: 'error',
-    	            title: 'Duplicate Aadhar Files Found',
-    	            //html: message
-    	        });
-
-    	        return false; // stop form submission or further processing
-    	    }
-
-    	    return true; // no duplicates
-    	}
-    	
-    	
-    	if (!checkDuplicateFileNamesEdit()) {
-    		
-            e.preventDefault(); // stop form submit
-            return;
-        }
-	
-	
-	for (let pair of formData1.entries()) {
-	    console.log(pair[0] + ':', pair[1]);
-	}
-	$('#pageLoader').show();
-	 // Send AJAX request
-	   $('#updateStudentdDetails').prop('disabled', true).text('Updating...');
-	      $.ajax({
-	        url: '/gcc/api/gccschool/studentInfo/updateStudent', 
-	        type: 'POST',
-	        data: formData1,
-	        contentType: false,
-	        processData: false,
-	        success: function (response) {
-	        	 $('#pageLoader').hide();
-	        	$('#updateStudentdDetails').prop('disabled', false).text('Update');
-	        	if (response.Message === 'Success') {
-	                Swal.fire({
-	                    icon: 'success',
-	                    title: 'Success',
-	                    allowOutsideClick: false, 
-	                    allowEscapeKey: false, 
-	                    allowEnterKey: false, 
-	                    showConfirmButton: true,
-	                    text: 'Student details '+response.Data+ '!'
-	                }).then((result) => {
-	                    if (result.isConfirmed) {	                    		                    	
-	                    	location.reload();
-	                    }
-	                });
-	                
-	            } 
-	        		        	
-	        	else if (response.Message === 'Error') {
-	                Swal.fire({
-	                    icon: 'error',
-	                    title: 'Error',
-	                    text: response.Data || 'An unknown error occurred.'
-	                });
-	            } else {
-	            	 let errorMessage = 'An error occurred while updating student details.';
-	            	    if (xhr.responseJSON && xhr.responseJSON.Error) {
-	            	        errorMessage = xhr.responseJSON.Error;
-	            	    }
-	            	    Swal.fire({
-	            	        icon: 'error',
-	            	        title: 'Error',
-	            	        text: errorMessage
-	            	    });
-	            	    console.error('AJAX error:', error);
-	            }
-	            
-	        },
-	        error: function () {
-	        	 $('#pageLoader').hide();
-	        	$('#updateStudentdDetails').prop('disabled', false).text('Update');
-	            Swal.fire({
-	                icon: 'error',
-	                title: 'Error',
-	                text: 'Something went wrong while saving.'
-	            });
-	        }
-	    }); 
-	
-});
-	
-	
-	
-	
-	function sentAddStudent(standard){
-		$('#AddStudentModal').modal('show');
-		//console.log("answwer=="+standard)
-		
-		$('#standard').val(standard);
-		
-		// Clear all other input fields
-	    $('#studentName').val("");
-	    $('#EmisNumber').val("").prop('readonly', false);
-	    $('#gender').prop('selectedIndex', 0);
-	    $('#dob').val("");
-	    $('#age').val("");
-	    $('#parentType').val(''); 
-	    
-	    $('#medium').val(''); 
-	    $('#section').val(''); 
-	    
-	    $('#studentAadhar').val('');
-	    
-	    //$('#studentAadharUpload').replaceWith($('#studentAadharUpload').clone());
-	    
-	    let sufileInput = $('#studentAadharUpload');
-	    let newFileInput = sufileInput.clone();
-	    newFileInput.val('');
-	    sufileInput.replaceWith(newFileInput);
-	    
-	     $('#singleParentDiv,#singleParentMotherDiv ,#guardianDiv, #parentDiv').hide().each(function () {
-	        // Reset all input, select, and textarea fields inside each div
-	        $(this).find('input, select, textarea').each(function () {
-	            if ($(this).attr('type') === 'file') {
-	                // Replace file input with its clone to clear safely
-	                //$(this).replaceWith($(this).clone());
-	                //console.log("vvvvvvv");
-	                 $(this).val(''); // Better than replacing
-	            } else {
-	                $(this).val('');
-	            }
-	        });
-	    }); 
-	     
-	     $('#parentDiv').hide();
-    	 $('#singleParentFatherDiv').hide();
-    	 $('#singleParentMotherDiv').hide();
-    	 $('#guardianDiv').hide();
-    	 $('#studentAadharPreview').hide();
-    	 
-    	 
-    	 $('#updateStudentdDetails').hide();
-    	 $('#saveStudentdDetails').show();
-	    
-		
-	    $('#AddStudentModalTitle').text('Add Student for '+standard);
-	}
-	
-	
-	function sentViewStudentList(viewstandard,globalUdise){
-		//console.log("======="+viewstandard,globalUdise);
-		
-		 $.ajax({
-		        url: '/gcc/api/gccschool/studentInfo/getStudentsClass', 
-		        type: 'GET',
-		        data: {std:viewstandard,udise:globalUdise},
-		        success: function (response) {
-		        	if (response.Message === 'Success') {
-		        		 const students = response.Data;
-		                 const $tbody = $('#StudentListDatatable tbody');
-		                 $tbody.empty(); // Clear previous rows if any
-		                 
-		              // Reinitialize or refresh DataTable if already initialized
-		                 if ($.fn.DataTable.isDataTable('#StudentListDatatable')) {
-		                     $('#StudentListDatatable').DataTable().clear().destroy();
-		                 }
-
-		                 students.forEach((student, index) => {
-		                     const row = `
-		                         <tr>
-		                             <td class="text-center">${index + 1}</td>
-		                             <td class="text-center">${student.student_name}</td>
-		                             <td class="text-center">${student.emis_no}</td>
-		                             <td >
-		                                 <button class="btn btn-sm btn-success view-student-btn" data-student-id="${student.student_id}">
-		                                 <i class="ik ik-eye"></i>
-		                                 </button>
-		                                 <button class="btn btn-sm btn-primary edit-student-btn ml-2" data-student-id="${student.student_id}">
-		                                 <i class="ik ik-edit"></i>
-		                                 </button>
-		                                 <button class="btn btn-sm btn-warning delete-student-btn ml-2" data-student-id="${student.student_id}" data-student-name="${student.student_name}">
-		                                 <i class="ik ik-trash-2"></i>
-		                                 </button>
-		                             </td>
-		                         </tr>
-		                     `;
-		                     $tbody.append(row);
-		                 });
-
-		                 
-
-		                 //$('#StudentListDatatable').DataTable();
-		                 $('#StudentListDatatable').DataTable({
-		                	 autoWidth: false, 
-		                	    columnDefs: [
-		                	        { width: "10%", targets: 0 }, // S.NO column
-		                	        { width: "30%", targets: 1 }, // Name
-		                	        { width: "20%", targets: 2 }, // EMIS Number
-		                	        { width: "40%", targets: 3 }  // Action
-		                	    ],
-		                     dom: 'Bfrtip',
-		                     buttons: [{
-		             			title: 'Data export',
-		            			extend: 'copyHtml5',
-		            			text: 'Copy',
-		            			className: 'btn btn-secondary',
-		            			id: 'copyBtn'
-		            		},
-		            		{
-		            			extend: 'excelHtml5',
-		            			text: 'Excel',
-		            			className: 'btn btn-secondary',
-		            			id: 'excelBtn',
-		            			title: viewstandard+' Students List'
-		            		},
-		            		{
-		            			extend: 'csvHtml5',
-		            			text: 'CSV',
-		            			className: 'btn btn-secondary',
-		            			id: 'csvBtn',
-		            			title: viewstandard+' Students List'
-		            		},
-		            		{
-		            			extend: 'pdfHtml5',
-		            			text: 'PDF',
-		            			className: 'btn btn-secondary',
-		            			id: 'pdfBtn',
-		            			title: viewstandard+' Students List'
-		            		},
-		            		{
-		            			extend: 'print',
-		            			text: 'Print',
-		            			className: 'btn btn-secondary',
-		            			id: 'printBtn',
-		            			title: 'School Students List',
-		            			exportOptions: {
-		            				columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-		            			}
-		            		}]
-		                 });
-
-		                 // Show the modal after loading data
-		                 $('#StudentListModal').modal('show');
-		                 $('#StudentListModalTitle').text(viewstandard+' Students List');
-		             } 
-		        	else if (response.Message === 'Error') {
-		                Swal.fire({
-		                    icon: 'error',
-		                    title: 'Error',
-		                    text: response.Error || 'An unknown error occurred.'
-		                });
-		            }
-		        	else {
-		                 console.log("Failed to fetch student list.");
-		             }
-		                		            		            
-		        },
-		        error: function () {
-		            Swal.fire({
-		                icon: 'error',
-		                title: 'Error',
-		                text: 'Something went wrong while Retrieving.'
-		            });
-		        }
-		    });
-	}
-	
-	/* function sentEditStudentList(editstandard,globalUdise){
-		console.log("="+editstandard,globalUdise);
-		
-		 $.ajax({
-		        url: '/gcc/api/gccschool/studentInfo/getStudentsClass', 
-		        type: 'GET',
-		        data: {std:editstandard,udise:globalUdise},
-		        success: function (response) {
-		        	if (response.Message === 'Success') {
-		        		 const students = response.Data;
-		                 const $tbody = $('#EditStudentListDatatable tbody');
-		                 $tbody.empty(); // Clear previous rows if any
-		                 
-		              // Reinitialize or refresh DataTable if already initialized
-		                 if ($.fn.DataTable.isDataTable('#EditStudentListDatatable')) {
-		                     $('#EditStudentListDatatable').DataTable().clear().destroy();
-		                 }
-
-		                 students.forEach((student, index) => {
-		                     const row = `
-		                         <tr>
-		                             <td class="text-center">${index + 1}</td>
-		                             <td class="text-center">${student.student_name}</td>
-		                             <td class="text-center">${student.emis_no}</td>
-		                             <td class="text-center">
-		                                 <button class="btn btn-sm btn-warning edit-student-btn" data-student-id="${student.student_id}">
-		                                     Edit
-		                                 </button>
-		                             </td>
-		                         </tr>
-		                     `;
-		                     $tbody.append(row);
-		                 });
-
-		                 
-
-		                 //$('#StudentListDatatable').DataTable();
-		                 $('#EditStudentListDatatable').DataTable({
-		                     dom: 'Bfrtip',
-		                     buttons: [{
-		             			title: 'Data export',
-		            			extend: 'copyHtml5',
-		            			text: 'Copy',
-		            			className: 'btn btn-secondary',
-		            			id: 'copyBtn'
-		            		},
-		            		{
-		            			extend: 'excelHtml5',
-		            			text: 'Excel',
-		            			className: 'btn btn-secondary',
-		            			id: 'excelBtn',
-		            			title: viewstandard+' Standard List'
-		            		},
-		            		{
-		            			extend: 'csvHtml5',
-		            			text: 'CSV',
-		            			className: 'btn btn-secondary',
-		            			id: 'csvBtn',
-		            			title: viewstandard+' Standard List'
-		            		},
-		            		{
-		            			extend: 'pdfHtml5',
-		            			text: 'PDF',
-		            			className: 'btn btn-secondary',
-		            			id: 'pdfBtn',
-		            			title: viewstandard+' Standard List'
-		            		},
-		            		{
-		            			extend: 'print',
-		            			text: 'Print',
-		            			className: 'btn btn-secondary',
-		            			id: 'printBtn',
-		            			title: 'School Standard List',
-		            			exportOptions: {
-		            				columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-		            			}
-		            		}]
-		                 });
-
-		                 // Show the modal after loading data
-		                 $('#EditStudentListModal').modal('show');
-		                 $('#EditStudentListModalTitle').text(editstandard+' Students List');
-		             } 
-		        	else if (response.Message === 'Error') {
-		                Swal.fire({
-		                    icon: 'error',
-		                    title: 'Error',
-		                    text: response.Error || 'An unknown error occurred.'
-		                });
-		            }
-		        	else {
-		                 console.log("Failed to fetch student list.");
-		             }
-		                		            		            
-		        },
-		        error: function () {
-		            Swal.fire({
-		                icon: 'error',
-		                title: 'Error',
-		                text: 'Something went wrong while Retrieving.'
-		            });
-		        }
-		    });
-	} */
-	
-	function sentStudentDetails(studentview){
-		
-		$('#viewstudentName').text('-');
-	    $('#viewEmisNumber').text('-');
-	    $('#viewgender').text('-');
-	    $('#viewstandard').text('-');
-	    $('#viewdob').text('-');
-	    $('#viewage').text('-');
-	    $('#viewstudentAadharNumber').text('-');
-	    $('#viewsection').text('-');
-	    $('#viewmedium').text('-');
-	    $('#viewparentType').text('-');
-	    
-	    $('#viewfatherName').text('-');
-	    $('#viewmotherName').text('-');
-	    $('#viewfatherMobile').text('-');
-	    $('#viewmotherMobile').text('-');
-	    $('#viewfatherAadhar').text('-');
-	    $('#viewmotherAadhar').text('-');
-	    $('#viewguardianName').text('-');
-		$('#viewguardianMobile').text('-');
-		$('#viewguardianAadhar').text('-');
-		
-		$('#viewfatherAadharUpload').html('<span class="text-muted">N/A</span>');
-		$('#viewmotherAadharUpload').html('<span class="text-muted">N/A</span>');
-		$('#viewguardianAadharUpload').html('<span class="text-muted">N/A</span>');
-		$('#viewstudentAadharUpload').html('<span class="text-muted">N/A</span>');
-		
-		//console.log("studentview=="+studentview);
-		 
-		 $.ajax({
-	        url: '/gcc/api/gccschool/studentInfo/getStudentsDetails', 
-	        type: 'GET',
-	        data: {studentId:studentview},
-	        success: function (response) {
-	        	//console.log(response.Data);
-	        	if (response.Message === 'Success') {
-	        		
-	        		const student = response.Data[0];
-
-	                // Populate fields
-	               	$('#viewstudentName').text(student.student_name || '-');
-				    $('#viewEmisNumber').text(student.emis_no || '-');
-				    $('#viewgender').text(student.gender || '-');
-				    $('#viewstandard').text(student.std || '-');
-				    //$('#viewdob').text(student.dob || '-');
-				    const dobFormatted = student.dob ? formatDateToDMY(student.dob) : '-';
-        			$('#viewdob').text(dobFormatted);
-				    $('#viewage').text(student.age || '-');
-				    $('#viewstudentAadharNumber').text(student.student_aadhar || '-');
-				    $('#viewsection').text(student.section || '-');				   				    
-				    $('#viewmedium').text(student.mediums || '-');
-				    
-				    $('#viewparentType').text(student.parent_type || '-');
-				    
-				    function renderFileButton(containerId, fileUrl, label) {
-				        if (fileUrl) {
-				            $(`#${containerId}`).html(
-				                `<button class="btn  btn-primary"  onclick="openDocModal('${fileUrl}')">View File</button>`
-				            );
-				        } else {
-				            $(`#${containerId}`).html('<span class="text-muted">N/A</span>');
-				        }
-				    }
-				    
-				    if(student.parent_type ==='Parent'){
-				    	
-				    	$('#viewfatherName').text(student.father_name || '-');
-					    $('#viewmotherName').text(student.mother_name || '-');
-					    $('#viewfatherMobile').text(student.father_mobile || '-');
-					    $('#viewmotherMobile').text(student.mother_mobile || '-');
-					    $('#viewfatherAadhar').text(student.father_aadhar || '-');
-					    $('#viewmotherAadhar').text(student.mother_aadhar || '-');
-					    renderFileButton('viewfatherAadharUpload', student.view_father_aadhar_file, 'Father Aadhar');
-					    renderFileButton('viewmotherAadharUpload', student.view_mother_aadhar_file, 'Mother Aadhar');
-				    }
-				    
-				    else if(student.parent_type ==='SingleParent_Father'){
-				    	
-						$('#viewfatherName').text(student.father_name || '-');
-						 $('#viewfatherMobile').text(student.father_mobile || '-');
-						 $('#viewfatherAadhar').text(student.father_aadhar || '-');
-						 renderFileButton('viewfatherAadharUpload', student.view_father_aadhar_file, 'Father Aadhar');
-				    }
-					
-				    else if(student.parent_type ==='SingleParent_Mother'){
-				    	
-						$('#viewmotherName').text(student.mother_name || '-');
-						$('#viewmotherMobile').text(student.mother_mobile || '-');
-						$('#viewmotherAadhar').text(student.mother_aadhar || '-');
-						renderFileButton('viewmotherAadharUpload', student.view_mother_aadhar_file, 'Mother Aadhar');
-				    }
-					
-				    else if(student.parent_type ==='Guardian'){
-				    	
-						$('#viewguardianName').text(student.guardian_name || '-');
-						$('#viewguardianMobile').text(student.guardian_mobile || '-');
-						$('#viewguardianAadhar').text(student.guardian_aadhar || '-');
-						renderFileButton('viewguardianAadharUpload', student.view_guardian_aadhar_file, 'Guardian Aadhar');
-						$('#viewfatherName').text(student.father_name || '-');
-					    $('#viewmotherName').text(student.mother_name || '-');
-					    $('#viewfatherMobile').text(student.father_mobile || '-');
-					    $('#viewmotherMobile').text(student.mother_mobile || '-');
-					    $('#viewfatherAadhar').text(student.father_aadhar || '-');
-					    $('#viewmotherAadhar').text(student.mother_aadhar || '-');
-					    renderFileButton('viewfatherAadharUpload', student.view_father_aadhar_file, 'Father Aadhar');
-					    renderFileButton('viewmotherAadharUpload', student.view_mother_aadhar_file, 'Mother Aadhar');
-						
-				    }
-				    
-				   /*  $('#viewfatherName').text(student.father_name || '-');
-				    $('#viewmotherName').text(student.mother_name || '-');
-				    $('#viewguardianName').text(student.guardian_name || '-');
-
-				    $('#viewfatherMobile').text(student.father_mobile || '-');
-				    $('#viewmotherMobile').text(student.mother_mobile || '-');
-				    $('#viewguardianMobile').text(student.guardian_mobile || '-');
-
-				    $('#viewfatherAadhar').text(student.father_aadhar || '-');
-				    $('#viewmotherAadhar').text(student.mother_aadhar || '-');
-				    $('#viewguardianAadhar').text(student.guardian_aadhar || '-'); */
-
-				    // Aadhar File Buttons
-				    
-/* 				    renderFileButton('viewfatherAadharUpload', student.view_father_aadhar_file, 'Father Aadhar');
-				    renderFileButton('viewmotherAadharUpload', student.view_mother_aadhar_file, 'Mother Aadhar');
-				    renderFileButton('viewguardianAadharUpload', student.view_guardian_aadhar_file, 'Guardian Aadhar'); */
-				    renderFileButton('viewstudentAadharUpload', student.view_student_aadhar_file, 'Student Aadhar');
-	               
-	                 
-
-	                $('#SpecificStudentModal').modal('show');
-	                $('#SpecificStudentModalTitle').text(student.student_name+' Student Details');
-	             } 
-	        	else if (response.Message === 'Error') {
-	                Swal.fire({
-	                    icon: 'error',
-	                    title: 'Error',
-	                    text: response.Error || 'An unknown error occurred.'
-	                });
-	            }
-	        	else {
-	                 console.log("Failed to fetch student Data.");
-	             }
-	                		            		            
-	        },
-	        error: function () {
-	            Swal.fire({
-	                icon: 'error',
-	                title: 'Error',
-	                text: 'Something went wrong while Retrieving.'
-	            });
-	        }
-	    }); 
-		
-	}
-	
-	function formatDateToDMY(dateStr) {
-	    const [year, month, day] = dateStr.split('-');
-	    return `${day}-${month}-${year}`;
-	}
-	
-function sentEditStudentDetails(studentedit){
-		
-		//console.log("studentedit=="+studentedit);
-		 
-		 $.ajax({
-	        url: '/gcc/api/gccschool/studentInfo/getStudentsDetails', 
-	        type: 'GET',
-	        data: {studentId:studentedit},
-	        success: function (response) {
-	        	//console.log(response.Data);
-	        	if (response.Message === 'Success') {
-	        		
-	        		const student = response.Data[0];
-	        		
-	        		$('#student_id').text(student.student_id);
-	        		
-	        		$('#studentName').val(student.student_name);
-	        		$('#EmisNumber').val(student.emis_no).prop('readonly', true);
-				    $('#standard').val(student.std);
-				    $('#sectionDropdown').val(student.section);
-				    $('#medium').val(student.mediums);
-				    $('#gender').val(student.gender);
-				    
-				    $('#dob').val(student.dob);
-				    $('#age').val(student.age);
-				    $('#studentAadhar').val(student.student_aadhar);
-				   
-				    $('#parentType').val(student.parent_type);
-				    
-				    $('#raw_father_file').text(student.father_aadhar_file);
-				    $('#raw_mother_file').text(student.mother_aadhar_file);
-				    $('#raw_guardian_file').text(student.guardian_aadhar_file);
-				    $('#raw_student_file').text(student.student_aadhar_file);
-				    
-				    $('#previous_father_aadhar').text(student.father_aadhar);
-				    $('#previous_mother_aadhar').text(student.mother_aadhar);
-				    $('#previous_guardian_aadhar').text(student.guardian_aadhar);
-				    $('#previous_student_aadhar').text(student.student_aadhar);
-				    
-				    $('#fatherAadharUpload, #motherAadharUpload, #sfatherAadharUpload,#smotherAadharUpload,#gfatherAadharUpload,#guardianAadharUpload,#gmotherAadharUpload, #studentAadharUpload').val('');
-				    
-				    if (student.view_student_aadhar_file) {
-				    	
-				    	$('#studentAadharPreview').show();
-				    	// Extract file name from URL
-				        const fileName = student.view_student_aadhar_file.split('/').pop();
-				    	
-				        $('#studentAadharPreview').html(`
-				            <a href="${student.view_student_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
-				        `);
-				    } else {
-				       
-				        $('#studentAadharPreview').hide();
-				    }
-				    
-				    if(student.parent_type==='Parent'){
-				    	
-				    	 $('#parentDiv').show();
-				    	 $('#singleParentFatherDiv').hide();
-				    	 $('#singleParentMotherDiv').hide();
-				    	 $('#guardianDiv').hide();
-				    	 
-				    	 $('#fatherName').val(student.father_name);
-				    	 $('#motherName').val(student.mother_name);
-				    	 $('#fatherMobile').val(student.father_mobile);
-				    	 $('#motherMobile').val(student.mother_mobile);
-				    	 $('#fatherAadhar').val(student.father_aadhar);
-				    	 $('#motherAadhar').val(student.mother_aadhar);
-				    	 
-				    	 if (student.view_father_aadhar_file) {
-						    	
-						    	$('#FatherAadharPreview').show();
-						    	// Extract file name from URL
-						        const fileName = student.view_father_aadhar_file.split('/').pop();
-						    	
-						        $('#FatherAadharPreview').html(`
-						            <a href="${student.view_father_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
-						        `);
-						    } else {
-						        
-						        $('#FatherAadharPreview').hide();
-						    }
-				    	 
-				    	 if (student.view_mother_aadhar_file) {
-						    	
-						    	$('#MotherAadharPreview').show();
-						    	// Extract file name from URL
-						        const fileName = student.view_mother_aadhar_file.split('/').pop();
-						    	
-						        $('#MotherAadharPreview').html(`
-						            <a href="${student.view_mother_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
-						        `);
-						    } else {
-						        
-						        $('#MotherAadharPreview').hide();
-						    }
-				    	 
-			           
-				    }
-				    
-					if(student.parent_type==='SingleParent_Father'){
-				    	
-						$('#singleParentFatherDiv').show();
-						$('#parentDiv').hide();
-						$('#singleParentMotherDiv').hide();
-				    	$('#guardianDiv').hide();
-				    	
-				    	 $('#sfatherName').val(student.father_name);
-				    	 
-				    	 $('#sfatherMobile').val(student.father_mobile);
-				    	 
-				    	 $('#sfatherAadhar').val(student.father_aadhar);
-				    	 
-				    	 if (student.view_father_aadhar_file) {
-						    	
-						    	$('#sFatherAadharPreview').show();
-						    	// Extract file name from URL
-						        const fileName = student.view_father_aadhar_file.split('/').pop();
-						    	
-						        $('#sFatherAadharPreview').html(`
-						            <a href="${student.view_father_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
-						        `);
-						    } else {
-						        
-						        $('#sFatherAadharPreview').hide();
-						    }
-				    	
-				    }
-
-				    if(student.parent_type==='SingleParent_Mother'){
-				    	
-				    	$('#singleParentMotherDiv').show();
-				    	$('#guardianDiv').hide();
-						$('#singleParentFatherDiv').hide();
-						$('#parentDiv').hide();
-						
-						
-				    	 $('#smotherName').val(student.mother_name);
-				    	 
-				    	 $('#smotherMobile').val(student.mother_mobile);
-				    	 
-				    	 $('#smotherAadhar').val(student.mother_aadhar);
-				    	 
-				    	 
-				    	 if (student.view_mother_aadhar_file) {
-						    	
-						    	$('#sMotherAadharPreview').show();
-						    	// Extract file name from URL
-						        const fileName = student.view_mother_aadhar_file.split('/').pop();
-						    	
-						        $('#sMotherAadharPreview').html(`
-						            <a href="${student.view_mother_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
-						        `);
-						    } else {
-						        
-						        $('#sMotherAadharPreview').hide();
-						    }
-				    	 
-				    }
-				    
-					if(student.parent_type==='Guardian'){
-						
-						 $('#guardianDiv').show();
-						 $('#singleParentFatherDiv').hide();
-				    	 $('#singleParentMotherDiv').hide();
-				    	 $('#parentDiv').hide();
-				    	 
-				    	 
-				    	 $('#gfatherName').val(student.father_name);
-				    	 $('#gmotherName').val(student.mother_name);
-				    	 $('#gfatherMobile').val(student.father_mobile);
-				    	 $('#gmotherMobile').val(student.mother_mobile);
-				    	 $('#gfatherAadhar').val(student.father_aadhar);
-				    	 $('#gmotherAadhar').val(student.mother_aadhar);
-				    	 $('#guardianName').val(student.guardian_name);
-				    	 $('#guardianMobile').val(student.guardian_mobile);
-				    	 $('#guardianAadhar').val(student.guardian_aadhar);
-				    	 
-				    	 if (student.view_father_aadhar_file) {
-						    	
-						    	$('#gFatherAadharPreview').show();
-						    	// Extract file name from URL
-						        const fileName = student.view_father_aadhar_file.split('/').pop();
-						    	
-						        $('#gFatherAadharPreview').html(`
-						            <a href="${student.view_father_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
-						        `);
-						    } else {
-						        
-						        $('#gFatherAadharPreview').hide();
-						    }
-				    	 
-				    	 if (student.view_mother_aadhar_file) {
-						    	
-						    	$('#gMotherAadharPreview').show();
-						    	// Extract file name from URL
-						        const fileName = student.view_mother_aadhar_file.split('/').pop();
-						    	
-						        $('#gMotherAadharPreview').html(`
-						            <a href="${student.view_mother_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
-						        `);
-						    } else {
-						        
-						        $('#gMotherAadharPreview').hide();
-						    }
-				    	 
-				    	 if (student.view_guardian_aadhar_file) {
-						    	
-						    	$('#GuardianAadharPreview').show();
-						    	// Extract file name from URL
-						        const fileName = student.view_guardian_aadhar_file.split('/').pop();
-						    	
-						        $('#GuardianAadharPreview').html(`
-						            <a href="${student.view_guardian_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
-						        `);
-						    } else {
-						        
-						        $('#GuardianAadharPreview').hide();
-						    }
-				    	 
-				    }
-	        		
-	        		 
-	        		$('#saveStudentdDetails').hide();
-	        		$('#updateStudentdDetails').show();
-	               
-	        		$('#AddStudentModal').css('z-index', '1055'); 
-	                $('#AddStudentModal').modal('show');
-	                $('#AddStudentModalTitle').text(student.student_name+' - Edit Details');
-	             } 
-	        	else if (response.Message === 'Error') {
-	                Swal.fire({
-	                    icon: 'error',
-	                    title: 'Error',
-	                    text: response.Error || 'An unknown error occurred.'
-	                });
-	            }
-	        	else {
-	                 console.log("Failed to fetch student Data.");
-	             }
-	                		            		            
-	        },
-	        error: function () {
-	            Swal.fire({
-	                icon: 'error',
-	                title: 'Error',
-	                text: 'Something went wrong while Retrieving.'
-	            });
-	        }
-	    }); 
-		
-	}
-	
-function sentDeleteStudentDetails(studentdelete){
-	
-	//console.log("studentdelete_id="+studentdelete);
-	//console.log("userId="+userId);
-	$('.delete-student-btn').prop('disabled', true);
-	$('#pageLoader').show();
- 	$.ajax({
-        url: '/gcc/api/gccschool/studentInfo/deleteStudent', 
-        type: 'POST',
-        data: {
-        	student_id:studentdelete,
-        	user_id:userId,
-        	action_type:'DELETE'
-        },
-        success: function (response) {
-        	$('#pageLoader').hide();
-        	$('.delete-student-btn').prop('disabled', false);
-        	if (response.Message === 'Success') {
-                Swal.fire({
-                    icon: 'success',
-                    title: 'Success',
-                    allowOutsideClick: false, // Disable clicking outside the modal to close it
-                    allowEscapeKey: false, // Disable escape key to close the modal
-                    allowEnterKey: false, // Disable enter key to close the modal
-                    showConfirmButton: true, // Ensure the confirm button is visible
-                    text: 'Student details '+response.Data+' !'
-                }).then((result) => {
-                    if (result.isConfirmed) {
-                    		                    	
-                    	location.reload();
-                    }
-                });
-                
-            } 
-        	
-        	else if (response.Message === 'Error') {
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error',
-                    text: response.Data || 'An unknown error occurred.'
-                });
-            } else {
-            	 let errorMessage = 'An error occurred while Deleting student details.';
-            	    if (xhr.responseJSON && xhr.responseJSON.Error) {
-            	        errorMessage = xhr.responseJSON.Error;
-            	    }
-            	    Swal.fire({
-            	        icon: 'error',
-            	        title: 'Error',
-            	        text: errorMessage
-            	    });
-            	    console.error('AJAX error:', error);
-            }
-            
-        },
-        error: function () {
-        	$('#pageLoader').hide();
-        	$('.delete-student-btn').prop('disabled', false);
-            Swal.fire({
-                icon: 'error',
-                title: 'Error',
-                text: 'Something went wrong while saving.'
-            });
-        }
-    }); 
-	
-}
-	
-	
-	
-	/* $('#dob').on('change', function () {
-        const dobValue = $(this).val(); // format: yyyy-mm-dd
-        if (dobValue) {
-            const today = new Date();
-            const dob = new Date(dobValue);
-            let age = today.getFullYear() - dob.getFullYear();
-            const m = today.getMonth() - dob.getMonth();
-
-            if (m < 0 || (m === 0 && today.getDate() < dob.getDate())) {
-                age--;
-            }
-
-            if (age >= 0) {
-                $('#age').val(age);
-            } else {
-                $('#age').val('');
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Invalid Date',
-                    text: 'Date of birth cannot be in the future.'
-                });
-                $('#age').val('');
-                $('#dob').val('');
-            }
-        } else {
-            $('#age').val('');
-        }
-    }); */
-    
-    
-    // Set max date to today minus 2 years
-    const today = new Date();
-    const twoYearsAgo = new Date(today.getFullYear() - 2, today.getMonth(), today.getDate());
-    const maxDate = twoYearsAgo.toISOString().split('T')[0];
-    $('#dob').attr('max', maxDate);
-
-    $('#dob').on('change', function () {
-        const dobValue = $(this).val(); // format: yyyy-mm-dd
-        if (dobValue) {
-            const today = new Date();
-            const dob = new Date(dobValue);
-            let age = today.getFullYear() - dob.getFullYear();
-            const m = today.getMonth() - dob.getMonth();
-
-            if (m < 0 || (m === 0 && today.getDate() < dob.getDate())) {
-                age--;
-            }
-
-            if (age >= 0) {
-                $('#age').val(age);
-            } else {
-                $('#age').val('');
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Invalid Date',
-                    text: 'Date of birth cannot be in the future.'
-                });
-                $('#age').val('');
-                $('#dob').val('');
-            }
-        } else {
-            $('#age').val('');
-        }
-    });
-	
-	
-
-
-		
-	
-	
-	document.getElementById("studentBackBtn").addEventListener("click", function () {
-        location.reload();
-    });	
-		
-		
-	
-	</script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/toilets.html b/src/main/resources/templates/modules/school/toilets.html
deleted file mode 100644
index 311fbfca..00000000
--- a/src/main/resources/templates/modules/school/toilets.html
+++ /dev/null
@@ -1,678 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}">
-	<style>
-		body {
-			background-color: #f8f9fa;
-		}
-
-		.header {
-			font-size: 22px;
-			font-weight: bold;
-			margin-bottom: 20px;
-		}
-
-		.table {
-			border: 1px solid #dee2e6;
-		}
-
-		.table th,
-		.table td {
-			border: 1px solid #dee2e6;
-			padding: 10px;
-		}
-
-		.section-title {
-			font-size: 18px;
-			font-weight: bold;
-			margin-top: 20px;
-			border-bottom: 2px solid #007bff;
-			padding-bottom: 5px;
-		}
-
-		.form-group {
-			margin-top: 15px;
-		}
-
-		.radio-group {
-			display: flex;
-			gap: 20px;
-			margin-top: 10px;
-		}
-		 .card1 {
-  padding: 0px;
-  margin-top: -58px;
-  margin-left: -230px;
-}
-
-
-
-/* ✅ Responsive Fix for Mobile Screens */
-@media (max-width: 768px) {
-  .card1 {
-    margin-top: 0 !important;
-   
-    padding: 15px;
-  }
-
-  .container {
- 
-    padding-left: 10px;
-    padding-right: 10px;
-  }
-}
- @media (max-width: 768px) {
-  #toiletDataContainer table {
-    display: block;
-    overflow-x: auto;
-    white-space: nowrap;
-  }
-}	
-
-</style>
-</head>
-<style>
-#toiletModal .modal-body {
-        max-height: 80vh;  
-        overflow-y: auto;  
-    }
-</style>
-
-<body>
-
-		<div class="container mt-4">
-				<header th:replace="~{fragments/modules/base/header :: header}"></header>
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-	
-			<div class="card p-3">
-				<div class="card-header">
-					<b>Toilets</b>
-				</div>
-								<br>
-								<!-- View Table -->
-								<div id="toiletDataContainer" style="display: none;">
-									<table class="table table-bordered">
-										<tr>
-											<!-- <th>No of Toilet Blocks</th>
-											<td id="td_blocks"></td> -->
-										
-											<th>Male Toilets (Urinals)</th>
-											<td id="td_urinals"></td>
-											
-											<th>Female Toilets (Urinals)</th>
-											<td id="td_female_urinals"></td>											
-											
-										</tr>
-										<tr>
-											<th>Male Toilets (seaters)</th>
-											<td id="td_wc_male"></td>
-										
-											<th>Female Toilets (seaters)</th>
-											<td id="td_wc_female"></td>
-											
-											
-										</tr>
-										<tr>
-											<th>Staff Toilets (Male)</th>
-											<td id="td_staff_male"></td>
-										
-											<th>Staff Toilets (Female)</th>
-											<td id="td_staff_female"></td>
-											
-											
-										</tr>
-										<tr>
-											<th>Differently Abled Toilets</th>
-											<td id="td_disabled"></td>
-										
-											<th>Incinerator for Napkin Disposal</th>
-											<td id="td_napkins"></td>
-										</tr>
-									</table>
-									<div class="text-center">
-									<button class="btn btn-primary" id="editToiletBtn">Update</button>
-									</div>
-								</div>
-	
-			<form id="toiletForm" novalidate>
-									<input type="hidden" name="school_id">
-									<input type="hidden" id="toilet_id" name="toilet_id" />
-
-									<div class="row p-3">
-										<!-- <div class="col-md-6 form-group">
-											<label>No of Toilet Blocks *</label>
-											<input type="text" class="form-control" name="total_toiletBlocks"
-												id="total_toiletBlocks" required>
-										</div> -->
-										<div class="col-md-6 form-group">
-											<label>Total Male Toilets (Urinals) *</label>
-											<input type="text" class="form-control" name="total_male_urinals"
-												id="total_male_urinals" required>
-										</div>
-										<div class="col-md-6 form-group">
-											<label>Total Female Toilets (Urinals) *</label>
-											<input type="text" class="form-control" name="total_female_urinals"
-												id="total_female_urinals" required>
-										</div>
-										<div class="col-md-6 form-group">
-											<label>Total Male Toilets (seaters) *</label>
-											<input type="text" class="form-control" name="total_wc_male"
-												id="total_wc_male" required>
-										</div>
-										<div class="col-md-6 form-group">
-											<label>Total Female Toilets (seaters) *</label>
-											<input type="text" class="form-control" name="total_wc_female"
-												id="total_wc_female" required>
-										</div>
-									</div>
-									
-									<div class="row p-3">
-										<div class="col-md-6 form-group">
-											<label>Total Staff Toilets (Male)*</label>
-											<input type="text" class="form-control" name="staff_male_toilets"
-												id="staff_male_toilets" required>
-										</div>
-										<div class="col-md-6 form-group">
-											<label>Total Staff Toilets (Female)*</label>
-											<input type="text" class="form-control" name="staff_female_toilets"
-												id="staff_female_toilets" required>
-										</div>
-									</div>
-
-									<div class="row p-3">
-										
-										<div class="col-md-6 form-group">
-											<label>Incinerator for Napkins Disposal *</label>
-											<div class="radio-group">
-												<input type="radio" name="is_napkins" value="true"> Yes
-												<input type="radio" name="is_napkins" value="false"> No
-											</div>
-										</div>
-										<div class="col-md-6 form-group">
-											<label>Differently Abled Toilets *</label>
-											<input type="text" class="form-control" name="total_diffAbled_toilet"
-												id="total_diffAbled_toilet" required>
-										</div>
-									</div>
-
-									<div class="card-footer text-center">
-										<button type="submit" class="btn btn-primary"><i class="ik ik-save"></i>
-											Submit</button>
-										<button type="reset" class="btn btn-secondary"><i class="ik ik-refresh-cw"></i>
-											Reset</button>
-									</div>
-								</form>
-		
-	</div>
-		</div>
-		
-		
-		<!-- Modal -->
-		<div class="modal fade" id="toiletModal" tabindex="-1" aria-labelledby="toiletModalLabel" aria-hidden="true">
-			<div class="modal-dialog">
-				<div class="modal-content">
-					<form id="toiletUpdateForm">
-						<div class="modal-header">
-							<h5 class="modal-title">Update Toilet Details</h5>
-							<button type="button" class="close" data-bs-dismiss="modal"
-													aria-label="Close"><span aria-hidden="true">&times;</span></button>
-						</div>
-						<div class="modal-body">
-							<input type="hidden" id="modal_toilet_id" />
-							<input type="hidden" id="modal_school_id" />
-
-							<!-- <div class="mb-2"><label>No of Toilet Blocks *</label><input type="number" id="modal_blocks"
-									class="form-control" required /></div> -->
-							<div class="mb-2"><label>Male Toilets (Urinals) *</label><input type="number"
-									id="modal_urinals" class="form-control" required /></div>
-							<div class="mb-2"><label>Female Toilets (Urinals) *</label><input type="number"
-									id="modal_female_urinals" class="form-control" required /></div>
-							<div class="mb-2"><label>Male Toilets (seaters) *</label><input type="number" id="modal_wc_male"
-									class="form-control" required /></div>
-							<div class="mb-2"><label>Female Toilets (seaters) *</label><input type="number"
-									id="modal_wc_female" class="form-control" required /></div>
-							<div class="mb-2"><label> Total Staff Toilets (Male) *</label><input type="number"
-									id="modal_staff_male" class="form-control" required /></div>
-							<div class="mb-2"><label> Total Staff Toilets (Female) *</label><input type="number"
-									id="modal_staff_female" class="form-control" required /></div>
-							<div class="mb-2"><label>Differently Abled Toilets *</label><input type="number"
-									id="modal_disabled" class="form-control" required /></div>
-							<div class="mb-2">
-								<label>Incinerator for Napkin Disposal *</label><br>
-								<input type="radio" name="modal_napkins" value="true" /> Yes
-								<input type="radio" name="modal_napkins" value="false" /> No
-							</div>
-						</div>
-						<div class="modal-footer">
-							<button type="submit" class="btn btn-success">Save Changes</button>
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-
-		<!-- Scripts -->
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-		<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-		<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-			<script th:replace="~{fragments/modules/base/script :: script}"></script>
-
-<script>
-  $(document).ready(function () {
-    const schoolId = new URLSearchParams(window.location.search).get("schoolId");
-    $('input[name="school_id"]').val(schoolId);
-    $('#modal_school_id').val(schoolId);
-    /*$('#total_toiletBlocks').on('input', function () {
-        const value = parseInt($(this).val()) || 0;
-        if (value === 0) {
-          $('#total_male_urinals').val(0);
-          $('#total_wc_male').val(0);
-          $('#total_wc_female').val(0);
-          $('#total_diffAbled_toilet').val(0);
-        }
-        else{
-        	
-        	 $('#total_male_urinals').val('');
-             $('#total_wc_male').val('');
-             $('#total_wc_female').val('');
-             $('#total_diffAbled_toilet').val('');
-        	
-        }
-        	
-        
-      });*/
-   /* $('#modal_blocks').on('input', function () {
-        const value = parseInt($(this).val()) || 0;
-        if (value === 0) {
-          $('#modal_urinals').val(0);
-          $('#modal_wc_male').val(0);
-          $('#modal_wc_female').val(0);
-          $('#modal_disabled').val(0);
-        }
-        else{
-        	
-        	 $('#modal_urinals').val('');
-             $('#modal_wc_male').val('');
-             $('#modal_wc_female').val('');
-             $('#modal_disabled').val('');
-        	
-        }
-        	
-        
-      });*/
-    // ✅ Enforce only numeric input
-    ['total_male_urinals', 'total_wc_male', 'total_wc_female', 'total_diffAbled_toilet','total_female_urinals','staff_male_toilets','staff_female_toilets']
-      .forEach(id => {
-        document.getElementById(id).addEventListener('input', function () {
-          this.value = this.value.replace(/[^0-9]/g, '');
-          if (parseInt(this.value) < 0) this.value = '';
-        });
-      });
-      
-      [ 'modal_urinals', 'modal_wc_male', 'modal_wc_female', 'modal_disabled','modal_female_urinals','modal_staff_male','modal_staff_female']
-      .forEach(id => {
-        document.getElementById(id).addEventListener('input', function () {
-          this.value = this.value.replace(/[^0-9]/g, '');
-          if (parseInt(this.value) < 0) this.value = '';
-        });
-      });
-
-
-    // ✅ Function to reload table data after update
-    function reloadToiletTable() {
-      $.get('/gcc/api/gccschool/schoolproperty/checkToiletDetails', { school_id: schoolId }, function (res) {
-        if (res && res[0]?.Data?.length > 0) {
-          const d = res[0].Data[0];
-
-          // Update table with fresh values
-          //$('#td_blocks').text(d.total_toiletBlocks);
-          $('#td_urinals').text(d.total_male_urinals);
-          $('#td_wc_male').text(d.total_wc_male);
-          $('#td_wc_female').text(d.total_wc_female);
-          $('#td_disabled').text(d.total_diffAbled_toilet);
-          $('#td_female_urinals').text(d.total_female_urinals);
-          $('#td_staff_male').text(d.staff_male_toilet);
-          $('#td_staff_female').text(d.staff_female_toilet);
-          $('#td_napkins').text(d.is_napkins === true || d.is_napkins === "true" ? 'Yes' : 'No');
-
-          
-          $('#toiletDataContainer').show();
-          $('#editToiletBtn').data('toiletData', d);
-        }
-      });
-    }
-
-    // ✅ Initial load
-    $.get('/gcc/api/gccschool/schoolproperty/checkToiletDetails', { school_id: schoolId }, function (res) {
-      if (res && res[0]?.Data?.length > 0) {
-        const d = res[0].Data[0];
-        $('#toilet_id').val(d.toilet_id);
-        $('#toiletForm').hide();
-        $('#toiletDataContainer').show();
-
-        //$('#td_blocks').text(d.total_toiletBlocks);
-        $('#td_urinals').text(d.total_male_urinals);
-        $('#td_wc_male').text(d.total_wc_male);
-        $('#td_wc_female').text(d.total_wc_female);
-        $('#td_disabled').text(d.total_diffAbled_toilet);
-        $('#td_female_urinals').text(d.total_female_urinals);
-        $('#td_staff_male').text(d.staff_male_toilet);
-        $('#td_staff_female').text(d.staff_female_toilet);
-        $('#td_napkins').text(d.is_napkins === true ? 'Yes' : 'No');
-
-        $('#editToiletBtn').data('toiletData', d);
-      } else {
-        $('#toiletForm').show();
-        $('#toiletDataContainer').hide();
-      }
-    });
-
-    // ✅ Save new toilet form (first time entry)
-    $('#toiletForm').submit(function (e) {
-      e.preventDefault();
-      //const blocks = parseInt($('#total_toiletBlocks').val()) || 0;
-      const urinals = parseInt($('#total_male_urinals').val()) || 0;
-      const wc_male = parseInt($('#total_wc_male').val()) || 0;
-      const wc_female = parseInt($('#total_wc_female').val()) || 0;
-      const diff_abled = parseInt($('#total_diffAbled_toilet').val()) || 0;
-      const isNapkins = $('input[name="is_napkins"]:checked').val();
-      
-      const feurinals = parseInt($('#total_female_urinals').val()) || 0;
-      const staff_male_toilets = parseInt($('#staff_male_toilets').val()) || 0;
-      const staff_female_toilets = parseInt($('#staff_female_toilets').val()) || 0;
-    /*  if (blocks === 0) {
-    	  $('#total_male_urinals').val(0);
-    	  $('#total_wc_male').val(0);
-    	  $('#total_wc_female').val(0);
-    	  $('#total_diffAbled_toilet').val(0);
-    	}*/
-
-      /* if ($('#total_toiletBlocks').val().trim() === '') {
-          return Swal.fire({
-              icon: 'warning',
-              title: 'Validation Error',
-              text: 'Enter Total Toilet Blocks ',
-              allowOutsideClick: false,
-              allowEscapeKey: false,
-              allowEnterKey: false,
-              showConfirmButton: true
-          });
-      } */
-      if ($('#total_male_urinals').val().trim() === '') {
-    	    return Swal.fire({
-    	        icon: 'warning',
-    	        title: 'Validation Error',
-    	        text: 'Enter number of Male Urinals (0 or more).',
-    	        allowOutsideClick: false,
-    	        allowEscapeKey: false,
-    	        allowEnterKey: false,
-    	        showConfirmButton: true
-    	    });
-    	}
-      
-      if ($('#total_female_urinals').val().trim() === '') {
-  	    return Swal.fire({
-  	        icon: 'warning',
-  	        title: 'Validation Error',
-  	        text: 'Enter number of Female Urinals (0 or more).',
-  	        allowOutsideClick: false,
-  	        allowEscapeKey: false,
-  	        allowEnterKey: false,
-  	        showConfirmButton: true
-  	    });
-  	}
-
-      if ($('#total_wc_male').val().trim() === '') {
-    	    return Swal.fire({
-    	        icon: 'warning',
-    	        title: 'Validation Error',
-    	        text: 'Enter number of Male WC (0 or more).',
-    	        allowOutsideClick: false,
-    	        allowEscapeKey: false,
-    	        allowEnterKey: false,
-    	        showConfirmButton: true
-    	    });
-    	}
-
-    	if ($('#total_wc_female').val().trim() === '') {
-    	    return Swal.fire({
-    	        icon: 'warning',
-    	        title: 'Validation Error',
-    	        text: 'Enter number of Female WC (0 or more).',
-    	        allowOutsideClick: false,
-    	        allowEscapeKey: false,
-    	        allowEnterKey: false,
-    	        showConfirmButton: true
-    	    });
-    	}
-    	
-    	if ($('#staff_male_toilets').val().trim() === '') {
-    	    return Swal.fire({
-    	        icon: 'warning',
-    	        title: 'Validation Error',
-    	        text: 'Enter number of Staff Toilets(Male) (0 or more).',
-    	        allowOutsideClick: false,
-    	        allowEscapeKey: false,
-    	        allowEnterKey: false,
-    	        showConfirmButton: true
-    	    });
-    	}
-    	
-    	if ($('#staff_female_toilets').val().trim() === '') {
-    	    return Swal.fire({
-    	        icon: 'warning',
-    	        title: 'Validation Error',
-    	        text: 'Enter number of Staff Toilets(Female) (0 or more).',
-    	        allowOutsideClick: false,
-    	        allowEscapeKey: false,
-    	        allowEnterKey: false,
-    	        showConfirmButton: true
-    	    });
-    	}
-    	   if (typeof isNapkins === 'undefined') {
-       	    return Swal.fire({
-       	        icon: 'warning',
-       	        title: 'Validation Error',
-       	        text: 'Please select whether there is an Incinerator for Napkins Disposal.',
-       	        allowOutsideClick: false,
-       	        allowEscapeKey: false,
-       	        allowEnterKey: false,
-       	        showConfirmButton: true
-       	    });
-       	}
-
-    	if ($('#total_diffAbled_toilet').val().trim() === '') {
-    	    return Swal.fire({
-    	        icon: 'warning',
-    	        title: 'Validation Error',
-    	        text: 'Enter number of Differently Abled Toilets (0 or more).',
-    	        allowOutsideClick: false,
-    	        allowEscapeKey: false,
-    	        allowEnterKey: false,
-    	        showConfirmButton: true
-    	    });
-    	}
-   
-
-      // Total toilets entered
-    /*  const totalToilets = urinals + wc_male + wc_female + diff_abled;
-
-      if (blocks !== totalToilets) {
-        Swal.fire({
-          icon: 'warning',
-          title: 'Mismatch Detected',
-          text: `The number of toilet blocks (${blocks}) must match the total toilets (${totalToilets}) entered.`,
-          allowOutsideClick: false,
-          allowEscapeKey: false,
-          allowEnterKey: false,
-          showConfirmButton: true
-        });
-        return;
-      }*/
-
-      const formData = new FormData(this);
-      
-       $.ajax({
-        type: 'POST',
-        url: '/gcc/api/gccschool/schoolproperty/saveToilets',
-        data: formData,
-        processData: false,
-        contentType: false,
-        success: function (response) {
-        	  Swal.fire({
-        	    icon: response.includes("already") ? "info" : "success",
-        	    title: response.includes("already") ? "Info" : "Data Saved!",
-        	    text: response,
-        	    confirmButtonColor: "#3085d6",
-        	    allowOutsideClick: false,
-        	    allowEscapeKey: false,
-        	    allowEnterKey: false,
-        	    showConfirmButton: true
-        	  }).then(() => {
-        	  
-        	      $("#toiletForm")[0].reset(); // Optional: reset form if saved
-        	      location.reload(); // Reload only if new data inserted
-        	    
-        	  });
-        	},
-
-        error: xhr =>Swal.fire({
-        	  title: 'Error',
-        	  text: xhr.responseText || 'Unknown error',
-        	  icon: 'error',
-        	  allowOutsideClick: false,
-        	  allowEscapeKey: false,
-        	  allowEnterKey: false,
-        	  showConfirmButton: true
-        	})
- 
-      }); 
-      
-    });
-
-	let originalModalData = {};
-
-	$('#editToiletBtn').click(function () {
-	  const d = $(this).data("toiletData");
-	
-
-	  $('#modal_toilet_id').val(d.toilet_id);
-	  //$('#modal_blocks').val(d.total_toiletBlocks);
-	  $('#modal_urinals').val(d.total_male_urinals);
-	  $('#modal_wc_male').val(d.total_wc_male);
-	  $('#modal_wc_female').val(d.total_wc_female);
-	  $('#modal_disabled').val(d.total_diffAbled_toilet);
-	  $('#modal_female_urinals').val(d.total_female_urinals);
-	  $('#modal_staff_male').val(d.staff_male_toilet);
-	  $('#modal_staff_female').val(d.staff_female_toilet);
-	  $(`input[name="modal_napkins"][value="${d.is_napkins}"]`).prop('checked', true);
-
-	  // ✅ Store original values
-	  originalModalData = {
-  total_male_urinals: d.total_male_urinals != null ? d.total_male_urinals.toString() : d.total_male_urinals,
-  total_wc_male: d.total_wc_male != null ? d.total_wc_male.toString() : d.total_wc_male,
-  total_wc_female: d.total_wc_female != null ? d.total_wc_female.toString() : d.total_wc_female,
-  total_diffAbled_toilet: d.total_diffAbled_toilet != null ? d.total_diffAbled_toilet.toString() : d.total_diffAbled_toilet,
-  is_napkins: d.is_napkins != null ? d.is_napkins.toString() : d.is_napkins,
-  total_female_urinals: d.total_female_urinals != null ? d.total_female_urinals.toString() : d.total_female_urinals,
-  staff_male_toilets: d.staff_male_toilet != null ? d.staff_male_toilet.toString() : d.staff_male_toilet,
-  staff_female_toilets: d.staff_female_toilet != null ? d.staff_female_toilet.toString() : d.staff_female_toilet,
-};
-
-	  const modal = new bootstrap.Modal(document.getElementById('toiletModal'));
-	  modal.show();
-	});
-
-	$('#toiletUpdateForm').submit(function (e) {
-	  e.preventDefault();
-	  //const updateBlocks = parseInt($('#modal_blocks').val()) || 0;
-	  const updateUrinals = parseInt($('#modal_urinals').val()) || 0;
-	  const updateWCMale = parseInt($('#modal_wc_male').val()) || 0;
-	  const updateWCFemale = parseInt($('#modal_wc_female').val()) || 0;
-	  const updateDisabled = parseInt($('#modal_disabled').val()) || 0;
-	  const updateFemaleUrinals = parseInt($('#modal_female_urinals').val()) || 0;
-	  const updateStafftoiletMale = parseInt($('#modal_staff_male').val()) || 0;
-	  const updateStafftoiletFemale = parseInt($('#modal_staff_female').val()) || 0;
-	/*  if (!updateBlocks ) {
-          return Swal.fire({
-              icon: 'warning',
-              title: 'Validation Error',
-              text: 'Enter Total Toilet Blocks greater than 0.',
-              allowOutsideClick: false,
-              allowEscapeKey: false,
-              allowEnterKey: false,
-              showConfirmButton: true
-          });
-      }*/
-
-	 /* const updateTotal = updateUrinals + updateWCMale + updateWCFemale + updateDisabled;
-
-	  if (updateBlocks !== updateTotal) {
-	    Swal.fire({
-	      icon: 'warning',
-	      title: 'Mismatch Detected',
-	      text: `The number of toilet blocks (${updateBlocks}) must match the total toilets (${updateTotal}) entered.`,
-	      allowOutsideClick: false,
-	      allowEscapeKey: false,
-	      allowEnterKey: false,
-	      showConfirmButton: true
-	    });
-	    return;
-	  }*/
-
-	  const currentData = {
-	    //total_toiletBlocks: $('#modal_blocks').val(),
-	    total_male_urinals: $('#modal_urinals').val(),
-	    total_wc_male: $('#modal_wc_male').val(),
-	    total_wc_female: $('#modal_wc_female').val(),
-	    total_diffAbled_toilet: $('#modal_disabled').val(),
-	    is_napkins: $('input[name="modal_napkins"]:checked').val(),
-	    total_female_urinals:$('#modal_female_urinals').val(),
-	    staff_male_toilets:$('#modal_staff_male').val(),
-	    staff_female_toilets:$('#modal_staff_female').val()
-	  };
-
-	  // ✅ Check if any value has changed
-	  const hasChanged = Object.keys(currentData).some(key => currentData[key] !== originalModalData[key]);
-
-	 /* if (!hasChanged) {
-	    Swal.fire('No Changes', 'Please make a change before submitting.', 'info');
-	    return;
-	  }*/
-
-	  currentData.school_id = $('#modal_school_id').val();
-
-	  $.post('/gcc/api/gccschool/schoolproperty/updateToiletDetails', currentData, function () {
-	   // Swal.fire('Updated', 'Toilet data updated successfully!', 'success').then(() => {
-		   Swal.fire({
-  title: 'Updated',
-  text: 'Toilet data updated successfully!',
-  icon: 'success',
-  allowOutsideClick: false,
-  allowEscapeKey: false,
-  allowEnterKey: false,
-  showConfirmButton: true
-}).then(() => {
-	      const modalInstance = bootstrap.Modal.getInstance(document.getElementById('toiletModal'));
-	      modalInstance.hide();
-	      location.reload();
-	    });
-	  }).fail(() => {
-	   // Swal.fire('Error', 'Update failed', 'error');
-		  Swal.fire({
-			  title: 'Error',
-			  text: 'Update failed',
-			  icon: 'error',
-			  allowOutsideClick: false,
-			  allowEscapeKey: false,
-			  allowEnterKey: false,
-			  showConfirmButton: true
-			});
-	  });
-	});
-  });
-</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/sos/closed_inbox.html b/src/main/resources/templates/modules/sos/closed_inbox.html
deleted file mode 100644
index db5e9f3e..00000000
--- a/src/main/resources/templates/modules/sos/closed_inbox.html
+++ /dev/null
@@ -1,427 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>SOS</h5>
-                                            <span>Closed Request List</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">SOS</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Closed Request List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="circularDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort" width="2%">S.No</th>
-														<th class="text-center" width="10%">Type</th>
-														<th class="text-center no-sort" width="2%">Mode</th>
-						 								<th class="text-center" width="10%">Name</th>
-						 								<th class="text-center" width="10%">Mobile</th>
-						 								<th class="text-center" width="10%">Zone</th>
-														<th class="text-center" width="10%">ward</th>
-														<th class="text-center" width="10%">Street Name</th>
-														<th class="text-center" width="10%">Comments</th>
-														<th class="text-center" width="10%">Status</th>
-						                                <th class="text-center no-sort no-exportable no-print" width="5%"><i class="ik ik-more-horizontal"></i></th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- 
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Category</th>
-						 								<th class="text-center">Type</th>
-						 								<th class="text-center">Department</th>
-						 								<th class="text-center">Date</th>
-														<th class="text-center">Subject</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-													</tr>
-                                                </tfoot>
-                                                 --> 
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/circular/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/circular/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-       		var uploadDirectory = /*[[${uploadDirectory}]]*/'';
-       		
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Circular List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_rescue_data(){
-	        	var apiUrl = '/gcc/api/sos/getRescueList?status=1';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_rescue_list(){
-	        	get_rescue_data().then(function(rescueList) {
-	    		    // Handle the complaint list
-	    		    generate_table(rescueList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching resuce list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching rescue list:', error);
-			        }
-	    		});
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#circularDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false },
-						  { targets: 5, orderSequence: ['desc'] }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        /*scrollY: '50vh',*/
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	//var rowNum = data.length;
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-					var file_text="";
-					var filetype="";
-					var rescueid=row['id'];
-					var action =`<center><a href="#" onclick="return viewFile(${rescueid});" class="text-blue" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Circular Details" data-original-title="View Circular Details"><i class="ik ik-eye f-16 text-blue"></i></a></center>`;
-			                    
-	                table.row.add([
-	                	rowNum++,
-	                	row['request_type'],
-	                	row['modeofcomplient'],
-	                    row['contact_name'],
-	                    row['contact_number'],
-	                    row['zone'],
-	                    row['ward'],
-	                    row['streetname'],
-	                    row['remarks'],
-	                    row['statusText'],
-	                    action
-	                ]).draw(false);
-	            });
-	            
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-			}
-	        
-	        /* Get Complaints Data */
-	        function viewData(rescueid){
-	        	var apiUrl = '/gcc/api/sos/getRescueUpdateData?rescueid='+rescueid;
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        function viewFile(rescueid) {
-	            viewData(rescueid).then(function(rescuedata) {
-	                $.each(rescuedata, function(index, row) {
-	                    // Show Modal Box
-	                    $("#viewFileBox").modal({
-	                        backdrop: 'static',
-	                        keyboard: false
-	                    });
-	                    var fileHTML='';
-	                    var fileHTMLleft = '';
-	                    var fileHTMLright = '';
-	                    $("#viewFileTitle").html("Rescue Information");
-	                    
-	                    $.each(row['Data'], function(index2, rowData) {
-
-		                    fileHTMLleft = `<div class="card mb-0">
-									             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-									                	<h3>Complaint Details</h3>
-									                </div>
-									                <div class="card-body">
-										                <table class="table table-borderless table-vcenter mb-0" style="font-size:12px;">
-													      <tbody>
-													        <tr>
-													          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-													          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-													           ${convertdate(rowData['cdate'])}
-													          </td>
-													        </tr>
-													        
-													        <tr>
-													          <th style="padding: 0.45rem 0.45rem;">Contact Name</th>
-													          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-													           ${rowData['contact_name']}
-													          </td>
-													        </tr>
-													        <tr>
-													          <th style="padding: 0.45rem 0.45rem;">Contact Number :</th>
-													          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-													           ${rowData['contact_number']}
-													          </td>
-													        </tr>
-													        <tr>
-												        	<td colspan="2" style="padding: 0.45rem 0.45rem;">
-													        	<table class="table table-bordered table-vcenter mb-0">
-													                <thead>
-													                  <tr>
-													                    <th>Zone</th>
-													                    <th>Ward</th>
-													                    <th>Street Name</th>
-													                  </tr>
-													                </thead>
-												                	<tbody>
-												                 		<tr>
-															            	<td class="fw-semibold">${rowData['zone']}</td>
-															            	<td class="fw-semibold">${rowData['ward']}</td>
-															            	<td class="fw-semibold">${rowData['streetname']}</td>
-													                  	</tr>
-												                	</tbody>
-												              	</table>
-												        	</td>
-												        </tr>
-													        <tr>
-													          <th colspan="2" style="padding: 0.45rem 0.45rem;"><b>Request Type: </b>${rowData['request_type']}  |  <b>Status: </b>${rowData['status_name']}</p></th>
-													        </tr>
-													        <tr>
-													        	<td colspan="2" style="padding: 0.45rem 0.45rem;">
-														        	<table class="table table-bordered table-vcenter mb-0">
-														                <thead>
-														                  <tr>
-														                    <th>Complaint <i class="fa fa-arrow-right"></i> Status</th>
-														                    <th class="text-right" id="complaint_forward_link"></th>
-														                  </tr>
-														                </thead>
-													                	<tbody>
-													                 		<tr>
-																            	<td colspan="2" class="fw-semibold">
-																            	
-															                    </td>
-														                  	</tr>
-													                	</tbody>
-													              	</table>
-													        	</td>
-													        </tr>
-													      </tbody>
-													    </table>
-									                </div>
-									            </div>`;
-	                    	
-		                    if (rowData['officer_activity_data'] && rowData['officer_activity_data'].length > 0) {
-		                        $.each(rowData['officer_activity_data'], function(activityIndex, activity) {
-		                            var filepath = activity['imageUrl'];
-		                            var filetype = activity['filetype'];
-		                            
-		                            fileHTMLright += `<b>Officer Remarks:</b><br>${activity['remarks']}<hr style="padding:1px;">`;
-		                            
-		                            if (filetype === 'application/pdf') {
-		                            	fileHTMLright += `<iframe src="${filepath}" type="application/pdf" width="100%" height="600px"></iframe>`;
-		                            } else if (filetype === 'image/jpeg' || filetype === 'image/png') {
-		                            	fileHTMLright += `<b>Activity Image:</b><br><img src="${filepath}" alt="${filetype}" style="max-width:100%; height:auto;">`;
-		                            } else {
-		                            	fileHTMLright += ``;
-		                            }
-		                            
-		                       });
-		                    } else {
-		                    	fileHTMLright = '<p>No activity data available for this rescue.</p>';
-		                    }
-	                    });
-	                    
-	                    fileHTML=`<div class="row">
-	                    				<div class="col-lg-6"><div class="block block-rounded">${fileHTMLleft}</div></div>
-	                    				<div class="col-lg-6"><div class="block block-rounded">${fileHTMLright}</div></div>
-	                    		  </div>`;
-	                    		  
-	                    $('#viewFileBoxBody').html(fileHTML); // Inject content into modal body
-	                });
-	            }).catch(function(error) {
-	                // Handle errors
-	                if (error && error.message) {
-	                    console.error('Error fetching rescue details:', error.message);
-	                } else {
-	                    console.error('An error occurred while fetching rescue details:', error);
-	                }
-	            });
-	            return false;
-	        }
-	        
-			
-			$(document).ready(function() {
-				call_loading();
-				get_rescue_list();
-			});
-			
-			
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/sos/inbox.html b/src/main/resources/templates/modules/sos/inbox.html
deleted file mode 100644
index 244efef0..00000000
--- a/src/main/resources/templates/modules/sos/inbox.html
+++ /dev/null
@@ -1,298 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Circular List</h5>
-                                            <span>Circular / Minutes</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">SOS</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Request List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="circularDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort" width="2%">S.No</th>
-														<th class="text-center" width="10%">Type</th>
-														<th class="text-center no-sort" width="2%">Mode</th>
-						 								<th class="text-center" width="10%">Name</th>
-						 								<th class="text-center" width="10%">Mobile</th>
-						 								<th class="text-center" width="10%">Zone</th>
-														<th class="text-center" width="10%">ward</th>
-														<th class="text-center" width="10%">Street Name</th>
-														<th class="text-center" width="10%">Comments</th>
-														<th class="text-center" width="10%">Status</th>
-						                                <th class="text-center no-sort no-exportable no-print" width="5%"><i class="ik ik-more-horizontal"></i></th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- 
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Category</th>
-						 								<th class="text-center">Type</th>
-						 								<th class="text-center">Department</th>
-						 								<th class="text-center">Date</th>
-														<th class="text-center">Subject</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-													</tr>
-                                                </tfoot>
-                                                 --> 
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/circular/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/circular/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-       		var uploadDirectory = /*[[${uploadDirectory}]]*/'';
-       		
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Circular List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_rescue_data(){
-	        	var apiUrl = '/gcc/api/sos/getRescueList';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_rescue_list(){
-	        	get_rescue_data().then(function(rescueList) {
-	    		    // Handle the complaint list
-	    		    generate_table(rescueList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching resuce list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching rescue list:', error);
-			        }
-	    		});
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#circularDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false },
-						  { targets: 5, orderSequence: ['desc'] }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        /*scrollY: '50vh',*/
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	//var rowNum = data.length;
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-
-					var action ="1";//`<center><a href="#" onclick="return viewFile('${file_text}','${filetype}');" class="text-blue" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Circular Details" data-original-title="View Circular Details"><i class="ik ik-eye f-16 text-blue"></i></a></center>`;
-			                    
-	                table.row.add([
-	                	rowNum++,
-	                	row['request_type'],
-	                	row['modeofcomplient'],
-	                    row['contact_name'],
-	                    row['contact_number'],
-	                    row['zone'],
-	                    row['ward'],
-	                    row['streetname'],
-	                    row['remarks'],
-	                    row['statusText'],
-	                    action
-	                ]).draw(false);
-	            });
-	            
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-				get_rescue_list();
-			});
-			
-			function viewFile(filename,filetype){
-	        	$("#viewFileBox").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				var filepath= '/gcc/files/circular/'+filename;
-				var fileHTML = '';
-				
-	        	if(filetype=='application/pdf'){
-	        		fileHTML = `<iframe src="${filepath}" type="application/pdf" width="100%" height="600px"></iframe>`;
-					
-				}
-				else{
-					fileHTML =nodata;
-				}
-				
-	        	console.error(fileHTML);
-	        	
-	        	$('#viewFileBoxBody').html(fileHTML); // Inject content into modal body
-				
-				return false;
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/sos/new_sos.html b/src/main/resources/templates/modules/sos/new_sos.html
deleted file mode 100644
index db4b42c3..00000000
--- a/src/main/resources/templates/modules/sos/new_sos.html
+++ /dev/null
@@ -1,667 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-    <style>
-        html,
-        body,
-        #viewDiv {
-            padding: 0;
-            margin: 0;
-            height: 100%;
-            width: 100%;
-        }
-
-        
-        label {
-            display: block;
-            margin: 5px 0 2px;
-            font-weight: bold;
-        }
-
-        select,
-        input {
-            width: 100%;
-            padding: 5px;
-        }
-
-        #resetButton {
-            margin-top: 10px;
-            padding: 10px;
-            background-color: #ff5733;
-            color: white;
-            border: none;
-            cursor: pointer;
-        }
-
-        #resetButton:hover {
-            background-color: #e04e1d;
-        }
-    </style>
-    <link rel="stylesheet" href="https://js.arcgis.com/4.30/esri/themes/light/main.css">
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>SOS</h5>
-                                            <span>Add SOS Request</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">SOS</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Add SOS Request</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        
-                        <div class="row">
-                        	<div class="col-md-2"></div>
-							<div class="col-md-12">
-                                <div class="card">
-									<form class="request-form" id="request-form" onsubmit="return saveRequest();">
-	                                    <div class="card-header"><h3>New SOS Request Form</h3></div>
-	                               		<div class="card-body">
-											<div class="row">	 
-							                     <div class="col-lg-6">
-													<div class="form-group">
-														<label for="contact_names">Requester Name :</label> 
-														<input type="text" id="contact_name" name="contact_name" class="form-control" placeholder="Name" required>
-													</div>
-												</div>
-												<div class="col-lg-6">
-													<div class="form-group">
-														<label for="contact_number">Requester Contact Number :</label> 
-														<input type="text" id="contact_number" name="contact_number" class="form-control" placeholder="Contact Number" required>
-													</div>
-												</div>
-												<div class="col-12">
-											    	<div id="viewDiv" style="width: 100%; height: 600px;"> &nbsp;</div>
-												</div>
-												<div id="infoContainer">
-												        <div id="infoDiv">
-												            <label for="zoneInput">Zone:</label>
-												            <input type="text" id="zoneInput" placeholder="Zone" readonly>
-												
-												            <label for="wardInput">Ward:</label>
-												            <input type="text" id="wardInput" placeholder="Ward" readonly>
-												
-												            <label for="roadInput">Road Name:</label>
-												            <input type="text" id="roadInput" placeholder="Road Name" readonly>
-												
-												            <label for="addressInput">Address:</label>
-												            <input type="text" id="addressInput" placeholder="Address" readonly>
-												
-												            <label for="latInput">Latitude:</label>
-												            <input type="text" id="latInput" placeholder="Latitude" readonly>
-												
-												            <label for="longInput">Longitude:</label>
-												            <input type="text" id="longInput" placeholder="Longitude" readonly>
-												
-												            <label for="roadBufferSelect">Roads within Area:</label>
-												            <select id="roadBufferSelect">
-												                <option value="">Select Road</option>
-												            </select>
-												
-												            <button id="resetButton">Reset Map</button>
-												        </div>
-												    </div>
-												<div class="col-lg-6">
-													<div class="form-group">
-			                                            <label for="zone">Select Zone</label>
-			                                            <select class="form-control" id="zone" name="zone" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." onchange="get_ward_list(this.value);" required>
-															<option value=""></option>
-														</select>
-			                                        </div>
-		                                      	</div>
-	                                        	<div class="col-lg-6">
-			                                        <div class="form-group">
-			                                            <label for="ward">Select Ward</label>
-			                                            <select class="form-control" id="ward" name="ward" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required  onchange="get_councillor_details(this.value);">
-															<option value=""></option>
-														</select>
-			                                        </div>
-	                                        	</div>
-	                                        	
-	                                        	<div class="col-lg-6">
-													<div class="form-group">
-			                                            <label for="request_type">Select Request Type</label>
-			                                            <select class="form-control" id="request_type" name="request_type" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required>
-															<option value=""></option>
-															<option value="Rescue">Rescue</option>
-															<option value="Medical">Medical</option>
-															<option value="Food">Food</option>
-														</select>
-			                                        </div>
-		                                      	</div>
-	                                        	<div class="col-lg-6">
-			                                        <div class="form-group">
-			                                            <label for="no_of_count">No Of People Count</label>
-			                                            <input type="text" class="form-control" id="no_of_count" name="no_of_count" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required>
-			                                        </div>
-	                                        	</div>
-											</div>
-	                                        
-											<div class="form-group">
-												<label for="subject">Remarks :</label>
-												<textarea class="form-control" name="remarks" id="remarks" rows="5" placeholder="Remarks if any" data-autosize-input='{ "space": 40 }'></textarea>
-											</div>
-	                                        
-										</div>	 
-	                                  	<div class="card-footer text-right">
-	                                  		<input type="hidden" id="mode" name="mode" value="1913">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/circular/script :: script}"></script>
-        
-   		<script src="https://js.arcgis.com/4.30/"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			
-	        /* Get Zone and Ward Data */
-	        function get_zone_ward_data(){
-	        	get_zone_ward_list().then(function(zoneWard) {
-	    		    // Handle the zoneward list
-	    		    zoneWardList = zoneWard;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(zoneWardList, function(index, zoneWards) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: zoneWards.zone, // case-sensitive as per object
-	    	                text: "Zone "+ zoneWards.zone
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#zone').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			
-	        /* Get Ward List */
-	        function get_ward_list(zone) {
-
-	            // Assuming get_zone_ward_list() returns a promise that resolves to the zoneWardList
-	            get_zone_ward_list().then(function(zoneWard) {
-	                // Handle the zoneWard list
-	                zoneWardList = zoneWard;
-	                
-	                // Clear any existing options in the ward dropdown
-	                $('#ward').empty();
-	                
-	                var option = $('<option>', {
-                        value:"" ,  // Set ward number as the value
-                        text:""  // Display as "Ward 1", "Ward 2", etc.
-                    });
-	                
-	                $('#ward').append(option);
-	                
-	                $('#councillorName').val('');
-					$('#councillorMobile').val('');
-					
-	            	 // Find the correct zone in the zoneWardList
-	                var selectedZone = zoneWardList.find(function(zoneWards) {	                    
-						return zoneWards.zone == zone;  // Compare the zone value
-	                });
-	                // If the zone is found, iterate over its wards and add options
-	                if (selectedZone) {
-	                    var wardsArray = selectedZone.wards.split(',');  // Split wards string into array
-	                    $.each(wardsArray, function(index, ward) {
-	                        // Create an option element
-	                        option = $('<option>', {
-	                            value: ward.trim(),  // Set ward number as the value
-	                            text: 'Ward ' + ward.trim()  // Display as "Ward 1", "Ward 2", etc.
-	                        });
-	                        // Append the option to the select element
-	                        $('#ward').append(option);
-	                    });
-	                } else {
-	                    console.error('Zone not found');
-	                }
-
-	            }).catch(function(error) {
-	                // Handle errors
-	                console.error('Error fetching ward list:', error);
-	            });
-	        }
-	        
-	        /* Zone and Ward List */
-	    	function get_zone_ward_list() {
-	    	    
-	    		var apiUrl = '/gcc/api/sos/getZoneAndWard';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	    	}
-	        
-			// Save New petition 
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementComplaintType = $('#request_type');
-				var request_type = inputElementComplaintType.val();
-				var loginId = $('#contact_number').val();
-				if (request_type && loginId) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#request-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        formData.append('loginId',loginId);
-			        saveFormData(formData).then(function(response) {
-			        	const status = response[0].status;
-						if(status!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Rescue data saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					// Reload the current page
-		        					//location.reload();
-		        					// Navigate to a Ack page
-		        					window.location = "/gcc/sos/new";
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save rescue data. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save circular:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					//inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveFormData(formData){
-				var apiUrl = '/gcc/api/sos/saveRequest';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#resetFormBtn").prop("disabled", false);
-				$("#requestSubmitBtn").prop("disabled", false);
-				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-			}
-			
-			function form_btn_disable(){
-				$("#resetFormBtn").prop("disabled", true);
-				$("#requestSubmitBtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			$(document).ready(function() {
-				//get_circular_type_data();
-				get_zone_ward_data();
-				//get_department_data();
-				//$('#petitionerMobile').mask('0000000000');
-			});
-		</script>
-		
-		<script>
-        require([
-            "esri/Map",
-            "esri/views/MapView",
-            "esri/layers/FeatureLayer",
-            "esri/widgets/Search",
-            "esri/geometry/geometryEngine",
-            "esri/Graphic",
-            "esri/widgets/LayerList",
-            "esri/widgets/Legend",
-            "esri/geometry/projection"
-        ], function (Map, MapView, FeatureLayer, Search, geometryEngine, Graphic, LayerList, Legend, projection) {
-
-            // Create the map and view
-            const map = new Map({
-                basemap: "streets"
-            });
-
-            const view = new MapView({
-                container: "viewDiv",
-                map: map,
-                center: [80.237617, 13.067439],
-                zoom: 12
-            });
-
-            // Define the road layer (FeatureLayer) to query
-            const roadLayer = new FeatureLayer({
-                url: "https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/APIRoadsMap/FeatureServer/0",
-                outFields: ["zone", "ward", "road_name", "address"],
-                renderer: {
-                    type: "simple",
-                    symbol: {
-                        type: "simple-line",
-                        color: "red",
-                        width: 0.5
-                    }
-                },
-                popupTemplate: {
-                    title: "{road_name}",
-                    content: "Zone: {zone}<br>Ward: {ward}<br>Address: {address}"
-                }
-            });
-
-            map.add(roadLayer);
-
-            const searchWidget = new Search({
-                view: view
-            });
-
-            const layerList = new LayerList({
-                view: view
-            });
-
-            // Add widgets to view
-            view.ui.add(layerList, {
-                position: "top-right"
-            });
-
-            const legend = new Legend({
-                view: view
-            });
-            view.ui.add(legend, {
-                position: "bottom-right"
-            });
-            view.ui.add(searchWidget, "top-right");
-
-            // Create a point graphic and store the reference to it for later use
-            let pointGraphic = null;
-            let highlightGraphic = null;  // To store the highlighted road graphic
-
-            // Event listener for map click on the basemap
-            view.on("click", function (event) {
-				reset();
-                const clickedPoint = event.mapPoint; // Capture the clicked point
-
-                // Update latitude and longitude fields
-                document.getElementById("latInput").value = clickedPoint.latitude.toFixed(6);
-                document.getElementById("longInput").value = clickedPoint.longitude.toFixed(6);
-
-                // Create a buffer around the clicked point (500 meters)
-                const buffer = geometryEngine.buffer(clickedPoint, 50, "meters");
-
-                // Query the road layer for roads within the buffer
-                const query = roadLayer.createQuery();
-                query.geometry = buffer;  // Use the buffer geometry to filter results
-                query.spatialRelationship = "intersects";
-                query.outFields = ["road_name"];  // Only fetch road names
-                query.returnGeometry = false;
-
-                roadLayer.queryFeatures(query).then(function (result) {
-                    const roadNames = result.features.map(function (feature) {
-                        return feature.attributes.road_name;
-                    });
-
-                    // Populate the dropdown with road names
-                    populateDropdown(roadNames);
-                }).catch(function (error) {
-                    console.error("Query failed: ", error);
-                });
-
-                // Create a new point graphic to show the clicked location
-                if (pointGraphic) {
-                    view.graphics.remove(pointGraphic); // Remove the old graphic if it exists
-                }
-
-                pointGraphic = new Graphic({
-                    geometry: clickedPoint,
-                    symbol: {
-                        type: "simple-marker",
-                        color: "blue",
-                        size: "14px"
-                    }
-                });
-
-                view.graphics.add(pointGraphic); // Add the point graphic to the map
-            });
-
-            // Function to populate the dropdown with road names
-            function populateDropdown(roadNames) {
-				
-                const dropdown = document.getElementById("roadBufferSelect");
-                dropdown.innerHTML = ''; // Clear existing dropdown items
-                
-                const defaultOption = document.createElement("option");
-                defaultOption.text = "Select a road";
-                dropdown.appendChild(defaultOption);
-                roadNames.sort();
-				
-                // Populate the dropdown with the queried road names
-                if (roadNames.length > 0) {
-                    roadNames.forEach(function (roadName) {
-                        const option = document.createElement("option");
-                        option.value = roadName;
-                        option.text = roadName;
-                        dropdown.appendChild(option);
-                    });
-                } else {
-                    const noRoadsOption = document.createElement("option");
-                    noRoadsOption.text = "No roads found within 500m";
-                    dropdown.appendChild(noRoadsOption);
-                }
-            }
-
-            // When a user selects a road from the dropdown, fetch additional details (zone, ward, address) and zoom to the road
-            document.getElementById("roadBufferSelect").addEventListener("change", function (event) {
-                const selectedRoadName = event.target.value;
-                if (selectedRoadName) {
-                    // Query the road layer to get the details and geometry of the selected road
-                    const query = roadLayer.createQuery();
-                    query.where = `road_name = '${selectedRoadName}'`;  // Query for the selected road name
-                    query.outFields = ["zone", "ward", "address"];  // Get zone, ward, and address
-                    query.returnGeometry = true;  // We need the geometry to zoom to the road
-
-                    roadLayer.queryFeatures(query).then(function (result) {
-                        if (result.features.length > 0) {
-                            const roadDetails = result.features[0].attributes;
-                            const roadGeometry = result.features[0].geometry;
-
-                            // Populate the fields with the road details
-                            document.getElementById("zoneInput").value = roadDetails.zone || "";
-                            document.getElementById("wardInput").value = roadDetails.ward || "";
-                            document.getElementById("addressInput").value = roadDetails.address || "";
-                            document.getElementById("roadInput").value = selectedRoadName;  // Populate the road name field
-							
-							/*
-			                alert(document.getElementById("zoneInput").value);
-			                alert(document.getElementById("wardInput").value);
-			                alert(document.getElementById("addressInput").value);
-			                alert(document.getElementById("roadInput").value);
-			                alert(document.getElementById("latInput").value);
-			                alert(document.getElementById("longInput").value);
-			                alert(document.getElementById("roadBufferSelect").value);
-							*/
-                            // Zoom to the selected road with level 15
-                            view.goTo({
-                                target: roadGeometry,
-                                zoom: 15
-                            });
-
-                            // Highlight the road
-                            if (highlightGraphic) {
-                                view.graphics.remove(highlightGraphic);  // Remove the previous highlight if any
-                            }
-
-                            highlightGraphic = new Graphic({
-                                geometry: roadGeometry,
-                                symbol: {
-                                    type: "simple-line",
-                                    color: "green",
-                                    width: 4
-                                }
-                            });
-
-                            view.graphics.add(highlightGraphic); // Add the highlight graphic to the map
-                        }
-                    }).catch(function (error) {
-                        console.error("Error fetching road details: ", error);
-                    });
-                } else {
-                    // Clear the input fields if no road is selected
-                    document.getElementById("zoneInput").value = "";
-                    document.getElementById("wardInput").value = "";
-                    document.getElementById("addressInput").value = "";
-                    document.getElementById("roadInput").value = "";
-                }
-            });
-
-            // Reset map (clear the point graphic and highlighted road)
-            document.getElementById("resetButton").addEventListener("click", function () {
-                if (pointGraphic) {
-                    view.graphics.remove(pointGraphic); // Remove the point graphic
-                    pointGraphic = null; // Reset the point graphic variable
-                }
-                if (highlightGraphic) {
-                    view.graphics.remove(highlightGraphic); // Remove the highlight graphic
-                    highlightGraphic = null; // Reset the highlight graphic variable
-                }
-                // Clear input fields
-                document.getElementById("zoneInput").value = "";
-                document.getElementById("wardInput").value = "";
-                document.getElementById("addressInput").value = "";
-                document.getElementById("roadInput").value = "";
-                document.getElementById("latInput").value = "";
-                document.getElementById("longInput").value = "";
-                document.getElementById("roadBufferSelect").value = "";
-            });
-			
-			function reset(){
-                
-                // Clear input fields
-                document.getElementById("zoneInput").value = "";
-                document.getElementById("wardInput").value = "";
-                document.getElementById("addressInput").value = "";
-                document.getElementById("roadInput").value = "";
-                //document.getElementById("latInput").value = "";
-                //document.getElementById("longInput").value = "";
-                document.getElementById("roadBufferSelect").value = "";
-			}
-			
-			
-			
-        });
-		/*
-		function test(){
-            alert(document.getElementById("zoneInput").value);
-            alert(document.getElementById("wardInput").value);
-            alert(document.getElementById("addressInput").value);
-            alert(document.getElementById("roadInput").value);
-            alert(document.getElementById("latInput").value);
-            alert(document.getElementById("longInput").value);
-            alert(document.getElementById("roadBufferSelect").value);
-		}*/
-    </script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/sos/pending_inbox.html b/src/main/resources/templates/modules/sos/pending_inbox.html
deleted file mode 100644
index db91a0aa..00000000
--- a/src/main/resources/templates/modules/sos/pending_inbox.html
+++ /dev/null
@@ -1,298 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>SOS</h5>
-                                            <span>Pending Request List</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">SOS</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Pending Request List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="circularDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort" width="2%">S.No</th>
-														<th class="text-center" width="10%">Type</th>
-						                                <th class="text-center no-sort" width="2%">Mode</th>
-						 								<th class="text-center" width="10%">Name</th>
-						 								<th class="text-center" width="10%">Mobile</th>
-						 								<th class="text-center" width="10%">Zone</th>
-														<th class="text-center" width="10%">ward</th>
-														<th class="text-center" width="10%">Street Name</th>
-														<th class="text-center" width="10%">Comments</th>
-														<th class="text-center" width="10%">Status</th>
-						                                <th class="text-center no-sort no-exportable no-print" width="5%"><i class="ik ik-more-horizontal"></i></th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- 
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Category</th>
-						 								<th class="text-center">Type</th>
-						 								<th class="text-center">Department</th>
-						 								<th class="text-center">Date</th>
-														<th class="text-center">Subject</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-													</tr>
-                                                </tfoot>
-                                                 --> 
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/circular/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/circular/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-       		var uploadDirectory = /*[[${uploadDirectory}]]*/'';
-       		
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Circular List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Circular List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_rescue_data(){
-	        	var apiUrl = '/gcc/api/sos/getRescueList?status=0';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_rescue_list(){
-	        	get_rescue_data().then(function(rescueList) {
-	    		    // Handle the complaint list
-	    		    generate_table(rescueList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching resuce list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching rescue list:', error);
-			        }
-	    		});
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	
-	            var table = $('#circularDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false },
-						  { targets: 5, orderSequence: ['desc'] }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        /*scrollY: '50vh',*/
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: true,
-				        searching: false,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	//var rowNum = data.length;
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-
-					var action =`<center><a href="#" onclick="return viewSOS('${row['id']}');" class="text-blue" data-animation="true" data-toggle="tooltip" data-placement="top" title="View SOS Details" data-original-title="View SOS Details"><i class="ik ik-eye f-16 text-blue"></i></a></center>`;
-			                    
-	                table.row.add([
-	                	rowNum++,
-	                	row['request_type'],
-	                	row['modeofcomplient'],
-	                    row['contact_name'],
-	                    row['contact_number'],
-	                    row['zone'],
-	                    row['ward'],
-	                    row['streetname'],
-	                    row['remarks'],
-	                    row['statusText'],
-	                    action
-	                ]).draw(false);
-	            });
-	            
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-				get_rescue_list();
-			});
-			
-			function viewFile(filename,filetype){
-	        	$("#viewFileBox").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				var filepath= '/gcc/files/circular/'+filename;
-				var fileHTML = '';
-				
-	        	if(filetype=='application/pdf'){
-	        		fileHTML = `<iframe src="${filepath}" type="application/pdf" width="100%" height="600px"></iframe>`;
-					
-				}
-				else{
-					fileHTML =nodata;
-				}
-				
-	        	console.error(fileHTML);
-	        	
-	        	$('#viewFileBoxBody').html(fileHTML); // Inject content into modal body
-				
-				return false;
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/sos/report.html b/src/main/resources/templates/modules/sos/report.html
deleted file mode 100644
index abeda821..00000000
--- a/src/main/resources/templates/modules/sos/report.html
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Complaint List</h5>
-                                            <span>Councillor Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Councillor Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Complaint List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-										<div id="tableLoading"></div>
-                                        <div>
-											<table id="circularDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort" width="2%">S.No</th>
-														<th class="text-center">Department</th>
-														<th class="text-center">Count</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/circular/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/circular/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Circular Report'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Circular Report'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Circular Report'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Circular Report',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_circular_data(){
-	        	var apiUrl = '/gcc/api/circular/getReport';
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_circular_list(){
-	        	get_circular_data().then(function(circularList) {
-
-        			// Iterate over the data array
-        			var rowNum = 1;
-		            $.each(circularList, function(index, row) {
-		                var department_name = row["name"];
-		                department_name = department_name.charAt(0).toUpperCase() + department_name.slice(1);
-
-		                // Create an array to store the dynamic values for this row
-		                var dynamicValues = [];
-
-		                // Iterate over the keys in the row object
-		                for (var key in row) {
-		                    // Check if the key starts with "dynamic_"
-		                    if (key.startsWith('dynamic_')) {
-		                        // Extract the field name without the "dynamic_" prefix
-		                        var fieldName = key.substring('dynamic_'.length);
-		                        // If it's the first row, add the dynamic column to the DataTable header
-		                        if (rowNum === 1) {
-		                            $('#circularDatatable thead tr').append(`<th class="text-center dynamic-column">${fieldName}</th>`);
-		                        }
-		                    }
-		                }
-		                rowNum++;
-		            });
-		                
-	    		    // Handle the complaint list
-	    		    generate_table(circularList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching circular list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching circular list:', error);
-			        }
-	    		});
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data) {
-	            var table = $('#circularDatatable').DataTable({
-	                dom: 'Bftip',
-	                columnDefs: [
-	                    { targets: 'no-sort', "orderable": false },
-	                    { targets: 'no-exportable', "exportable": false }
-	                ],
-	                lengthMenu: [
-	                    [25, 50, 100, 200, 500, -1],
-	                    ['25 rows', '50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-	                ],
-	                /*scrollY: '50vh',*/
-	                fixedColumns: {
-	                    left: 0,
-	                    right: 0
-	                },
-	                buttons: [buttons],
-	                responsive: true,
-	                searching: false,
-	                select: false,
-	                processing: false,
-	            });
-
-	            // Clear Table data
-	            table.clear().draw();
-
-	            // Initialize row number
-	            var rowNum = 1;
-
-	            // Iterate over the data array
-	            $.each(data, function(index, row) {
-	                var department_name = row["name"];
-	                department_name = department_name.charAt(0).toUpperCase() + department_name.slice(1);
-
-	                // Create an array to store the dynamic values for this row
-	                var dynamicValues = [];
-
-	                // Iterate over the keys in the row object
-	                for (var key in row) {
-	                    // Check if the key starts with "dynamic_"
-	                    if (key.startsWith('dynamic_')) {
-	                        // Add the dynamic value to the array
-	                        dynamicValues.push(row[key]);
-	                    }
-	                }
-
-					// Create the row array
-				    var rowData = [
-				        rowNum++,
-				        department_name,
-				        row["total"]
-				    ];
-
-				    // Add each dynamic value to the row array
-				    rowData = rowData.concat(dynamicValues);
-
-				    // Add the row to the DataTable
-				    table.row.add(rowData).draw(false);
-	            });
-
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-	        }
-
-			
-			$(document).ready(function() {
-				call_loading();
-				get_circular_list();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/taxcollection/index.html b/src/main/resources/templates/modules/taxcollection/index.html
deleted file mode 100644
index 420f5f61..00000000
--- a/src/main/resources/templates/modules/taxcollection/index.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-bar-chart-2 bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>1913 Tax Collection Module</h5>
-                                            <span>Tax collection appication for senior citizen and disability users</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item">1913 Tax Collection</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							
-							<!-- analytic card start - First Tile Start -->
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-facebook mb-20"><i class="ik ik-layers"></i></h2>
-                                        <h3 class="text-facebook fw-700">6,750</h3>
-                                        <p>Assets</p>
-                                        <p class="mb-0 mt-15">View Assets List<i class="fas fa-arrow-right ml-5 f-10 text-facebook"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-twitter mb-20"><i class="fas fa-comments"></i></h2>
-                                        <h3 class="text-twitter fw-700">9,752</h3>
-                                        <p>Feedbacks</p>
-                                        <p class="mb-0 mt-15">View Feedbacks List<i class="fas fa-arrow-right ml-5 f-10 text-twitter"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-green mb-20"><i class="far fa-smile-beam"></i></h2>
-                                        <h3 class="text-green fw-700">8,752</h3>
-                                        <p>Positive Feedbacks</p>
-                                        <p class="mb-0 mt-15">View Positive Feedbacks<i class="fas fa-arrow-right ml-5 f-10 text-green"></i></p>
-                                    </div>
-                                </div>
-                                </a>
-                            </div>
-                            <div class="col-xl-3 col-md-6">
-								<a href="javascript:void(0)">
-                                <div class="card social-card">
-                                    <div class="card-body text-center">
-                                        <h2 class="text-red mb-20"><i class="far fa-frown"></i></h2>
-                                        <h3 class="text-red fw-700">952</h3>
-                                        <p>Negative Feedbacks</p>
-                                        <p class="mb-0 mt-15">View Negative Feedbacks<i class="fas fa-arrow-right ml-5 f-10 text-red"></i></p>
-                                    </div>
-                                </div>
-								</a>
-                            </div>
-                            <!-- First Tile End -->
-			                
-			                <div class="col-md-12">
-				                <div class="card sale-card">
-		                            <div class="card-header">
-		                                <h3>Deals Analytics</h3>
-		                            </div>
-		                            <div class="card-block">
-		                                <div id="deal-analytic-chart" class="chart-shadow" style="height:300px"></div>
-		                            </div>
-		                        </div>    
-	                        </div>    
-	                          
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>Page Title</h3>
-                                    </div>
-                                    <div class="card-block">
-                                        
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <script>
-			
-			var chartData = [];
-		    var currentDate = new Date();
-		    var currentMonth = currentDate.getMonth() + 1;
-		    var currentYear = currentDate.getFullYear();
-		    var daysInMonth = new Date(currentYear, currentMonth, 0).getDate();
-		
-		    // Generate random data for each date in the current month
-		    for (var i = 1; i <= daysInMonth; i++) {
-		        var randomValue1 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		        var randomValue2 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-		
-		        var dateString = currentYear + '-' + (currentMonth < 10 ? '0' : '') + currentMonth + '-' + (i < 10 ? '0' : '') + i;
-		        var dataPoint = {
-		            "date": dateString,
-		            "market1": randomValue1,
-		            "market2": randomValue2
-		        };
-		        chartData.push(dataPoint);
-		    }
-			// deal-analytic-chart
-    var chart = AmCharts.makeChart("deal-analytic-chart", {
-        "type": "serial",
-        "theme": "light",
-        "dataDateFormat": "YYYY-MM-DD",
-        "precision": 2,
-        "valueAxes": [{
-            "id": "v1",
-            "position": "left",
-            "autoGridCount": false,
-            "labelFunction": function(value) {
-                return "$" + Math.round(value) + "M";
-            }
-        }, {
-            "id": "v2",
-            "gridAlpha": 0,
-            "autoGridCount": false
-        }],
-        "graphs": [{
-            "id": "g1",
-            "valueAxis": "v2",
-            /*"bullet": "round",
-            "bulletBorderAlpha": 1,
-            "bulletColor": "#FFFFFF",
-            "bulletSize": 8,
-            "hideBulletsCount": 50,
-            "lineThickness": 3,
-            "lineColor": "#2ed8b6",*/
-            "lineColor": "#2ed8b6",
-            "fillColors": "#2ed8b6",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Positive Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market1",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }, {
-            "id": "g2",
-            "valueAxis": "v2",
-            //"bullet": "round",
-            //"bulletBorderAlpha": 1,
-            //"bulletColor": "#FFFFFF",
-            //"bulletSize": 8,
-            //"hideBulletsCount": 50,
-            //"lineThickness": 3,
-            //"lineColor": "#e95753",
-            "lineColor": "#F22613",
-            "fillColors": "#F22613",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Negative Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market2",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }],
-        "chartCursor": {
-            "pan": true,
-            "valueLineEnabled": true,
-            "valueLineBalloonEnabled": true,
-            "cursorAlpha": 0,
-            "valueLineAlpha": 0.2
-        },
-        "categoryField": "date",
-        "categoryAxis": {
-            "parseDates": true,
-            "dashLength": 1,
-            "minorGridEnabled": true
-        },
-        "legend": {
-            "useGraphSettings": true,
-            "position": "top"
-        },
-        "balloon": {
-            "borderThickness": 1,
-            "shadowAlpha": 0
-        },
-        "dataProvider": chartData,
-    });
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/taxcollection/request-create.html b/src/main/resources/templates/modules/taxcollection/request-create.html
deleted file mode 100644
index 83119c29..00000000
--- a/src/main/resources/templates/modules/taxcollection/request-create.html
+++ /dev/null
@@ -1,874 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-		<link rel="stylesheet" type="text/css" href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css"/ >
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Create Request</h5>
-                                            <span>1913 Tax Collection Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">1913 Tax Collection</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Create Request</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-md-6">
-                                <div class="card">
-									<form class="request-form" id="request-form" onsubmit="return saveRequest();">
-	                                    <div class="card-header"><h3>Request Form</h3></div>
-	                               		<div class="card-body">
-											<div class="form-group">
-	                                            <label for="exampleInputPassword1">Name</label>
-	                                            <input type="text" class="form-control" name="name" id="name" placeholder="Name" autocomplete="off" required>
-	                                        </div>
-											<div class="row">
-                                                <div class="col-md-6">
-													<label for="exampleInputEmail1">Property tax number</label>
-													<div class="form-group input-group input-group-button">
-                                                        <input type="text" class="form-control" id="ptax" placeholder="00-000-00000-000" autocomplete="off" required>
-                                                        <div class="input-group-append">
-                                                            <button class="btn btn-primary" type="button" id="ptaxsearchbtn" autocomplete="off" onclick="displayPtaxInfo();return false;"><i class="ik ik-search"></i></button>
-                                                        </div>
-                                                    </div>
-			                                    </div>
-                                                <div class="col-md-6">
-			                                        <div class="form-group">
-			                                            <label for="exampleInputUsername1">Mobile Number</label>
-			                                            <input type="text" class="form-control" id="mobileno" placeholder="Enter your 10-digit mobile number" autocomplete="off" required>
-			                                        </div>
-			                                    </div>
-                                            </div>
-	                                        
-	                                        <div class="row">
-                                                <div class="col-md-6">
-                                                    <div class="form-group">
-                                                        <label for="availabilitydate">Availability Date & Time</label>
-                                                        <input type="text" class="form-control" name="availabilitydate" id="availabilitydate" placeholder="Year/Month/date Hours:Minutes" autocomplete="off" required>
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-6">
-                                                    <div class="form-group">
-		                                                <label for="usertype">User Type</label>
-		                                                <select class="form-control" name="usertype" id="usertype" required>
-		                                                    <option>Senior citizen</option>
-		                                                    <option>Disability</option>
-		                                                </select>
-		                                            </div>
-                                                </div>
-                                            </div>
-	                                  	</div>
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-							<div class="col-md-6">
-								<div class="card">
-                                    <div class="card-header"><h3>Property tax Information</h3></div>
-                               		<div class="card-body" id="ptaxPersonalInfo">
-									
-									</div>
-								</div>
-							</div>
-							
-							<div class="card">
-                                <div class="card-block">
-									<div class="d-flex">
-                                        <h4 class="card-title">Today tax collection request list</h4>
-                                        
-                                    </div>
-                                
-									<div>
-										<table id="requestDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                            <thead class="thead-dark">
-                                                <tr role="row">
-													<th class="text-center no-sort" width="1%">S.No</th>
-													<th class="text-center" width="20%">Name</th>
-													<th class="text-center" width="20%">Property tax number</th>
-													<th class="text-center" width="20%">Mobile Number</th>
-													<th class="text-center" width="20%">Availability Date</th>
-													<th class="text-center" width="20%">User Type</th>
-													<th class="text-center" width="20%">Status</th>
-					                                <th class="text-center no-sort" style="width:50px;">Action</th>
-												</tr>
-                                            </theadclass="thead-dark">
-                                            <tbody>
-                                                <tr th:each="taxCollectionRequestList, i : ${taxCollectionRequestEntities}" class="taxCollectionRequestList text-capitalize">
-					                                <td th:text="${i.count}">0</td>
-													<td th:text="${taxCollectionRequestList.name}"></td>
-													<td th:text="${taxCollectionRequestList.ptax}"></td>
-					                                <td th:text="${taxCollectionRequestList.mobile}"></td>
-					                                <td th:text="${taxCollectionRequestList.availabilitydate}"></td>
-					                                <td th:text="${taxCollectionRequestList.usertype}"></td>
-					                                <td>
-														<a th:href="@{#}" th:text="${taxCollectionRequestList.status}" th:classappend="${taxCollectionRequestList.status == 'open'} ? 'badge badge-success mb-1' : 'badge badge-secondary mb-1'" th:onclick="return callStatusUpdate([[${taxCollectionRequestList.request_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Update Current Status" data-original-title="Update Current Status"></a>
-													</td>
-					                                <td class="text-center">
-					                                    <a th:href="@{#}" th:onclick="return callView([[${taxCollectionRequestList.request_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Request Details" data-original-title="View Request Details"><i class="ik ik-eye f-16 text-blue"></i></a>&nbsp;&nbsp;
-					                                </td>
-					                            </tr>
-                                             </tbody>
-                                            <tfoot class="thead-dark">
-                                                <tr>
-													<th class="text-center">S.No</th>
-					                                <th class="text-center">Name</th>
-													<th class="text-center">Property tax number</th>
-													<th class="text-center">Mobile Number</th>
-													<th class="text-center">Availability Date</th>
-													<th class="text-center">User Type</th>
-													<th class="text-center">Status</th>
-					                                <th class="text-center">Action</th>
-												</tr>
-                                            </tfoot>
-                                        </table>
-                                    </div>
-								</div>
-                            </div>
-                           <img src="/images/userimg/my.jpeg">
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-        
-		<div class="modal fade" id="taxCollectionRequestView" tabindex="-1" role="dialog" aria-labelledby="modalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="modalCenterLabel"><i class="ik ik-file-text text-primary"></i> Collection Request Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-							      
-                            <div class="col-xl-6 col-md-6" id="requestDetails">
-								
-                            </div>
-                            <div class="col-xl-6 col-md-6" style="border-left: 1px solid #dee2e6;" id="pTaxdetails">
-                                &nbsp;
-                            </div>
-						</div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="ik ik-x-square"></i>Close</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="taxCollectionRequestUpdate" tabindex="-1" role="dialog" aria-labelledby="modalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-					
-	                    <div class="modal-header">
-	                        <h5 class="modal-title" id="modalCenterLabel"><i class="ik ik-file-text text-primary"></i> Collection Request Status Update Form</h5>
-	                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div>
-	                    <div class="modal-body">
-							<div class="row">
-								      
-	                            <div class="col-xl-6 col-md-6" id="requestDetailsUpdate">
-									
-	                            </div>
-	                            <div class="col-xl-6 col-md-6" style="border-left: 1px solid #dee2e6;" id="statusUpdateForm">
-	                                &nbsp;
-	                            </div>
-	                            
-	                            <div class="card table-card mb-0">
-                                    
-                                   <h5 class="text-warning pl-10 text-center">Status History</h5>
-                                    
-                                    <div class="card-block pb-0">
-                                        <div class="table-responsive">
-                                            <table class="table table-hover mb-0">
-                                                <thead>
-                                                    <tr>
-                                                        <th>Company</th>
-                                                        <th>Start Date</th>
-                                                        <th>End Date</th>
-                                                        <th>Status</th>
-                                                    </tr>
-                                                </thead>
-                                                <tbody>
-                                                    <tr>
-                                                        <td>Apple Company</td>
-                                                        <td>23/05/2017</td>
-                                                        <td>04/08/2018</td>
-                                                        <td><label class="badge badge-success">Paid</label></td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                                
-							</div>
-	                    </div>
-	                    <div class="modal-footer">
-	                        <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="ik ik-x-square"></i>Close</button>
-	                    </div>
-                    
-                </div>
-            </div>
-        </div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-        <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-       	<script th:inline="javascript">
-			var loginUserID = /*[[${LoginUserId}]]*/'';
-			$(document).ready(function() {
-			  // Input masking for the desired format
-			  $('#ptax').mask('00-000-00000-000');
-			  $('#mobileno').mask('0000000000');
-			  
-			  // For datetime picker
-			  jQuery('#availabilitydate').datetimepicker({
-				  minTime:'10:00',
-				  maxTime:'18:01',
-				  minDate: 0, // Today
-				  //minDate:'-1970/01/2',
-				  //maxDate:'+1970/01/2',
-				  //timepicker:false, // Disable time picker
-				  mask:false,
-				  disabledWeekDays:[0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-				  disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-				  /*
-				  // Disable all weekends
-				  onGenerate:function( ct ){
-				    jQuery(this).find('.xdsoft_date.xdsoft_weekend')
-				      .addClass('xdsoft_disabled');
-				  }
-				  */
-			  });
-			  
-			});
-			
-			function displayPtaxInfo(ptax){
-				var inputElement = $('#ptax');
-				
-				inputElement.removeClass('is-invalid');
-				
-				// Disable the button to prevent multiple clicks
-				$("#ptaxsearchbtn").prop("disabled", true);
-				
-				// Show the loading icon on the button
-				$("#ptaxsearchbtn").html('<i class="fas fa-spinner fa-spin"></i>');
-				  
-				var ptax = inputElement.val();
-				var formatRegex = /^\d{2}-\d{3}-\d{5}-\d{3}$/; //'04-042-03251-000';
-				
-				// Check if the tax value is not null and follows the format
-				if (ptax !== null && formatRegex.test(ptax)) {
-				  console.log('ptax value is valid:', ptax);
-				  // Check if the tax value has the correct length as per the format (15 characters)
-				  if (ptax.length === 16) {
-				    console.log('ptax value length is correct.');
-				    getPtaxInfo(ptax);
-				  } else {
-				    console.log('ptax value length is incorrect.');
-				    
-				    inputElement.addClass('is-invalid');
-				    
-				    $("#ptaxsearchbtn").prop("disabled", false);
-    				$("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				  }
-				} else {
-				  console.log('ptax value is not valid or null.');
-				  
-				  inputElement.addClass('is-invalid'); //Error
-				  
-				  $("#ptaxsearchbtn").prop("disabled", false); 
-    			  $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				}
-			}
-			
-			function getPtaxInfo(ptax){
-				call_loading('ptaxPersonalInfo','start');
-				//var ptax = '04-042-03251-000';
-				var apiUrl = '/gcc/api/taxcollection/getPropertTaxPersonalDetails?ptax='+ptax;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						if(data.ResultStatus=="False")
-						{
-							$("#ptaxPersonalInfo").html("<center>"+nodata(data.Message)+"</center>");
-							$("#ptaxsearchbtn").prop("disabled", false);
-						    $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-						}
-						else{
-							// Access the values
-							var owner = data.PROPTAX[0].Owner;
-							var address = data.PROPTAX[0].Address;
-							//var famCardNo = data.PROPTAX[0].Fam_Card_No;
-							var mobNo = data.PROPTAX[0].Mob_No;
-							var email = data.PROPTAX[0].Email_ID;
-							
-							// HTML content
-							var ptaxPersonalinfoHtml = '<table class="table table-borderless text-capitalize">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td>Property tax number</td>' +
-							           '      <td class="font-medium">'+ptax+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Owner Name</td>' +
-							           '      <td class="font-medium">'+owner+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Address</td>' +
-							           '      <td class="font-medium">'+address+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Mobile No</td>' +
-							           '      <td class="font-medium">'+mobNo+'</td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>';
-							$("#ptaxPersonalInfo").html(ptaxPersonalinfoHtml);
-							// Enable the button
-							$("#ptaxsearchbtn").prop("disabled", false);
-	    					$("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-						}
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				      // Enable the button
-				      $("#ptaxsearchbtn").prop("disabled", false);
-				      $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				    }
-				});
-			}
-			
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				$("#requestSubmitBtn").prop("disabled", true);
-				
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-				var name = $('#name').val();
-				
-				var inputElement = $('#ptax');
-				var ptax = inputElement.val();
-				var formatRegex = /^\d{2}-\d{3}-\d{5}-\d{3}$/; //'04-042-03251-000';
-				inputElement.removeClass('is-invalid');
-				
-				var inputElementMobileNo = $('#mobileno');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementUsertype = $('#usertype');
-				var usertype = inputElementUsertype.val();
-				//inputElementUsertype.removeClass('is-invalid');
-				
-				var inputElementAvailabilityDate = $('#availabilitydate');
-				var availabilitydate = inputElementAvailabilityDate.val();
-				
-				var selectedDateTime = new Date(availabilitydate);
-			    var currentDateTime = new Date();
-			
-			    if (selectedDateTime < currentDateTime) {
-					alert('Selected date and time must be greater than or equal to the current date and time.');
-		        	inputElementAvailabilityDate.addClass('is-invalid');
-					$("#requestSubmitBtn").prop("disabled", false);
-    				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-		        	return false; // Prevent form submission
-		      	}
-			    
-				var formData = new FormData();
-				
-				// Check if the tax value is not null and follows the format
-				if (ptax !== null && formatRegex.test(ptax) && ptax.length == 16) {
-					
-					// Mobile number Check
-					if (mobileNo !== null && mobileFormatRegex.test(mobileNo) && mobileNo.length == 10) {
-						$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Submitting your request, please wait...');
-						
-						formData.append('name',name);
-						formData.append('ptax', ptax );
-						formData.append('mobile', mobileNo );
-						formData.append('usertype', usertype );
-						formData.append('availabilitydate', availabilitydate);
-						formData.append('created_by', loginUserID);
-						
-						submitSaveRequest(formData);
-
-						$("#requestSubmitBtn").html('Your request has been successfully submitted!');
-					} else {
-						inputElementMobileNo.addClass('is-invalid');
-						$("#requestSubmitBtn").prop("disabled", false);
-    					$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-					}
-				 
-				} else {
-				  console.log('ptax value is not valid or null.');
-				  
-				  inputElement.addClass('is-invalid'); //Error
-				  
-				  $("#requestSubmitBtn").prop("disabled", false); 
-    			  $("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-				}
-				return false;
-			}
-			
-			function submitSaveRequest(formData){
-				$.ajax({
-				    type: "POST",
-				    url: '/gcc/api/taxcollection/saveTaxCollectionRequest',
-		                data: formData,
-		                contentType: false,
-		                processData: false,
-				}).done(function(response) {
-	  			      Swal.fire(
-	  			        'Complaint Status Update!',
-	  			        'Complaint closed Successfully!',
-	  			        'success'
-	  			      ).then(() => {
-	  						    location.reload();
-	  						 });
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					$("#requestSubmitBtn").prop("disabled", false);
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-			    
-				});
-			}
-		</script>
-		<script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                
-	            ];
-				
-			    $('#requestDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callView(request_id){
-				$('#taxCollectionRequestView').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#taxCollectionRequestView').modal('show');
-				
-				call_loading('requestDetails','start');
-				getTaxCollectionRequestDetails(request_id);
-				call_loading('pTaxdetails','start');
-				
-				return false;
-			}
-			
-			function getTaxCollectionRequestDetails(request_id){
-				var apiUrl = '/gcc/api/taxcollection/getTaxCollectionRequestById?request_id='+request_id;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						
-						// Access the values
-						var request_id = data.request_id;
-						var requestNo = data.requestNo;
-						var name = data.name;
-						var mobile = data.mobile;
-						var ptax = data.ptax;
-						var usertype = data.usertype;
-						var availabilitydate = data.availabilitydate;
-						var status = data.status;
-						var cdate = data.cDate;
-						
-						// HTML content
-						var ptaxPersonalinfoHtml = '<table class="table table-borderless text-capitalize">' +
-						           '  <tbody>' +
-								   '    <tr>' +
-						           '      <td>Name</td>' +
-						           '      <td class="font-medium">'+name+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Property tax number</td>' +
-						           '      <td class="font-medium font-weight-bold" id="pTaxVerification">'+ptax+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Mobile Number</td>' +
-						           '      <td class="font-medium">'+mobile+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Availability Date & Time</td>' +
-						           '      <td class="font-medium">'+availabilitydate+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>User Type</td>' +
-						           '      <td class="font-medium">'+usertype+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Current Status</td>' +
-						           '      <td class="font-medium">'+status+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Request Created On</td>' +
-						           '      <td class="font-medium">'+cdate+'</td>' +
-						           '    </tr>' +
-						           '  </tbody>' +
-						           '</table>';
-						$("#requestDetails").html(ptaxPersonalinfoHtml);
-						getpTaxDetails(ptax);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching collection reqtest data:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function getpTaxDetails(ptax){
-				
-				var apiUrl = '/gcc/api/taxcollection/getPropertTaxPersonalDetails?ptax='+ptax;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						if (data.ResultStatus === "True") {
-							// Access the values
-							var owner = data.PROPTAX[0].Owner;
-							var address = data.PROPTAX[0].Address;
-							var mobNo = data.PROPTAX[0].Mob_No;
-							var email = data.PROPTAX[0].Email_ID;
-							
-							// HTML content
-							var ptaxPersonalinfoHtml = '<table class="table table-borderless">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td>Property tax number</td>' +
-							           '      <td class="font-medium">'+ptax+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Owner Name</td>' +
-							           '      <td class="font-medium">'+owner+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Address</td>' +
-							           '      <td class="font-medium">'+address+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Mobile No</td>' +
-							           '      <td class="font-medium">'+mobNo+'</td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>';
-							$("#pTaxdetails").html(ptaxPersonalinfoHtml);
-							
-							// if Ptax data fetched then load valid message
-							var validPtax = ptax+'&nbsp;<font class="custom-tooltip-success"><a href="#" class="text-success" onclick="return false;" data-container=".custom-tooltip-success" data-toggle="tooltip" data-html="true" data-placement="top" title="Property tax number<br>cross-verify success" data-original-title="Property tax number cross-verify success"><i class="ik ik-check-circle"></i></font>';
-							$("#pTaxVerification").html(validPtax);
-						}
-						else {
-						    // No data found
-						    console.log("Message: " + data.Message);
-						    var inValidPtax = ptax+'&nbsp;<font class="custom-tooltip-warning"><a href="#" class="text-warning" onclick="return false;" data-container=".custom-tooltip-warning" data-toggle="tooltip" data-html="true" data-placement="top" title="Property tax number<br>cross-verify failed" data-original-title="Property tax number cross-verify failed"><i class="ik ik-alert-triangle"></i></font>';
-							$("#pTaxVerification").html(inValidPtax);
-							
-						    $("#pTaxdetails").html('<center><img src="images/nodata.png"></br>No Record Found</center>');
-						}
-						// Enable tooltip for model page
-						$('[data-toggle="tooltip"]').tooltip();
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching pTax data:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function callStatusUpdate(request_id){
-				$('#taxCollectionRequestUpdate').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#taxCollectionRequestUpdate').modal('show');
-				
-				call_loading('requestDetailsUpdate','start');
-				getTaxCollectionRequestUpdate(request_id);
-				call_loading('statusUpdateForm','start');
-				
-				return false;
-			}
-			
-			function getTaxCollectionRequestUpdate(request_id){
-				var apiUrl = '/gcc/api/taxcollection/getTaxCollectionRequestById?request_id='+request_id;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						
-						// Access the values
-						var request_id = data.request_id;
-						var requestNo = data.requestNo;
-						var name = data.name;
-						var mobile = data.mobile;
-						var ptax = data.ptax;
-						var usertype = data.usertype;
-						var availabilitydate = data.availabilitydate;
-						var status = data.status;
-						var cdate = data.cDate;
-						
-						// HTML content
-						var ptaxPersonalinfoHtml = '<table class="table table-borderless text-capitalize">' +
-						           '  <tbody>' +
-								   '    <tr>' +
-						           '      <td>Name</td>' +
-						           '      <td class="font-medium">'+name+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Property tax number</td>' +
-						           '      <td class="font-medium font-weight-bold" id="pTaxVerification">'+ptax+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Mobile Number</td>' +
-						           '      <td class="font-medium">'+mobile+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Availability Date & Time</td>' +
-						           '      <td class="font-medium">'+availabilitydate+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>User Type</td>' +
-						           '      <td class="font-medium">'+usertype+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Current Status</td>' +
-						           '      <td class="font-medium">'+status+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Request Created On</td>' +
-						           '      <td class="font-medium">'+cdate+'</td>' +
-						           '    </tr>' +
-						           '  </tbody>' +
-						           '</table>';
-						$("#requestDetailsUpdate").html(ptaxPersonalinfoHtml);
-						showStatusUpdateForm(request_id, status);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching collection reqtest data:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function showStatusUpdateForm(request_id, status){
-				
-				var selectInput = `<select class="form-control" name="requestStatus" id="requestStatus" required>
-								        <option value="open">Open</option>
-								        <option value="close">Close</option>
-								    </select>`;
-								    
-				var textareaInput=`<textarea class="form-control" name="statusComments" id="statusComments" rows="4"></textarea>`;
-				
-				var ptaxPersonalinfoHtml = '<form class="request-form" id="request-form" onsubmit="return saveStatus();">' +
-									   '<div class="card table-card mb-0"><div class="card-header" style="background-color: #ffe1003b !important;"><h3>Update Form</h3></div>' +
-									   '<div class="card-block p-0">' +
-									   '<table class="table table-borderless">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td width="30%">Current Status</td>' +
-							           '      <td class="font-medium">'+selectInput+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td colspan="2">Status Comments' + textareaInput+'</td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>' +
-							           '</div><div class="card-footer text-center">' +
-									   '        <button type="reset" class="btn btn-secondary mr-2"><i class="ik ik-refresh-cw"></i>Reset</button>'+
-                                       ' 	    <button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>'+
-							           '</div></div></form>';
-							           
-				$("#statusUpdateForm").html(ptaxPersonalinfoHtml);
-				
-				
-				var apiUrl = '/gcc/api/taxcollection/getPropertTaxPersonalDetails?ptax='+ptax;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						if (data.ResultStatus === "True") {
-							// Access the values
-							var owner = data.PROPTAX[0].Owner;
-							var address = data.PROPTAX[0].Address;
-							var mobNo = data.PROPTAX[0].Mob_No;
-							var email = data.PROPTAX[0].Email_ID;
-							
-							// HTML content
-							var ptaxPersonalinfoHtml = '<form class="request-form" id="request-form" onsubmit="return saveStatus();">' +
-									   '<div class="card table-card"><div class="card-header"><h3>Update Form</h3></div>' +
-									   '<div class="card-block">' +
-									   '<table class="table table-borderless">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td>Current Status</td>' +
-							           '      <td class="font-medium">'+ptax+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Status Comments</td>' +
-							           '      <td class="font-medium">'+owner+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Address</td>' +
-							           '      <td class="font-medium">'+
-									   
-									   '      </td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>' +
-							           '</div><div class="card-footer  text-center">' +
-									   '        <button type="reset" class="btn btn-secondary mr-2"><i class="ik ik-refresh-cw"></i>Reset</button>'+
-                                       ' 	    <button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>'+
-							           '</div></div></form>';
-							$("#statusUpdateForm").html(ptaxPersonalinfoHtml);
-						}
-						else {
-						    // No data found
-						    console.log("Status history: " + data.Message);
-						    //$("#pTaxdetails").html('<center><img src="images/nodata.png"></br>No Record Found</center>');
-						}
-						// Enable tooltip for model page
-						$('[data-toggle="tooltip"]').tooltip();
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching Status history:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function saveStatus(){
-				return false;
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/taxcollection/request-list.html b/src/main/resources/templates/modules/taxcollection/request-list.html
deleted file mode 100644
index d1174799..00000000
--- a/src/main/resources/templates/modules/taxcollection/request-list.html
+++ /dev/null
@@ -1,813 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-		<link rel="stylesheet" type="text/css" href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css"/ >
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-headset bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Request List</h5>
-                                            <span>1913 Tax Collection Module</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">1913 Tax Collection</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Request List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							
-							<div class="card">
-                                <div class="card-block">
-									<div class="d-flex">
-                                        <h4 class="card-title">Tax collection request list</h4>
-                                        
-                                    </div>
-                                
-									<div>
-										<table id="requestDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                            <thead class="thead-dark">
-                                                <tr role="row">
-													<th class="text-center no-sort" width="1%">S.No</th>
-													<th class="text-center" width="20%">Name</th>
-													<th class="text-center" width="20%">Property tax number</th>
-													<th class="text-center" width="20%">Mobile Number</th>
-													<th class="text-center" width="20%">Availability Date</th>
-													<th class="text-center" width="20%">User Type</th>
-													<th class="text-center" width="20%">Status</th>
-					                                <th class="text-center no-sort" style="width:50px;">Action</th>
-												</tr>
-                                            </theadclass="thead-dark">
-                                            <tbody>
-                                                <tr th:each="taxCollectionRequestList, i : ${taxCollectionRequestEntities}" class="taxCollectionRequestList text-capitalize">
-					                                <td th:text="${i.count}">0</td>
-													<td th:text="${taxCollectionRequestList.name}"></td>
-													<td th:text="${taxCollectionRequestList.ptax}"></td>
-					                                <td th:text="${taxCollectionRequestList.mobile}"></td>
-					                                <td th:text="${taxCollectionRequestList.availabilitydate}"></td>
-					                                <td th:text="${taxCollectionRequestList.usertype}"></td>
-					                                <td>
-														<a th:href="@{#}" th:text="${taxCollectionRequestList.status}" th:classappend="${taxCollectionRequestList.status == 'open'} ? 'badge badge-success mb-1' : 'badge badge-secondary mb-1'" th:onclick="return callStatusUpdate([[${taxCollectionRequestList.request_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Update Current Status" data-original-title="Update Current Status"></a>
-													</td>
-					                                <td class="text-center">
-					                                    <a th:href="@{#}" th:onclick="return callView([[${taxCollectionRequestList.request_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Request Details" data-original-title="View Request Details"><i class="ik ik-eye f-16 text-blue"></i></a>&nbsp;&nbsp;
-					                                </td>
-					                            </tr>
-                                             </tbody>
-                                            <tfoot class="thead-dark">
-                                                <tr>
-													<th class="text-center">S.No</th>
-					                                <th class="text-center">Name</th>
-													<th class="text-center">Property tax number</th>
-													<th class="text-center">Mobile Number</th>
-													<th class="text-center">Availability Date</th>
-													<th class="text-center">User Type</th>
-													<th class="text-center">Status</th>
-					                                <th class="text-center">Action</th>
-												</tr>
-                                            </tfoot>
-                                        </table>
-                                    </div>
-								</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-        
-		<div class="modal fade" id="taxCollectionRequestView" tabindex="-1" role="dialog" aria-labelledby="modalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="modalCenterLabel"><i class="ik ik-file-text text-primary"></i> Collection Request Details</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="modal-body">
-						<div class="row">
-							      
-                            <div class="col-xl-6 col-md-6" id="requestDetails">
-								
-                            </div>
-                            <div class="col-xl-6 col-md-6" style="border-left: 1px solid #dee2e6;" id="pTaxdetails">
-                                &nbsp;
-                            </div>
-						</div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="ik ik-x-square"></i>Close</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="taxCollectionRequestUpdate" tabindex="-1" role="dialog" aria-labelledby="modalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-					
-	                    <div class="modal-header">
-	                        <h5 class="modal-title" id="modalCenterLabel"><i class="ik ik-file-text text-primary"></i> Collection Request Status Update Form</h5>
-	                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	                    </div>
-	                    <div class="modal-body">
-							<div class="row">
-								      
-	                            <div class="col-xl-6 col-md-6" id="requestDetailsUpdate">
-									
-	                            </div>
-	                            <div class="col-xl-6 col-md-6" style="border-left: 1px solid #dee2e6;" id="statusUpdateForm">
-	                                &nbsp;
-	                            </div>
-	                            
-	                            <div class="card table-card mb-0">
-                                    
-                                   <h5 class="text-warning pl-10 text-center">Status History</h5>
-                                    
-                                    <div class="card-block pb-0">
-                                        <div class="table-responsive">
-                                            <table class="table table-hover mb-0">
-                                                <thead>
-                                                    <tr>
-                                                        <th>Company</th>
-                                                        <th>Start Date</th>
-                                                        <th>End Date</th>
-                                                        <th>Status</th>
-                                                    </tr>
-                                                </thead>
-                                                <tbody>
-                                                    <tr>
-                                                        <td>Apple Company</td>
-                                                        <td>23/05/2017</td>
-                                                        <td>04/08/2018</td>
-                                                        <td><label class="badge badge-success">Paid</label></td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                                
-							</div>
-	                    </div>
-	                    <div class="modal-footer">
-	                        <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="ik ik-x-square"></i>Close</button>
-	                    </div>
-                    
-                </div>
-            </div>
-        </div>
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-        <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-       	<script th:inline="javascript">
-			var loginUserID = /*[[${LoginUserId}]]*/'';
-			$(document).ready(function() {
-			  // Input masking for the desired format
-			  $('#ptax').mask('00-000-00000-000');
-			  $('#mobileno').mask('0000000000');
-			  
-			  // For datetime picker
-			  jQuery('#availabilitydate').datetimepicker({
-				  minTime:'10:00',
-				  maxTime:'18:01',
-				  minDate: 0, // Today
-				  //minDate:'-1970/01/2',
-				  //maxDate:'+1970/01/2',
-				  //timepicker:false, // Disable time picker
-				  mask:false,
-				  disabledWeekDays:[0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-				  disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-				  /*
-				  // Disable all weekends
-				  onGenerate:function( ct ){
-				    jQuery(this).find('.xdsoft_date.xdsoft_weekend')
-				      .addClass('xdsoft_disabled');
-				  }
-				  */
-			  });
-			  
-			});
-			
-			function displayPtaxInfo(ptax){
-				var inputElement = $('#ptax');
-				
-				inputElement.removeClass('is-invalid');
-				
-				// Disable the button to prevent multiple clicks
-				$("#ptaxsearchbtn").prop("disabled", true);
-				
-				// Show the loading icon on the button
-				$("#ptaxsearchbtn").html('<i class="fas fa-spinner fa-spin"></i>');
-				  
-				var ptax = inputElement.val();
-				var formatRegex = /^\d{2}-\d{3}-\d{5}-\d{3}$/; //'04-042-03251-000';
-				
-				// Check if the tax value is not null and follows the format
-				if (ptax !== null && formatRegex.test(ptax)) {
-				  console.log('ptax value is valid:', ptax);
-				  // Check if the tax value has the correct length as per the format (15 characters)
-				  if (ptax.length === 16) {
-				    console.log('ptax value length is correct.');
-				    getPtaxInfo(ptax);
-				  } else {
-				    console.log('ptax value length is incorrect.');
-				    
-				    inputElement.addClass('is-invalid');
-				    
-				    $("#ptaxsearchbtn").prop("disabled", false);
-    				$("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				  }
-				} else {
-				  console.log('ptax value is not valid or null.');
-				  
-				  inputElement.addClass('is-invalid'); //Error
-				  
-				  $("#ptaxsearchbtn").prop("disabled", false); 
-    			  $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				}
-			}
-			
-			function getPtaxInfo(ptax){
-				call_loading('ptaxPersonalInfo','start');
-				//var ptax = '04-042-03251-000';
-				var apiUrl = '/gcc/api/taxcollection/getPropertTaxPersonalDetails?ptax='+ptax;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						if(data.ResultStatus=="False")
-						{
-							$("#ptaxPersonalInfo").html("<center>"+nodata(data.Message)+"</center>");
-							$("#ptaxsearchbtn").prop("disabled", false);
-						    $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-						}
-						else{
-							// Access the values
-							var owner = data.PROPTAX[0].Owner;
-							var address = data.PROPTAX[0].Address;
-							//var famCardNo = data.PROPTAX[0].Fam_Card_No;
-							var mobNo = data.PROPTAX[0].Mob_No;
-							var email = data.PROPTAX[0].Email_ID;
-							
-							// HTML content
-							var ptaxPersonalinfoHtml = '<table class="table table-borderless text-capitalize">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td>Property tax number</td>' +
-							           '      <td class="font-medium">'+ptax+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Owner Name</td>' +
-							           '      <td class="font-medium">'+owner+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Address</td>' +
-							           '      <td class="font-medium">'+address+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Mobile No</td>' +
-							           '      <td class="font-medium">'+mobNo+'</td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>';
-							$("#ptaxPersonalInfo").html(ptaxPersonalinfoHtml);
-							// Enable the button
-							$("#ptaxsearchbtn").prop("disabled", false);
-	    					$("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-						}
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				      // Enable the button
-				      $("#ptaxsearchbtn").prop("disabled", false);
-				      $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				    }
-				});
-			}
-			
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				$("#requestSubmitBtn").prop("disabled", true);
-				
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-				var name = $('#name').val();
-				
-				var inputElement = $('#ptax');
-				var ptax = inputElement.val();
-				var formatRegex = /^\d{2}-\d{3}-\d{5}-\d{3}$/; //'04-042-03251-000';
-				inputElement.removeClass('is-invalid');
-				
-				var inputElementMobileNo = $('#mobileno');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementUsertype = $('#usertype');
-				var usertype = inputElementUsertype.val();
-				//inputElementUsertype.removeClass('is-invalid');
-				
-				var inputElementAvailabilityDate = $('#availabilitydate');
-				var availabilitydate = inputElementAvailabilityDate.val();
-				
-				var selectedDateTime = new Date(availabilitydate);
-			    var currentDateTime = new Date();
-			
-			    if (selectedDateTime < currentDateTime) {
-					alert('Selected date and time must be greater than or equal to the current date and time.');
-		        	inputElementAvailabilityDate.addClass('is-invalid');
-					$("#requestSubmitBtn").prop("disabled", false);
-    				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-		        	return false; // Prevent form submission
-		      	}
-			    
-				var formData = new FormData();
-				
-				// Check if the tax value is not null and follows the format
-				if (ptax !== null && formatRegex.test(ptax) && ptax.length == 16) {
-					
-					// Mobile number Check
-					if (mobileNo !== null && mobileFormatRegex.test(mobileNo) && mobileNo.length == 10) {
-						$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Submitting your request, please wait...');
-						
-						formData.append('name',name);
-						formData.append('ptax', ptax );
-						formData.append('mobile', mobileNo );
-						formData.append('usertype', usertype );
-						formData.append('availabilitydate', availabilitydate);
-						formData.append('created_by', loginUserID);
-						
-						submitSaveRequest(formData);
-
-						$("#requestSubmitBtn").html('Your request has been successfully submitted!');
-					} else {
-						inputElementMobileNo.addClass('is-invalid');
-						$("#requestSubmitBtn").prop("disabled", false);
-    					$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-					}
-				 
-				} else {
-				  console.log('ptax value is not valid or null.');
-				  
-				  inputElement.addClass('is-invalid'); //Error
-				  
-				  $("#requestSubmitBtn").prop("disabled", false); 
-    			  $("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-				}
-				return false;
-			}
-			
-			function submitSaveRequest(formData){
-				$.ajax({
-				    type: "POST",
-				    url: '/gcc/api/taxcollection/saveTaxCollectionRequest',
-		                data: formData,
-		                contentType: false,
-		                processData: false,
-				}).done(function(response) {
-	  			      Swal.fire(
-	  			        'Complaint Status Update!',
-	  			        'Complaint closed Successfully!',
-	  			        'success'
-	  			      ).then(() => {
-	  						    location.reload();
-	  						 });
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					$("#requestSubmitBtn").prop("disabled", false);
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-			    
-				});
-			}
-		</script>
-		<script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var buttons = [
-	            	{
-						extend: 'pageLength',
-						className: 'btn btn-warning'
-					},
-	                {
-						title: 'Data export',
-	                    extend: 'copyHtml5',
-	                    text: 'Copy',
-	                    className: 'btn btn-secondary',
-	                    id: 'copyBtn'
-	                },
-	                {
-	                    extend: 'excelHtml5',
-	                    text: 'Excel',
-	                    className: 'btn btn-secondary',
-	                    id: 'excelBtn'
-	                },
-	                {
-	                    extend: 'csvHtml5',
-	                    text: 'CSV',
-	                    className: 'btn btn-secondary',
-	                    id: 'csvBtn'
-	                },
-	                {
-	                    extend: 'pdfHtml5',
-	                    text: 'PDF',
-	                    className: 'btn btn-secondary',
-	                    id: 'pdfBtn'
-	                },
-	                
-	            ];
-				
-			    $('#requestDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callView(request_id){
-				$('#taxCollectionRequestView').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#taxCollectionRequestView').modal('show');
-				
-				call_loading('requestDetails','start');
-				getTaxCollectionRequestDetails(request_id);
-				call_loading('pTaxdetails','start');
-				
-				return false;
-			}
-			
-			function getTaxCollectionRequestDetails(request_id){
-				var apiUrl = '/gcc/api/taxcollection/getTaxCollectionRequestById?request_id='+request_id;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						
-						// Access the values
-						var request_id = data.request_id;
-						var requestNo = data.requestNo;
-						var name = data.name;
-						var mobile = data.mobile;
-						var ptax = data.ptax;
-						var usertype = data.usertype;
-						var availabilitydate = data.availabilitydate;
-						var status = data.status;
-						var cdate = data.cDate;
-						
-						// HTML content
-						var ptaxPersonalinfoHtml = '<table class="table table-borderless text-capitalize">' +
-						           '  <tbody>' +
-								   '    <tr>' +
-						           '      <td>Name</td>' +
-						           '      <td class="font-medium">'+name+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Property tax number</td>' +
-						           '      <td class="font-medium font-weight-bold" id="pTaxVerification">'+ptax+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Mobile Number</td>' +
-						           '      <td class="font-medium">'+mobile+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Availability Date & Time</td>' +
-						           '      <td class="font-medium">'+availabilitydate+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>User Type</td>' +
-						           '      <td class="font-medium">'+usertype+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Current Status</td>' +
-						           '      <td class="font-medium">'+status+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Request Created On</td>' +
-						           '      <td class="font-medium">'+cdate+'</td>' +
-						           '    </tr>' +
-						           '  </tbody>' +
-						           '</table>';
-						$("#requestDetails").html(ptaxPersonalinfoHtml);
-						getpTaxDetails(ptax);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching collection reqtest data:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function getpTaxDetails(ptax){
-				
-				var apiUrl = '/gcc/api/taxcollection/getPropertTaxPersonalDetails?ptax='+ptax;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						if (data.ResultStatus === "True") {
-							// Access the values
-							var owner = data.PROPTAX[0].Owner;
-							var address = data.PROPTAX[0].Address;
-							var mobNo = data.PROPTAX[0].Mob_No;
-							var email = data.PROPTAX[0].Email_ID;
-							
-							// HTML content
-							var ptaxPersonalinfoHtml = '<table class="table table-borderless">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td>Property tax number</td>' +
-							           '      <td class="font-medium">'+ptax+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Owner Name</td>' +
-							           '      <td class="font-medium">'+owner+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Address</td>' +
-							           '      <td class="font-medium">'+address+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Mobile No</td>' +
-							           '      <td class="font-medium">'+mobNo+'</td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>';
-							$("#pTaxdetails").html(ptaxPersonalinfoHtml);
-							
-							// if Ptax data fetched then load valid message
-							var validPtax = ptax+'&nbsp;<font class="custom-tooltip-success"><a href="#" class="text-success" onclick="return false;" data-container=".custom-tooltip-success" data-toggle="tooltip" data-html="true" data-placement="top" title="Property tax number<br>cross-verify success" data-original-title="Property tax number cross-verify success"><i class="ik ik-check-circle"></i></font>';
-							$("#pTaxVerification").html(validPtax);
-						}
-						else {
-						    // No data found
-						    console.log("Message: " + data.Message);
-						    var inValidPtax = ptax+'&nbsp;<font class="custom-tooltip-warning"><a href="#" class="text-warning" onclick="return false;" data-container=".custom-tooltip-warning" data-toggle="tooltip" data-html="true" data-placement="top" title="Property tax number<br>cross-verify failed" data-original-title="Property tax number cross-verify failed"><i class="ik ik-alert-triangle"></i></font>';
-							$("#pTaxVerification").html(inValidPtax);
-							
-						    $("#pTaxdetails").html('<center><img src="images/nodata.png"></br>No Record Found</center>');
-						}
-						// Enable tooltip for model page
-						$('[data-toggle="tooltip"]').tooltip();
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching pTax data:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function callStatusUpdate(request_id){
-				$('#taxCollectionRequestUpdate').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#taxCollectionRequestUpdate').modal('show');
-				
-				call_loading('requestDetailsUpdate','start');
-				getTaxCollectionRequestUpdate(request_id);
-				call_loading('statusUpdateForm','start');
-				
-				return false;
-			}
-			
-			function getTaxCollectionRequestUpdate(request_id){
-				var apiUrl = '/gcc/api/taxcollection/getTaxCollectionRequestById?request_id='+request_id;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						
-						// Access the values
-						var request_id = data.request_id;
-						var requestNo = data.requestNo;
-						var name = data.name;
-						var mobile = data.mobile;
-						var ptax = data.ptax;
-						var usertype = data.usertype;
-						var availabilitydate = data.availabilitydate;
-						var status = data.status;
-						var cdate = data.cDate;
-						
-						// HTML content
-						var ptaxPersonalinfoHtml = '<table class="table table-borderless text-capitalize">' +
-						           '  <tbody>' +
-								   '    <tr>' +
-						           '      <td>Name</td>' +
-						           '      <td class="font-medium">'+name+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Property tax number</td>' +
-						           '      <td class="font-medium font-weight-bold" id="pTaxVerification">'+ptax+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Mobile Number</td>' +
-						           '      <td class="font-medium">'+mobile+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Availability Date & Time</td>' +
-						           '      <td class="font-medium">'+availabilitydate+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>User Type</td>' +
-						           '      <td class="font-medium">'+usertype+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Current Status</td>' +
-						           '      <td class="font-medium">'+status+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Request Created On</td>' +
-						           '      <td class="font-medium">'+cdate+'</td>' +
-						           '    </tr>' +
-						           '  </tbody>' +
-						           '</table>';
-						$("#requestDetailsUpdate").html(ptaxPersonalinfoHtml);
-						showStatusUpdateForm(request_id, status);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching collection reqtest data:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function showStatusUpdateForm(request_id, status){
-				
-				var selectInput = `<select class="form-control" name="requestStatus" id="requestStatus" required>
-								        <option value="open">Open</option>
-								        <option value="close">Close</option>
-								    </select>`;
-								    
-				var textareaInput=`<textarea class="form-control" name="statusComments" id="statusComments" rows="4"></textarea>`;
-				
-				var ptaxPersonalinfoHtml = '<form class="request-form" id="request-form" onsubmit="return saveStatus();">' +
-									   '<div class="card table-card mb-0"><div class="card-header" style="background-color: #ffe1003b !important;"><h3>Update Form</h3></div>' +
-									   '<div class="card-block p-0">' +
-									   '<table class="table table-borderless">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td width="30%">Current Status</td>' +
-							           '      <td class="font-medium">'+selectInput+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td colspan="2">Status Comments' + textareaInput+'</td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>' +
-							           '</div><div class="card-footer text-center">' +
-									   '        <button type="reset" class="btn btn-secondary mr-2"><i class="ik ik-refresh-cw"></i>Reset</button>'+
-                                       ' 	    <button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>'+
-							           '</div></div></form>';
-							           
-				$("#statusUpdateForm").html(ptaxPersonalinfoHtml);
-				
-				
-				var apiUrl = '/gcc/api/taxcollection/getPropertTaxPersonalDetails?ptax='+ptax;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						if (data.ResultStatus === "True") {
-							// Access the values
-							var owner = data.PROPTAX[0].Owner;
-							var address = data.PROPTAX[0].Address;
-							var mobNo = data.PROPTAX[0].Mob_No;
-							var email = data.PROPTAX[0].Email_ID;
-							
-							// HTML content
-							var ptaxPersonalinfoHtml = '<form class="request-form" id="request-form" onsubmit="return saveStatus();">' +
-									   '<div class="card table-card"><div class="card-header"><h3>Update Form</h3></div>' +
-									   '<div class="card-block">' +
-									   '<table class="table table-borderless">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td>Current Status</td>' +
-							           '      <td class="font-medium">'+ptax+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Status Comments</td>' +
-							           '      <td class="font-medium">'+owner+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Address</td>' +
-							           '      <td class="font-medium">'+
-									   
-									   '      </td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>' +
-							           '</div><div class="card-footer  text-center">' +
-									   '        <button type="reset" class="btn btn-secondary mr-2"><i class="ik ik-refresh-cw"></i>Reset</button>'+
-                                       ' 	    <button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>'+
-							           '</div></div></form>';
-							$("#statusUpdateForm").html(ptaxPersonalinfoHtml);
-						}
-						else {
-						    // No data found
-						    console.log("Status history: " + data.Message);
-						    //$("#pTaxdetails").html('<center><img src="images/nodata.png"></br>No Record Found</center>');
-						}
-						// Enable tooltip for model page
-						$('[data-toggle="tooltip"]').tooltip();
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching Status history:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function saveStatus(){
-				return false;
-			}
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/vendors/EventList.html b/src/main/resources/templates/modules/vendors/EventList.html
deleted file mode 100644
index ab442942..00000000
--- a/src/main/resources/templates/modules/vendors/EventList.html
+++ /dev/null
@@ -1,805 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required {
-        color: red;
-    }
-
-    /* Mobile screens - targeting devices with a max width of 767px */
-    @media (max-width: 767px) {
-        #requestlistform label {
-            margin-top: 10px;
-        }
-    }
-
-    #viewModal .modal-body {
-        max-height: 70vh;
-        /* Limit the height to 70% of the viewport */
-        overflow-y: auto;
-        /* Enable vertical scrolling */
-    }
-
-    .custom-doc-btn {
-        height: 20px;
-        width: 80px;
-        font-size: 9px;
-        font-weight: bold;
-        text-align: center;
-        padding: 0px;
-        border: 1px solid grey;
-    }
-
-    .col-md-3 {
-        padding-bottom: 10px;
-    }
-
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-</style>
-
-<body>
-
-    <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="far fa-calendar-plus bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Meeting List</h5>
-                                        <span>Vending Committe</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">Vending Committe</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Meeting List</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="row">
-
-
-                        <div class="col-md-12">
-                            <div class="card">
-                                <div class="card-header">
-                                    <span style="font-size: medium;font-weight: bold;">Reports Filters</span><span
-                                        th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span><span
-                                        th:text="${zone}" id="userzone" style="display: none;"></span>
-                                </div>
-                                <div class="card-body">
-                                    <div class="row">
-
-                                        <div class="col-md-4 mb-1">
-                                            <label for="meetingdropdown" style="font-size: medium;">Meeting:</label>
-                                            <select id="meetingdropdown" class="form-control">
-                                                <option value="">Select an Meeting</option>
-                                            </select>
-                                        </div>
-
-                                        <div class="col-md-2 mb-1">
-                                            <label for="statusdropdown" style="font-size: medium;">Status:</label>
-                                            <select id="statusdropdown" class="form-control">
-                                                <option value="">Select Status</option>
-                                                <option value="Approved">Approved</option>
-                                                <option value="Rejected">Rejected</option>
-                                                <option value="Postponed">Postponed</option>
-
-                                            </select>
-                                        </div>
-
-
-                                        <div class="col-md-3 mb-1">
-                                            <label for="zonedropdown" style="font-size: medium;">Zone:</label>
-                                            <select id="zonedropdown" class="form-control">
-                                                <option value="">Select an Zone</option>
-                                            </select>
-                                        </div>
-
-                                        <div class="col-md-3 mb-1">
-                                            <label for="warddropdown" style="font-size: medium;">Ward:</label>
-                                            <select id="warddropdown" class="form-control">
-                                                <option value="">Select an Ward</option>
-                                            </select>
-                                        </div>
-
-                                        <!-- <div class="col-md-4 mb-1">
-										<button class="btn btn-primary" style="margin-top: 32px;" id="submitBtn">Submit</button>
-									</div> -->
-
-                                    </div>
-
-                                    <div class="row mt-4">
-                                        <div class="col-12 d-flex justify-content-center">
-                                            <button class="btn btn-primary" id="submitBtn">Submit</button>
-
-                                            <button class="btn btn-danger mx-2" id="resetBtn" name="reset"
-                                                type="reset">Reset</button>
-                                        </div>
-                                    </div>
-
-                                </div>
-
-                                <div class="card-block">
-                                    <div class="page-header-title">
-                                        <h5 style="margin: 0;font-weight: bold;">Vendors Meeting List</h5>
-                                        <hr>
-                                    </div>
-
-
-                                    <table id="RequestListDatatable"
-                                        class="table table-striped table-bordered table-hover dataTable" role="grid">
-                                        <thead class="thead-dark">
-                                            <tr role="row">
-                                                <th class="text-center">S.No</th>
-                                                <th class="text-center">Request No</th>
-                                                <th class="text-center">Zone</th>
-                                                <th class="text-center">Ward</th>
-                                                <th class="text-center">Public Name</th>
-                                                <th class="text-center">Mobile</th>
-                                                <th class="text-center">Status</th>
-                                                <th class="text-center no-sort" width="%2">View Details</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-
-                                        </tbody>
-                                        <tfoot class="thead-dark">
-                                            <tr>
-                                                <th class="text-center">S.No</th>
-                                                <th class="text-center">Request No</th>
-                                                <th class="text-center">Zone</th>
-                                                <th class="text-center">Ward</th>
-                                                <th class="text-center">Public Name</th>
-                                                <th class="text-center">Mobile</th>
-                                                <th class="text-center">Status</th>
-                                                <th class="text-center no-sort" width="%2">View Details</th>
-                                            </tr>
-                                        </tfoot>
-                                    </table>
-
-                                </div>
-                            </div>
-                        </div>
-
-
-
-
-
-
-                    </div>
-
-
-                </div>
-            </div>
-
-
-            <!-- Modal -->
-            <div class="modal fade" id="viewModal" tabindex="-1" aria-labelledby="viewModalLabel" aria-hidden="true"
-                data-bs-backdrop="static" data-bs-keyboard="false">
-                <div class="modal-dialog modal-lg">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title" id="viewModalLabel">Request Details</h5>
-                            <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                                <span aria-hidden="true">&times;</span>
-                            </button>
-                        </div>
-                        <div class="modal-body" id="modalBodyContent">
-                            <!-- Dynamic content loads here -->
-                        </div>
-                        <div class="modal-footer">
-                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-
-            <!-- Image Modal -->
-            <div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
-                <div class="modal-dialog modal-dialog-scrollable modal-lg">
-                    <div class="modal-content border-0">
-                        <div class="modal-body p-0 text-center" style="background-color: #f8f9fa;">
-                            <div id="docContainer" style="max-height: 90vh; overflow: auto;"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-
-            <div id="pageLoader"
-                style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-                <div style="position: relative; top: 50%; transform: translateY(-50%);">
-                    <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                        <span class="sr-only">Loading...</span>
-                    </div>
-                    <!-- Add the 'Please wait' text below the spinner -->
-                    <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-                </div>
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-
-
-
-    </div>
-
-
-
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-    <script type="text/javascript">
-
-        let userzone = document.getElementById('userzone').textContent;
-        let userId = document.getElementById('userIdSpan').textContent;
-
-        // GLOBAL scope — must be outside any other function
-        function openDocModal(fileUrl) {
-            const container = document.getElementById('docContainer');
-            const ext = fileUrl.split('.').pop().toLowerCase();
-
-            if (ext === 'pdf') {
-                container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
-            } else {
-                container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;" onerror="this.src='/default.jpg'">`;
-            }
-
-            $('#docModal').modal('show');
-        }
-
-        $(document).ready(function () {
-
-            var table = $('#RequestListDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { targets: 'no-sort', orderable: false }
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', 'Show all']
-                ],
-                scrollY: '50vh',
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: false,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false
-
-
-            });
-
-
-            fetchEventDropdown(userId);
-            let zoneString = userzone;   // e.g. "01,02,03,04,05"
-
-            if (zoneString) {
-                let zoneArray = zoneString.split(",");  // ["01","02","03","04","05"]
-
-                zoneArray.forEach(z => {
-                    $("#zonedropdown").append(
-                        `<option value="${z}">${z}</option>`
-                    );
-                });
-            }
-            $('#zonedropdown').on('change', function () {
-                let selectedZone = $(this).val();
-
-                // Reset ward dropdown
-                $('#warddropdown').html(`<option value="">Select Ward</option>`);
-
-                if (selectedZone) {
-                    fetchWardDropdown(selectedZone);
-                }
-            });
-            fetchVendingCommitteeList("", "", "", "", userId)
-
-        });
-
-        function fetchWardDropdown(zone) {
-
-            $.ajax({
-                url: "/gcc/api/streetvendor/getwardbyzone",
-                type: "GET",
-                data: { zone: zone },
-                success: function (data) {
-
-                    if (!data || data.length === 0) {
-                        $('#warddropdown').html(`<option value="">No wards found</option>`);
-                        return;
-                    }
-
-                    // Clear before loading
-                    $('#warddropdown').html(`<option value="">Select Ward</option>`);
-
-                    // Append wards
-                    data.forEach(w => {
-                        // backend returns ward_name
-                        $('#warddropdown').append(
-                            `<option value="${w.ward_name}">${w.ward_name}</option>`
-                        );
-                    });
-                },
-                error: function (xhr) {
-                    console.error("Error fetching wards:", xhr.responseText);
-                    $('#warddropdown').html(`<option value="">Error loading wards</option>`);
-                }
-            });
-        }
-
-        $('#resetBtn').on('click', function () {
-            location.reload();
-            return;
-        });
-
-        $('#submitBtn').on('click', function () {
-
-            const meeting = $('#meetingdropdown').val();
-
-            const status = $('#statusdropdown').val();
-
-            const zone = $('#zonedropdown').val();
-
-            const ward = $('#warddropdown').val();
-
-            console.log("Selected Meeting Value:", meeting);
-
-            console.log("Selected Status Value:", status);
-
-            console.log("Selected zone Value:", zone);
-            console.log("Selected ward Value:", ward);
-
-            // 👉 Now call your API or next function using these two
-            fetchVendingCommitteeList(meeting, status, zone, ward, userId);
-        });
-
-
-
-
-        function fetchVendingCommitteeList(event_req_id, status, zone, ward) {
-            $('#pageLoader').show();
-            $.ajax({
-                url: '/gcc/api/vending/getreports',
-                data: { meeting: event_req_id, status: status, zone: zone, ward: ward, userId: userId },
-                method: 'GET',
-                contentType: 'application/json',
-                success: function (data) {
-                    $('#pageLoader').hide();
-                    let tableContainer = $('#RequestListDatatable');
-
-                    // Destroy any existing DataTable instance
-                    if ($.fn.DataTable.isDataTable(tableContainer)) {
-                        tableContainer.DataTable().destroy();
-                    }
-
-                    // Check for empty list
-                    /* if (!data || data.length === 0) {
-                        tableContainer.find('tbody').html(`
-                            <tr>
-                                <td colspan="8" class="text-center text-danger">No Data Available</td>
-                            </tr>
-                        `);
-                        return;
-                    } */
-
-                    // Initialize DataTable
-                    tableContainer.DataTable({
-                        destroy: true,
-                        searching: true,
-                        autoWidth: false,
-                        paging: true,
-                        info: true,
-                        data: data,
-                        columns: [
-                            {
-                                data: null,
-                                render: (data, type, row, meta) => meta.row + 1,
-                                className: 'text-center'
-                            },
-                            { data: 'vendor_req_id', defaultContent: '-', className: 'text-center' },
-                            { data: 'zone', defaultContent: '-', className: 'text-center' },
-                            { data: 'ward', defaultContent: '-', className: 'text-center' },
-                            { data: 'name', defaultContent: '-', className: 'text-center' },
-                            { data: 'mob_no', defaultContent: '-', className: 'text-center' },
-                            {
-                                data: 'status',
-                                defaultContent: '-',
-                                className: 'text-center',
-                                createdCell: function (td, cellData, rowData, row, col) {
-                                    if (cellData === 'Approved') {
-                                        $(td).css('color', 'green').css('font-weight', 'bold');
-                                    } else if (cellData === 'Rejected') {
-                                        $(td).css('color', 'red').css('font-weight', 'bold');
-                                    }
-                                    else {
-                                        $(td).css('color', 'orange').css('font-weight', 'bold');
-                                    }
-                                }
-                            },
-                            {
-                                data: 'id',
-                                render: function (data, type, row) {
-                                    return `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
-                                },
-                                className: 'text-center'
-                            }
-
-                        ],
-                        dom: 'Bfrtip',
-                        buttons: [
-                            { extend: 'pageLength', className: 'btn btn-warning' },
-                            { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-                            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-                            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-                            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-                        ],
-                        columnDefs: [{ targets: 'no-sort', orderable: false }],
-                        lengthMenu: [
-                            [50, 100, 200, 500, -1],
-                            ['50 rows', '100 rows', '200 rows', 'Show all']
-                        ],
-                        scrollY: '80vh',
-                        scrollX: true,
-                        responsive: false
-                    });
-
-
-                    // Bind view buttons
-                    tableContainer.off('click', '.btn-view');
-                    tableContainer.on('click', '.btn-view', function () {
-                        let id = $(this).data('id');
-                        $.ajax({
-                            url: `/gcc/api/vending/finalvendorDetailsById?requestId=${id}`,
-                            method: 'GET',
-                            success: function (detailData) {
-
-
-                                if (!detailData || detailData.length === 0) {
-                                    $('#modalBodyContent').html("<p>No data found for this request.</p>");
-                                    $('#viewModal').modal('show');
-                                    return;
-                                }
-
-                                const details = detailData[0];
-
-                                const historyList = detailData.map(h => ({
-                                    date: h.vc_Inspection_date || "N/A",
-                                    status: h.vc_status || "N/A",
-                                    remarks: h.vc_remarks || "",
-                                    event: h.event_name || "-"
-                                }));
-
-                                const diffAbledDisplay = details.diff_abled ? (details.diff_abled ? 'Yes' : 'No') : '-';
-                                const pmLoanDisplay = details.pm_svanidhi_loan ? (details.pm_svanidhi_loan ? 'Yes' : 'No') : '-';
-                                const bankAccDisplay = details.bank_acc_status ? (details.bank_acc_status === '1' ? 'Yes' : 'No') : '-';
-                                const idCardDisplay = details.vendor_id_card ? (details.vendor_id_card === '1' ? 'Yes' : 'No') : '-';
-                                const bankPassbookDisplay = details.bank_acc_status === '1' && details.bank_passbook
-                                    ? `<img src="${details.bank_passbook}" alt="Bank Passbook" class="img-fluid" style="max-width: 150px;" onerror="this.src='/default.jpg'">`
-                                    : '-';
-
-                                const aadharFrontBtn = details.aadhar_front_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.aadhar_front_photo}')">View</button>` : '-';
-                                const rationCardBtn = details.ration_card_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.ration_card_photo}')">View</button>` : '-';
-                                const aadharBackBtn = details.aadhar_back_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.aadhar_back_photo}')">View</button>` : '-';
-                                const bankPassbookBtn = details.bank_acc_status === '1' && details.bank_passbook
-                                    ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.bank_passbook}')">View</button>`
-                                    : '-';
-
-                                const spacePhotoBtn = details.vendor_space_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.vendor_space_photo}')">View</button>` : '-';
-
-
-                                let historyHtml = "";
-                                historyList.forEach(h => {
-                                    historyHtml += `
-                                    <div class="comment mb-4">
-                                        <div class="row">
-                                            <div class="col-4 text-center">
-                                                <p class="text-muted"><strong>${h.date}</strong></p>
-                                            </div>
-                                            <div class="col-8">
-                                                <p><strong>Vending Committee ${h.status} (${h.event})</strong></p>
-                                                <p><strong>Remarks: </strong>${h.remarks}</p>
-                                            </div>
-                                        </div>
-                                    </div>`;
-                                });
-
-
-                                const content = `
-                                    <div class="container-fluid">
-                                        <!-- Personal Details -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-primary text-white">Personal Details</div>
-                                            <div class="card-body row">
-                                            <div class="col-md-3"><strong>Name:</strong></div>
-                                            <div class="col-md-3">${details.name || '-'}</div>
-                                            <div class="col-md-3"><strong>Father/Husband Name:</strong></div>
-                                            <div class="col-md-3">${details.f_h_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Mobile:</strong></div>
-                                            <div class="col-md-3">${details.mob_no || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Community Category:</strong></div>
-                                            <div class="col-md-3">${details.category_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>DOB:</strong></div>
-                                            <div class="col-md-3">${details.dob || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Address:</strong></div>
-                                            <div class="col-md-3">${details.residental_address || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Gender:</strong></div>
-                                            <div class="col-md-3">${details.gender || '-'}</div>
-
-                                           
-
-                                            <div class="col-md-3"><strong>Differently Abled:</strong></div>
-                                            <div class="col-md-3">${diffAbledDisplay || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Aadhaar front Image:</strong></div>
-                                            <div class="col-md-3">${aadharFrontBtn}</div>
-
-                                            <div class="col-md-3"><strong>Ration card Image:</strong></div>
-                                            <div class="col-md-3">${rationCardBtn}</div>
-
-                                            <div class="col-md-3"><strong>Aadhaar back Image:</strong></div>
-                                            <div class="col-md-3">${aadharBackBtn}</div>
-                                            </div>
-                                        </div>
-
-                                        <!-- Business Details -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-success text-white">Business Details</div>
-                                            <div class="card-body row">
-                                            <div class="col-md-3"><strong>Type of Business:</strong></div>
-                                            <div class="col-md-3">${details.vending_category_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Zone:</strong></div>
-                                            <div class="col-md-3">${details.zone || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Business Space (sq.ft):</strong></div>
-                                            <div class="col-md-3">${details.vending_space || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Ward:</strong></div>
-                                            <div class="col-md-3">${details.ward || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Address:</strong></div>
-                                            <div class="col-md-3">${details.business_address || '-'}</div>
-
-                                            
-
-                                            <div class="col-md-3"><strong>PM SVANidhi Loan Availed:</strong></div>
-                                            <div class="col-md-3">${pmLoanDisplay || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Do you Have Bank Account?:</strong></div>
-                                            <div class="col-md-3">${bankAccDisplay || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Bank Passbook Image:</strong></div>
-                                            <div class="col-md-3">${bankPassbookBtn}</div>
-
-                                            </div>
-                                        </div>
-                                        
-                                        
-                                        <!-- Inspection Details -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-warning text-white">Inspection Details</div>
-                                            <div class="card-body row">
-                                            <div class="col-md-3"><strong>Vendor Type:</strong></div>
-                                            <div class="col-md-3">${details.vendor_type || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Vendor ID Card:</strong></div>
-                                            <div class="col-md-3">${idCardDisplay}</div>
-
-                                            <div class="col-md-3"><strong>Vending Nature:</strong></div>
-                                            <div class="col-md-3">${details.vending_nature || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Vending Time:</strong></div>
-                                            <div class="col-md-3">${details.vending_time || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Transaction Mode:</strong></div>
-                                            <div class="col-md-3">${details.transaction_mode || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Swanidi Loan Amount:</strong></div>
-                                            <div class="col-md-3">${details.swanidi_loan_amount || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Vendor Space Image:</strong></div>
-                                            <div class="col-md-3">${spacePhotoBtn || '-'}</div>
-                                           
-
-                                            </div>
-                                        </div>
-
-                                        <!-- Request History -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-info text-white">Request History</div>
-                                            <div class="card-body">
-                                            	<div class="comment mb-4">
-                                            		<div class="row">
-                                                		<div class="col-4 text-center">
-                                                    		<p class="text-muted"><strong>${details.LI_Cdate || 'N/A'}</strong></p>
-                                                		</div>
-                                                		<div class="col-8">
-		                                                    <p><strong>LI Officer ${details.LI_Status || 'N/A'}</strong></p>
-		                                                    <p><strong>Remarks: </strong>${details.LI_Remarks || ''}</p>                                                
-                                               			 </div>
-                                            		</div>
-                                        		</div>
-                                        		
-                                        	<div class="comment mb-4">
-                                        		<div class="row">
-                                            		<div class="col-4 text-center">
-                                                		<p class="text-muted"><strong>${details.ARO_Inspection_date || 'N/A'}</strong></p>
-                                            		</div>
-                                            		<div class="col-8">
-	                                                    <p><strong>ARO Officer ${details.ARO_status || 'N/A'}</strong></p>
-	                                                    <p><strong>Remarks: </strong>${details.ARO_remarks || ''}</p>                                                
-                                           			 </div>
-                                        		</div>
-                                    		</div>
-                                    		
-                                    		<div class="comment mb-4">
-	                                    		<div class="row">
-	                                        		<div class="col-4 text-center">
-	                                            		<p class="text-muted"><strong>${details.EE_Inspection_date || 'N/A'}</strong></p>
-	                                        		</div>
-	                                        		<div class="col-8">
-	                                                    <p><strong>EE Officer ${details.EE_status || 'N/A'}</strong></p>
-	                                                    <p><strong>Remarks: </strong>${details.EE_remarks || ''}</p>                                                
-	                                       			 </div>
-	                                    		</div>
-                                			</div>
-                                			
-                                			${historyHtml}
-                                			
-                                			
-	
-                                            </div>
-                                        </div>
-                                    </div>
-                                                                       
-                                `;
-
-                                $('#modalBodyContent').html(content);
-                                $('#viewModalLabel').text(`Vendor Details - ${id}`);
-                                $('#viewModal').modal('show');
-                            },
-                            error: function (xhr) {
-                                console.error("Error fetching detail:", xhr.responseText);
-                                alert("Failed to fetch vendor details.");
-                            }
-                        });
-                    });
-
-                },
-
-                error: function (xhr, status, error) {
-                    $('#pageLoader').hide();
-                    console.error("Error fetching data:", error);
-                    alert("Failed to load vendor list.");
-                }
-            });
-        }
-
-        // Call this function on page load
-        function fetchEventDropdown(userId) {
-            $.ajax({
-                url: '/gcc/api/vending/committedropdown',
-                type: 'GET',
-                data: { userId: userId },
-                dataType: 'json',
-                success: function (data) {
-                    let eventDropdown = $('#meetingdropdown');
-                    eventDropdown.empty();
-                    eventDropdown.append('<option value="">Select an Meeting</option>');
-
-                    data.forEach(function (event) {
-                        // Optional: filter active & not deleted
-                        eventDropdown.append(
-                            $('<option></option>')
-                                .val(event.req_id)
-                                .text(`${event.event_name} - ${event.formated_date}`)
-                        );
-
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching event dropdown:', error);
-                    Swal.fire('Error', 'Unable to load events', 'error');
-                }
-            });
-        }
-
-
-
-
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vendors/RequestList.html b/src/main/resources/templates/modules/vendors/RequestList.html
deleted file mode 100644
index 70199c9b..00000000
--- a/src/main/resources/templates/modules/vendors/RequestList.html
+++ /dev/null
@@ -1,1144 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .required {
-        color: red;
-    }
-
-    /* Mobile screens - targeting devices with a max width of 767px */
-    @media (max-width: 767px) {
-        #requestlistform label {
-            margin-top: 10px;
-        }
-    }
-
-    #viewModal .modal-body {
-        max-height: 70vh;
-        /* Limit the height to 70% of the viewport */
-        overflow-y: auto;
-        /* Enable vertical scrolling */
-    }
-
-    .custom-doc-btn {
-        height: 20px;
-        width: 80px;
-        font-size: 9px;
-        font-weight: bold;
-        text-align: center;
-        padding: 0px;
-        border: 1px solid grey;
-    }
-
-    .col-md-3 {
-        padding-bottom: 10px;
-    }
-
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-</style>
-
-<body>
-
-    <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="far fa-calendar-plus bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Request List</h5>
-                                        <span>Vending Committe</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item" aria-current="page">Vending Committe</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Request List</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                    <!-- <h4 class="h4 text-right text-mute" style="font-size: 12px;">
-						Auto refresh in <font id="refresh-countdown">00</font> seconds
-					</h4> -->
-
-                    <div class="row">
-
-                        <div class="col-md-12">
-                            <div class="card">
-                                <div class="card-block">
-                                    <div class="row">
-                                        <div class="form-group col-sm-8">
-                                            <label for="dropdownevent">Select Meeting
-                                                <span class="text-danger">*</span></label>
-                                            <select id="dropdownevent" class="form-control">
-                                            </select>
-                                        </div>
-
-                                        <div class="form-group col-sm-4">
-                                            <label for="zonedropdown">Select Zone
-                                            </label>
-                                            <select id="zonedropdown" class="form-control">
-                                                <option value="">Select Zone </option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="page-header-title">
-                                        <h5 style="margin: 0;font-weight: bold;"><span th:text="${zone}" id="userzone"
-                                                style="display: none;"></span>Vendors Request List</h5><span
-                                            th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span>
-                                        <hr>
-                                    </div>
-
-                                    <div>
-                                        <table id="RequestListDatatable"
-                                            class="table table-striped table-bordered table-hover dataTable"
-                                            role="grid">
-                                            <thead class="thead-dark">
-                                                <tr role="row">
-                                                    <th class="text-center">S.No</th>
-                                                    <th class="text-center">
-                                                        <input type="checkbox" id="selectAll">Select first 20
-                                                    </th>
-                                                    <th class="text-center">Request No</th>
-                                                    <th class="text-center">Zone</th>
-                                                    <th class="text-center">Ward</th>
-                                                    <th class="text-center">Name</th>
-                                                    <th class="text-center">Mobile</th>
-                                                    <th class="text-center">Address</th>
-                                                    <th class="text-center">View Details</th>
-                                                    <th class="text-center">Status</th>
-                                                    <th class="text-center">Remarks</th>
-                                                    <th class="text-center no-sort" width="%2">Action</th>
-                                                </tr>
-                                            </thead>
-
-                                            <tbody>
-
-                                            </tbody>
-
-
-
-
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div class="col-md-12" id="bulksavecontainer" style="display: none;">
-                            <div class="card">
-                                <div class="card-block">
-                                    <div class="row">
-                                        <div class="col-md-6">
-                                            <label for="bulkstatus">Select Status<span class="text-danger">*</span>
-                                            </label>
-                                            <select id="bulkstatus" class="form-control">
-                                                <option value="">Select</option>
-                                                <option value="Approved">Approved</option>
-                                                <option value="Rejected">Rejected</option>
-                                                <option value="Postponed">Postponed</option>
-                                            </select>
-                                        </div>
-                                        <div class="col-md-6">
-                                            <label for="bulkremarks">Remarks<span
-                                                    class="text-danger">*</span></label><br>
-                                            <textarea rows="2" id="bulkremarks" class="form-control"></textarea>
-                                        </div>
-                                        <div class="col-md-12">
-                                            <div class="text-center mt-4">
-                                                <button type="button" class="btn btn-primary"
-                                                    id="bulksubmitBtn">Submit</button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-
-
-                    </div>
-
-
-                </div>
-            </div>
-
-            <!-- Modal -->
-            <!-- Modal -->
-            <div class="modal fade" id="viewModal" tabindex="-1" aria-labelledby="viewModalLabel" aria-hidden="true"
-                data-bs-backdrop="static" data-bs-keyboard="false">
-                <div class="modal-dialog modal-lg">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title" id="viewModalLabel">Request Details</h5>
-                            <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                                <span aria-hidden="true">&times;</span>
-                            </button>
-                        </div>
-                        <div class="modal-body" id="modalBodyContent">
-                            <!-- Dynamic content loads here -->
-                        </div>
-                        <div class="modal-footer">
-                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-
-            <!-- Image Modal -->
-            <div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
-                <div class="modal-dialog modal-dialog-scrollable modal-lg">
-                    <div class="modal-content border-0">
-                        <div class="modal-body p-0 text-center" style="background-color: #f8f9fa;">
-                            <div id="docContainer" style="max-height: 90vh; overflow: auto;"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-
-            <div id="pageLoader"
-                style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-                <div style="position: relative; top: 50%; transform: translateY(-50%);">
-                    <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                        <span class="sr-only">Loading...</span>
-                    </div>
-                    <!-- Add the 'Please wait' text below the spinner -->
-                    <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-                </div>
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-
-
-
-    </div>
-
-
-
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-    <script type="text/javascript">
-        let userzone = document.getElementById('userzone').textContent;
-        let userId = document.getElementById('userIdSpan').textContent;
-        //console.log("userId="+userId);
-        // GLOBAL scope — must be outside any other function
-        function openDocModal(fileUrl) {
-            const container = document.getElementById('docContainer');
-            const ext = fileUrl.split('.').pop().toLowerCase();
-
-            if (ext === 'pdf') {
-                container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
-            } else {
-                container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;" onerror="this.src='/default.jpg'">`;
-            }
-
-            $('#docModal').modal('show');
-        }
-
-        $(document).ready(function () {
-
-
-
-            var table = $('#RequestListDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { width: "150px", targets: 7 },
-                    { width: "150px", targets: 10 }
-                ],
-                lengthMenu: [
-                    [200, 400, -1],
-                    ['200 rows', '400 rows', 'Show all']
-                ],
-                scrollY: '50vh',
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: false,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false
-
-
-            });
-
-            // Trigger on page load
-
-            fetchEventDropdown(userId);
-
-            let zoneString = userzone;   // e.g. "01,02,03,04,05"
-
-            if (zoneString) {
-                let zoneArray = zoneString.split(",");  // ["01","02","03","04","05"]
-
-                zoneArray.forEach(z => {
-                    $("#zonedropdown").append(
-                        `<option value="${z}">${z}</option>`
-                    );
-                });
-            }
-
-
-            $('#dropdownevent').on('change', function () {
-
-                $('#zonedropdown').val("");
-
-                fetchVendingCommitteeList();
-
-            });
-
-
-            $('#zonedropdown').on('change', function () {
-                let miss_meet = $('#dropdownevent').val();
-
-                if (!miss_meet) {
-                    Swal.fire("Warning", "Please select an meeting!", "warning");
-                    return;
-                }
-                fetchVendingCommitteeList();
-
-            });
-
-        });
-
-
-        $('#bulksubmitBtn').on('click', function () {
-
-            const bulkStatus = $('#bulkstatus').val();
-            const bulkRemarks = $('#bulkremarks').val();
-            const eventReqId = $('#dropdownevent').val();
-
-            // Validate fields
-            if (!eventReqId) {
-                Swal.fire("Warning", "Please select an meeting!", "warning");
-                return;
-            }
-            if (!bulkStatus) {
-                Swal.fire("Warning", "Please select status", "warning");
-                return;
-            }
-            if (!bulkRemarks.trim()) {
-                Swal.fire("Warning", "Please enter remarks", "warning");
-                return;
-            }
-
-            // Collect all selected rows
-            const table = $('#RequestListDatatable').DataTable();
-            let selectedList = [];
-
-            $('.row-check:checked').each(function () {
-                const row = $(this).closest('tr');
-                const rowData = table.row(row).data();
-
-                selectedList.push({
-                    vendor_req_id: rowData.id,
-                    vendor_req_number: rowData.vendor_req_id,
-                    zone: rowData.zone,
-                    ward: rowData.ward,
-                    mob_no: rowData.mob_no
-                });
-            });
-
-            if (selectedList.length === 0) {
-                Swal.fire("Warning", "Please select at least one record!", "warning");
-                return;
-            }
-
-            // Prepare final payload
-            const payload = {
-                event_req_id: eventReqId,
-                status: bulkStatus,
-                remarks: bulkRemarks,
-                cby: userId,
-                vendorList: selectedList
-            };
-
-            console.log("Bulk Payload =", payload);
-
-            $('#pageLoader').show();
-
-            // AJAX Bulk Submit
-            $.ajax({
-                url: '/gcc/api/streetvendor/saveBulkVendorDetails',
-                method: 'POST',
-                contentType: 'application/json',
-                data: JSON.stringify(payload),
-                success: function (response) {
-                    $('#pageLoader').hide();
-
-                    if (response.status === "success") {
-                        Swal.fire("Success", response.message, "success").then(() => {
-
-
-                            $('.row-check').prop('checked', false);
-                            $('#selectAll').prop('checked', false);
-
-                            $('#bulksavecontainer').hide();
-                            $('#bulkstatus').val("");
-                            $('#bulkremarks').val("");
-
-                            fetchVendingCommitteeList();
-                        });
-                    } else {
-                        Swal.fire("Error", response.message, "error");
-                    }
-                },
-                error: function () {
-                    $('#pageLoader').hide();
-                    Swal.fire("Error", "Something went wrong during bulk submit!", "error");
-                }
-            });
-
-        });
-
-
-        function toggleBulkSaveContainer() {
-            if ($('.row-check:checked').length > 0) {
-                $('#bulksavecontainer').show();
-                $('#bulkstatus').val('');
-                $('#bulkremarks').val('');
-            } else {
-                $('#bulksavecontainer').hide();
-            }
-        }
-        const MAX_SELECTION = 20;
-        function fetchVendingCommitteeList() {
-
-            const selectedOption = $('#dropdownevent option:selected').text();
-
-            // Assuming the format is: "Event Name - yyyy-mm-dd"
-            const eventDateRaw = selectedOption.split(' - ')[1];
-
-            if (!eventDateRaw) {
-                console.error("No date found in selected option.");
-                location.reload();
-                return;
-            }
-
-            const dateParts = eventDateRaw.split('-'); // yyyy-mm-dd
-            if (dateParts.length !== 3) {
-                console.error("Date format is incorrect.");
-                return;
-            }
-
-            const formattedDate = `${dateParts[2]}-${dateParts[1]}-${dateParts[0]}`;
-
-
-            // Read zone dropdown value
-            let selectedZone = $('#zonedropdown').val();
-
-            // If selected zone is empty → use userzone
-            let finalZone = selectedZone && selectedZone.trim() !== "" ? selectedZone : userzone;
-
-            //console.log("Zone sent to API =", finalZone);
-
-            $('#pageLoader').show();
-
-
-            $.ajax({
-                url: '/gcc/api/streetvendor/getvedingcommitteelist',
-                data: { date: formattedDate, zones: finalZone },
-                method: 'GET',
-                contentType: 'application/json',
-                success: function (data) {
-
-                    //console.log("data="+data);
-
-                    $('#pageLoader').hide();
-                    let tableContainer = $('#RequestListDatatable');
-
-                    // Destroy any existing DataTable instance
-                    if ($.fn.DataTable.isDataTable(tableContainer)) {
-                        tableContainer.DataTable().destroy();
-                    }
-
-                    // Check for empty list
-                    /* if (!data || data.length === 0) {
-                        tableContainer.find('tbody').html(`
-                            <tr>
-                                <td colspan="11" class="text-center text-danger">No Data Available</td>
-                            </tr>
-                        `);
-                        return;
-                    } */
-
-                    // Initialize DataTable
-                    tableContainer.DataTable({
-                        destroy: true,
-                        searching: true,
-                        autoWidth: true,
-                        paging: true,
-                        info: true,
-                        data: data,
-                        columns: [
-                            {
-                                data: null,
-                                render: (data, type, row, meta) => meta.row + 1,
-                                className: 'text-center'
-                            },
-                            {
-                                data: 'id',
-                                render: function (data) {
-                                    return `<input type="checkbox" class="row-check" data-id="${data}">`;
-                                },
-                                className: 'text-center'
-                            },
-                            { data: 'vendor_req_id', defaultContent: '-', className: 'text-center' },
-                            { data: 'zone', defaultContent: '-', className: 'text-center' },
-                            { data: 'ward', defaultContent: '-', className: 'text-center' },
-                            { data: 'name', defaultContent: '-', className: 'text-center' },
-                            { data: 'mob_no', defaultContent: '-', className: 'text-center' },
-                            { data: 'vending_address', defaultContent: '-', className: 'text-center' },
-                            {
-                                data: 'id',
-                                render: function (data, type, row) {
-                                    return `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
-                                },
-                                className: 'text-center'
-                            },
-                            {
-                                data: 'vcp_status',
-                                render: function (data) {
-                                    return `
-                                        <select class="form-select status-dropdown">
-                                            <option value="" ${!data ? 'selected' : ''}>Select Status</option>
-                                            <option value="Approved" ${data === 'Approved' ? 'selected' : ''}>Approved</option>
-                                            <option value="Rejected" ${data === 'Rejected' ? 'selected' : ''}>Rejected</option>
-                                            <option value="Postponed" ${data === 'Postponed' ? 'selected' : ''}>Postponed</option>
-                                        </select>
-                                    `;
-                                },
-                                className: 'text-center'
-                            },
-                            {
-                                data: 'vcp_remarks',
-                                render: function (data) {
-                                    return `
-                                        <textarea class="form-control remark-box" 
-                                        placeholder="Enter Remarks"
-                                        rows="2">${data || ''}</textarea>
-                                    `;
-                                },
-                                className: 'text-center'
-                            },
-
-                            {
-                                data: 'id',
-                                render: () => `<button class="btn btn-success btn-sm">Submit</button>`,
-                                className: 'text-center'
-                            }
-                        ],
-                        dom: 'Bfrtip',
-                        buttons: [
-                            { extend: 'pageLength', className: 'btn btn-warning' },
-                            { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-                            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-                            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-                            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-                        ],
-                        columnDefs: [
-                            { width: "150px", targets: 7 },
-                            { width: "150px", targets: 10 }
-                        ],
-
-                        lengthMenu: [
-                            [200, 400, -1],
-                            ['200 rows', '400 rows', 'Show all']
-                        ],
-
-                        scrollY: '80vh',
-                        scrollX: true,
-                        responsive: false
-                    });
-
-                    tableContainer.off('change', '.row-check');
-                    tableContainer.on('change', '.row-check', function () {
-
-                        let row = $(this).closest('tr');
-                        let checked = $(this).is(':checked');
-
-                        row.find('select').prop('disabled', checked);
-                        row.find('textarea').prop('disabled', checked);
-                        row.find('button.btn-success').prop('disabled', checked);
-
-                        let table = $('#RequestListDatatable').DataTable();
-                        let pageRows = table.rows({ page: 'current' }).nodes();
-
-                        // FIXED: Only check visible rows on the current page
-                        let allVisible = $(pageRows).find('.row-check').length ===
-                            $(pageRows).find('.row-check:checked').length;
-
-                        $('#selectAll').prop('checked', allVisible);
-
-                        enforceMaxLimit();
-                        toggleBulkSaveContainer();
-                    });
-
-
-                    $('#selectAll').off('change');
-                    $('#selectAll').on('change', function () {
-                        console.log("Select All clicked");
-
-                        let checked = $(this).is(':checked');
-                        let table = $('#RequestListDatatable').DataTable();
-
-                        // rows only on current page
-                        let pageRows = table.rows({ page: 'current' }).nodes();
-
-                        // Step 1: Uncheck ONLY current page rows (not all pages)
-                        $(pageRows).find('.row-check').prop('checked', false).prop('disabled', false);
-
-                        if (checked) {
-                            // Step 2: Select only first MAX rows of CURRENT PAGE
-                            $(pageRows).find('.row-check').each(function (index) {
-                                if (index < MAX_SELECTION) {
-                                    $(this).prop('checked', true);
-                                }
-                            });
-                        }
-
-                        // Step 3: Enforce global limit
-                        enforceMaxLimit();
-
-                        // Step 4: Disable form fields only in current page
-                        $(pageRows).each(function () {
-                            let isChecked = $(this).find('.row-check').is(':checked');
-
-                            $(this).find('select').prop('disabled', isChecked);
-                            $(this).find('textarea').prop('disabled', isChecked);
-                            $(this).find('button.btn-success').prop('disabled', isChecked);
-                        });
-
-                        toggleBulkSaveContainer();
-                    });
-
-                    function enforceMaxLimit() {
-                        let table = $('#RequestListDatatable').DataTable();
-                        let checkedCount = table.$('.row-check:checked').length;
-
-                        if (checkedCount >= MAX_SELECTION) {
-                            table.$('.row-check:not(:checked)').prop('disabled', true);
-                        } else {
-                            table.$('.row-check').prop('disabled', false);
-                        }
-                    }
-
-
-                    tableContainer.on('draw.dt', function () {
-
-                        $('.row-check:visible').each(function () {
-
-                            let checked = $(this).is(':checked');
-                            let row = $(this).closest('tr');
-
-                            row.find('select').prop('disabled', checked);
-                            row.find('textarea').prop('disabled', checked);
-                            row.find('button.btn-success').prop('disabled', checked);
-
-                        });
-
-                    });
-
-                    tableContainer.on('draw.dt', function () {
-                        enforceMaxLimit();
-                        toggleBulkSaveContainer();
-                    });
-
-                    tableContainer.off('click', '.btn-view');
-                    // Bind view buttons
-                    tableContainer.on('click', '.btn-view', function () {
-                        let id = $(this).data('id');
-                        $.ajax({
-                            url: `/gcc/api/streetvendor/vendorDetailsById?requestId=${id}`,
-                            method: 'GET',
-                            success: function (details) {
-                                if (!details) {
-                                    $('#modalBodyContent').html("<p>No data found for this request.</p>");
-                                    $('#viewModal').modal('show');
-                                    return;
-                                }
-
-                                const diffAbledDisplay = details.diff_abled ? (details.diff_abled ? 'Yes' : 'No') : '-';
-                                const pmLoanDisplay = details.pm_svanidhi_loan ? (details.pm_svanidhi_loan ? 'Yes' : 'No') : '-';
-                                const bankAccDisplay = details.bank_acc_status ? (details.bank_acc_status === '1' ? 'Yes' : 'No') : '-';
-                                const idCardDisplay = details.vendor_id_card ? (details.vendor_id_card === '1' ? 'Yes' : 'No') : '-';
-                                const bankPassbookDisplay = details.bank_acc_status === '1' && details.bank_passbook
-                                    ? `<img src="${details.bank_passbook}" alt="Bank Passbook" class="img-fluid" style="max-width: 150px;" onerror="this.src='/default.jpg'">`
-                                    : '-';
-
-                                const aadharFrontBtn = details.aadhar_front_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.aadhar_front_photo}')">View</button>` : '-';
-                                const rationCardBtn = details.ration_card_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.ration_card_photo}')">View</button>` : '-';
-                                const aadharBackBtn = details.aadhar_back_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.aadhar_back_photo}')">View</button>` : '-';
-                                const bankPassbookBtn = details.bank_acc_status === '1' && details.bank_passbook
-                                    ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.bank_passbook}')">View</button>`
-                                    : '-';
-
-                                const spacePhotoBtn = details.vendor_space_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.vendor_space_photo}')">View</button>` : '-';
-
-                                let postponedHTML = "";
-
-
-                                // History list
-                                if (details.postponedHistory && details.postponedHistory.length > 0) {
-                                    details.postponedHistory.forEach(entry => {
-                                        postponedHTML += `
-                                            <div class="comment mb-4">
-                                                <div class="row">
-                                                    <div class="col-4 text-center">
-                                                        <p class="text-muted"><strong>${entry.date || 'N/A'}</strong></p>
-                                                    </div>
-                                                    <div class="col-8">
-                                                        <p><strong>Postponed - History</strong></p>
-                                                        <p><strong>Status: </strong>${entry.status || '-'}</p>
-                                                        <p><strong>Remarks: </strong>${entry.remarks || '-'}</p>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        `;
-                                    });
-                                }
-
-                                //  Latest postponed entry
-                                if (details.latestPostponed) {
-                                    postponedHTML += `
-                                        <div class="comment mb-4">
-                                            <div class="row">
-                                                <div class="col-4 text-center">
-                                                    <p class="text-muted"><strong>${details.latestPostponed.date || 'N/A'}</strong></p>
-                                                </div>
-                                                <div class="col-8">
-                                                    <p><strong>Postponed - Latest</strong></p>
-                                                    <p><strong>Status: </strong>${details.latestPostponed.status || '-'}</p>
-                                                    <p><strong>Remarks: </strong>${details.latestPostponed.remarks || '-'}</p>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    `;
-                                }
-
-                                const content = `
-                                    <div class="container-fluid">
-                                        <!-- Personal Details -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-primary text-white">Personal Details</div>
-                                            <div class="card-body row">
-                                            <div class="col-md-3"><strong>Name:</strong></div>
-                                            <div class="col-md-3">${details.name || '-'}</div>
-                                            <div class="col-md-3"><strong>Father/Husband Name:</strong></div>
-                                            <div class="col-md-3">${details.f_h_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Mobile:</strong></div>
-                                            <div class="col-md-3">${details.mob_no || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Community Category:</strong></div>
-                                            <div class="col-md-3">${details.category_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>DOB:</strong></div>
-                                            <div class="col-md-3">${details.dob || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Address:</strong></div>
-                                            <div class="col-md-3">${details.residental_address || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Gender:</strong></div>
-                                            <div class="col-md-3">${details.gender || '-'}</div>
-
-                                            
-
-                                            <div class="col-md-3"><strong>Differently Abled:</strong></div>
-                                            <div class="col-md-3">${diffAbledDisplay || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Aadhaar front Image:</strong></div>
-                                            <div class="col-md-3">${aadharFrontBtn}</div>
-
-                                            <div class="col-md-3"><strong>Ration card Image:</strong></div>
-                                            <div class="col-md-3">${rationCardBtn}</div>
-
-                                            <div class="col-md-3"><strong>Aadhaar back Image:</strong></div>
-                                            <div class="col-md-3">${aadharBackBtn}</div>
-                                            </div>
-                                        </div>
-
-                                        <!-- Business Details -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-success text-white">Business Details</div>
-                                            <div class="card-body row">
-                                            <div class="col-md-3"><strong>Type of Business:</strong></div>
-                                            <div class="col-md-3">${details.vending_category_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Zone:</strong></div>
-                                            <div class="col-md-3">${details.zone || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Business Space (sq.ft):</strong></div>
-                                            <div class="col-md-3">${details.vending_space || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Ward:</strong></div>
-                                            <div class="col-md-3">${details.ward || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Address:</strong></div>
-                                            <div class="col-md-3">${details.business_address || '-'}</div>
-
-                                           
-
-                                            <div class="col-md-3"><strong>PM SVANidhi Loan Availed:</strong></div>
-                                            <div class="col-md-3">${pmLoanDisplay || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Do you Have Bank Account?:</strong></div>
-                                            <div class="col-md-3">${bankAccDisplay || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Bank Passbook Image:</strong></div>
-                                            <div class="col-md-3">${bankPassbookBtn}</div>
-
-                                            </div>
-                                        </div>
-                                        
-                                        <!-- Inspection Details -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-warning text-white">Inspection Details</div>
-                                            <div class="card-body row">
-                                            <div class="col-md-3"><strong>Vendor Type:</strong></div>
-                                            <div class="col-md-3">${details.vendor_type || '-'}</div>
-                                            
-                                            <div class="col-md-3"><strong>Vendor Sub Type:</strong></div>
-                                            <div class="col-md-3">${details.vendor_sub_type || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Vendor ID Card:</strong></div>
-                                            <div class="col-md-3">${idCardDisplay}</div>
-
-                                            <div class="col-md-3"><strong>Vending Nature:</strong></div>
-                                            <div class="col-md-3">${details.vending_nature || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Vending Time:</strong></div>
-                                            <div class="col-md-3">${details.vending_time || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Transaction Mode:</strong></div>
-                                            <div class="col-md-3">${details.transaction_mode || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Swanidi Loan Amount:</strong></div>
-                                            <div class="col-md-3">${details.swanidi_loan_amount || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Vendor Space Image:</strong></div>
-                                            <div class="col-md-3">${spacePhotoBtn || '-'}</div>
-                                           
-
-                                            </div>
-                                        </div>
-
-                                        <!-- Request History -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-info text-white">Request History</div>
-                                            <div class="card-body">
-                                            	<div class="comment mb-4">
-                                            		<div class="row">
-                                                		<div class="col-4 text-center">
-                                                    		<p class="text-muted"><strong>${details.LI_Cdate || 'N/A'}</strong></p>
-                                                		</div>
-                                                		<div class="col-8">
-		                                                    <p><strong>LI Officer ${details.LI_Status || 'N/A'}</strong></p>
-		                                                    <p><strong>Remarks: </strong>${details.LI_Remarks || ''}</p>                                                
-                                               			 </div>
-                                            		</div>
-                                        		</div>
-                                        		
-                                        	<div class="comment mb-4">
-                                        		<div class="row">
-                                            		<div class="col-4 text-center">
-                                                		<p class="text-muted"><strong>${details.ARO_Inspection_date || 'N/A'}</strong></p>
-                                            		</div>
-                                            		<div class="col-8">
-	                                                    <p><strong>ARO Officer ${details.ARO_status || 'N/A'}</strong></p>
-	                                                    <p><strong>Remarks: </strong>${details.ARO_remarks || ''}</p>                                                
-                                           			 </div>
-                                        		</div>
-                                    		</div>
-                                    		
-                                    		<div class="comment mb-4">
-	                                    		<div class="row">
-	                                        		<div class="col-4 text-center">
-	                                            		<p class="text-muted"><strong>${details.EE_Inspection_date || 'N/A'}</strong></p>
-	                                        		</div>
-	                                        		<div class="col-8">
-	                                                    <p><strong>EE Officer ${details.EE_status || 'N/A'}</strong></p>
-	                                                    <p><strong>Remarks: </strong>${details.EE_remarks || ''}</p>                                                
-	                                       			 </div>
-	                                    		</div>
-                                			</div>
-                                			
-                                			<!-- POSTPONED HISTORY (NEW) -->
-                                            ${postponedHTML}
-                                        		
-                                            </div>
-                                        </div>
-                                    </div>
-                                `;
-
-                                $('#modalBodyContent').html(content);
-                                $('#viewModalLabel').text(`Request Details - ${id}`);
-                                $('#viewModal').modal('show');
-                            },
-                            error: function (xhr) {
-                                console.error("Error fetching detail:", xhr.responseText);
-                                alert("Failed to fetch vendor details.");
-                            }
-                        });
-                    });
-
-                    $('#RequestListDatatable tbody').off('change', '.status-dropdown');
-                    $('#RequestListDatatable tbody').on('change', '.status-dropdown', function () {
-
-                        const $row = $(this).closest('tr');
-
-                        // Clear only that row's remarks
-                        $row.find('.remark-box').val('');
-
-                    });
-
-
-                    $('#RequestListDatatable tbody').off('click', '.btn-success');
-
-                    $('#RequestListDatatable tbody').on('click', '.btn-success', function () {
-
-
-
-                        const $submitBtn = $(this);  // ONLY this button
-                        $submitBtn.prop('disabled', true).text('Submitting...');
-
-                        const $row = $(this).closest('tr'); // get the clicked row
-
-                        const table1 = $('#RequestListDatatable').DataTable();
-                        const rowData = table1.row($row).data(); // fetch DataTables row data (e.g., vendor_req_id, name, etc.)
-
-                        // Now get values from select and input elements inside the row
-                        const status = $row.find('select').val();
-                        const remarks = $row.find('textarea').val();
-                        const eventReqId = $('#dropdownevent').val();
-
-                        // Event dropdown check
-                        if (!eventReqId) {
-                            Swal.fire({
-                                icon: 'warning',
-                                title: 'Meeting Required',
-                                text: 'Please select an event before submitting.',
-                            });
-                            $submitBtn.prop('disabled', false).text('Submit');
-                            return;
-                        }
-
-
-                        //  Status must be selected
-                        if (!status) {
-                            Swal.fire({
-                                icon: 'warning',
-                                title: 'Status Required',
-                                text: 'Please select a status before submitting.',
-                            });
-                            $submitBtn.prop('disabled', false).text('Submit');
-                            return;
-                        }
-
-                        // Remarks required 
-                        if (!remarks) {
-                            Swal.fire({
-                                icon: 'warning',
-                                title: 'Remarks Required',
-                                text: 'Please enter remarks.',
-                            });
-                            $submitBtn.prop('disabled', false).text('Submit');
-                            return;
-                        }
-
-
-                        // Construct the data object to send
-                        const payload = {
-                            vendor_req_id: rowData.id,
-                            vendor_req_number: rowData.vendor_req_id,
-                            status: status,
-                            remarks: remarks,
-                            event_req_id: eventReqId,
-                            zone: rowData.zone,
-                            ward: rowData.ward,
-                            cby: userId,
-                            mob_no: rowData.mob_no
-                        };
-
-                        console.log("payload = " + JSON.stringify(payload, null, 2));
-
-                        $('#pageLoader').show();
-                        // 📨 AJAX call
-                        $.ajax({
-                            url: '/gcc/api/streetvendor/savedetailsforvendor',
-                            method: 'POST',
-                            contentType: 'application/json',
-                            data: JSON.stringify(payload),
-                            success: function (response) {
-                                $('#pageLoader').hide();
-                                $submitBtn.prop('disabled', false).text('Submit');
-                                if (response.status === "success") {
-
-                                    Swal.fire({
-                                        icon: 'success',
-                                        title: 'Success',
-                                        text: response.message,
-                                        allowOutsideClick: false,
-                                        allowEscapeKey: false,
-                                        allowEnterKey: false,
-                                        showConfirmButton: true,
-                                    }).then((result) => {
-                                        if (result.isConfirmed) {
-                                            console.log("ok button");
-                                            fetchVendingCommitteeList();
-
-                                        }
-                                    });
-
-                                }
-                                else if (response.status === "Error") {
-
-                                    Swal.fire({
-                                        icon: 'error',
-                                        title: 'Error',
-                                        text: response.message,
-                                    });
-                                }
-
-                                else {
-                                    Swal.fire('Error', 'Failed to submit data.', 'error');
-                                }
-                            },
-                            error: function () {
-                                $('#pageLoader').hide();
-                                $submitBtn.prop('disabled', false).text('Submit');
-                                Swal.fire('Error', 'Something went wrong while submitting.', 'error');
-                            }
-                        });
-
-                    });
-                },
-
-                error: function (xhr, status, error) {
-                    $('#pageLoader').hide();
-                    console.error("Error fetching data:", error);
-                    alert("Failed to load vendor list.");
-                }
-            });
-        }
-
-        // Call this function on page load
-        function fetchEventDropdown(userId) {
-            $.ajax({
-                url: '/gcc/api/vending/dropdown-Event',
-                type: 'GET',
-                data: { userId: userId },
-                dataType: 'json',
-                success: function (data) {
-                    let eventDropdown = $('#dropdownevent');
-                    eventDropdown.empty();
-                    eventDropdown.append('<option value="" >Select an Meeting</option>');
-
-                    data.forEach(function (event) {
-                        if (event.isactive && !event.isdelete) {  // Optional: filter active & not deleted
-                            eventDropdown.append(
-                                $('<option></option>')
-                                    .val(event.req_id)
-                                    .text(`${event.event_name} - ${event.event_date}`)
-                            );
-                        }
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching event dropdown:', error);
-                    Swal.fire('Error', 'Unable to load events', 'error');
-                }
-            });
-        }
-
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vendors/addevent.html b/src/main/resources/templates/modules/vendors/addevent.html
deleted file mode 100644
index f627ae82..00000000
--- a/src/main/resources/templates/modules/vendors/addevent.html
+++ /dev/null
@@ -1,274 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-	color: red;
-}
-/* Mobile screens - targeting devices with a max width of 767px */
-@media (max-width: 767px) 
-{
-	#addeventform label{
-		margin-top: 10px;
-	} 
-}
-</style>
-    <body>
-		
-
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="far fa-calendar-plus bg-blue"></i>
-									<div class="d-inline">
-										<h5>Create Meeting</h5>
-										<span>Vending Committe</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Vending Committe</li>
-										<li class="breadcrumb-item active" aria-current="page">Create Meeting</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<br>
-					
-					<div class="row">
-					
-						<div class="col-md-12">
-							<div class="card" style="margin-top: 0px;">
-								<div class="card-header justify-content-between align-items-center">
-									<h3><b>Add Vending Committee Meeting<span th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span></b></h3>
-								</div>
-								<div class="card-body">
-								
-									 <form id="addeventform">
-					                    <div class="form-group">
-					                    	<div class="row" style="row-gap:10px;">
-					                    		<div class="col-sm-12 col-md-6">
-							                        <label class="form-label" for="name">Meeting Name<span
-													class="text-danger">*</span></label> <input type="text"
-													class="form-control" value="vending committee event"
-													id="eventname"  required readonly="readonly">
-					                    		</div>
-					                    	
-					                            <div class="col-sm-12 col-md-6">
-							                        <label class="form-label" for="dateofbirth">Select Date<span
-													class="text-danger">*</span></label> <input type="DATE"
-													class="form-control" id="eventdate" onclick="this.showPicker()" required>
-					                    		</div>
-					                    
-					                    
-								           <!-- Attachment -->
-											<div class="col-sm-12">
-												<label for="fileInput" class="form-label" >Attachment:<span class="text-danger">*</span></label>
-					                     	    <input type="file" class="form-control" id="fileInput" required>			
-					                     	    <small id="fileError" class="text-danger" style="display: none;">Only JPEG, JPG, or PDF files are allowed.</small>
-					                     	    
-											</div>
-
-
-					                    	</div>
-					                    </div>
-
-
-					                    <div class="form-group text-center">
-					                        <button type="submit" class="btn btn-primary " id="createdBtn">Create Meeting</button>
-					                        <button type="reset" class="btn btn-secondary ml-2" onclick="resetForm()">Reset</button>
-					                    </div>
-					                </form>
-
-								
-								</div>
-
-							</div>
-						</div>
-
-                      </div>
-                        
-                        
-                     </div>
-                </div>
-                
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-               
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-				</div>
-				
-		</div>
-	
-	          
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-        
-          <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-        
-        <script type="text/javascript">
-  
-
-
-        
-        function resetForm() {
-            document.getElementById('addeventform').reset(); // Built-in reset functionality
-        }
-        
-        //disabled the past dates
-        document.addEventListener("DOMContentLoaded", function () {
-            var today = new Date().toISOString().split('T')[0];
-            document.getElementById("eventdate").setAttribute("min", today);
-        });
-      
-        
-
-        $(document).ready(function () {
-            $('#addeventform').on('submit', function (e) {
-                e.preventDefault();
-                
-                $('#createdBtn').prop('disabled', true).text('Creating...');
-    	        
-    	        $('#pageLoader').show();
-
-                var eventName = $('#eventname').val().trim();
-                var eventDate = $('#eventdate').val();
-                var file = $('#fileInput')[0].files[0];
-                let userId = document.getElementById('userIdSpan').textContent;
-
-                if (!eventName || !eventDate || !file) {
-                	$('#pageLoader').hide();
-                	 $('#createdBtn').prop('disabled', false).text('Create Meeting');
-                    Swal.fire('warning', 'All fields are required.', 'info');                  
-                    return;
-                }
-
-                var formData = new FormData();
-                
-                formData.append("eventName", eventName);
-                formData.append("eventDate", eventDate);
-                formData.append("file", file);
-                formData.append("cby", userId);
-                console.log("formData",formData);
-
-                $.ajax({
-                    url: '/gcc/api/vending/save',
-                    type: 'POST',
-                    data: formData,
-                    processData: false,
-                    contentType: false,
-                    success: function (response) {
-                    	$('#pageLoader').hide();
-                        if (response.status) {
-                        	Swal.fire({
-    	                        icon: 'success',
-    	                        title: 'Success',
-    	                        text: response.description ,
-    	                        allowOutsideClick: false, 
-    		                    allowEscapeKey: false,
-    		                    allowEnterKey: false, 
-    		                    showConfirmButton: true
-    	                    }).then((result) => {
-    		                    if (result.isConfirmed) {		                    	
-    		                    	location.reload();		                    			                    	
-    		                    }
-    		                });                       
-                        } else {
-                        	$('#pageLoader').hide();
-                        	 Swal.fire({
-    		                        icon: 'error',
-    		                        title: 'Update Failed',
-    		                        text: response.description || 'Something went wrong!'
-    		                    });
-                        }
-                        $('#createdBtn').prop('disabled', false).text('Create Meeting');
-                    },
-                    error: function () {
-                    	$('#pageLoader').hide();
-                    	Swal.fire({
-    	                    icon: 'error',
-    	                    title: 'Submission Error',
-    	                    text: 'Something went wrong while submitting the form.'
-    	                });
-                    	$('#createdBtn').prop('disabled', false).text('Create Meeting');
-                    }
-                });
-            });
-        });
-
-    
-
- 
-    ///////new function for saving method//////
-
-	document.getElementById('fileInput').addEventListener('change', function (event) {
-	    var fileInput = event.target;
-	    var filePath = fileInput.value;
-	    var allowedExtensions = /(\.jpeg|\.jpg|\.pdf)$/i;
-	
-	    if (!allowedExtensions.exec(filePath)) {
-	        document.getElementById('fileError').style.display = 'block'; // Show error message
-	        fileInput.value = ''; // Clear the input
-	    } else {
-	        document.getElementById('fileError').style.display = 'none'; // Hide error message
-	    }
-	});
-
-	//Maximum file size (10 MB)
-	const MAX_FILE_SIZE = 10 * 1024 * 1024; // 10MB in bytes
-
-	// Apply to all file inputs inside the form
-	$("#addeventform input[type='file']").on("change", function () {
-	    const fileInput = this;
-
-	    if (fileInput.files.length > 0) {
-	        let file = fileInput.files[0];
-
-	        if (file.size > MAX_FILE_SIZE) {
-
-	            Swal.fire({
-	                icon: "error",
-	                title: "File too large!",
-	                text: "Maximum allowed file size is 10 MB.",
-	            });
-
-	            // Clear file input
-	            $(fileInput).val('');
-	        }
-	    }
-	});
-
-		
-        </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vendors/certificate.html b/src/main/resources/templates/modules/vendors/certificate.html
deleted file mode 100644
index 16eaaee9..00000000
--- a/src/main/resources/templates/modules/vendors/certificate.html
+++ /dev/null
@@ -1,764 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required {
-        color: red;
-    }
-
-    /* Mobile screens - targeting devices with a max width of 767px */
-    @media (max-width: 767px) {
-        #requestlistform label {
-            margin-top: 10px;
-        }
-    }
-
-    #viewModal .modal-body {
-        max-height: 70vh;
-        /* Limit the height to 70% of the viewport */
-        overflow-y: auto;
-        /* Enable vertical scrolling */
-    }
-
-    .custom-doc-btn {
-        height: 20px;
-        width: 80px;
-        font-size: 9px;
-        font-weight: bold;
-        text-align: center;
-        padding: 0px;
-        border: 1px solid grey;
-    }
-
-    .col-md-3 {
-        padding-bottom: 10px;
-    }
-
-    .comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-</style>
-    <body>
-		
-
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Vending Certificate</h5>
-										<span>Vending Committe</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Vending Committe</li>
-										<li class="breadcrumb-item active" aria-current="page">Vending Certificate</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<br>
-					
-					 <div class="row">
-
-
-                        <div class="col-md-12">
-                            <div class="card">
-                                <div class="card-header">
-                                    <span style="font-size: medium;font-weight: bold;"> Filters</span><span
-                                        th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span><span
-                                        th:text="${zone}" id="userzone" style="display: none;"></span>
-                                </div>
-                                <div class="card-body">
-                                    <div class="row">
-
-                                        <div class="col-md-4 mb-1">
-                                            <label for="meetingdropdown" style="font-size: medium;">Meeting:</label>
-                                            <select id="meetingdropdown" class="form-control">
-                                                <option value="">Select an Meeting</option>
-                                            </select>
-                                        </div>
-
-                                        
-
-
-                                        <div class="col-md-3 mb-1">
-                                            <label for="zonedropdown" style="font-size: medium;">Zone:</label>
-                                            <select id="zonedropdown" class="form-control">
-                                                <option value="">Select an Zone</option>
-                                            </select>
-                                        </div>
-
-                                        <div class="col-md-3 mb-1">
-                                            <label for="warddropdown" style="font-size: medium;">Ward:</label>
-                                            <select id="warddropdown" class="form-control">
-                                                <option value="">Select an Ward</option>
-                                            </select>
-                                        </div>
-
-                                        
-
-                                    </div>
-
-                                    <div class="row mt-4">
-                                        <div class="col-12 d-flex justify-content-center">
-                                            <button class="btn btn-primary" id="submitBtn">Submit</button>
-
-                                            <button class="btn btn-danger mx-2" id="resetBtn" name="reset"
-                                                type="reset">Reset</button>
-                                        </div>
-                                    </div>
-
-                                </div>
-
-                                <div class="card-block">
-                                    <div class="page-header-title">
-                                        <h5 style="margin: 0;font-weight: bold;">Vendors(ID card) Approved List</h5>
-                                        <hr>
-                                    </div>
-
-
-                                    <table id="RequestListDatatable"
-                                        class="table table-striped table-bordered table-hover dataTable" role="grid">
-                                        <thead class="thead-dark">
-                                            <tr role="row">
-                                                <th class="text-center">S.No</th>
-                                                <th class="text-center">Request No</th>
-                                                <th class="text-center">Zone</th>
-                                                <th class="text-center">Ward</th>
-                                                <th class="text-center">Public Name</th>
-                                                <th class="text-center">Mobile</th>
-                                                <th class="text-center">ID Status</th>
-                                                <th class="text-center no-sort" width="%2">View Details</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-
-                                        </tbody>                                       
-                                    </table>
-
-                                </div>
-                            </div>
-                        </div>
-                        
-                        
-                     </div>
-                </div>
-                
-                </div>
-                
-                <!-- Modal -->
-            <div class="modal fade" id="viewModal" tabindex="-1" aria-labelledby="viewModalLabel" aria-hidden="true"
-                data-bs-backdrop="static" data-bs-keyboard="false">
-                <div class="modal-dialog modal-lg">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title" id="viewModalLabel">Request Details</h5>
-                            <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                                <span aria-hidden="true">&times;</span>
-                            </button>
-                        </div>
-                        <div class="modal-body" id="modalBodyContent">
-                            <!-- Dynamic content loads here -->
-                        </div>
-                        <div class="modal-footer">
-                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-
-            <!-- Image Modal -->
-            <div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
-                <div class="modal-dialog modal-dialog-scrollable modal-lg">
-                    <div class="modal-content border-0">
-                        <div class="modal-body p-0 text-center" style="background-color: #f8f9fa;">
-                            <div id="docContainer" style="max-height: 90vh; overflow: auto;"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-                
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-               
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-				</div>
-				
-		</div>
-	
-	          
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-        
-          <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-        
-          <script type="text/javascript">
-          
-          let userzone = document.getElementById('userzone').textContent;
-          let userId = document.getElementById('userIdSpan').textContent;
-
-          // GLOBAL scope — must be outside any other function
-          function openDocModal(fileUrl) {
-              const container = document.getElementById('docContainer');
-              const ext = fileUrl.split('.').pop().toLowerCase();
-
-              if (ext === 'pdf') {
-                  container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
-              } else {
-                  container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;" onerror="this.src='/default.jpg'">`;
-              }
-
-              $('#docModal').modal('show');
-          }
-
-          $(document).ready(function () {
-
-              var table = $('#RequestListDatatable').DataTable({
-                  dom: 'Bftip',
-                  columnDefs: [
-                      { targets: 'no-sort', orderable: false }
-                  ],
-                  lengthMenu: [
-                      [50, 100, 200, 500, -1],
-                      ['50 rows', '100 rows', '200 rows', 'Show all']
-                  ],
-                  scrollY: '50vh',
-                  buttons: [
-                      {
-                          extend: 'pageLength',
-                          className: 'btn btn-warning'
-                      },
-                      {
-                          title: 'Data export',
-                          extend: 'copyHtml5',
-                          text: 'Copy',
-                          className: 'btn btn-secondary',
-                          id: 'copyBtn'
-                      },
-                      {
-                          extend: 'excelHtml5',
-                          text: 'Excel',
-                          className: 'btn btn-secondary',
-                          id: 'excelBtn'
-                      },
-                      {
-                          extend: 'csvHtml5',
-                          text: 'CSV',
-                          className: 'btn btn-secondary',
-                          id: 'csvBtn'
-                      },
-                      {
-                          extend: 'pdfHtml5',
-                          text: 'PDF',
-                          className: 'btn btn-secondary',
-                          id: 'pdfBtn'
-                      }
-                  ],
-                  fixedHeader: false,
-                  autoWidth: true,
-                  responsive: true,
-                  searching: false,
-                  select: false,
-                  processing: false
-
-
-              });
-
-
-              fetchEventDropdown(userId);
-              let zoneString = userzone;   // e.g. "01,02,03,04,05"
-
-              if (zoneString) {
-                  let zoneArray = zoneString.split(",");  // ["01","02","03","04","05"]
-
-                  zoneArray.forEach(z => {
-                      $("#zonedropdown").append(
-                          `<option value="${z}">${z}</option>`
-                      );
-                  });
-              }
-              $('#zonedropdown').on('change', function () {
-                  let selectedZone = $(this).val();
-
-                  // Reset ward dropdown
-                  $('#warddropdown').html(`<option value="">Select Ward</option>`);
-
-                  if (selectedZone) {
-                      fetchWardDropdown(selectedZone);
-                  }
-              });
-              fetchVendingCommitteeList("", "Approved", "", "", userId)
-
-          });
-
-          function fetchWardDropdown(zone) {
-
-              $.ajax({
-                  url: "/gcc/api/streetvendor/getwardbyzone",
-                  type: "GET",
-                  data: { zone: zone },
-                  success: function (data) {
-
-                      if (!data || data.length === 0) {
-                          $('#warddropdown').html(`<option value="">No wards found</option>`);
-                          return;
-                      }
-
-                      // Clear before loading
-                      $('#warddropdown').html(`<option value="">Select Ward</option>`);
-
-                      // Append wards
-                      data.forEach(w => {
-                          // backend returns ward_name
-                          $('#warddropdown').append(
-                              `<option value="${w.ward_name}">${w.ward_name}</option>`
-                          );
-                      });
-                  },
-                  error: function (xhr) {
-                      console.error("Error fetching wards:", xhr.responseText);
-                      $('#warddropdown').html(`<option value="">Error loading wards</option>`);
-                  }
-              });
-          }
-
-          $('#resetBtn').on('click', function () {
-              location.reload();
-              return;
-          });
-          
-          $('#submitBtn').on('click', function () {
-
-              const meeting = $('#meetingdropdown').val();
-
-              const status = "Approved";
-
-              const zone = $('#zonedropdown').val();
-
-              const ward = $('#warddropdown').val();
-
-              console.log("Selected Meeting Value:", meeting);
-
-              console.log("Selected Status Value:", status);
-
-              console.log("Selected zone Value:", zone);
-              console.log("Selected ward Value:", ward);
-
-              // 👉 Now call your API or next function using these two
-              fetchVendingCommitteeList(meeting, status, zone, ward, userId);
-          });
-          
-          
-          function fetchVendingCommitteeList(event_req_id, status, zone, ward) {
-              $('#pageLoader').show();
-              $.ajax({
-                  url: '/gcc/api/vending/getreports',
-                  data: { meeting: event_req_id, status: status, zone: zone, ward: ward, userId: userId },
-                  method: 'GET',
-                  contentType: 'application/json',
-                  success: function (data) {
-                      $('#pageLoader').hide();
-                      let tableContainer = $('#RequestListDatatable');
-
-                      // Destroy any existing DataTable instance
-                      if ($.fn.DataTable.isDataTable(tableContainer)) {
-                          tableContainer.DataTable().destroy();
-                      }
-
-                      // Check for empty list
-                      /* if (!data || data.length === 0) {
-                          tableContainer.find('tbody').html(`
-                              <tr>
-                                  <td colspan="8" class="text-center text-danger">No Data Available</td>
-                              </tr>
-                          `);
-                          return;
-                      } */
-
-                      // Initialize DataTable
-                      tableContainer.DataTable({
-                          destroy: true,
-                          searching: true,
-                          autoWidth: false,
-                          paging: true,
-                          info: true,
-                          data: data,
-                          columns: [
-                              {
-                                  data: null,
-                                  render: (data, type, row, meta) => meta.row + 1,
-                                  className: 'text-center'
-                              },
-                              { data: 'vendor_req_id', defaultContent: '-', className: 'text-center' },
-                              { data: 'zone', defaultContent: '-', className: 'text-center' },
-                              { data: 'ward', defaultContent: '-', className: 'text-center' },
-                              { data: 'name', defaultContent: '-', className: 'text-center' },
-                              { data: 'mob_no', defaultContent: '-', className: 'text-center' },
-                              {
-                                  data: 'status',
-                                  defaultContent: '-',
-                                  className: 'text-center',
-                                  createdCell: function (td, cellData, rowData, row, col) {
-                                      if (cellData === 'Approved') {
-                                          $(td).css('color', 'green').css('font-weight', 'bold');
-                                      } else if (cellData === 'Rejected') {
-                                          $(td).css('color', 'red').css('font-weight', 'bold');
-                                      }
-                                      else {
-                                          $(td).css('color', 'orange').css('font-weight', 'bold');
-                                      }
-                                  }
-                              },
-                              {
-                                  data: 'id',
-                                  render: function (data, type, row) {
-                                      return `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
-                                  },
-                                  className: 'text-center'
-                              }
-
-                          ],
-                          dom: 'Bfrtip',
-                          buttons: [
-                              { extend: 'pageLength', className: 'btn btn-warning' },
-                              { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-                              { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-                              { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-                              { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-                          ],
-                          columnDefs: [{ targets: 'no-sort', orderable: false }],
-                          lengthMenu: [
-                              [50, 100, 200, 500, -1],
-                              ['50 rows', '100 rows', '200 rows', 'Show all']
-                          ],
-                          scrollY: '80vh',
-                          scrollX: true,
-                          responsive: false
-                      });
-
-
-                      // Bind view buttons
-                      tableContainer.off('click', '.btn-view');
-                      tableContainer.on('click', '.btn-view', function () {
-                          let id = $(this).data('id');
-                          $.ajax({
-                              url: `/gcc/api/vending/finalvendorDetailsById?requestId=${id}`,
-                              method: 'GET',
-                              success: function (detailData) {
-
-
-                                  if (!detailData || detailData.length === 0) {
-                                      $('#modalBodyContent').html("<p>No data found for this request.</p>");
-                                      $('#viewModal').modal('show');
-                                      return;
-                                  }
-
-                                  const details = detailData[0];
-
-                                  const historyList = detailData.map(h => ({
-                                      date: h.vc_Inspection_date || "N/A",
-                                      status: h.vc_status || "N/A",
-                                      remarks: h.vc_remarks || "",
-                                      event: h.event_name || "-"
-                                  }));
-
-                                  const diffAbledDisplay = details.diff_abled ? (details.diff_abled ? 'Yes' : 'No') : '-';
-                                  const pmLoanDisplay = details.pm_svanidhi_loan ? (details.pm_svanidhi_loan ? 'Yes' : 'No') : '-';
-                                  const bankAccDisplay = details.bank_acc_status ? (details.bank_acc_status === '1' ? 'Yes' : 'No') : '-';
-                                  const idCardDisplay = details.vendor_id_card ? (details.vendor_id_card === '1' ? 'Yes' : 'No') : '-';
-                                  const bankPassbookDisplay = details.bank_acc_status === '1' && details.bank_passbook
-                                      ? `<img src="${details.bank_passbook}" alt="Bank Passbook" class="img-fluid" style="max-width: 150px;" onerror="this.src='/default.jpg'">`
-                                      : '-';
-
-                                  const aadharFrontBtn = details.aadhar_front_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.aadhar_front_photo}')">View</button>` : '-';
-                                  const rationCardBtn = details.ration_card_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.ration_card_photo}')">View</button>` : '-';
-                                  const aadharBackBtn = details.aadhar_back_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.aadhar_back_photo}')">View</button>` : '-';
-                                  const bankPassbookBtn = details.bank_acc_status === '1' && details.bank_passbook
-                                      ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.bank_passbook}')">View</button>`
-                                      : '-';
-
-                                  const spacePhotoBtn = details.vendor_space_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.vendor_space_photo}')">View</button>` : '-';
-
-
-                                  let historyHtml = "";
-                                  historyList.forEach(h => {
-                                      historyHtml += `
-                                      <div class="comment mb-4">
-                                          <div class="row">
-                                              <div class="col-4 text-center">
-                                                  <p class="text-muted"><strong>${h.date}</strong></p>
-                                              </div>
-                                              <div class="col-8">
-                                                  <p><strong>Vending Committee ${h.status} (${h.event})</strong></p>
-                                                  <p><strong>Remarks: </strong>${h.remarks}</p>
-                                              </div>
-                                          </div>
-                                      </div>`;
-                                  });
-
-
-                                  const content = `
-                                      <div class="container-fluid">
-                                          <!-- Personal Details -->
-                                          <div class="card mb-3">
-                                              <div class="card-header bg-primary text-white">Personal Details</div>
-                                              <div class="card-body row">
-                                              <div class="col-md-3"><strong>Name:</strong></div>
-                                              <div class="col-md-3">${details.name || '-'}</div>
-                                              <div class="col-md-3"><strong>Father/Husband Name:</strong></div>
-                                              <div class="col-md-3">${details.f_h_name || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Mobile:</strong></div>
-                                              <div class="col-md-3">${details.mob_no || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Community Category:</strong></div>
-                                              <div class="col-md-3">${details.category_name || '-'}</div>
-
-                                              <div class="col-md-3"><strong>DOB:</strong></div>
-                                              <div class="col-md-3">${details.dob || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Address:</strong></div>
-                                              <div class="col-md-3">${details.residental_address || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Gender:</strong></div>
-                                              <div class="col-md-3">${details.gender || '-'}</div>
-
-                                             
-
-                                              <div class="col-md-3"><strong>Differently Abled:</strong></div>
-                                              <div class="col-md-3">${diffAbledDisplay || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Aadhaar front Image:</strong></div>
-                                              <div class="col-md-3">${aadharFrontBtn}</div>
-
-                                              <div class="col-md-3"><strong>Ration card Image:</strong></div>
-                                              <div class="col-md-3">${rationCardBtn}</div>
-
-                                              <div class="col-md-3"><strong>Aadhaar back Image:</strong></div>
-                                              <div class="col-md-3">${aadharBackBtn}</div>
-                                              </div>
-                                          </div>
-
-                                          <!-- Business Details -->
-                                          <div class="card mb-3">
-                                              <div class="card-header bg-success text-white">Business Details</div>
-                                              <div class="card-body row">
-                                              <div class="col-md-3"><strong>Type of Business:</strong></div>
-                                              <div class="col-md-3">${details.vending_category_name || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Zone:</strong></div>
-                                              <div class="col-md-3">${details.zone || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Business Space (sq.ft):</strong></div>
-                                              <div class="col-md-3">${details.vending_space || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Ward:</strong></div>
-                                              <div class="col-md-3">${details.ward || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Address:</strong></div>
-                                              <div class="col-md-3">${details.business_address || '-'}</div>
-
-                                              
-
-                                              <div class="col-md-3"><strong>PM SVANidhi Loan Availed:</strong></div>
-                                              <div class="col-md-3">${pmLoanDisplay || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Do you Have Bank Account?:</strong></div>
-                                              <div class="col-md-3">${bankAccDisplay || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Bank Passbook Image:</strong></div>
-                                              <div class="col-md-3">${bankPassbookBtn}</div>
-
-                                              </div>
-                                          </div>
-                                          
-                                          
-                                          <!-- Inspection Details -->
-                                          <div class="card mb-3">
-                                              <div class="card-header bg-warning text-white">Inspection Details</div>
-                                              <div class="card-body row">
-                                              <div class="col-md-3"><strong>Vendor Type:</strong></div>
-                                              <div class="col-md-3">${details.vendor_type || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Vendor ID Card:</strong></div>
-                                              <div class="col-md-3">${idCardDisplay}</div>
-
-                                              <div class="col-md-3"><strong>Vending Nature:</strong></div>
-                                              <div class="col-md-3">${details.vending_nature || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Vending Time:</strong></div>
-                                              <div class="col-md-3">${details.vending_time || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Transaction Mode:</strong></div>
-                                              <div class="col-md-3">${details.transaction_mode || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Swanidi Loan Amount:</strong></div>
-                                              <div class="col-md-3">${details.swanidi_loan_amount || '-'}</div>
-
-                                              <div class="col-md-3"><strong>Vendor Space Image:</strong></div>
-                                              <div class="col-md-3">${spacePhotoBtn || '-'}</div>
-                                             
-
-                                              </div>
-                                          </div>
-
-                                          <!-- Request History -->
-                                          <div class="card mb-3">
-                                              <div class="card-header bg-info text-white">Request History</div>
-                                              <div class="card-body">
-                                              	<div class="comment mb-4">
-                                              		<div class="row">
-                                                  		<div class="col-4 text-center">
-                                                      		<p class="text-muted"><strong>${details.LI_Cdate || 'N/A'}</strong></p>
-                                                  		</div>
-                                                  		<div class="col-8">
-  		                                                    <p><strong>LI Officer ${details.LI_Status || 'N/A'}</strong></p>
-  		                                                    <p><strong>Remarks: </strong>${details.LI_Remarks || ''}</p>                                                
-                                                 			 </div>
-                                              		</div>
-                                          		</div>
-                                          		
-                                          	<div class="comment mb-4">
-                                          		<div class="row">
-                                              		<div class="col-4 text-center">
-                                                  		<p class="text-muted"><strong>${details.ARO_Inspection_date || 'N/A'}</strong></p>
-                                              		</div>
-                                              		<div class="col-8">
-  	                                                    <p><strong>ARO Officer ${details.ARO_status || 'N/A'}</strong></p>
-  	                                                    <p><strong>Remarks: </strong>${details.ARO_remarks || ''}</p>                                                
-                                             			 </div>
-                                          		</div>
-                                      		</div>
-                                      		
-                                      		<div class="comment mb-4">
-  	                                    		<div class="row">
-  	                                        		<div class="col-4 text-center">
-  	                                            		<p class="text-muted"><strong>${details.EE_Inspection_date || 'N/A'}</strong></p>
-  	                                        		</div>
-  	                                        		<div class="col-8">
-  	                                                    <p><strong>EE Officer ${details.EE_status || 'N/A'}</strong></p>
-  	                                                    <p><strong>Remarks: </strong>${details.EE_remarks || ''}</p>                                                
-  	                                       			 </div>
-  	                                    		</div>
-                                  			</div>
-                                  			
-                                  			${historyHtml}
-                                  			
-                                  			
-  	
-                                              </div>
-                                          </div>
-                                      </div>
-                                                                         
-                                  `;
-
-                                  $('#modalBodyContent').html(content);
-                                  $('#viewModalLabel').text(`Vendor Details - ${id}`);
-                                  $('#viewModal').modal('show');
-                              },
-                              error: function (xhr) {
-                                  console.error("Error fetching detail:", xhr.responseText);
-                                  alert("Failed to fetch vendor details.");
-                              }
-                          });
-                      });
-
-                  },
-
-                  error: function (xhr, status, error) {
-                      $('#pageLoader').hide();
-                      console.error("Error fetching data:", error);
-                      alert("Failed to load vendor list.");
-                  }
-              });
-          }
-
-          // Call this function on page load
-          function fetchEventDropdown(userId) {
-              $.ajax({
-                  url: '/gcc/api/vending/committedropdown',
-                  type: 'GET',
-                  data: { userId: userId },
-                  dataType: 'json',
-                  success: function (data) {
-                      let eventDropdown = $('#meetingdropdown');
-                      eventDropdown.empty();
-                      eventDropdown.append('<option value="">Select an Meeting</option>');
-
-                      data.forEach(function (event) {
-                          // Optional: filter active & not deleted
-                          eventDropdown.append(
-                              $('<option></option>')
-                                  .val(event.req_id)
-                                  .text(`${event.event_name} - ${event.formated_date}`)
-                          );
-
-                      });
-                  },
-                  error: function (xhr, status, error) {
-                      console.error('Error fetching event dropdown:', error);
-                      Swal.fire('Error', 'Unable to load events', 'error');
-                  }
-              });
-          }
-
-          
-          </script>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vendors/streetVendorRequestForm.html b/src/main/resources/templates/modules/vendors/streetVendorRequestForm.html
deleted file mode 100644
index c06c398f..00000000
--- a/src/main/resources/templates/modules/vendors/streetVendorRequestForm.html
+++ /dev/null
@@ -1,1486 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-	.required {
-		color: red;
-	}
-
-	#modalBody h4 {
-		font-weight: bold;
-		margin-top: 15px;
-		margin-bottom: 10px;
-	}
-
-	#modalBody p {
-		margin: 5px 0;
-	}
-
-	#modalBody hr {
-		margin: 15px 0;
-	}
-
-	.comment {
-		margin-bottom: 20px;
-	}
-
-	.comment p {
-		margin: 0;
-	}
-
-	hr {
-		border: 1px solid #ccc;
-		margin-top: 20px;
-		margin-bottom: 20px;
-	}
-
-	h5 {
-
-		font-size: bold;
-	}
-
-	/* Limit the height of the dropdown menu and make it scrollable */
-	.dropdown-menu {
-		max-height: 200px;
-		/* Adjust this value as needed */
-		overflow-y: auto;
-	}
-
-
-	.col-4 {
-		font-weight: bold;
-		text-align: right;
-	}
-
-	.col-8 {
-		padding-left: 20px;
-	}
-
-	.comment {
-		padding: 10px 0;
-	}
-
-	.comment .text-muted {
-		font-size: 0.9em;
-		color: #6c757d;
-	}
-
-	.comment hr {
-		border-top: 1px solid #ccc;
-	}
-
-	.comment .btn-link {
-		font-size: 0.9em;
-		text-decoration: underline;
-		color: #007bff;
-	}
-
-	/* Make the modal body scrollable */
-	#detailsModal .modal-body {
-		max-height: 70vh;
-		/* Limit the height to 70% of the viewport */
-		overflow-y: auto;
-		/* Enable vertical scrolling */
-	}
-
-	.card-box {
-		border-radius: 20px;
-		box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
-	}
-
-	#followupCard {
-		transition: transform 0.2s ease;
-		/* Smooth scaling transition */
-		cursor: pointer;
-		/* Default cursor change */
-	}
-
-	#followupCard:hover {
-		transform: scale(1.05);
-		/* Slightly scale up on hover */
-		cursor: pointer;
-		/* Change cursor to hand symbol */
-	}
-
-	.card-block {
-		padding: 20px;
-	}
-
-	.form-label {
-		margin-bottom: 0.5rem;
-	}
-
-	/* input.form-control {
-    padding: 10px;
-} */
-	.form-select {
-		padding: 10px;
-		height: 40px;
-	}
-
-	#employeeCard label {
-		padding-top: 2%;
-	}
-
-	.form-section h5 {
-		background-color: #0d6efd;
-		color: white;
-		padding: 10px;
-		border-radius: 5px;
-		margin-bottom: 20px;
-	}
-
-	.upload-box {
-		border: 2px dashed #999;
-		padding: 20px;
-		text-align: center;
-		color: #666;
-		border-radius: 8px;
-		background-color: #f8f9fa;
-		cursor: pointer;
-	}
-
-	/*css for map in step2*/
-	#googleMap {
-		height: 300px;
-		width: 100%;
-		position: relative;
-		overflow: hidden;
-		max-width: 100%;
-	}
-
-	#pac-input {
-		position: absolute;
-		top: 10px;
-		left: 50%;
-		transform: translateX(-50%);
-		width: 300px;
-		z-index: 5;
-		padding: 10px;
-		border: 1px solid #ccc;
-		background-color: white;
-		border-radius: 4px;
-	}
-
-	#search-container {
-		position: absolute;
-		top: 10px;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 1000;
-		width: 500px;
-		box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3);
-		background-color: white;
-		border-radius: 4px;
-		padding: 0;
-		/* Removed extra padding to match the input width */
-	}
-
-	#search-box {
-		width: 100%;
-		/* Ensures the input takes up the entire width of the container */
-		padding: 5px;
-		font-size: 16px;
-		border: 1px solid #ccc;
-		border-radius: 4px;
-		/* Rounded corners matching the container */
-		box-sizing: border-box;
-		/* Makes sure padding is considered in width */
-	}
-
-	#suggestions {
-		border: 1px solid #ccc;
-		border-radius: 4px;
-		max-height: 200px;
-		overflow-y: auto;
-		margin-top: 5px;
-		background-color: white;
-		display: none;
-		width: 100%;
-		/* Matches the width of the container and input */
-		box-sizing: border-box;
-		/* Ensures the width includes borders and padding */
-	}
-
-	#suggestions ul {
-		list-style: none;
-		padding: 0;
-		margin: 0;
-	}
-
-	#suggestions ul li {
-		padding: 5px;
-		cursor: pointer;
-	}
-
-	#suggestions ul li:hover {
-		background-color: #f0f0f0;
-	}
-
-	.section-notes {
-		padding: 20px;
-		border: 1px solid #ccc;
-		border-radius: 8px;
-		background: #f9f9f9;
-		width: 100%;
-		/* max-width: 600px; */
-		/* font-family: Arial, sans-serif; */
-	}
-
-	/* Each checkbox row */
-	.note-row {
-		display: flex;
-		align-items: flex-start;
-		margin-bottom: 12px;
-		gap: 10px;
-	}
-
-	/* Line text */
-	.note-text {
-		font-size: 13px;
-		line-height: 1.4;
-	}
-</style>
-
-<body>
-	<!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Street Vendor Entries</h5>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item" aria-current="page">Vending Committe</li>
-										<li class="breadcrumb-item active" aria-current="page">Add Street vendor</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<div class="container my-4">
-
-						<div class="card p-4 shadow"><span th:text="${LoginUserId}" style="display:none;"
-								id="userIdSpan"></span>
-							<form id="vendorForm" enctype="multipart/form-data">
-								<!-- Business Details -->
-								<div class="section-header">
-
-									<h5>Business Details | வியாபார விவரங்கள்</h5>
-								</div>
-								<div id="mapContainer" style="position: relative; height: 500px;">
-									<input id="pac-input" class="controls" type="text" placeholder="Search location">
-									<div id="googleMap" style="height: 90%; width: 100%;"></div>
-								</div>
-								<div id="search-container">
-									<!-- <input type="text" id="search-box" placeholder="Search for a location..."> -->
-									<div id="suggestions"></div>
-								</div>
-								<div class="row mb-3">
-
-									<div class="col-md-6">
-										<!-- <label for="latitude_field">Latitide</label>
-									<input type="text" class="form-control" id="latitude_field"> -->
-										<label for="latitude_field">Latitude</label>
-										<input type="text" class="form-control" id="latitude_field"
-											name="latitude_field" readonly>
-									</div>
-									<div class="col-md-6">
-										<!-- <label for="longitude_field">Longtitude</label>
-									<input type="text" class="form-control" id="longitude_field" name="longtitude"> -->
-										<label for="longitude_field">Longitude</label>
-										<input type="text" class="form-control" id="longitude_field"
-											name="longitude_field" readonly>
-									</div>
-
-								</div>
-
-
-								<div class="row mb-3">
-
-
-									<!-- <div class="col-md-6" >
-					          <label for="zone" class="form-label">Zone - மண்டலம் <span class="required">*</span></label>
-					          <select id="zone" name="zone" class="form-control" required >
-								  <option value="">-- Select Zone --</option>
-								  <th:block th:each="zone : ${zones}">
-								    <option th:value="${zone.id}" th:text="${zone.zone_name}"></option>
-								  </th:block>
-								</select>
-								
-								
-					        </div>
-					        
-					        
-					        
-					        <div class="col-md-6">
-					          <label for="ward" class="form-label">Ward - வார்டு <span class="required">*</span></label>
-					          <select id="ward" name="ward" class="form-control" required>
-							    <option value="">-- Select Ward --</option>
-							  </select>
-					        </div> -->
-
-									<div class="col-md-6">
-										<!-- <label for="latitude_field">Latitide</label>
-									<input type="text" class="form-control" id="latitude_field"> -->
-										<label for="zone">Zone</label>
-
-										<input type="text" class="form-control" id="zone" name="zone" readonly>
-									</div>
-
-									<div class="col-md-6">
-										<label for="ward">Ward</label>
-										<input type="text" class="form-control" id="ward" name="ward" readonly>
-									</div>
-
-								</div>
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Landmark (maximum 255 characters)</label>
-										<textarea class="form-control" id="landmark" name="landmark"
-											maxlength="255"></textarea>
-									</div>
-									<div class="col-md-6">
-										<label class="form-label">விற்பனை பகுதி</label>
-										<textarea class="form-control" id="landmark_tamil" name="landmark_tamil"
-											placeholder="தமிழில் பதிவு செய்யவும்"></textarea>
-									</div>
-								</div>
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">District</label>
-										<input type="text" class="form-control" id="vendor_district"
-											name="vendor_district"
-											oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')">
-									</div>
-									<div class="col-md-6">
-										<label class="form-label"> மாவட்டம்</label>
-										<input type="text" class="form-control" id="vendor_district_tamil"
-											name="vendor_district_tamil" placeholder="தமிழில் பதிவு செய்யவும்">
-									</div>
-
-								</div>
-
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Pincode</label>
-										<input type="text" class="form-control" id="vendor_pincode"
-											name="vendor_pincode" oninput="validatePincode(this)">
-
-									</div>
-								</div>
-
-								<div class="row mb-3">
-
-									<div class="col-md-6">
-										<label for="businesstype" class="form-label">Type of Business <span
-												class="text-danger">*</span>
-										</label>
-										<select id="businesstype" name="businesstype" class="form-control" required>
-											<option value="">-- Select Business Type --</option>
-											<th:block th:each="vendingCategory : ${vendingCategories}">
-												<option th:value="${vendingCategory.id}"
-													th:text="${vendingCategory.vending_category_name}"></option>
-											</th:block>
-										</select>
-
-									</div>
-
-
-									<div class="col-md-6">
-										<label for="tamilbusinesstype" class="form-label"> வியாபார வகை <span
-												class="text-danger">*</span>
-										</label>
-										<select id="tamilbusinesstype" name="tamilbusinesstype" class="form-control"
-											required>
-											<option value="">-- வியாபார வகையைத் தேர்ந்தெடுக்கவும் --</option>
-											<th:block th:each="tamilvendingCategory : ${tamilvendingCategories}">
-												<option th:value="${tamilvendingCategory.id}"
-													th:text="${tamilvendingCategory.tamil_vending_category_name}">
-												</option>
-											</th:block>
-										</select>
-									</div>
-								</div>
-
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Business Space (Sq ft)| வியாபார இடம் </label>
-										<input type="text" class="form-control" id="business_space"
-											name="business_space">
-									</div>
-								</div>
-
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Did you get SVANIDHI loan? | ஸ்வநிதி கடன்
-											வாங்கினீங்களா? </label><br>
-										<input type="radio" name="svanidhi" value="Yes"> Yes
-										<input type="radio" name="svanidhi" value="No" class="ms-3"> No
-									</div>
-									<div class="col-md-6">
-										<label class="form-label">Do you have a Bank Account? | வங்கி கணக்கு உள்ளதா?
-										</label><br>
-										<input type="radio" name="bank_account" value="Yes"> Yes
-										<input type="radio" name="bank_account" value="No" class="ms-3"> No
-									</div>
-
-
-									<div class="col-md-6" id="bank_passbook_container" style="display:none;">
-										<label for="bank_passbook" class="form-label">Upload Bank Passbook
-											(jpg/jpeg/pdf)
-										</label>
-										<input type="file" class="form-control" id="bank_passbook" name="bank_passbook"
-											accept=".jpg,.jpeg,.pdf,application/pdf">
-									</div>
-
-								</div>
-
-								<!-- Personal Details -->
-								<div class="section-header">
-									<h5>தனிப்பட்ட விவரங்கள் | Personal Details</h5>
-								</div>
-
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Profile Image (jpg/jpeg/pdf)</label>
-										<input type="file" class="form-control" id="profileimage"
-											accept=".jpg,.jpeg,.pdf,application/pdf" name="profileimage">
-									</div>
-								</div>
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label"> Name<span class="required">*</span></label>
-										<input type="text" class="form-control" id="name" name="name"
-											oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" required>
-									</div>
-									<div class="col-md-6">
-										<label class="form-label">பெயர் <span class="required">*</span></label>
-										<input type="text" class="form-control" id="name_tamil" name="name_tamil"
-											placeholder="தமிழில் பதிவு செய்யவும்" required>
-									</div>
-								</div>
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Father's / Husband's Name </label>
-										<input type="text" class="form-control" id="father_name" name="father_name"
-											oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')">
-									</div>
-									<div class="col-md-6">
-										<label class="form-label"> தந்தை/கணவர் பெயர் </label>
-										<input type="text" class="form-control" id="father_name_tamil"
-											name="father_name_tamil" placeholder="தமிழில் பதிவு செய்யவும்">
-									</div>
-								</div>
-
-								<div class="row mb-3">
-
-									<div class="col-md-6">
-										<label class="form-label">Gender | பாலினம் </label><br>
-										<input type="radio" name="gender" value="Male"> Male
-										<input type="radio" name="gender" value="Female" class="ms-3"> Female
-										<input type="radio" name="gender" value="Transgender" class="ms-3">Transgender
-									</div>
-
-									<div class="col-md-6">
-										<label class="form-label"> பாலினம் </label><br>
-										<input type="radio" name="gender_tamil" value="ஆண்"> ஆண்
-										<input type="radio" name="gender_tamil" value="பெண்" class="ms-3"> பெண்
-										<input type="radio" name="gender_tamil" value="பிற்பாலினர்"
-											class="ms-3">பிற்பாலினர்
-									</div>
-								</div>
-
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Mobile Number | மொபைல் எண் <span
-												class="required">*</span></label>
-										<input type="text" class="form-control" id="mobile_no" name="mobile_no"
-											oninput="validatePhoneNumber(this)" required>
-									</div>
-								</div>
-
-
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Date of Birth | பிறந்த தேதி </label>
-										<input type="date" id="dob" class="form-control" name="dob">
-									</div>
-									<div class="col-md-6">
-										<label class="form-label">Community Category | சமூக வகை </label>
-										<select class="form-control" id="community" name="community">
-											<option value="">-- Select Community --</option>
-											<th:block th:each="com : ${communities}">
-												<option th:value="${com.id}" th:text="${com.category_name}"></option>
-											</th:block>
-										</select>
-									</div>
-								</div>
-
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Differently Abled | இயலாமை உள்ளவரா? </label><br>
-										<input type="radio" name="differently_abled" value="Yes"> Yes
-										<input type="radio" name="differently_abled" value="No" class="ms-3"> No
-									</div>
-
-
-
-									<div class="col-md-6">
-										<label class="form-label">Street Vendor’s educational status | தெருவணிகரின்
-											கல்வித்தகுதி </label>
-										<select class="form-control" id="education" name="education">
-											<option value="">-- Select Education Status--</option>
-											<th:block th:each="edu : ${educationList}">
-												<option th:value="${edu.id}" th:text="${edu.education}"></option>
-											</th:block>
-										</select>
-									</div>
-								</div>
-
-
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label for="maritalstatus" class="form-label"> Marital Status | திருமண நிலை
-										</label>
-										<select class="form-control" id="maritalStatus" name="maritalStatus">
-											<option value="">-- Select Marital Status --</option>
-											<th:block th:each="status : ${maritalStatuses}">
-												<option th:value="${status.id}" th:text="${status.marital_status}">
-												</option>
-											</th:block>
-										</select>
-									</div>
-									<div class="col-md-6">
-										<label for="familymembers" class="form-label">Number of Family Members | குடும்ப
-											உறுப்பினர்கள் எண்ணிக்கை </label>
-										<input type="number" class="form-control" name="familymembers"
-											id="familymembers">
-									</div>
-								</div>
-
-								<div class="mb-3">
-									<label class="form-label">Are any of your family member involved in street vending |
-										உங்கள் குடும்ப உறுப்பினர் வியாபாரத்தில் உள்ளவரா? </label><br>
-									<input type="radio" name="fam_vendor" value="Yes"> Yes
-									<input type="radio" name="fam_vendor" value="No" class="ms-3"> No
-								</div>
-
-								<!-- Address -->
-								<div class="section-header">
-									<h5>Residential Address | வீட்டு முகவரி </h5>
-								</div>
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Door No | கதவு எண் </label>
-										<input type="text" class="form-control" name="doorno" id="doorno">
-									</div>
-									<div class="col-md-6">
-										<label class="form-label">Street Name | தெரு பெயர் </label>
-										<input type="text" class="form-control" name="streetname" id="streetname">
-									</div>
-								</div>
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Area Name | பகுதி பெயர் </label>
-										<input type="text" class="form-control" name="areaname" id="areaname">
-									</div>
-									<div class="col-md-6">
-										<label class="form-label">District | மாவட்டம் </label>
-										<input type="text" class="form-control" name="district" id="district"
-											oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')">
-									</div>
-								</div>
-
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Pincode | அஞ்சல் குறியீடு </label>
-										<input type="text" class="form-control" name="pincode" id="pincode"
-											oninput="validatePincode(this)">
-									</div>
-
-
-									<div class="col-md-6">
-										<label class="form-label">Aadhaar Number | ஆதார் எண் </label>
-										<input type="text" class="form-control" id="aadhar_number" name="aadhar_number"
-											maxlength="12" oninput="validateAadhar(this)">
-									</div>
-
-								</div>
-
-								<!-- Document Uploads -->
-								<div class="section-header">
-									<h5>ஆவணங்கள் | Document Uploads</h5>
-								</div>
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Aadhaar Front Image | ஆதார் முன்னணி படத்தை
-											பதிவேற்றவும் (jpg/jpeg/pdf)</label>
-										<input type="file" class="form-control" id="aadharfrontimage"
-											accept=".jpg,.jpeg,.pdf,application/pdf" name="aadharfrontimage">
-									</div>
-									<div class="col-md-6">
-										<label class="form-label">Aadhaar Back Image | ஆதார் பின்னணி படத்தை பதிவேற்றவும்
-											(jpg/jpeg/pdf)</label>
-										<input type="file" class="form-control" id="aadharbackimage"
-											accept=".jpg,.jpeg,.pdf,application/pdf" name="aadharbackimage">
-									</div>
-								</div>
-								<div class="row mb-3">
-									<div class="col-md-6">
-										<label class="form-label">Take Ration Card Front Image | ரேஷன் கார்டு முன்னணி
-											படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
-										<input type="file" class="form-control" id="ration_card_photo"
-											accept=".jpg,.jpeg,.pdf,application/pdf" name="ration_card_photo">
-									</div>
-								</div>
-
-
-								<div class="section-notes">
-
-									<div class="note-row">
-										<input type="checkbox">
-										<div class="note-text">I have no other means of livelihood except street vending
-											/ எனக்கு வேறு வாழ்வாதார வழிகள் எதுவும் இல்லை.</div>
-									</div>
-
-									<div class="note-row">
-										<input type="checkbox">
-										<div class="note-text">I shall carry on the business of street vending myself or
-											through any of my family member / நான் அல்லது என்னுடைய குடும்ப உறுப்பினர்
-											வாயிலாக தெரு விற்பனை தொழிலை மேற்கொள்வேன்.</div>
-									</div>
-
-									<div class="note-row">
-										<input type="checkbox">
-										<div class="note-text">I shall not transfer in any manner whatsoever, including
-											rent, the Certificate of Vending or the place specified therein to any other
-											person. / வாடகை, விற்பனைச் சான்றிதழ் அல்லது குறிப்பிடப்பட்டுள்ள இடம் உட்பட
-											எதையும் நான் வேறு எந்த நபருக்கும் எந்த வகையிலும் மாற்றம் செய்யமாட்டேன்.
-										</div>
-									</div>
-
-									<div class="note-row">
-										<input type="checkbox">
-										<div class="note-text">I certify that I have attained the age of 14 (fourteen
-											years). / எனக்கு 14 வயது (பதினான்கு வயது) பூர்த்தி அடைந்துவிட்டது,என்று
-											உறுதி அளிக்கிறேன்.</div>
-									</div>
-
-								</div>
-
-								<div class="text-center mt-2">
-									<span class="text-danger">*</span>Note: Click all the checkboxes above to submit the
-									form.
-								</div>
-
-
-								<!-- Submit -->
-								<div class="text-center mt-4">
-									<button type="submit" class="btn btn-success" name="submitBtn"
-										id="submitBtn">Submit</button>
-
-								</div>
-							</form>
-						</div>
-
-
-
-
-
-
-
-					</div>
-				</div>
-			</div>
-			<div id="pageLoader"
-				style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				<div style="position: relative; top: 50%; transform: translateY(-50%);">
-					<div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-						<span class="sr-only">Loading...</span>
-					</div>
-					<!-- Add the 'Please wait' text below the spinner -->
-					<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-	<!-- Bootstrap 5 JS -->
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-	<script sync defer
-		src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCi7N6uW5MZaSkd50Kzw7ax2GkMN1vjE-E&callback=myMap&libraries=places">
-		</script>
-	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-	<script src="https://www.gstatic.com/inputtools/js/ln/13/en.js"></script>
-	<script>
-		function allowTamilAndSymbols(id) {
-			const el = document.getElementById(id);
-
-			el.addEventListener("input", function () {
-				// Allowed:
-				// Tamil letters: \u0B80-\u0BFF
-				// Digits: 0-9
-				// Dot .      → \.
-				// Slash /    → \/
-				// Comma ,    → ,
-				// Hyphen -   → -
-				// Space      → \s
-				// Newline    → \n (included in \s)
-				this.value = this.value.replace(/[^\u0B80-\u0BFF0-9.,\/\-\s]/g, "");
-			});
-		}
-
-		allowTamilAndSymbols("landmark_tamil");
-		allowTamilAndSymbols("vendor_district_tamil");
-		allowTamilAndSymbols("name_tamil");
-		allowTamilAndSymbols("father_name_tamil");
-	</script>
-	<script>
-		document.addEventListener("DOMContentLoaded", function () {
-
-			const checkboxes = document.querySelectorAll(".section-notes input[type='checkbox']");
-			const submitBtn1 = document.getElementById("submitBtn");
-
-			submitBtn1.disabled = true; // button disabled initially
-
-			checkboxes.forEach(cb => {
-				cb.addEventListener("change", function () {
-					// check if all checkboxes are checked
-					const allChecked = [...checkboxes].every(box => box.checked);
-
-					submitBtn1.disabled = !allChecked;
-				});
-			});
-
-		});
-	</script>
-
-
-	<script>
-
-		//Script For Map
-
-		function myMap() {
-			const defaultCenter = { lat: 13.0827, lng: 80.2707 };
-			const map = new google.maps.Map(document.getElementById("googleMap"), {
-				center: defaultCenter,
-				zoom: 14
-			});
-
-			let marker = null;
-			let streetsList = []; // ✅ Define globally inside myMap
-			const infowindow = new google.maps.InfoWindow();
-
-			// 🔍 Initialize the SearchBox
-			const input = document.getElementById('pac-input');
-			const searchBox = new google.maps.places.SearchBox(input);
-			//map.controls[google.maps.ControlPosition.TOP_LEFT].push(input);
-
-			map.addListener('bounds_changed', function () {
-				searchBox.setBounds(map.getBounds());
-			});
-
-			searchBox.addListener('places_changed', function () {
-				const places = searchBox.getPlaces();
-				if (places.length === 0) return;
-
-				if (marker) marker.setMap(null);
-				const place = places[0];
-				if (!place.geometry) return;
-
-				marker = new google.maps.Marker({
-					map: map,
-					position: place.geometry.location
-				});
-
-				const lat = place.geometry.location.lat().toFixed(6);
-				const lng = place.geometry.location.lng().toFixed(6);
-				document.getElementById("latitude_field").value = lat;
-				document.getElementById("longitude_field").value = lng;
-
-				map.setCenter(place.geometry.location);
-				map.setZoom(15);
-
-				infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
-				infowindow.open(map, marker);
-
-				fetchStreets(lat, lng);
-			});
-
-			map.addListener("click", function (event) {
-				const clickedLatLng = event.latLng;
-				if (marker) marker.setMap(null);
-
-				marker = new google.maps.Marker({
-					position: clickedLatLng,
-					map: map
-				});
-
-				const lat = clickedLatLng.lat().toFixed(6);
-				const lng = clickedLatLng.lng().toFixed(6);
-
-				document.getElementById("latitude_field").value = lat;
-				document.getElementById("longitude_field").value = lng;
-
-				infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
-				infowindow.open(map, marker);
-
-				fetchStreets(lat, lng);
-			});
-
-			// ✅ Move fetchStreets here inside myMap, and use local streetsList
-			/* function fetchStreets(lat, lng) {
-				const encodedGeometry = encodeURIComponent(JSON.stringify({ y: lat, x: lng }));
-				const streetURL = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/0/query?` +
-					`where=&objectIds=&time=&geometry=${encodedGeometry}` +
-					`&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25` +
-					`&units=esriSRUnit_Meter&relationParam=&outFields=region%2Cnew_zone%2C+new_ward%2Croad_id%2C+road_name%2Cgis_id%2Ctype` +
-					`&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=` +
-					`&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=` +
-					`&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=` +
-					`&resultRecordCount=&returnTrueCurves=false&returnExceededLimitFeatures=false&quantizationParameters=&returnCentroid=false` +
-					`&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault` +
-					`&datumTransformation=&f=geojson`;
-	
-				const streetSelect = document.getElementById("streetName");
-				streetSelect.innerHTML = "";
-	
-				const defaultOption = document.createElement("option");
-				defaultOption.value = "";
-				defaultOption.text = "-- Select Street --";
-				streetSelect.appendChild(defaultOption);
-	
-				document.getElementById("streetId").value = "";
-				document.getElementById("landmark").value = "";
-				
-				// Timeout mechanism: 1 seconds
-				const timeout = new Promise((_, reject) =>
-					setTimeout(() => reject(new Error("Request timed out")), 1000)
-				);
-	
-				// Actual fetch
-				const fetchRequest = fetch(streetURL).then(res => res.json());
-	
-				Promise.race([fetchRequest, timeout])
-					.then(data => {
-						const features = data.features;
-						if (!features || features.length === 0) {
-							Swal.fire({
-								icon: 'warning',
-								title: 'No Street Found',
-								text: 'Please select the nearby street.',
-							});
-							return;
-						}
-	
-						streetsList = features.map(f => f.properties); //Save for use in dropdown
-						streetsList.forEach((props, index) => {
-							const option = document.createElement("option");
-							option.value = index;
-							option.text = props.road_name;
-							streetSelect.appendChild(option);
-						});
-					})
-					.catch(err => {
-						console.error("Error fetching street:", err);
-						Swal.fire("Failed to load street data", '', 'error');
-					});
-			} */
-
-			/* document.getElementById("streetName").addEventListener("change", function () {
-				const selectedIndex = this.value;
-				if (selectedIndex !== "") {
-					const selectedStreet = streetsList[selectedIndex];
-	
-					document.getElementById("streetId").value = selectedStreet.road_id;
-					document.getElementById("landmark").value = selectedStreet.type;
-					// document.getElementById("zone").value = selectedStreet.new_zone;
-					// document.getElementById("ward").value = selectedStreet.new_ward;
-	
-					console.log("Selected street:", selectedStreet);
-				} else {
-					document.getElementById("streetId").value = "";
-					document.getElementById("landmark").value = "";
-					// document.getElementById("zone").value = "";
-					// document.getElementById("ward").value = "";
-				}
-			}); */
-
-
-			function fetchStreets(lat, lng) {
-				const encodedGeometry = encodeURIComponent(JSON.stringify({ y: lat, x: lng }));
-				//const url = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/
-				//FeatureServer/2/query?where=&objectIds=&time=&geometry={encodedGeometry}&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=1&units=esriSRUnit_Meter&outFields=zone,ward&returnGeometry=false&f=geojson`;
-
-				const url = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/2/query?` +
-					`where=&objectIds=&time=&geometry=${encodedGeometry}` +
-					`&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=1` +
-					`&units=esriSRUnit_Meter&relationParam=&outFields=zone,ward` +
-					`&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=` +
-					`&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=` +
-					`&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=` +
-					`&resultRecordCount=&returnTrueCurves=false&returnExceededLimitFeatures=false&quantizationParameters=&returnCentroid=false` +
-					`&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault` +
-					`&datumTransformation=&f=geojson`;
-				fetch(url)
-					.then(response => {
-						if (!response.ok) {
-							throw new Error(`HTTP error! Status: ${response.status}`);
-						}
-						return response.json();
-					})
-					.then(data => {
-
-						console.log("GIS API Response:", data);
-
-						const features = data.features;
-						if (features.length > 0) {
-							const props = features[0].properties;
-							const zone = props.zone;
-							const ward = props.ward;
-
-							console.log("Zone:", zone, "Ward:", ward);
-							// 👉 You can update form fields or DOM elements here
-							document.getElementById("zone").value = zone;
-							document.getElementById("ward").value = ward;
-						} else {
-							console.warn("No zone/ward found for this location.");
-							document.getElementById("zone").value = '';
-							document.getElementById("ward").value = '';
-						}
-					})
-					.catch(error => {
-						console.error("Error fetching zone/ward:", error);
-					});
-			}
-		}
-		/* function fetchSuggestions(query) {
-			// ArcGIS API URL to fetch suggestions based on the input query
-			const arcgisSuggestionUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=UPPER(road_name)%20LIKE%20'%25${query.toUpperCase()}%25'&outFields=road_name,zone,ward,road_id&returnGeometry=true&f=geojson`;
-
-			fetch(arcgisSuggestionUrl)
-				.then(response => response.json())
-				.then(data => {
-					var suggestions = document.getElementById('suggestions');
-					suggestions.innerHTML = '';
-
-					if (data.features && data.features.length > 0) {
-						suggestions.style.display = 'block';
-						var ul = document.createElement('ul');
-						data.features.forEach(function (result) {
-							var lat = result.geometry.coordinates[1];
-							var lng = result.geometry.coordinates[0];
-							var roadName = result.properties.road_name || 'Unknown Road';
-							 var zone = result.properties.zone || 'Unknown Zone';
-							var ward = result.properties.ward || 'Unknown Ward'; 
-							var roadId = result.properties.road_id || 'Unknown Road ID'
-
-							// Creating the suggestion item with road name, zone, and ward
-							var li = document.createElement('li');
-							li.textContent = `${roadName} - Zone: ${zone}, Ward: ${ward}`;
-							li.dataset.latlng = JSON.stringify([lat, lng]);
-							li.dataset.roadName = roadName;
-							li.dataset.roadId = roadId;
-								li.dataset.zone = zone;
-								li.dataset.ward = ward; 
-							ul.appendChild(li);
-						});
-						suggestions.appendChild(ul);
-					} else {
-						suggestions.style.display = 'none';
-					}
-				})
-				.catch(error => console.error('Error fetching suggestions:', error));
-		} */
-
-		/* function fetchLocationInfoByMap(lat, lng, marker) {
-			const arcgisUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=&objectIds=&time=&geometry=%7B%22y%22%3A${lat}%2C%22x%22%3A${lng}%7D&geometryType=esriGeometryEnvelope&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25&units=esriSRUnit_Meter&relationParam=&outFields=zone%2Cward%2Croad_id%2Croad_name&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=&resultRecordCount=&returnTrueCurves=false&returnCentroid=false&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&datumTransformation=&lodType=geohash&lod=&lodSR=&f=geojson`;
-
-			fetch(arcgisUrl)
-				.then(response => response.json())
-				.then(data => {
-					console.log(data);
-					let info;
-					if (data.features && data.features.length > 0) {
-						const properties = data.features[0].properties;
-						const roadName = properties.road_name || 'N/A';
-							  const zone = properties.zone || 'N/A';
-							const ward = properties.ward || 'N/A'; 
-						const roadId = properties.road_id || 'N/A';
-
-						info = `Road Name: ${roadName}<br>Zone: ${zone}<br>Ward: ${ward}<br>Latitude: ${lat}<br>Longitude: ${lng}`;
-						document.getElementById("street").value = roadName;
-						document.getElementById("latitude_field").value = lat;
-						document.getElementById("longitude_field").value = lng;
-						//document.getElementById("street_id").value = roadId;
-						document.getElementById("streetId").value = roadId;
-						document.getElementById("landmark").value = roadName;
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					} else {
-						document.getElementById("street").value = "No road data found for this location";
-						document.getElementById("latitude_field").value = "No latitude data found for this location";
-						document.getElementById("longitude_field").value = "No latitude data found for this location";
-						//document.getElementById("street_id").value = "No street id data found for this location";
-						document.getElementById("streetId").value = "No street id data found for this location";
-						document.getElementById("landmark").value = "No landmark data found for this location";
-						info = `No road data found for this location`
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					}
-				})
-				.catch(error => {
-					console.error('Error fetching road data:', error);
-					marker.bindTooltip(`Error fetching road data.<br>Latitude: ${lat}<br>Longitude: ${lng}`, {permanent: false, direction: 'top'}).openTooltip();
-				});
-		} */
-
-		/* function fetchLocationInfoBySuggestions(lat, lng, marker) {
-			const arcgisUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=&objectIds=&time=&geometry=%7B%22y%22%3A${lat}%2C%22x%22%3A${lng}%7D&geometryType=esriGeometryEnvelope&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25&units=esriSRUnit_Meter&relationParam=&outFields=zone%2Cward%2Croad_id%2Croad_name&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=&resultRecordCount=&returnTrueCurves=false&returnCentroid=false&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&datumTransformation=&lodType=geohash&lod=&lodSR=&f=geojson`;
-
-			fetch(arcgisUrl)
-				.then(response => response.json())
-				.then(data => {
-					console.log(data);
-					let info;
-					if (data.features && data.features.length > 0) {
-						const properties = data.features[0].properties;
-						const roadName = properties.road_name || 'N/A';
-								const zone = properties.zone || 'N/A';
-								const ward = properties.ward || 'N/A'; 
-						const roadId = properties.road_id || 'N/A';
-
-						info = `Road Name: ${roadName}<br>Zone: ${zone}<br>Ward: ${ward}<br>Latitude: ${lat}<br>Longitude: ${lng}`;
-						document.getElementById("street").value = roadName;
-						document.getElementById("latitude_field").value = lat;
-						document.getElementById("longitude_field").value = lng;
-						//document.getElementById("street_id").value = roadId;
-						document.getElementById("streetId").value = roadId;
-						document.getElementById("landmark").value = roadName;
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					} else {
-						document.getElementById("street").value = suggestedRoadName;
-						document.getElementById("latitude_field").value = lat;
-						document.getElementById("longitude_field").value = lng;
-						//document.getElementById("street_id").value = suggestedRoadId;
-						document.getElementById("streetId").value = suggestedRoadId;
-						document.getElementById("landmark").value = suggestedRoadName;
-						info = `Road Name: ${suggestedRoadName}<br>Zone: ${suggestedZone}<br>Ward: ${suggestedWard}<br>Latitude: ${lat}<br>Longitude: ${lng}`
-						marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
-					}
-				})
-				.catch(error => {
-					console.error('Error fetching road data:', error);
-					marker.bindTooltip(`Error fetching road data.<br>Latitude: ${lat}<br>Longitude: ${lng}`, {permanent: false, direction: 'top'}).openTooltip();
-				});
-		} */
-
-
-
-
-
-
-		$(document).ready(function () {
-
-			/* $('#zone').on('change', function () {
-				var zoneId = $(this).val();
-				$('#ward').html('<option value="">-- Loading Wards --</option>');
-
-				if (zoneId) {
-					$.ajax({
-						url: '/gcc/api/streetvendor/wards-by-zone',
-						type: 'GET',
-						data: { zoneId: zoneId },
-						success: function (data) {
-							$('#ward').empty().append('<option value="">-- Select Ward --</option>');
-							$.each(data, function (i, ward) {
-								$('#ward').append(`<option value="${ward.id}">${ward.ward_name}</option>`);
-							});
-						},
-						error: function () {
-							$('#ward').html('<option value="">-- Error Loading Wards --</option>');
-						}
-					});
-				} else {
-					$('#ward').html('<option value="">-- Select Ward --</option>');
-				}
-			}); */
-
-			$('#business_space').on('input', function () {
-				// Remove anything that is not a digit
-				this.value = this.value.replace(/\D/g, '');
-
-				// Limit to max 2 digits
-				if (this.value.length > 2) {
-					this.value = this.value.slice(0, 2);
-				}
-			});
-
-			// Show&hide bank passbook input
-			$("input[name='bank_account']").change(function () {
-				if ($(this).val() === "Yes") {
-					$("#bank_passbook_container").show();
-				} else {
-					$("#bank_passbook_container").hide();
-					$("#bank_passbook").val("");
-				}
-			});
-
-			// Form submit
-			$('#vendorForm').submit(function (e) {
-				e.preventDefault();
-
-				let formData = new FormData(this);
-				$('#submitBtn').prop('disabled', true).text('Saving...');
-
-				// Mobile validation + check
-				const mobileNumber = $('#mobile_no').val();
-				if (!/^\d{10}$/.test(mobileNumber)) {
-					Swal.fire("Invalid Mobile Number", "Enter a valid 10-digit number.", "error");
-					$('#submitBtn').prop('disabled', false).text('Submit');
-					return;
-				}
-				
-				const czone = $('#zone').val().trim();
-		        if (czone==="") {
-		            Swal.fire("Missing Zone", "Please Click on Map", "info");
-		            $('#submitBtn').prop('disabled', false).text('Submit');
-		            return;
-		        }
-		        const cward = $('#ward').val().trim();
-		        if (cward==="") {
-		            Swal.fire("Missing Ward", "Please Click on Map", "info");
-		            $('#submitBtn').prop('disabled', false).text('Submit');
-		            return;
-		        }
-
-
-				$('#pageLoader').show();
-				$.ajax({
-					url: '/gcc/api/streetvendor/check-mobile',
-					type: 'GET',
-					data: { mobilenumber: mobileNumber },
-					success: function (resp) {
-						$('#pageLoader').hide();
-						console.log("Check-mobile response:", resp);
-						if (resp.exists === false) {
-							//console.log("New mobile → allowed");
-							proceedSubmission(mobileNumber, formData);
-							return;
-						}
-						if (resp.blocked === true) {
-							Swal.fire(
-								'Not Allowed',
-								'This mobile number is already processed.',
-								'warning'
-							);
-							$('#submitBtn').prop('disabled', false).text('Submit');
-							return;
-						}
-						//console.log("Mobile exists but allowed (Rejected case)");
-						proceedSubmission(mobileNumber, formData);
-					},
-					error: function () {
-						$('#pageLoader').hide();
-						Swal.fire({
-							icon: 'error',
-							title: 'Submission Error',
-							text: 'Something went wrong while Checking duplicate.'
-						});
-						$('#submitBtn').prop('disabled', false).text('Submit');
-					}
-
-				});
-			});
-		});
-
-
-		function proceedSubmission(mobileNumber, formData) {
-			$('#pageLoader').show();
-			function setIfPresent(formData, key, value) {
-				if (value !== undefined && value !== null && value !== "") {
-					formData.set(key, value);
-				}
-			}
-
-			function setFileIfPresent(formData, key, fileInput) {
-				if (fileInput && fileInput.files && fileInput.files.length > 0) {
-					formData.set(key, fileInput.files[0]);
-				}
-			}
-
-			let userId = document.getElementById('userIdSpan').textContent;
-
-			// pm_svanidhi_loan
-			let svanidhiVal = $("input[name='svanidhi']:checked").val();
-			setIfPresent(formData, "pm_svanidhi_loan", svanidhiVal === undefined ? "" : svanidhiVal === "Yes");
-			//formData.set("pm_svanidhi_loan", svanidhiVal === undefined ? "" : svanidhiVal === "Yes");
-
-			// bank_acc_status
-			let bankVal = $("input[name='bank_account']:checked").val();
-			setIfPresent(formData, "bank_acc_status", bankVal === undefined ? "" : bankVal === "Yes");
-
-			// diff_abled
-			let diffVal = $("input[name='differently_abled']:checked").val();
-			setIfPresent(formData, "diff_abled", diffVal === undefined ? "" : diffVal === "Yes");
-
-			// are_any_fam_mem_invol_str
-			let famVal = $("input[name='fam_vendor']:checked").val();
-			setIfPresent(formData, "are_any_fam_mem_invol_str", famVal === undefined ? "" : famVal === "Yes");
-
-
-			// File check if bank status is Yes
-			const isBankYes = $("input[name='bank_account']:checked").val() === "Yes";
-			//setIfPresent(formData, "bank_acc_status", isBankYes === undefined ? "" : isBankYes === "Yes");
-			const bankPassbook = $('#bank_passbook')[0]?.files[0];
-			if (isBankYes && !bankPassbook) {
-				Swal.fire('Missing Bank Passbook', 'Bank passbook is required because Bank Account Status is Yes.', 'warning');
-				$('#submitBtn').prop('disabled', false).text('Submit');
-				return;
-			}
-
-			if (isBankYes) {
-				setFileIfPresent(formData, "bank_passbook", $('#bank_passbook')[0]);
-			}
-
-			//if (isBankYes) setFileIfPresent(formData, "bank_passbook", $('#bank_passbook')[0]);
-
-			// Lat/Lng
-			const latitude = $('#latitude_field').val().trim();
-			const longitude = $('#longitude_field').val().trim();
-
-			/*ormData.set("latitude", latitude);
-			formData.set("longitude", longitude); */
-
-			setIfPresent(formData, "latitude", latitude);
-			setIfPresent(formData, "longitude", longitude);
-
-			const landmarkval = $('#landmark').val().trim();
-			setIfPresent(formData, "landmark", landmarkval);
-
-			const zone = $('#zone').val().trim();
-			const ward = $('#ward').val().trim();
-
-			//formData.set("zone", zone);
-			//formData.set("ward", ward);
-
-			setIfPresent(formData, "zone", zone);
-			setIfPresent(formData, "ward", ward);
-
-			// Pincode validation
-			const vendingPincode = $('#vendor_pincode').val().trim();
-			if (vendingPincode !== "" && !/^\d{6}$/.test(vendingPincode)) {
-				$('#pageLoader').hide();
-				Swal.fire("Invalid vending place pincode", "Pincode must be 6 digits.", "error");
-				$('#submitBtn').prop('disabled', false).text('Submit');
-				return;
-			}
-			setIfPresent(formData, "vending_pincode", vendingPincode);
-
-			const presentPincode = $('#pincode').val().trim();
-			if (presentPincode !== "" && !/^\d{6}$/.test(presentPincode)) {
-				$('#pageLoader').hide();
-				Swal.fire("Invalid Present place Pincode", "Pincode must be 6 digits.", "error");
-				$('#submitBtn').prop('disabled', false).text('Submit');
-				return;
-			}
-			setIfPresent(formData, "present_pincode", presentPincode);
-
-			// Aadhaar validation
-			const aadharNo = $('#aadhar_number').val().trim();
-			if (aadharNo !== "" && !/^\d{12}$/.test(aadharNo)) {
-				$('#pageLoader').hide();
-				Swal.fire("Invalid Aadhaar Number", "Aadhaar number must be 12 digits.", "error");
-				$('#submitBtn').prop('disabled', false).text('Submit');
-				return;
-			}
-
-			setIfPresent(formData, "aadharNo", aadharNo);
-
-			setIfPresent(formData, "mobile_number", mobileNumber);
-
-			// Set other fields
-			setIfPresent(formData, "vending_district", $('#vendor_district').val());
-			setIfPresent(formData, "vending_category", $('#businesstype').val());
-			setIfPresent(formData, "tamilvending_category", $('#tamilbusinesstype').val());
-			setIfPresent(formData, "vending_space", $('#business_space').val());
-
-
-
-			setIfPresent(formData, "name", $('#name').val());
-			setIfPresent(formData, "f_h_name", $('#father_name').val());
-
-			const dobValue = new Date($('#dob').val());
-			const today = new Date();
-			const age14Date = new Date(
-				today.getFullYear() - 14,
-				today.getMonth(),
-				today.getDate()
-			);
-
-			if (dobValue > age14Date) {
-				Swal.fire("Invalid Age", "Applicant must be at least 14 years old.", "error");
-				return;
-			}
-
-			setIfPresent(formData, "dob", $('#dob').val());
-
-
-			let genderVal = $("input[name='gender']:checked").val();
-			setIfPresent(formData, "gender", genderVal);
-
-			setIfPresent(formData, "social_category", $('#community').val());
-			setIfPresent(formData, "education_status", $('#education').val());
-			setIfPresent(formData, "marital_status", $('#maritalStatus').val());
-			setIfPresent(formData, "no_of_fam_mem", $('#familymembers').val());
-
-			setIfPresent(formData, "door_no", $('#doorno').val());
-			setIfPresent(formData, "streetname", $('#streetname').val());
-			setIfPresent(formData, "areaname", $('#areaname').val());
-			setIfPresent(formData, "present_district", $('#district').val());
-
-			//formData.set("street_vendor_photo", $('#profileimage')[0].files[0]);
-			setFileIfPresent(formData, "street_vendor_photo", $('#profileimage')[0]);
-			setFileIfPresent(formData, "ration_card_photo", $('#ration_card_photo')[0]);
-			setFileIfPresent(formData, "aadhar_front_photo", $('#aadharfrontimage')[0]);
-			setFileIfPresent(formData, "aadhar_back_photo", $('#aadharbackimage')[0]);
-
-
-			setIfPresent(formData, "tamil_name", $('#name_tamil').val());
-			setIfPresent(formData, "tamil_f_h_name", $('#father_name_tamil').val());
-			let landmarkvaltamil = $('#landmark_tamil').val().trim();
-			setIfPresent(formData, "tamil_landmark", landmarkvaltamil);
-			setIfPresent(formData, "tamil_present_district", $('#vendor_district_tamil').val());
-			let genderValtamil = $("input[name='gender_tamil']:checked").val();
-			setIfPresent(formData, "tamil_gender", genderValtamil);
-
-			formData.set("userId", userId);
-
-			for (let pair of formData.entries()) {
-				console.log(pair[0] + ':', pair[1]);
-			}
-
-			// Final submit
-			$.ajax({
-				url: '/gcc/api/streetvendor/saveDetails',
-				type: 'POST',
-				data: formData,
-				enctype: 'multipart/form-data',
-				processData: false,
-				contentType: false,
-				success: function (response) {
-					$('#pageLoader').hide();
-					if (response.status) {
-						Swal.fire({
-							icon: 'success',
-							title: 'Details are Saved Successfully',
-							html: 'Reference ID: <b>' + response.vendor_req_id + '</b>'
-						});
-						$('#vendorForm')[0].reset();
-					} else {
-						$('#pageLoader').hide();
-						Swal.fire({
-							icon: 'error',
-							title: 'Save Failed',
-							text: response.description || 'Something went wrong!'
-						});
-					}
-					$('#submitBtn').prop('disabled', false).text('Submit');
-				},
-				error: function () {
-					$('#pageLoader').hide();
-					Swal.fire({
-						icon: 'error',
-						title: 'Submission Error',
-						text: 'Something went wrong while submitting the form.'
-					});
-					$('#submitBtn').prop('disabled', false).text('Submit');
-				}
-			});
-		}
-
-		// Validation helpers
-		function validatePhoneNumber(input) {
-			input.value = input.value.replace(/[^0-9]/g, '').slice(0, 10);
-		}
-
-		function validatePincode(input) {
-			input.value = input.value.replace(/[^0-9]/g, '').slice(0, 6);
-			//const errorDiv = document.getElementById('pincode_error');
-			//errorDiv.style.display = (input.value.length > 0 && input.value.length < 6) ? 'block' : 'none';
-		}
-
-		function validateAadhar(input) {
-			input.value = input.value.replace(/[^0-9]/g, '').slice(0, 12);
-		}
-
-		// DOB max date
-		document.addEventListener("DOMContentLoaded", function () {
-
-			const dobInput = document.getElementById("dob");
-
-			const today = new Date();
-
-			// Subtract 14 years
-			const minAgeDate = new Date(
-				today.getFullYear() - 14,
-				today.getMonth(),
-				today.getDate()
-			);
-
-			// Format to yyyy-mm-dd
-			const formattedDate = minAgeDate.toISOString().split("T")[0];
-
-			// Set maximum allowed date
-			dobInput.setAttribute("max", formattedDate);
-
-			// Open picker on focus (optional)
-			dobInput.addEventListener("focus", function () {
-				if (typeof dobInput.showPicker === "function") {
-					dobInput.showPicker();
-				}
-			});
-
-		});
-
-
-	</script>
-
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vendors/streetVendorRequestList.html b/src/main/resources/templates/modules/vendors/streetVendorRequestList.html
deleted file mode 100644
index 92b849b6..00000000
--- a/src/main/resources/templates/modules/vendors/streetVendorRequestList.html
+++ /dev/null
@@ -1,1621 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-	color: red;
-}
-/* Mobile screens - targeting devices with a max width of 767px */
-@media (max-width: 767px) 
-{
-	#requestlistform label{
-		margin-top: 10px;
-	} 
-}
-
-    #viewModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-    
-    .custom-doc-btn {
-  height: 20px;
-  width: 80px;
-  font-size: 9px;
-  font-weight:bold;
-  text-align: center;
-  padding: 0px;
-  border:1px solid grey;
-}
-
-.col-md-3{
-padding-bottom: 10px; 
-}
-
-.comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-    
-        #EditModal .modal-body {
-        max-height: 80vh;  
-        overflow-y: auto;  
-    }
-    
-    
-    card-block {
-    padding: 20px;
-}
-
-.form-label {
-    margin-bottom: 0.5rem;
-}
-
-input.form-control {
-    padding: 10px;
-}
-.form-select {
-    padding: 10px;
-    height: 40px;
-}
-
-/*css for map in step2*/
-		#googleMap {
-			height: 300px;
-			width: 100%;
-			position: relative;
-			overflow: hidden;
-			max-width: 100%;
-		}
-		
-		#pac-input {
-		    position: absolute;
-		    top: 10px;
-		    left: 50%;
-		    transform: translateX(-50%);
-		    width: 300px;
-		    z-index: 5;
-		    padding: 10px;
-		    border: 1px solid #ccc;
-		    background-color: white;
-		    border-radius: 4px;
-		  }
-
-		#search-container {
-			position: absolute;
-			top: 10px;
-			left: 50%;
-			transform: translateX(-50%);
-			z-index: 1000;
-			width: 500px;
-			box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3);
-			background-color: white;
-			border-radius: 4px;
-			padding: 0;
-			/* Removed extra padding to match the input width */
-		}
-
-		#search-box {
-			width: 100%;
-			/* Ensures the input takes up the entire width of the container */
-			padding: 5px;
-			font-size: 16px;
-			border: 1px solid #ccc;
-			border-radius: 4px;
-			/* Rounded corners matching the container */
-			box-sizing: border-box;
-			/* Makes sure padding is considered in width */
-		}
-
-		#suggestions {
-			border: 1px solid #ccc;
-			border-radius: 4px;
-			max-height: 200px;
-			overflow-y: auto;
-			margin-top: 5px;
-			background-color: white;
-			display: none;
-			width: 100%;
-			/* Matches the width of the container and input */
-			box-sizing: border-box;
-			/* Ensures the width includes borders and padding */
-		}
-		.pac-container {
-    z-index: 2000 !important; /* higher than modal's z-index */
-}
-
-		#suggestions ul {
-			list-style: none;
-			padding: 0;
-			margin: 0;
-		}
-
-		#suggestions ul li {
-			padding: 5px;
-			cursor: pointer;
-		}
-
-		#suggestions ul li:hover {
-			background-color: #f0f0f0;
-		}
-</style>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Street Vendor Req List</h5>
-										<span>Vending Committe</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Vending Committe</li>
-										<li class="breadcrumb-item active" aria-current="page">Street Vendor Req List</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					<div class="row">
-					
-						
-						<div class="col-md-12" >
-						    <div class="card">
-						        <div class="card-block">
-						        
-						        <!-- <div class="form-group col-sm-12">
-							        <label for="dropdownevent">Select Event
-							        <span class="text-danger">*</span></label>
-							        <select id="dropdownevent" class="form-control">							          
-							        </select>
-							    </div>	 -->
-						        
-						        
-						        <div class="page-header-title" >
-									<h5 style="margin: 0;font-weight: bold;">Request List (Web)- Created by Login ID: <span th:text="${LoginUserId}" id="userIdSpan"></span></h5><hr>
-							   </div> 
-						        
-						            <div>
-						                <table id="RequestListDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-						                    <thead class="thead-dark">
-						                        <tr role="row">
-						                            <th class="text-center">S.No</th>                                                  
-						                            <th class="text-center">Request No</th>
-						                            <th class="text-center">Name</th>
-						                            <th class="text-center">Mobile</th>
-						                            <th class="text-center">Address</th>
-						                            <th class="text-center">Postal Code</th>                                                                                               
-						                            <th class="text-center no-sort">Action</th> 
-						                        </tr>
-						                    </thead>
-						                    <tbody>
-						                        
-						                    </tbody>
-						                    <tfoot class="thead-dark">
-						                        <tr>
-						                            <th class="text-center">S.No</th>                                                  
-						                            <th class="text-center">Request No</th>
-						                            <th class="text-center">Name</th>
-						                            <th class="text-center">Mobile</th>
-						                            <th class="text-center">Address</th>
-						                            <th class="text-center">Postal Code</th> 
-						                            <th class="text-center no-sort">Action</th>                            
-						                        </tr>
-						                    </tfoot>
-						                </table>
-						            </div>
-						        </div>
-						    </div>
-						</div>
-
-
-
-
-
-						
-                      </div>
-                        
-                        
-                     </div>
-                </div>
-                
-                
-                <!-- Modal -->
-				<div class="modal fade" id="viewModal" tabindex="-1" aria-labelledby="viewModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-				  <div class="modal-dialog modal-lg">
-				    <div class="modal-content">
-				      <div class="modal-header">
-				        <h5 class="modal-title" id="viewModalLabel">Request Details</h5>
-				       <button type="button" class="close"  data-bs-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-				      </div>
-				      <div class="modal-body" id="modalBodyContent">
-				        <!-- Dynamic content loads here -->
-				      </div>
-				      <div class="modal-footer">
-				        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-
-
-				<!-- Image Modal -->
-                <div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
-				  <div class="modal-dialog modal-dialog-scrollable modal-lg">
-				    <div class="modal-content border-0">
-				      <div class="modal-body p-0 text-center" style="background-color: #f8f9fa;">
-				        <div id="docContainer" style="max-height: 90vh; overflow: auto;"></div>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-				
-				
-				<!-- Edit Modal -->
-				<div class="modal fade" id="EditModal" tabindex="-1" aria-labelledby="EditModalLabel" aria-hidden="true">
-	    			<div class="modal-dialog modal-xl">
-	        			<div class="modal-content">
-	            			<div class="modal-header">
-	                			<h5 class="modal-title"><span id="vendor_req_id"></span> - Edit Details</h5>
-	                
-	                			<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-									<span aria-hidden="true">&times;</span>
-								</button>
-	            			</div>
-	            			<div class="modal-body">
-	                			<!-- <span th:text="${LoginUserId}" style="display:none;" id="userIdSpan"></span> -->
-	                			
-	                			 <div id="raw_bank_passbook" style="display: none;"></div>
-							     <div id="raw_street_vendor_photo" style="display: none;"></div>
-							     <div id="raw_aadhar_front_photo" style="display: none;"></div>
-							     <div id="raw_aadhar_back_photo" style="display: none;"></div>
-							     <div id="raw_ration_card_photo" style="display: none;"></div>
-	                			
-	                			<form id="vendorForm" enctype="multipart/form-data" >
-	                			<div class="section-header">				    
-				      				<h5>Business Details | வியாபார விவரங்கள்</h5>
-				      			</div>
-				      			
-				      			<div id="mapContainer" style="position: relative; height: 500px;">
-								  	<input id="pac-input" class="controls" type="text" placeholder="Search location">
-								  	<div id="googleMap" style="height: 90%; width: 100%;"></div>
-								</div>
-								<div id="search-container">
-									<!-- <input type="text" id="search-box" placeholder="Search for a location..."> -->
-									<div id="suggestions"></div>
-								</div>
-								
-								<div class="row mb-3">
-								
-									<div class="col-md-6">									
-										<label for="latitude_field">Latitude</label>
-										<input type="text" class="form-control" id="latitude_field" name="latitude_field"  readonly >
-									</div>
-							   		<div class="col-md-6">									
-										<label for="longitude_field">Longitude</label>
-										<input type="text" class="form-control" id="longitude_field" name="longitude_field"  readonly >
-									</div>
-								
-								</div>
-								
-								<div class="row mb-3">
-									<div class="col-md-6">									
-										<label for="zone">Zone</label>					        
-						        		<input type="text" class="form-control" id="zone" name="zone"  readonly>
-					        		</div>
-					        
-							        <div class="col-md-6">
-								        <label for="ward">Ward</label>
-										<input type="text" class="form-control" id="ward" name="ward" readonly>
-							        </div>
-								</div>
-								
-								<div class="row mb-3">
-									<div class="col-md-6">	
-								        <label class="form-label">Landmark (maximum 255 characters)</label>
-								        <textarea class="form-control" id="landmark" name="landmark" maxlength="255"></textarea>
-							        </div>
-							        <div class="col-md-6">
-								        <label class="form-label">விற்பனை பகுதி</label>
-								        <textarea class="form-control" id="landmark_tamil" name="landmark_tamil"  placeholder="தமிழில் பதிவு செய்யவும்"></textarea>
-							        </div>
-							    </div>
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">District | மாவட்டம்</label>
-					          <input type="text" class="form-control" id="vendor_district" name="vendor_district" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
-					        </div>
-					       <div class="col-md-6">
-					          <label class="form-label"> மாவட்டம்</label>
-					          <input type="text" class="form-control" id="vendor_district_tamil" name="vendor_district_tamil"  placeholder="தமிழில் பதிவு செய்யவும்">
-					        </div>
-					      </div>
-					      
-					      <div class="row mb-3">
-					      	 <div class="col-md-6">
-					          <label class="form-label">Pincode | அஞ்சல் குறியீடு</label>
-					          <input type="text" class="form-control" id="vendor_pincode" name="vendor_pincode" oninput="validatePincode(this)" >
-					         		 
-					        </div>
-					      </div>
-					
-					      <div class="row mb-3">
-					      
-					      <div class="col-md-6">
-								<label for="businesstype" class="form-label">Type of Business <span class="text-danger">*</span>
-								</label> 
-									<select id="businesstype" name="businesstype" class="form-control"  required>
-								  <option value="">-- Select Business Type --</option>
-								  <th:block th:each="vendingCategory : ${vendingCategories}">
-								    <option th:value="${vendingCategory.id}" th:text="${vendingCategory.vending_category_name}"></option>
-								  </th:block>
-								</select>
-								
-							</div>
-					        
-					          
-					        <div class="col-md-6">
-					         	<label for="tamilbusinesstype" class="form-label"> வியாபார வகை <span class="text-danger">*</span>
-								</label> 
-									<select id="tamilbusinesstype" name="tamilbusinesstype" class="form-control"  required>
-								  <option value="">-- வியாபார வகையைத் தேர்ந்தெடுக்கவும் --</option>
-								  <th:block th:each="tamilvendingCategory : ${tamilvendingCategories}">
-								    <option th:value="${tamilvendingCategory.id}" th:text="${tamilvendingCategory.tamil_vending_category_name}"></option>
-								  </th:block>
-								</select>
-					        </div>
-					      </div>
-					      
-					       <div class="row mb-3">
-					       <div class="col-md-6">
-					          <label class="form-label">Business Space (Sq ft)| வியாபார இடம் </label>
-					          <input type="text" class="form-control" id="business_space" name="business_space">
-					        </div>
-					       </div>
-					
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Did you get SVANIDHI loan? | ஸ்வநிதி கடன் வாங்கினீங்களா? </label><br>
-					          <input type="radio" name="svanidhi" value="Yes" > Yes
-					          <input type="radio" name="svanidhi" value="No" class="ms-3"> No
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">Do you have a Bank Account? | வங்கி கணக்கு உள்ளதா? </label><br>
-					          <input type="radio" name="bank_account" value="Yes" > Yes
-					          <input type="radio" name="bank_account" value="No" class="ms-3"> No
-					        </div>
-					        
-					        
-					        <div class="col-md-6" id="bank_passbook_container" style="display:none;">
-							    <label for="bank_passbook" class="form-label">Upload Bank Passbook (jpg/jpeg/pdf)
-							   </label>
-							    <input type="file" class="form-control" id="bank_passbook" name="bank_passbook" accept=".jpg,.jpeg,.pdf,application/pdf" >
-							     <div id="bank_passbookpreview" class="mt-2" style="display: none;"></div>
-							</div>
-												        
-					      </div>
-					
-					      <!-- Personal Details -->
-					      <div class="section-header">
-					      <h5>தனிப்பட்ட விவரங்கள் | Personal Details</h5>
-					      </div>
-					      
-					      <div class="row mb-3">
-					      <div class="col-md-6">
-					          <label class="form-label">Profile Image (jpg/jpeg/pdf)</label>
-					          <input type="file" class="form-control" id="profileimage"
-														accept=".jpg,.jpeg,.pdf,application/pdf" name="profileimage" >
-							 <div id="profilepreview" class="mt-2" style="display: none;"></div>
-					        </div>
-					        </div>
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label"> Name <span class="required">*</span></label>
-					          <input type="text" class="form-control" id="name" name="name" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" required>
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">பெயர் <span class="required">*</span></label>
-					          <input type="text" class="form-control" id="name_tamil" name="name_tamil" placeholder="தமிழில் பதிவு செய்யவும்" required>
-					        </div>
-					        </div>
-					        <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Father's / Husband's Name </label>
-					          <input type="text" class="form-control" id="father_name" name="father_name" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label"> தந்தை/கணவர் பெயர் </label>
-					          <input type="text" class="form-control" id="father_name_tamil" name="father_name_tamil" placeholder="தமிழில் பதிவு செய்யவும்" >
-					        </div>
-					      </div>
-					
-					      <div class="row mb-3">
-					       
-					        <div class="col-md-6">
-					          <label class="form-label">Gender | பாலினம் </label><br>
-					          <input type="radio" name="gender" value="Male" > Male
-					          <input type="radio" name="gender" value="Female" class="ms-3"> Female
-					          <input type="radio" name="gender" value="Transgender" class="ms-3">Transgender
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label"> பாலினம் </label><br>
-					          <input type="radio" name="gender_tamil" value="ஆண்" > ஆண்
-					          <input type="radio" name="gender_tamil" value="பெண்" class="ms-3"> பெண்
-					          <input type="radio" name="gender_tamil" value="பிற்பாலினர்" class="ms-3">பிற்பாலினர்
-					        </div>
-					      </div>
-					      
-					      <div class="row mb-3">
-					       <div class="col-md-6">
-					          <label class="form-label">Mobile Number | மொபைல் எண் <span class="required">*</span></label>
-					          <input type="text" class="form-control" id="mobile_no" name="mobile_no" oninput="validatePhoneNumber(this)" required readonly="readonly">
-					        </div>
-					      </div>
-					      
-					
-					      
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Date of Birth | பிறந்த தேதி </label>
-					          <input type="date" id="dob" class="form-control" name="dob" >
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">Community Category | சமூக வகை </label>
-					          <select class="form-control" id="community" name="community" >
-								    <option value="">-- Select Community --</option>
-								    <th:block th:each="com : ${communities}">
-								        <option th:value="${com.id}" th:text="${com.category_name}"></option>
-								    </th:block>
-								</select>
-					        </div>
-					      </div>
-					
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Differently Abled | இயலாமை உள்ளவரா? </label><br>
-					          <input type="radio" name="differently_abled" value="Yes" > Yes
-					          <input type="radio" name="differently_abled" value="No" class="ms-3"> No
-					        </div>
-					        
-					        
-					        
-					        <div class="col-md-6">
-					          <label class="form-label">Street Vendor’s educational status  | தெருவணிகரின் கல்வித்தகுதி </label>
-					          <select class="form-control"  id="education" name="education" >
-							    <option value="">-- Select Education Status--</option>
-							    <th:block th:each="edu : ${educationList}">
-							        <option th:value="${edu.id}" th:text="${edu.education}"></option>
-							    </th:block>
-							</select>
-					        </div>
-					      </div>
-					
-					
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label for="maritalstatus" class="form-label"> Marital Status | திருமண நிலை </label>
-					          <select class="form-control" id="maritalStatus" name="maritalStatus" >
-							    <option value="">-- Select Marital Status --</option>
-							    <th:block th:each="status : ${maritalStatuses}">
-							        <option th:value="${status.id}" th:text="${status.marital_status}"></option>
-							    </th:block>
-							</select>
-					        </div>
-					        <div class="col-md-6">
-					          <label for="familymembers" class="form-label">Number of Family Members | குடும்ப உறுப்பினர்கள் எண்ணிக்கை </label>
-					          <input type="number" class="form-control" name="familymembers" id="familymembers">
-					        </div>
-					      </div>
-					
-					      <div class="mb-3">
-					        <label class="form-label">Are any of your family member involved in street vending | உங்கள் குடும்ப உறுப்பினர் வியாபாரத்தில் உள்ளவரா? </label><br>
-					        <input type="radio" name="fam_vendor" value="Yes" > Yes
-					        <input type="radio" name="fam_vendor" value="No" class="ms-3"> No
-					      </div>
-					
-					      <!-- Address -->
-					      <div class="section-header">
-					      <h5>Residential Address | வீட்டு முகவரி </h5>
-					      </div>
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Door No | கதவு எண் </label>
-					          <input type="text" class="form-control" name="doorno" id="doorno" >
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">Street Name | தெரு பெயர் </label>
-					          <input type="text" class="form-control" name="streetname" id="streetname" >
-					        </div>
-					      </div>
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Area Name | பகுதி பெயர் </label>
-					          <input type="text" class="form-control" name="areaname" id="areaname" >
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">District | மாவட்டம் </label>
-					          <input type="text" class="form-control" name="district" id="district" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
-					        </div>
-					      </div>
-					      
-					      <div class="row mb-3">
-					      <div class="col-md-6">
-					        <label class="form-label">Pincode | அஞ்சல் குறியீடு </label>
-					        <input type="text" class="form-control" name="pincode" id="pincode" oninput="validatePincode(this)" >
-					      </div>
-					      
-					      
-					      <div class="col-md-6">
-							  <label class="form-label">Aadhaar Number | ஆதார் எண் </label>
-							  <input type="text" class="form-control" id="aadhar_number" name="aadhar_number" maxlength="12" oninput="validateAadhar(this)" >
-							</div>
-					      
-					      </div>
-					
-					      <!-- Document Uploads -->
-					     <div class="section-header">
-					     <h5>ஆவணங்கள் | Document Uploads</h5>
-					     </div>
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Aadhaar Front Image | ஆதார் முன்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
-					          <input type="file" class="form-control" id="aadharfrontimage"
-														accept=".jpg,.jpeg,.pdf,application/pdf" name="aadharfrontimage" >
-								
-							  <div id="aadharfrontimagepreview" class="mt-2" style="display: none;"></div>
-														
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">Aadhaar Back Image | ஆதார் பின்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
-					          <input type="file" class="form-control" id="aadharbackimage"
-															accept=".jpg,.jpeg,.pdf,application/pdf" name="aadharbackimage" >
-															
-								<div id="aadharbackimagepreview" class="mt-2" style="display: none;"></div>
-					        </div>
-					      </div>
-					      <div class="row mb-3">
-					      <div class="col-md-6">
-					        <label class="form-label">Take Ration Card Front Image | ரேஷன் கார்டு முன்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
-					        <input type="file" class="form-control" id="ration_card_photo"
-															accept=".jpg,.jpeg,.pdf,application/pdf" name="ration_card_photo" >
-															
-							<div id="ration_card_preview" class="mt-2" style="display: none;"></div>								
-					      </div>
-					 </div>
-				      <!-- Submit -->
-				      <div class="text-center mt-4">
-								<button type="submit" class="btn btn-primary" name="submitBtn" id="submitBtn">Update</button>
-								
-						</div>
-	                			
-	                			</form>
-
-				            </div>
-				        </div>
-				    </div>
-				</div>
-                
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-               
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-				</div>
-				
-               
-            
-		</div>
-		
-
-				
-		
-                      
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-                  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-        
-        <script sync defer
-		src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCi7N6uW5MZaSkd50Kzw7ax2GkMN1vjE-E&callback=myMap&libraries=places">
-		</script>
-            <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-            
-            <script>
-function allowTamilAndSymbols(id) {
-    const el = document.getElementById(id);
-
-    el.addEventListener("input", function () {
-        // Allowed:
-        // Tamil letters: \u0B80-\u0BFF
-        // Digits: 0-9
-        // Dot .      → \.
-        // Slash /    → \/
-        // Comma ,    → ,
-        // Hyphen -   → -
-        // Space      → \s
-        // Newline    → \n (included in \s)
-        this.value = this.value.replace(/[^\u0B80-\u0BFF0-9.,\/\-\s]/g, "");
-    });
-}
-
-allowTamilAndSymbols("landmark_tamil");
-allowTamilAndSymbols("vendor_district_tamil");
-allowTamilAndSymbols("name_tamil");
-allowTamilAndSymbols("father_name_tamil");
-</script>
-        
-        
-        <script type="text/javascript">
-        
-    
-        function myMap(latFromDb, lngFromDb) {
-            // Use vendor lat/lng if available, else fallback
-            const defaultCenter = (latFromDb && lngFromDb) 
-                ? { lat: parseFloat(latFromDb), lng: parseFloat(lngFromDb) }
-                : { lat: 13.0827, lng: 80.2707 };
-      		const map = new google.maps.Map(document.getElementById("googleMap"), {
-      			center: defaultCenter,
-      			zoom: 14
-      		});
-
-      		let marker = null;
-      		let streetsList = []; // ✅ Define globally inside myMap
-      		const infowindow = new google.maps.InfoWindow();
-
-      		// 🔍 Initialize the SearchBox
-      		let input = document.getElementById('pac-input');
-      		let searchBox = new google.maps.places.SearchBox(input);
-      		//map.controls[google.maps.ControlPosition.TOP_LEFT].push(input);
-
-      		map.addListener('bounds_changed', function () {
-      			searchBox.setBounds(map.getBounds());
-      		});
-
-      		searchBox.addListener('places_changed', function () {
-      			const places = searchBox.getPlaces();
-      			if (places.length === 0) return;
-
-      			if (marker) marker.setMap(null);
-      			const place = places[0];
-      			if (!place.geometry) return;
-
-      			marker = new google.maps.Marker({
-      				map: map,
-      				position: place.geometry.location
-      			});
-
-      			const lat = place.geometry.location.lat().toFixed(6);
-      			const lng = place.geometry.location.lng().toFixed(6);
-      			document.getElementById("latitude_field").value = lat;
-      			document.getElementById("longitude_field").value = lng;
-
-      			map.setCenter(place.geometry.location);
-      			map.setZoom(15);
-
-      			infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
-      			infowindow.open(map, marker);
-
-      			fetchStreets(lat, lng);
-      		});
-
-      		map.addListener("click", function (event) {
-      			const clickedLatLng = event.latLng;
-      			if (marker) marker.setMap(null);
-
-      			marker = new google.maps.Marker({
-      				position: clickedLatLng,
-      				map: map
-      			});
-
-      			const lat = clickedLatLng.lat().toFixed(6);
-      			const lng = clickedLatLng.lng().toFixed(6);
-
-      			document.getElementById("latitude_field").value = lat;
-      			document.getElementById("longitude_field").value = lng;
-
-      			infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
-      			infowindow.open(map, marker);
-
-      			fetchStreets(lat, lng);
-      		});
-      		
-      		function fetchStreets(lat, lng) {
-      			const encodedGeometry = encodeURIComponent(JSON.stringify({ y: lat, x: lng }));
-      		    //const url = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/
-      		    //FeatureServer/2/query?where=&objectIds=&time=&geometry={encodedGeometry}&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=1&units=esriSRUnit_Meter&outFields=zone,ward&returnGeometry=false&f=geojson`;
-      		    
-      			const url=`https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/2/query?` +
-      				`where=&objectIds=&time=&geometry=${encodedGeometry}` + 
-      				`&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=1` +
-      				`&units=esriSRUnit_Meter&relationParam=&outFields=zone,ward` +
-      				`&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=` +
-      				`&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=` +
-      				`&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=` +
-      				`&resultRecordCount=&returnTrueCurves=false&returnExceededLimitFeatures=false&quantizationParameters=&returnCentroid=false` +
-      				`&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault` +
-      				`&datumTransformation=&f=geojson`;
-      		    fetch(url)
-      		        .then(response => {
-      		            if (!response.ok) {
-      		                throw new Error(`HTTP error! Status: ${response.status}`);
-      		            }
-      		            return response.json();
-      		        })
-      		        .then(data => {
-      		        	
-      		        	console.log("GIS API Response:", data);
-
-      		            const features = data.features;
-      		            if (features.length > 0) {
-      		                const props = features[0].properties;
-      		                const zone = props.zone;
-      		                const ward = props.ward;
-
-      		                console.log("Zone:", zone, "Ward:", ward);
-      		                // 👉 You can update form fields or DOM elements here
-      		                document.getElementById("zone").value = zone;
-      		                document.getElementById("ward").value = ward;
-      		            } else {
-      		                console.warn("No zone/ward found for this location.");
-      		                document.getElementById("zone").value = '';
-      		                document.getElementById("ward").value = '';
-      		            }
-      		        })
-      		        .catch(error => {
-      		            console.error("Error fetching zone/ward:", error);
-      		        });
-      		}
-      	}
-    	  
-    	  // GLOBAL scope — must be outside any other function
-    	  function openDocModal(fileUrl) {
-    	      const container = document.getElementById('docContainer');
-    	      const ext = fileUrl.split('.').pop().toLowerCase();
-
-    	      if (ext === 'pdf') {
-    	          container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
-    	      } else {
-    	          container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;" onerror="No image">`;
-    	      }
-
-    	      $('#docModal').modal('show');
-    	  }
-        
-        $(document).ready(function() {
-
-        	var table = $('#RequestListDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { targets: 'no-sort', orderable: false }
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', 'Show all']
-                ],
-                scrollY: '50vh',               
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false
-            
-
-            });
-        	
-        	let userId = document.getElementById('userIdSpan').textContent;
-        	         
-            fetchVendingCommitteeList(userId);
-        
-            
-            $("input[name='bank_account']").change(function () {
-		        if ($(this).val() === "Yes") {
-		            $("#bank_passbook_container").show();
-		        } else {
-		            $("#bank_passbook_container").hide();
-		            $("#bank_passbook").val("");
-		        }
-		    });
-            
-            $('#business_space').on('input', function () {
-			    // Remove anything that is not a digit
-			    this.value = this.value.replace(/\D/g, '');
-
-			    // Limit to max 2 digits
-			    if (this.value.length > 2) {
-			        this.value = this.value.slice(0, 2);
-			    }
-			});
-         
-        });
-        
-     // Validation helpers
-		function validatePhoneNumber(input) {
-		    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 10);
-		}
-
-		function validatePincode(input) {
-		    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 6);
-		    
-		}
-
-		function validateAadhar(input) {
-		    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 12);
-		}
-
-		// DOB max date
-		document.addEventListener("DOMContentLoaded", function () {
-		    const dobInput = document.getElementById("dob");
-		    const today = new Date().toISOString().split("T")[0];
-		    dobInput.setAttribute("max", today);
-		    dobInput.addEventListener("focus", function () {
-		        if (typeof dobInput.showPicker === "function") {
-		            dobInput.showPicker();
-		        }
-		    });
-		});
-        
-        function fetchVendingCommitteeList(userId) {
-        	$('#pageLoader').show();
-            $.ajax({
-                url: '/gcc/api/streetvendor/vendingDetailsWeb',
-                method: 'GET',
-                data:{cby:userId},
-                contentType: 'application/json',
-                success: function (data) {
-                	$('#pageLoader').hide();
-                    let tableContainer = $('#RequestListDatatable');
-
-                    // Destroy any existing DataTable instance
-                    if ($.fn.DataTable.isDataTable(tableContainer)) {
-                        tableContainer.DataTable().destroy();
-                    }
-
-                    // Check for empty list
-                    if (!data || data.length === 0) {
-                        tableContainer.find('tbody').html(`
-                            <tr>
-                                <td colspan="7" class="text-center text-danger">No Data Available</td>
-                            </tr>
-                        `);
-                        return;
-                    }
-
-                    // Initialize DataTable
-                    tableContainer.DataTable({
-                        destroy: true,
-                        searching: true,
-                        autoWidth: false,
-                        paging: true,
-                        info: true,
-                        data: data,
-                        columns: [
-                            {
-                                data: null,
-                                render: (data, type, row, meta) => meta.row + 1,
-                                className: 'text-center'
-                            },
-                            { data: 'vendor_req_id', defaultContent: '-', className: 'text-center' },
-                            { data: 'name', defaultContent: '-', className: 'text-center' },
-                            { data: 'mob_no', defaultContent: '-', className: 'text-center' },
-                            { data: 'present_address', defaultContent: '-', className: 'text-center' },
-                            { data: 'present_pincode', defaultContent: '-', className: 'text-center' },                               
-                            /* {
-                                data: 'vendor_req_id',
-                                render: function (data, type, row) {
-                                    return `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
-                                },
-                                className: 'text-center'
-                            } */
-                            {
-                                data: 'vendor_req_id',
-                                render: function (data, type, row) {
-                                    let viewBtn = `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
-                                    let editBtn = "";
-
-                                    // check editable flag from row
-                                    if (row.editable === true) {
-                                        editBtn = ` <button class="btn btn-success btn-sm btn-edit" data-id="${data}">Edit</button>`;
-                                    }
-
-                                    return viewBtn + editBtn; // concatenate buttons
-                                },
-                                className: 'text-center'
-                            }
-                            
-                        ],
-                        dom: 'Bfrtip',
-                        buttons: [
-                            { extend: 'pageLength', className: 'btn btn-warning' },
-                            { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-                            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-                            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-                            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-                        ],
-                        columnDefs: [{ targets: 'no-sort', orderable: false }],
-                        lengthMenu: [
-	      		                [50, 100, 200, 500, -1],
-	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-	      		            ],
-                        scrollY: '80vh',
-                        scrollX: true,
-                        responsive: false
-                    });
-                    
-                    tableContainer.on('click', '.btn-edit', function () {
-                    	//$('#EditModal').modal('show');
-                    	 let id = $(this).data('id');                      
-                        $.ajax({
-                            url: `/gcc/api/streetvendor/webVendorDetailsByReqId?requestId=${id}`,
-                            method: 'GET',
-                            success: function (response) {
-                            	DisplayInModal(response)
-                            },
-                            error: function (xhr) {
-                                console.error("Error fetching detail:", xhr.responseText);
-                                alert("Failed to fetch vendor details.");
-                            }
-                        });
-                    });
-                    
-                    
-                 // Bind view buttons
-                    tableContainer.on('click', '.btn-view', function () {
-                        let id = $(this).data('id');                      
-                        $.ajax({
-                            url: `/gcc/api/streetvendor/webVendorDetailsByReqId?requestId=${id}`,
-                            method: 'GET',
-                            success: function (detailData) {
-                                if (detailData.length === 0) {
-                                    $('#modalBodyContent').html("<p>No data found for this request.</p>");
-                                    $('#viewModal').modal('show');
-                                    return;
-                                }
-
-                                const details = detailData[0];
-                                const diffAbledDisplay = details.diff_abled === true ? 'Yes' : (details.diff_abled === false ? 'No' : '-');
-                                const pmLoanDisplay = details.pm_svanidhi_loan ? (details.pm_svanidhi_loan ? 'Yes' : 'No') : '-';
-                                const bankAccDisplay = details.bank_acc_status ? (details.bank_acc_status === '1' ? 'Yes' : 'No') : '-';
-                                const idCardDisplay= details.vendor_id_card ? (details.vendor_id_card ==='1' ? 'Yes' : 'No') : '-';
-                                const bankPassbookDisplay = details.bank_acc_status === '1' && details.view_bank_passbook
-                                ? `<img src="${details.view_bank_passbook}" alt="Bank Passbook" class="img-fluid" style="max-width: 150px;" onerror="this.src='/default.jpg'">`
-                                : '-';
-                                
-                                const aadharFrontBtn = details.view_aadhar_front_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_aadhar_front_photo}')">View</button>` : '-';
-                                const rationCardBtn = details.view_ration_card_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_ration_card_photo}')">View</button>` : '-';
-                                const aadharBackBtn = details.view_aadhar_back_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_aadhar_back_photo}')">View</button>` : '-';
-                                const bankPassbookBtn = details.bank_acc_status === '1' && details.view_bank_passbook
-                                    ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_bank_passbook}')">View</button>`
-                                    : '-';
-                                    
-                                const vendorPhotoBtn= details.view_street_vendor_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_street_vendor_photo}')">View</button>` : '-';
-                                
-                                const content = `
-                                    <div class="container-fluid">
-                                        <!-- Personal Details -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-primary text-white">Personal Details</div>
-                                            <div class="card-body row">
-                                            <div class="col-md-3"><strong>Name:</strong></div>
-                                            <div class="col-md-3">${details.name || '-'}</div>
-                                            <div class="col-md-3"><strong>Father/Husband Name:</strong></div>
-                                            <div class="col-md-3">${details.f_h_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Mobile:</strong></div>
-                                            <div class="col-md-3">${details.mob_no || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Community Category:</strong></div>
-                                            <div class="col-md-3">${details.category_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>DOB:</strong></div>
-                                            <div class="col-md-3">${details.dob || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Address:</strong></div>
-                                            <div class="col-md-3">${details.residental_address || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Gender:</strong></div>
-                                            <div class="col-md-3">${details.gender || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Pincode:</strong></div>
-                                            <div class="col-md-3">${details.present_pincode || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Differently Abled:</strong></div>
-                                            <div class="col-md-3">${diffAbledDisplay || '-'}</div>
-                                            
-                                            <div class="col-md-3"><strong>Vendor Image:</strong></div>
-                                            <div class="col-md-3">${vendorPhotoBtn || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Aadhaar front Image:</strong></div>
-                                            <div class="col-md-3">${aadharFrontBtn}</div>
-
-                                            <div class="col-md-3"><strong>Ration card Image:</strong></div>
-                                            <div class="col-md-3">${rationCardBtn}</div>
-
-                                            <div class="col-md-3"><strong>Aadhaar back Image:</strong></div>
-                                            <div class="col-md-3">${aadharBackBtn}</div>
-                                            </div>
-                                        </div>
-
-                                        <!-- Business Details -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-success text-white">Business Details</div>
-                                            <div class="card-body row">
-                                            <div class="col-md-3"><strong>Type of Business:</strong></div>
-                                            <div class="col-md-3">${details.vending_category_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Zone:</strong></div>
-                                            <div class="col-md-3">${details.zone || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Business Space (sq.ft):</strong></div>
-                                            <div class="col-md-3">${details.vending_space || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Ward:</strong></div>
-                                            <div class="col-md-3">${details.ward || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Address:</strong></div>
-                                            <div class="col-md-3">${details.business_address || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Pincode:</strong></div>
-                                            <div class="col-md-3">${details.vending_pincode || '-'}</div>
-
-                                            <div class="col-md-3"><strong>PM SVANidhi Loan Availed:</strong></div>
-                                            <div class="col-md-3">${pmLoanDisplay || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Do you Have Bank Account?:</strong></div>
-                                            <div class="col-md-3">${bankAccDisplay || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Bank Passbook Image:</strong></div>
-                                            <div class="col-md-3">${bankPassbookBtn}</div>
-
-                                            </div>
-                                        </div>
-                                                                                                                  
-                                        </div>
-                                    </div>
-                                `;                                                           
-                                
-                                $('#modalBodyContent').html(content);
-                                $('#viewModalLabel').text(`Vendor Details - ${id}`);
-                                $('#viewModal').modal('show');
-                            },
-                            error: function (xhr) {
-                                console.error("Error fetching detail:", xhr.responseText);
-                                alert("Failed to fetch vendor details.");
-                            }
-                        });
-                    });
-                   
-                },
-
-                error: function (xhr, status, error) {
-                	$('#pageLoader').hide();
-                    console.error("Error fetching data:", error);
-                    alert("Failed to load vendor list.");
-                }
-            });
-        }
-        
-        
-        
-        function DisplayInModal(responseData){
-        	
-        	// clear previous search box value
-            $('#pac-input').val('');
-            
-    		
-        	$('#EditModal').modal('show');
-        	 let data = responseData[0];
-        	 
-        	 $("#latitude_field").val(data.latitude);
-        	 $("#longitude_field").val(data.longitude);
-        	 $('#EditModal').on('shown.bs.modal', function () {
-        	        myMap(data.latitude, data.longitude);
-        	    });
-        	 $("#zone").val(data.zone);
-        	 $("#ward").val(data.ward);
-        	 $("#landmark").val(data.vending_address);
-        	 $("#landmark_tamil").val(data.tamil_landmark);
-        	 $("#vendor_district").val(data.vending_district);
-        	 $("#vendor_district_tamil").val(data.tamil_present_district)
-        	 $("#vendor_pincode").val(data.vending_pincode);
-        	 $("#businesstype").val(data.vending_category);
-        	 $("#tamilbusinesstype").val(data.tamil_vending_category);
-        	 $("#business_space").val(data.vending_space);
-        	 if (data.pm_svanidhi_loan == null) {
-        		    $("input[name='svanidhi']").prop("checked", false); // clear both
-        		} else {
-        		    $("input[name='svanidhi'][value='" + (data.pm_svanidhi_loan ? "Yes" : "No") + "']")
-        		        .prop("checked", true);
-        		}
-
-        	 if (data.pm_svanidhi_loan == null) {
-        		    $("input[name='svanidhi']").prop("checked", false); // clear both
-        		} else {
-        		    $("input[name='svanidhi'][value='" + (data.pm_svanidhi_loan ? "Yes" : "No") + "']")
-        		        .prop("checked", true);
-        		}
-        	 
-        	 if (data.bank_acc_status === "1") {
-        		    $("input[name='bank_account'][value='Yes']").prop("checked", true);
-        		    $("#bank_passbook_container").show();
-        		} else if (data.bank_acc_status === "0") {
-        		    $("input[name='bank_account'][value='No']").prop("checked", true);
-        		    $("#bank_passbook_container").hide();
-        		} else {
-        		    // null → clear selection
-        		    $("input[name='bank_account']").prop("checked", false);
-        		    $("#bank_passbook_container").hide();
-        		}
-        	 
-        	 $("#name").val(data.name);
-        	 $("#name_tamil").val(data.tamil_name);
-        	 $("#father_name").val(data.f_h_name);
-        	 $("#father_name_tamil").val(data.tamil_f_h_name);
-        	 $("#mobile_no").val(data.mob_no);
-        	 if (data.gender == null) {
-        		    $("input[name='gender']").prop("checked", false); // clear all
-        		} else {
-        		    $("input[name='gender'][value='" + data.gender + "']").prop("checked", true);
-        		}
-        	 
-        	 if (data.tamil_gender == null) {
-     		    $("input[name='gender_tamil']").prop("checked", false); // clear all
-     		} else {
-     		    $("input[name='gender_tamil'][value='" + data.tamil_gender + "']").prop("checked", true);
-     		}
-        	 
-        	 $("#dob").val(data.dob);
-        	 $("#community").val(data.social_category);
-        	 if (data.diff_abled == null) {
-      		    $("input[name='differently_abled']").prop("checked", false); // clear both
-      		} else {
-      		    $("input[name='differently_abled'][value='" + (data.diff_abled ? "Yes" : "No") + "']")
-      		        .prop("checked", true);
-      		}
-        	 $("#education").val(data.education_status);
-        	 $("#maritalStatus").val(data.marital_status);
-        	 $("#familymembers").val(data.no_of_fam_mem);
-        	 
-        	 if (data.are_any_fam_mem_invol_str_ven == null) {
-       		    $("input[name='fam_vendor']").prop("checked", false); // clear both
-       		} else {
-       		    $("input[name='fam_vendor'][value='" + (data.are_any_fam_mem_invol_str_ven ? "Yes" : "No") + "']")
-       		        .prop("checked", true);
-       		}
-        	 
-        	 if (data.present_address) {
-       		    let parts = data.present_address.split(",").map(p => p.trim());
-
-       		    $("#doorno").val(parts[0] || "");
-       		    $("#streetname").val(parts[1] || "");
-       		    $("#areaname").val(parts[2] || "");
-       		} else {
-       		    $("#doorno").val("");
-       		    $("#streetname").val("");
-       		    $("#areaname").val("");
-       		}
-        	 
-        	 $("#district").val(data.present_district); 
-        	 $("#pincode").val(data.present_pincode); 
-        	 $("#aadhar_number").val(data.aadhar_no); 
-        	 $("#vendor_req_id").text(data.vendor_req_id);
-        	 
-        	 if (data.view_bank_passbook) {
-			    	
-			    	$('#bank_passbookpreview').show();
-			    	
-			        const fileName = data.view_bank_passbook.split('/').pop();
-			    	
-			        $('#bank_passbookpreview').html(`
-			            <a href="${data.view_bank_passbook}" target="_blank" style="color:blue;">${fileName}</a>
-			        `);
-			  } else {
-			        
-			        $('#bank_passbookpreview').hide();
-			  }
-        	 
-        	 if (data.view_street_vendor_photo) {
-			    	
-			    	$('#profilepreview').show();
-			    	// Extract file name from URL
-			        const fileName = data.view_street_vendor_photo.split('/').pop();
-			    	
-			        $('#profilepreview').html(`
-			            <a href="${data.view_street_vendor_photo}" target="_blank" style="color:blue;">${fileName}</a>
-			        `);
-			  } else {
-			        
-			        $('#profilepreview').hide();
-			  }
-        	 
-        	 if (data.view_aadhar_front_photo) {
-			    	
-			    	$('#aadharfrontimagepreview').show();
-			    	// Extract file name from URL
-			        const fileName = data.view_aadhar_front_photo.split('/').pop();
-			    	
-			        $('#aadharfrontimagepreview').html(`
-			            <a href="${data.view_aadhar_front_photo}" target="_blank" style="color:blue;">${fileName}</a>
-			        `);
-			  } else {
-			        
-			        $('#aadharfrontimagepreview').hide();
-			  }
-        	 
-        	 if (data.view_aadhar_back_photo) {
-			    	
-			    	$('#aadharbackimagepreview').show();
-			    	// Extract file name from URL
-			        const fileName = data.view_aadhar_back_photo.split('/').pop();
-			    	
-			        $('#aadharbackimagepreview').html(`
-			            <a href="${data.view_aadhar_back_photo}" target="_blank" style="color:blue;">${fileName}</a>
-			        `);
-			  } else {
-			        
-			        $('#aadharbackimagepreview').hide();
-			  }
-        	 
-        	 if (data.view_ration_card_photo) {
-			    	
-			    	$('#ration_card_preview').show();
-			    	// Extract file name from URL
-			        const fileName = data.view_ration_card_photo.split('/').pop();
-			    	
-			        $('#ration_card_preview').html(`
-			            <a href="${data.view_ration_card_photo}" target="_blank" style="color:blue;">${fileName}</a>
-			        `);
-			  } else {
-			        
-			        $('#ration_card_preview').hide();
-			  }
-        	 
-        	 
-        	 $('#raw_bank_passbook').text(data.bank_passbook);
-        	 $('#raw_street_vendor_photo').text(data.street_vendor_photo);
-        	 $('#raw_aadhar_front_photo').text(data.aadhar_front_photo);
-        	 $('#raw_aadhar_back_photo').text(data.aadhar_back_photo);
-        	 $('#raw_ration_card_photo').text(data.ration_card_photo);
-        	 	 
-        }
-     
-        
-     // Form submit
-	    $('#vendorForm').submit(function (e) {
-	    	console.log("hiiii");
-	    	
-	    	e.preventDefault();
-	    	
-	    	let formData = new FormData(this);
-	        $('#submitBtn').prop('disabled', true).text('Updating...');
-	        
-	        $('#pageLoader').show();
-	        
-	        
-	        let bankpassbook_Preview= $('#bank_passbookpreview');
-	        let profile_Preview = $('#profilepreview');
-	        let aadharfront_Preview= $('#aadharfrontimagepreview');
-	        let aadharback_Preview = $('#aadharbackimagepreview');
-	        let rationcard_Preview = $('#ration_card_preview');
-	        
-	        let raw_bank_passbook = $('#raw_bank_passbook').text();	        
-	        let raw_street_vendor_photo= $('#raw_street_vendor_photo').text();
-	        let raw_aadhar_front_photo= $('#raw_aadhar_front_photo').text();
-	        let raw_aadhar_back_photo = $('#raw_aadhar_back_photo').text();
-	        let raw_ration_card_photo = $('#raw_ration_card_photo').text();
-	        
-			/* console.log("==========raw_bank_passbook========"+raw_bank_passbook);
-	        console.log("==========raw_street_vendor_photo========"+raw_street_vendor_photo);
-	        console.log("==========raw_aadhar_front_photo========"+raw_aadhar_front_photo);
-	        console.log("==========raw_aadhar_back_photo========"+raw_aadhar_back_photo);
-	        console.log("==========raw_ration_card_photo========"+raw_ration_card_photo); */
-	        
-	        function setIfPresent(formData, key, value) {
-                if (value !== undefined && value !== null && value !== "") {
-                    formData.set(key, value);
-                }
-            }
-        	
-        	function setFileIfPresent(formData, key, fileInput) {
-        	    if (fileInput && fileInput.files && fileInput.files.length > 0) {
-        	        formData.set(key, fileInput.files[0]);
-        	    }
-        	}
-        	
-        	let userId = document.getElementById('userIdSpan').textContent;
-        	
-        	// pm_svanidhi_loan
-        	let svanidhiVal = $("input[name='svanidhi']:checked").val();
-        	setIfPresent(formData, "pm_svanidhi_loan", svanidhiVal === undefined ? "" : svanidhiVal === "Yes");
-        	//formData.set("pm_svanidhi_loan", svanidhiVal === undefined ? "" : svanidhiVal === "Yes");
-
-        	// bank_acc_status
-        	let bankVal = $("input[name='bank_account']:checked").val();
-        	setIfPresent(formData, "bank_acc_status",bankVal === undefined ? "" : bankVal === "Yes");
-
-        	// diff_abled
-        	let diffVal = $("input[name='differently_abled']:checked").val();
-        	setIfPresent(formData, "diff_abled", diffVal === undefined ? "" : diffVal === "Yes");
-
-        	// are_any_fam_mem_invol_str
-        	let famVal = $("input[name='fam_vendor']:checked").val();
-        	setIfPresent(formData, "are_any_fam_mem_invol_str", famVal === undefined ? "" : famVal === "Yes");
-        	
-        	const isBankYes = $("input[name='bank_account']:checked").val() === "Yes";
-        	const bankPassbook = $('#bank_passbook')[0]?.files[0];
-        	if(isBankYes){
-        		
-        		if(bankpassbook_Preview.html().trim() === '' && !bankPassbook){
-        			$('#pageLoader').hide();
-        			Swal.fire('Missing Bank Passbook', 'Bank passbook is required because Bank Account Status is Yes.', 'warning');
-		            $('#submitBtn').prop('disabled', false).text('Update');
-		            return; 
-        		} 
-        		if(bankPassbook){
-        			setFileIfPresent(formData, "bank_passbook", $('#bank_passbook')[0].files[0]);
-        		}
-        		if(bankpassbook_Preview.html().trim() !== ''){
-        			setIfPresent(formData, "raw_bank_passbook", raw_bank_passbook);
-        		}
-        	}
-        	else{
-        		setFileIfPresent(formData, "bank_passbook", null);
-        		setIfPresent(formData, "raw_bank_passbook", null);
-        	}
-        	
-        	// Lat/Lng
-	        const latitude = $('#latitude_field').val().trim();
-	        const longitude = $('#longitude_field').val().trim();
-	        
-	        setIfPresent(formData, "latitude", latitude);
-	        setIfPresent(formData, "longitude", longitude);
-	        
-	        const landmarkval = $('#landmark').val().trim();
-	        setIfPresent(formData, "landmark", landmarkval);
-	        
-	        const zone = $('#zone').val().trim();
-	        const ward = $('#ward').val().trim();
-	        
-	        
-	        setIfPresent(formData, "zone", zone);
-	        setIfPresent(formData, "ward", ward);
-        	
-	     // Pincode validation
-	        const vendingPincode = $('#vendor_pincode').val().trim();
-	        if (vendingPincode !=="" && !/^\d{6}$/.test(vendingPincode)) {
-	        	$('#pageLoader').hide();
-	            Swal.fire("Invalid vending place pincode", "Pincode must be 6 digits.", "error");
-	            $('#submitBtn').prop('disabled', false).text('Update');
-	            return;
-	        }
-	        setIfPresent(formData, "vending_pincode", vendingPincode);
-
-	        const presentPincode = $('#pincode').val().trim();
-	        if (presentPincode !=="" && !/^\d{6}$/.test(presentPincode)) {
-	        	$('#pageLoader').hide();
-	            Swal.fire("Invalid Present place Pincode", "Pincode must be 6 digits.", "error");
-	            $('#submitBtn').prop('disabled', false).text('Update');
-	            return;
-	        }						        
-	        setIfPresent(formData, "present_pincode", presentPincode);
-
-	        // Aadhaar validation
-	        const aadharNo = $('#aadhar_number').val().trim();
-	        if (aadharNo !=="" && !/^\d{12}$/.test(aadharNo)) {
-	        	$('#pageLoader').hide();
-	            Swal.fire("Invalid Aadhaar Number", "Aadhaar number must be 12 digits.", "error");
-	            $('#submitBtn').prop('disabled', false).text('Update');
-	            return;
-	        }
-	       
-	        setIfPresent(formData, "aadharNo", aadharNo);
-	        
-	        const mobileNumber = $('#mobile_no').val();
-	        if (!/^\d{10}$/.test(mobileNumber)) {
-	        	$('#pageLoader').hide();
-	            Swal.fire("Invalid Mobile Number", "Enter a valid 10-digit number.", "error");
-	            $('#submitBtn').prop('disabled', false).text('Update');
-	            return;
-	        }
-	        	        
-	        setIfPresent(formData, "mobile_number", mobileNumber);
-
-            // Set other fields
-            setIfPresent(formData, "vending_district", $('#vendor_district').val());
-			setIfPresent(formData, "vending_category", $('#businesstype').val());
-			setIfPresent(formData, "tamilvending_category", $('#tamilbusinesstype').val());
-			setIfPresent(formData, "vending_space", $('#business_space').val());
-            
-           
-            
-            setIfPresent(formData, "name", $('#name').val());
-            setIfPresent(formData, "f_h_name", $('#father_name').val());
-            setIfPresent(formData, "dob", $('#dob').val());
-            			                   
-	        
-	        let genderVal = $("input[name='gender']:checked").val();
-	        setIfPresent(formData, "gender", genderVal);
-	        
-        	setIfPresent(formData, "social_category", $('#community').val());
-        	setIfPresent(formData, "education_status", $('#education').val());
-        	setIfPresent(formData, "marital_status", $('#maritalStatus').val());
-        	setIfPresent(formData, "no_of_fam_mem", $('#familymembers').val());
-
-        	setIfPresent(formData, "door_no", $('#doorno').val());
-        	setIfPresent(formData, "streetname", $('#streetname').val());
-        	setIfPresent(formData, "areaname", $('#areaname').val());
-        	setIfPresent(formData, "present_district", $('#district').val());
-        	        	
-        	setIfPresent(formData, "userId", userId);
-        	
-        	let vendor_req_id= document.getElementById('vendor_req_id').textContent;
-        	setIfPresent(formData, "vendor_req_id", vendor_req_id);
-        	
-        	setFileIfPresent(formData, "street_vendor_photo", $('#profileimage')[0]);
-			setFileIfPresent(formData, "ration_card_photo", $('#ration_card_photo')[0]);
-			setFileIfPresent(formData, "aadhar_front_photo", $('#aadharfrontimage')[0]);
-			setFileIfPresent(formData, "aadhar_back_photo", $('#aadharbackimage')[0]);
-			
-			if(profile_Preview.html().trim() !== ''){
-    			setIfPresent(formData, "raw_street_vendor_photo", raw_street_vendor_photo);
-    		}
-			
-			if(aadharfront_Preview.html().trim() !== ''){
-    			setIfPresent(formData, "raw_aadhar_front_photo", raw_aadhar_front_photo);
-    		}
-			if(aadharback_Preview.html().trim() !== ''){
-    			setIfPresent(formData, "raw_aadhar_back_photo", raw_aadhar_back_photo);
-    		}
-			if(rationcard_Preview.html().trim() !== ''){
-    			setIfPresent(formData, "raw_ration_card_photo", raw_ration_card_photo);
-    		}
-			
-			
-			setIfPresent(formData, "tamil_name", $('#name_tamil').val());
-            setIfPresent(formData, "tamil_f_h_name", $('#father_name_tamil').val());
-            let landmarkvaltamil = $('#landmark_tamil').val().trim();
-	        setIfPresent(formData, "tamil_landmark", landmarkvaltamil);
-	        setIfPresent(formData, "tamil_present_district", $('#vendor_district_tamil').val());
-	        let genderValtamil = $("input[name='gender_tamil']:checked").val();
-	        setIfPresent(formData, "tamil_gender", genderValtamil);
-			
-			for (let pair of formData.entries()) {
-                console.log(pair[0] + ':', pair[1]);
-            }
-			
-			 $.ajax({
-                url: '/gcc/api/streetvendor/updateDetails',
-                type: 'POST',
-                data: formData,
-                enctype: 'multipart/form-data',
-                processData: false,
-                contentType: false,
-                success: function (response) {
-                	$('#pageLoader').hide();
-                    if (response.status) {
-                    	Swal.fire({
-	                        icon: 'success',
-	                        title: 'Success',
-	                        text: response.description ,
-	                        allowOutsideClick: false, 
-		                    allowEscapeKey: false,
-		                    allowEnterKey: false, 
-		                    showConfirmButton: true
-	                    }).then((result) => {
-		                    if (result.isConfirmed) {		                    	
-		                    	location.reload();		                    			                    	
-		                    }
-		                });                       
-                    } else {
-                    	$('#pageLoader').hide();
-                    	 Swal.fire({
-		                        icon: 'error',
-		                        title: 'Update Failed',
-		                        text: response.description || 'Something went wrong!'
-		                    });
-                    }
-                    $('#submitBtn').prop('disabled', false).text('Update');
-                },
-                error: function () {
-                	$('#pageLoader').hide();
-                	Swal.fire({
-	                    icon: 'error',
-	                    title: 'Submission Error',
-	                    text: 'Something went wrong while updating the form.'
-	                });
-                    $('#submitBtn').prop('disabled', false).text('Update');
-                }
-            }); 
-			
-	    });
-        
-
-        </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vendors/zonerequests.html b/src/main/resources/templates/modules/vendors/zonerequests.html
deleted file mode 100644
index b82cf7ee..00000000
--- a/src/main/resources/templates/modules/vendors/zonerequests.html
+++ /dev/null
@@ -1,1606 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-.required{
-	color: red;
-}
-/* Mobile screens - targeting devices with a max width of 767px */
-@media (max-width: 767px) 
-{
-	#requestlistform label{
-		margin-top: 10px;
-	} 
-}
-
-    #viewModal .modal-body {
-        max-height: 70vh;  /* Limit the height to 70% of the viewport */
-        overflow-y: auto;  /* Enable vertical scrolling */
-    }
-    
-    .custom-doc-btn {
-  height: 20px;
-  width: 80px;
-  font-size: 9px;
-  font-weight:bold;
-  text-align: center;
-  padding: 0px;
-  border:1px solid grey;
-}
-
-.col-md-3{
-padding-bottom: 10px; 
-}
-
-.comment {
-        margin-bottom: 20px;
-    }
-
-    .comment p {
-        margin: 0;
-    }
-
-    hr {
-        border: 1px solid #ccc;
-    }
-
-    .comment {
-        padding: 10px 0;
-    }
-
-    .comment .text-muted {
-        font-size: 0.9em;
-        color: #6c757d;
-    }
-
-    .comment hr {
-        border-top: 1px solid #ccc;
-    }
-    
-        #EditModal .modal-body {
-        max-height: 80vh;  
-        overflow-y: auto;  
-    }
-    
-    
-    card-block {
-    padding: 20px;
-}
-
-.form-label {
-    margin-bottom: 0.5rem;
-}
-
-input.form-control {
-    padding: 10px;
-}
-.form-select {
-    padding: 10px;
-    height: 40px;
-}
-
-/*css for map in step2*/
-		#googleMap {
-			height: 300px;
-			width: 100%;
-			position: relative;
-			overflow: hidden;
-			max-width: 100%;
-		}
-		
-		#pac-input {
-		    position: absolute;
-		    top: 10px;
-		    left: 50%;
-		    transform: translateX(-50%);
-		    width: 300px;
-		    z-index: 5;
-		    padding: 10px;
-		    border: 1px solid #ccc;
-		    background-color: white;
-		    border-radius: 4px;
-		  }
-
-		#search-container {
-			position: absolute;
-			top: 10px;
-			left: 50%;
-			transform: translateX(-50%);
-			z-index: 1000;
-			width: 500px;
-			box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3);
-			background-color: white;
-			border-radius: 4px;
-			padding: 0;
-			/* Removed extra padding to match the input width */
-		}
-
-		#search-box {
-			width: 100%;
-			/* Ensures the input takes up the entire width of the container */
-			padding: 5px;
-			font-size: 16px;
-			border: 1px solid #ccc;
-			border-radius: 4px;
-			/* Rounded corners matching the container */
-			box-sizing: border-box;
-			/* Makes sure padding is considered in width */
-		}
-
-		#suggestions {
-			border: 1px solid #ccc;
-			border-radius: 4px;
-			max-height: 200px;
-			overflow-y: auto;
-			margin-top: 5px;
-			background-color: white;
-			display: none;
-			width: 100%;
-			/* Matches the width of the container and input */
-			box-sizing: border-box;
-			/* Ensures the width includes borders and padding */
-		}
-		.pac-container {
-    z-index: 2000 !important; /* higher than modal's z-index */
-}
-
-		#suggestions ul {
-			list-style: none;
-			padding: 0;
-			margin: 0;
-		}
-
-		#suggestions ul li {
-			padding: 5px;
-			cursor: pointer;
-		}
-
-		#suggestions ul li:hover {
-			background-color: #f0f0f0;
-		}
-</style>
-    <body>
-		
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header mb-2">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="fa fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Street Vendor Req List</h5>
-										<span>Vending Committe</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item"><a href="/gcc/index"><i
-												class="ik ik-home"></i></a></li>
-										<li class="breadcrumb-item" aria-current="page">Vending Committe</li>
-										<li class="breadcrumb-item active" aria-current="page">Zone Requests</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					
-					<div class="row">
-					
-						
-						<div class="col-md-12" >
-						    <div class="card">
-						        <div class="card-block">
-						        						        
-						        <div class="page-header-title" >
-									<h5 style="margin: 0;font-weight: bold;"><span th:text="${zone}" id="userzone"></span>&nbsp;-&nbsp;Zone Request List</h5><span th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span><hr>
-							   </div> 
-						        
-						            <div>
-						                <table id="RequestListDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-						                    <thead class="thead-dark">
-						                        <tr role="row">
-						                            <th class="text-center">S.No</th>                                                  
-						                            <th class="text-center">Request No</th>
-						                            <th class="text-center">Name</th>
-						                            <th class="text-center">Mobile</th>
-						                            <th class="text-center">Address</th>
-						                            <th class="text-center">Postal Code</th>                                                                                               
-						                            <th class="text-center no-sort">Action</th> 
-						                        </tr>
-						                    </thead>
-						                    <tbody>
-						                        
-						                    </tbody>
-						                    <tfoot class="thead-dark">
-						                        <tr>
-						                            <th class="text-center">S.No</th>                                                  
-						                            <th class="text-center">Request No</th>
-						                            <th class="text-center">Name</th>
-						                            <th class="text-center">Mobile</th>
-						                            <th class="text-center">Address</th>
-						                            <th class="text-center">Postal Code</th> 
-						                            <th class="text-center no-sort">Action</th>                            
-						                        </tr>
-						                    </tfoot>
-						                </table>
-						            </div>
-						        </div>
-						    </div>
-						</div>
-
-
-
-
-
-						
-                      </div>
-                        
-                        
-                     </div>
-                </div>
-                
-                
-                <!-- Modal -->
-				<div class="modal fade" id="viewModal" tabindex="-1" aria-labelledby="viewModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
-				  <div class="modal-dialog modal-lg">
-				    <div class="modal-content">
-				      <div class="modal-header">
-				        <h5 class="modal-title" id="viewModalLabel">Request Details</h5>
-				       <button type="button" class="close"  data-bs-dismiss="modal" aria-label="Close">
-		                    <span aria-hidden="true">&times;</span>
-		                </button>
-				      </div>
-				      <div class="modal-body" id="modalBodyContent">
-				        <!-- Dynamic content loads here -->
-				      </div>
-				      <div class="modal-footer">
-				        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-
-
-				<!-- Image Modal -->
-                <div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
-				  <div class="modal-dialog modal-dialog-scrollable modal-lg">
-				    <div class="modal-content border-0">
-				      <div class="modal-body p-0 text-center" style="background-color: #f8f9fa;">
-				        <div id="docContainer" style="max-height: 90vh; overflow: auto;"></div>
-				      </div>
-				    </div>
-				  </div>
-				</div>
-				
-				
-				<!-- Edit Modal -->
-				<div class="modal fade" id="EditModal" tabindex="-1" aria-labelledby="EditModalLabel" aria-hidden="true">
-	    			<div class="modal-dialog modal-xl">
-	        			<div class="modal-content">
-	            			<div class="modal-header">
-	                			<h5 class="modal-title"><span id="vendor_req_id"></span> - Edit Details</h5>
-	                
-	                			<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-									<span aria-hidden="true">&times;</span>
-								</button>
-	            			</div>
-	            			<div class="modal-body">
-	                			<!-- <span th:text="${LoginUserId}" style="display:none;" id="userIdSpan"></span> -->
-	                			
-	                			 <div id="raw_bank_passbook" style="display: none;"></div>
-							     <div id="raw_street_vendor_photo" style="display: none;"></div>
-							     <div id="raw_aadhar_front_photo" style="display: none;"></div>
-							     <div id="raw_aadhar_back_photo" style="display: none;"></div>
-							     <div id="raw_ration_card_photo" style="display: none;"></div>
-	                			
-	                			<form id="vendorForm" enctype="multipart/form-data" >
-	                			<div class="section-header">				    
-				      				<h5>Business Details | வியாபார விவரங்கள்</h5>
-				      			</div>
-				      			
-				      			<div id="mapContainer" style="position: relative; height: 500px;">
-								  	<input id="pac-input" class="controls" type="text" placeholder="Search location">
-								  	<div id="googleMap" style="height: 90%; width: 100%;"></div>
-								</div>
-								<div id="search-container">
-									<!-- <input type="text" id="search-box" placeholder="Search for a location..."> -->
-									<div id="suggestions"></div>
-								</div>
-								
-								<div class="row mb-3">
-								
-									<div class="col-md-6">									
-										<label for="latitude_field">Latitude</label>
-										<input type="text" class="form-control" id="latitude_field" name="latitude_field"  readonly >
-									</div>
-							   		<div class="col-md-6">									
-										<label for="longitude_field">Longitude</label>
-										<input type="text" class="form-control" id="longitude_field" name="longitude_field"  readonly >
-									</div>
-								
-								</div>
-								
-								<div class="row mb-3">
-									<div class="col-md-6">									
-										<label for="zone">Zone</label>					        
-						        		<input type="text" class="form-control" id="zone" name="zone"  readonly>
-					        		</div>
-					        
-							        <div class="col-md-6">
-								        <label for="ward">Ward</label>
-										<input type="text" class="form-control" id="ward" name="ward" readonly>
-							        </div>
-								</div>
-								
-								<div class="row mb-3">
-									<div class="col-md-6">	
-								        <label class="form-label">Landmark (maximum 255 characters)</label>
-								        <textarea class="form-control" id="landmark" name="landmark" maxlength="255"></textarea>
-							        </div>
-							        <div class="col-md-6">
-								        <label class="form-label">விற்பனை பகுதி</label>
-								        <textarea class="form-control" id="landmark_tamil" name="landmark_tamil"  placeholder="தமிழில் பதிவு செய்யவும்"></textarea>
-							        </div>
-							    </div>
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">District | மாவட்டம்</label>
-					          <input type="text" class="form-control" id="vendor_district" name="vendor_district" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
-					        </div>
-					       <div class="col-md-6">
-					          <label class="form-label"> மாவட்டம்</label>
-					          <input type="text" class="form-control" id="vendor_district_tamil" name="vendor_district_tamil"  placeholder="தமிழில் பதிவு செய்யவும்">
-					        </div>
-					      </div>
-					      
-					      <div class="row mb-3">
-					      	 <div class="col-md-6">
-					          <label class="form-label">Pincode | அஞ்சல் குறியீடு</label>
-					          <input type="text" class="form-control" id="vendor_pincode" name="vendor_pincode" oninput="validatePincode(this)" >
-					         		 
-					        </div>
-					      </div>
-					
-					      <div class="row mb-3">
-					      
-					      <div class="col-md-6">
-								<label for="businesstype" class="form-label">Type of Business <span class="text-danger">*</span>
-								</label> 
-									<select id="businesstype" name="businesstype" class="form-control"  required>
-								  <option value="">-- Select Business Type --</option>
-								  <th:block th:each="vendingCategory : ${vendingCategories}">
-								    <option th:value="${vendingCategory.id}" th:text="${vendingCategory.vending_category_name}"></option>
-								  </th:block>
-								</select>
-								
-							</div>
-					        
-					          
-					        <div class="col-md-6">
-					         	<label for="tamilbusinesstype" class="form-label"> வியாபார வகை <span class="text-danger">*</span>
-								</label> 
-									<select id="tamilbusinesstype" name="tamilbusinesstype" class="form-control"  required>
-								  <option value="">-- வியாபார வகையைத் தேர்ந்தெடுக்கவும் --</option>
-								  <th:block th:each="tamilvendingCategory : ${tamilvendingCategories}">
-								    <option th:value="${tamilvendingCategory.id}" th:text="${tamilvendingCategory.tamil_vending_category_name}"></option>
-								  </th:block>
-								</select>
-					        </div>
-					      </div>
-					      
-					       <div class="row mb-3">
-					       <div class="col-md-6">
-					          <label class="form-label">Business Space (Sq ft)| வியாபார இடம் </label>
-					          <input type="text" class="form-control" id="business_space" name="business_space">
-					        </div>
-					       </div>
-					
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Did you get SVANIDHI loan? | ஸ்வநிதி கடன் வாங்கினீங்களா? </label><br>
-					          <input type="radio" name="svanidhi" value="Yes" > Yes
-					          <input type="radio" name="svanidhi" value="No" class="ms-3"> No
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">Do you have a Bank Account? | வங்கி கணக்கு உள்ளதா? </label><br>
-					          <input type="radio" name="bank_account" value="Yes" > Yes
-					          <input type="radio" name="bank_account" value="No" class="ms-3"> No
-					        </div>
-					        
-					        
-					        <div class="col-md-6" id="bank_passbook_container" style="display:none;">
-							    <label for="bank_passbook" class="form-label">Upload Bank Passbook (jpg/jpeg/pdf)
-							   </label>
-							    <input type="file" class="form-control" id="bank_passbook" name="bank_passbook" accept=".jpg,.jpeg,.pdf,application/pdf" >
-							     <div id="bank_passbookpreview" class="mt-2" style="display: none;"></div>
-							</div>
-												        
-					      </div>
-					
-					      <!-- Personal Details -->
-					      <div class="section-header">
-					      <h5>தனிப்பட்ட விவரங்கள் | Personal Details</h5>
-					      </div>
-					      
-					      <div class="row mb-3">
-					      <div class="col-md-6">
-					          <label class="form-label">Profile Image (jpg/jpeg/pdf)</label>
-					          <input type="file" class="form-control" id="profileimage"
-														accept=".jpg,.jpeg,.pdf,application/pdf" name="profileimage" >
-							 <div id="profilepreview" class="mt-2" style="display: none;"></div>
-					        </div>
-					        </div>
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label"> Name <span class="required">*</span></label>
-					          <input type="text" class="form-control" id="name" name="name" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" required>
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">பெயர் <span class="required">*</span></label>
-					          <input type="text" class="form-control" id="name_tamil" name="name_tamil" placeholder="தமிழில் பதிவு செய்யவும்" required>
-					        </div>
-					        </div>
-					        <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Father's / Husband's Name </label>
-					          <input type="text" class="form-control" id="father_name" name="father_name" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label"> தந்தை/கணவர் பெயர் </label>
-					          <input type="text" class="form-control" id="father_name_tamil" name="father_name_tamil" placeholder="தமிழில் பதிவு செய்யவும்" >
-					        </div>
-					      </div>
-					
-					      <div class="row mb-3">
-					       
-					        <div class="col-md-6">
-					          <label class="form-label">Gender | பாலினம் </label><br>
-					          <input type="radio" name="gender" value="Male" > Male
-					          <input type="radio" name="gender" value="Female" class="ms-3"> Female
-					          <input type="radio" name="gender" value="Transgender" class="ms-3">Transgender
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label"> பாலினம் </label><br>
-					          <input type="radio" name="gender_tamil" value="ஆண்" > ஆண்
-					          <input type="radio" name="gender_tamil" value="பெண்" class="ms-3"> பெண்
-					          <input type="radio" name="gender_tamil" value="பிற்பாலினர்" class="ms-3">பிற்பாலினர்
-					        </div>
-					      </div>
-					      
-					      <div class="row mb-3">
-					       <div class="col-md-6">
-					          <label class="form-label">Mobile Number | மொபைல் எண் <span class="required">*</span></label>
-					          <input type="text" class="form-control" id="mobile_no" name="mobile_no" oninput="validatePhoneNumber(this)" required readonly="readonly">
-					        </div>
-					      </div>
-					      
-					
-					      
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Date of Birth | பிறந்த தேதி </label>
-					          <input type="date" id="dob" class="form-control" name="dob" >
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">Community Category | சமூக வகை </label>
-					          <select class="form-control" id="community" name="community" >
-								    <option value="">-- Select Community --</option>
-								    <th:block th:each="com : ${communities}">
-								        <option th:value="${com.id}" th:text="${com.category_name}"></option>
-								    </th:block>
-								</select>
-					        </div>
-					      </div>
-					
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Differently Abled | இயலாமை உள்ளவரா? </label><br>
-					          <input type="radio" name="differently_abled" value="Yes" > Yes
-					          <input type="radio" name="differently_abled" value="No" class="ms-3"> No
-					        </div>
-					        
-					        
-					        
-					        <div class="col-md-6">
-					          <label class="form-label">Street Vendor’s educational status  | தெருவணிகரின் கல்வித்தகுதி </label>
-					          <select class="form-control"  id="education" name="education" >
-							    <option value="">-- Select Education Status--</option>
-							    <th:block th:each="edu : ${educationList}">
-							        <option th:value="${edu.id}" th:text="${edu.education}"></option>
-							    </th:block>
-							</select>
-					        </div>
-					      </div>
-					
-					
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label for="maritalstatus" class="form-label"> Marital Status | திருமண நிலை </label>
-					          <select class="form-control" id="maritalStatus" name="maritalStatus" >
-							    <option value="">-- Select Marital Status --</option>
-							    <th:block th:each="status : ${maritalStatuses}">
-							        <option th:value="${status.id}" th:text="${status.marital_status}"></option>
-							    </th:block>
-							</select>
-					        </div>
-					        <div class="col-md-6">
-					          <label for="familymembers" class="form-label">Number of Family Members | குடும்ப உறுப்பினர்கள் எண்ணிக்கை </label>
-					          <input type="number" class="form-control" name="familymembers" id="familymembers">
-					        </div>
-					      </div>
-					
-					      <div class="mb-3">
-					        <label class="form-label">Are any of your family member involved in street vending | உங்கள் குடும்ப உறுப்பினர் வியாபாரத்தில் உள்ளவரா? </label><br>
-					        <input type="radio" name="fam_vendor" value="Yes" > Yes
-					        <input type="radio" name="fam_vendor" value="No" class="ms-3"> No
-					      </div>
-					
-					      <!-- Address -->
-					      <div class="section-header">
-					      <h5>Residential Address | வீட்டு முகவரி </h5>
-					      </div>
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Door No | கதவு எண் </label>
-					          <input type="text" class="form-control" name="doorno" id="doorno" >
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">Street Name | தெரு பெயர் </label>
-					          <input type="text" class="form-control" name="streetname" id="streetname" >
-					        </div>
-					      </div>
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Area Name | பகுதி பெயர் </label>
-					          <input type="text" class="form-control" name="areaname" id="areaname" >
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">District | மாவட்டம் </label>
-					          <input type="text" class="form-control" name="district" id="district" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
-					        </div>
-					      </div>
-					      
-					      <div class="row mb-3">
-					      <div class="col-md-6">
-					        <label class="form-label">Pincode | அஞ்சல் குறியீடு </label>
-					        <input type="text" class="form-control" name="pincode" id="pincode" oninput="validatePincode(this)" >
-					      </div>
-					      
-					      
-					      <div class="col-md-6">
-							  <label class="form-label">Aadhaar Number | ஆதார் எண் </label>
-							  <input type="text" class="form-control" id="aadhar_number" name="aadhar_number" maxlength="12" oninput="validateAadhar(this)" >
-							</div>
-					      
-					      </div>
-					
-					      <!-- Document Uploads -->
-					     <div class="section-header">
-					     <h5>ஆவணங்கள் | Document Uploads</h5>
-					     </div>
-					      <div class="row mb-3">
-					        <div class="col-md-6">
-					          <label class="form-label">Aadhaar Front Image | ஆதார் முன்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
-					          <input type="file" class="form-control" id="aadharfrontimage"
-														accept=".jpg,.jpeg,.pdf,application/pdf" name="aadharfrontimage" >
-								
-							  <div id="aadharfrontimagepreview" class="mt-2" style="display: none;"></div>
-														
-					        </div>
-					        <div class="col-md-6">
-					          <label class="form-label">Aadhaar Back Image | ஆதார் பின்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
-					          <input type="file" class="form-control" id="aadharbackimage"
-															accept=".jpg,.jpeg,.pdf,application/pdf" name="aadharbackimage" >
-															
-								<div id="aadharbackimagepreview" class="mt-2" style="display: none;"></div>
-					        </div>
-					      </div>
-					      <div class="row mb-3">
-					      <div class="col-md-6">
-					        <label class="form-label">Take Ration Card Front Image | ரேஷன் கார்டு முன்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
-					        <input type="file" class="form-control" id="ration_card_photo"
-															accept=".jpg,.jpeg,.pdf,application/pdf" name="ration_card_photo" >
-															
-							<div id="ration_card_preview" class="mt-2" style="display: none;"></div>								
-					      </div>
-					 </div>
-				      <!-- Submit -->
-				      <div class="text-center mt-4">
-								<button type="submit" class="btn btn-primary" name="submitBtn" id="submitBtn">Update</button>
-								
-						</div>
-	                			
-	                			</form>
-
-				            </div>
-				        </div>
-				    </div>
-				</div>
-                
-                
-                <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-               
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-				</div>
-				
-               
-            
-		</div>
-		
-
-				
-		
-                      
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-        <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-                  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-        
-        <script sync defer
-		src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCi7N6uW5MZaSkd50Kzw7ax2GkMN1vjE-E&callback=myMap&libraries=places">
-		</script>
-            <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-        <script>
-function allowTamilAndSymbols(id) {
-    const el = document.getElementById(id);
-
-    el.addEventListener("input", function () {
-        // Allowed:
-        // Tamil letters: \u0B80-\u0BFF
-        // Digits: 0-9
-        // Dot .      → \.
-        // Slash /    → \/
-        // Comma ,    → ,
-        // Hyphen -   → -
-        // Space      → \s
-        // Newline    → \n (included in \s)
-        this.value = this.value.replace(/[^\u0B80-\u0BFF0-9.,\/\-\s]/g, "");
-    });
-}
-
-allowTamilAndSymbols("landmark_tamil");
-allowTamilAndSymbols("vendor_district_tamil");
-allowTamilAndSymbols("name_tamil");
-allowTamilAndSymbols("father_name_tamil");
-</script>
-        
-        <script type="text/javascript">
-        
-    
-        function myMap(latFromDb, lngFromDb) {
-            // Use vendor lat/lng if available, else fallback
-            const defaultCenter = (latFromDb && lngFromDb) 
-                ? { lat: parseFloat(latFromDb), lng: parseFloat(lngFromDb) }
-                : { lat: 13.0827, lng: 80.2707 };
-      		const map = new google.maps.Map(document.getElementById("googleMap"), {
-      			center: defaultCenter,
-      			zoom: 14
-      		});
-
-      		let marker = null;
-      		let streetsList = []; // ✅ Define globally inside myMap
-      		const infowindow = new google.maps.InfoWindow();
-
-      		// 🔍 Initialize the SearchBox
-      		let input = document.getElementById('pac-input');
-      		let searchBox = new google.maps.places.SearchBox(input);
-      		//map.controls[google.maps.ControlPosition.TOP_LEFT].push(input);
-
-      		map.addListener('bounds_changed', function () {
-      			searchBox.setBounds(map.getBounds());
-      		});
-
-      		searchBox.addListener('places_changed', function () {
-      			const places = searchBox.getPlaces();
-      			if (places.length === 0) return;
-
-      			if (marker) marker.setMap(null);
-      			const place = places[0];
-      			if (!place.geometry) return;
-
-      			marker = new google.maps.Marker({
-      				map: map,
-      				position: place.geometry.location
-      			});
-
-      			const lat = place.geometry.location.lat().toFixed(6);
-      			const lng = place.geometry.location.lng().toFixed(6);
-      			document.getElementById("latitude_field").value = lat;
-      			document.getElementById("longitude_field").value = lng;
-
-      			map.setCenter(place.geometry.location);
-      			map.setZoom(15);
-
-      			infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
-      			infowindow.open(map, marker);
-
-      			fetchStreets(lat, lng);
-      		});
-
-      		map.addListener("click", function (event) {
-      			const clickedLatLng = event.latLng;
-      			if (marker) marker.setMap(null);
-
-      			marker = new google.maps.Marker({
-      				position: clickedLatLng,
-      				map: map
-      			});
-
-      			const lat = clickedLatLng.lat().toFixed(6);
-      			const lng = clickedLatLng.lng().toFixed(6);
-
-      			document.getElementById("latitude_field").value = lat;
-      			document.getElementById("longitude_field").value = lng;
-
-      			infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
-      			infowindow.open(map, marker);
-
-      			fetchStreets(lat, lng);
-      		});
-      		
-      		function fetchStreets(lat, lng) {
-      			const encodedGeometry = encodeURIComponent(JSON.stringify({ y: lat, x: lng }));
-      		    //const url = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/
-      		    //FeatureServer/2/query?where=&objectIds=&time=&geometry={encodedGeometry}&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=1&units=esriSRUnit_Meter&outFields=zone,ward&returnGeometry=false&f=geojson`;
-      		    
-      			const url=`https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/2/query?` +
-      				`where=&objectIds=&time=&geometry=${encodedGeometry}` + 
-      				`&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=1` +
-      				`&units=esriSRUnit_Meter&relationParam=&outFields=zone,ward` +
-      				`&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=` +
-      				`&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=` +
-      				`&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=` +
-      				`&resultRecordCount=&returnTrueCurves=false&returnExceededLimitFeatures=false&quantizationParameters=&returnCentroid=false` +
-      				`&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault` +
-      				`&datumTransformation=&f=geojson`;
-      		    fetch(url)
-      		        .then(response => {
-      		            if (!response.ok) {
-      		                throw new Error(`HTTP error! Status: ${response.status}`);
-      		            }
-      		            return response.json();
-      		        })
-      		        .then(data => {
-      		        	
-      		        	console.log("GIS API Response:", data);
-
-      		            const features = data.features;
-      		            if (features.length > 0) {
-      		                const props = features[0].properties;
-      		                const zone = props.zone;
-      		                const ward = props.ward;
-
-      		                console.log("Zone:", zone, "Ward:", ward);
-      		                // 👉 You can update form fields or DOM elements here
-      		                document.getElementById("zone").value = zone;
-      		                document.getElementById("ward").value = ward;
-      		            } else {
-      		                console.warn("No zone/ward found for this location.");
-      		                document.getElementById("zone").value = '';
-      		                document.getElementById("ward").value = '';
-      		            }
-      		        })
-      		        .catch(error => {
-      		            console.error("Error fetching zone/ward:", error);
-      		        });
-      		}
-      	}
-    	  
-    	  // GLOBAL scope — must be outside any other function
-    	  function openDocModal(fileUrl) {
-    	      const container = document.getElementById('docContainer');
-    	      const ext = fileUrl.split('.').pop().toLowerCase();
-
-    	      if (ext === 'pdf') {
-    	          container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
-    	      } else {
-    	          container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;" onerror="No image">`;
-    	      }
-
-    	      $('#docModal').modal('show');
-    	  }
-        
-        $(document).ready(function() {
-
-        	var table = $('#RequestListDatatable').DataTable({
-                dom: 'Bftip',
-                columnDefs: [
-                    { targets: 'no-sort', orderable: false }
-                ],
-                lengthMenu: [
-                    [50, 100, 200, 500, -1],
-                    ['50 rows', '100 rows', '200 rows', 'Show all']
-                ],
-                scrollY: '50vh',               
-                buttons: [
-                    {
-                        extend: 'pageLength',
-                        className: 'btn btn-warning'
-                    },
-                    {
-                        title: 'Data export',
-                        extend: 'copyHtml5',
-                        text: 'Copy',
-                        className: 'btn btn-secondary',
-                        id: 'copyBtn'
-                    },
-                    {
-                        extend: 'excelHtml5',
-                        text: 'Excel',
-                        className: 'btn btn-secondary',
-                        id: 'excelBtn'
-                    },
-                    {
-                        extend: 'csvHtml5',
-                        text: 'CSV',
-                        className: 'btn btn-secondary',
-                        id: 'csvBtn'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        text: 'PDF',
-                        className: 'btn btn-secondary',
-                        id: 'pdfBtn'
-                    }
-                ],
-                fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
-                searching: false,
-                select: false,
-                processing: false
-            
-
-            });
-        	
-        	let userzone = document.getElementById('userzone').textContent;
-        	         
-            fetchVendingCommitteeList(userzone);
-        
-            
-            $("input[name='bank_account']").change(function () {
-		        if ($(this).val() === "Yes") {
-		            $("#bank_passbook_container").show();
-		        } else {
-		            $("#bank_passbook_container").hide();
-		            $("#bank_passbook").val("");
-		        }
-		    });
-            
-            $('#business_space').on('input', function () {
-			    // Remove anything that is not a digit
-			    this.value = this.value.replace(/\D/g, '');
-
-			    // Limit to max 2 digits
-			    if (this.value.length > 2) {
-			        this.value = this.value.slice(0, 2);
-			    }
-			});
-         
-        });
-        
-     // Validation helpers
-		function validatePhoneNumber(input) {
-		    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 10);
-		}
-
-		function validatePincode(input) {
-		    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 6);
-		    
-		}
-
-		function validateAadhar(input) {
-		    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 12);
-		}
-
-		// DOB max date
-		document.addEventListener("DOMContentLoaded", function () {
-		    const dobInput = document.getElementById("dob");
-		    const today = new Date().toISOString().split("T")[0];
-		    dobInput.setAttribute("max", today);
-		    dobInput.addEventListener("focus", function () {
-		        if (typeof dobInput.showPicker === "function") {
-		            dobInput.showPicker();
-		        }
-		    });
-		});
-        
-        function fetchVendingCommitteeList(userzone) {
-        	$('#pageLoader').show();
-            $.ajax({
-                url: '/gcc/api/streetvendor/vendingDetailsbyZoneWeb',
-                method: 'GET',
-                data:{zone:userzone},
-                contentType: 'application/json',
-                success: function (data) {
-                	$('#pageLoader').hide();
-                    let tableContainer = $('#RequestListDatatable');
-
-                    // Destroy any existing DataTable instance
-                    if ($.fn.DataTable.isDataTable(tableContainer)) {
-                        tableContainer.DataTable().destroy();
-                    }
-
-                    // Check for empty list
-                    if (!data || data.length === 0) {
-                        tableContainer.find('tbody').html(`
-                            <tr>
-                                <td colspan="7" class="text-center text-danger">No Data Available</td>
-                            </tr>
-                        `);
-                        return;
-                    }
-
-                    // Initialize DataTable
-                    tableContainer.DataTable({
-                        destroy: true,
-                        searching: true,
-                        autoWidth: false,
-                        paging: true,
-                        info: true,
-                        data: data,
-                        columns: [
-                            {
-                                data: null,
-                                render: (data, type, row, meta) => meta.row + 1,
-                                className: 'text-center'
-                            },
-                            { data: 'vendor_req_id', defaultContent: '-', className: 'text-center' },
-                            { data: 'name', defaultContent: '-', className: 'text-center' },
-                            { data: 'mob_no', defaultContent: '-', className: 'text-center' },
-                            { data: 'present_address', defaultContent: '-', className: 'text-center' },
-                            { data: 'present_pincode', defaultContent: '-', className: 'text-center' },                               
-                            {
-                                data: 'vendor_req_id',
-                                render: function (data, type, row) {
-                                    let viewBtn = `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
-                                    let editBtn = "";
-
-                                    // check editable flag from row
-                                    if (row.editable === true) {
-                                        editBtn = ` <button class="btn btn-success btn-sm btn-edit" data-id="${data}">Edit</button>`;
-                                    }
-
-                                    return viewBtn + editBtn; // concatenate buttons
-                                },
-                                className: 'text-center'
-                            }
-                            
-                        ],
-                        dom: 'Bfrtip',
-                        buttons: [
-                            { extend: 'pageLength', className: 'btn btn-warning' },
-                            { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-                            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-                            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-                            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-                        ],
-                        columnDefs: [{ targets: 'no-sort', orderable: false }],
-                        lengthMenu: [
-	      		                [50, 100, 200, 500, -1],
-	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
-	      		            ],
-                        scrollY: '80vh',
-                        scrollX: true,
-                        responsive: false
-                    });
-                    
-                    tableContainer.on('click', '.btn-edit', function () {
-                    	//$('#EditModal').modal('show');
-                    	 let id = $(this).data('id');                      
-                        $.ajax({
-                            url: `/gcc/api/streetvendor/webVendorDetailsByReqId?requestId=${id}`,
-                            method: 'GET',
-                            success: function (response) {
-                            	DisplayInModal(response)
-                            },
-                            error: function (xhr) {
-                                console.error("Error fetching detail:", xhr.responseText);
-                                alert("Failed to fetch vendor details.");
-                            }
-                        });
-                    });
-                    
-                    
-                 // Bind view buttons
-                    tableContainer.on('click', '.btn-view', function () {
-                        let id = $(this).data('id');                      
-                        $.ajax({
-                            url: `/gcc/api/streetvendor/webVendorDetailsByReqId?requestId=${id}`,
-                            method: 'GET',
-                            success: function (detailData) {
-                                if (detailData.length === 0) {
-                                    $('#modalBodyContent').html("<p>No data found for this request.</p>");
-                                    $('#viewModal').modal('show');
-                                    return;
-                                }
-
-                                const details = detailData[0];
-                                const diffAbledDisplay = details.diff_abled === true ? 'Yes' : (details.diff_abled === false ? 'No' : '-');
-                                const pmLoanDisplay = details.pm_svanidhi_loan ? (details.pm_svanidhi_loan ? 'Yes' : 'No') : '-';
-                                const bankAccDisplay = details.bank_acc_status ? (details.bank_acc_status === '1' ? 'Yes' : 'No') : '-';
-                                const idCardDisplay= details.vendor_id_card ? (details.vendor_id_card ==='1' ? 'Yes' : 'No') : '-';
-                                const bankPassbookDisplay = details.bank_acc_status === '1' && details.view_bank_passbook
-                                ? `<img src="${details.view_bank_passbook}" alt="Bank Passbook" class="img-fluid" style="max-width: 150px;" onerror="this.src='/default.jpg'">`
-                                : '-';
-                                
-                                const aadharFrontBtn = details.view_aadhar_front_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_aadhar_front_photo}')">View</button>` : '-';
-                                const rationCardBtn = details.view_ration_card_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_ration_card_photo}')">View</button>` : '-';
-                                const aadharBackBtn = details.view_aadhar_back_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_aadhar_back_photo}')">View</button>` : '-';
-                                const bankPassbookBtn = details.bank_acc_status === '1' && details.view_bank_passbook
-                                    ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_bank_passbook}')">View</button>`
-                                    : '-';
-                                    
-                                const vendorPhotoBtn= details.view_street_vendor_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_street_vendor_photo}')">View</button>` : '-';
-                                
-                                const content = `
-                                    <div class="container-fluid">
-                                        <!-- Personal Details -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-primary text-white">Personal Details</div>
-                                            <div class="card-body row">
-                                            <div class="col-md-3"><strong>Name:</strong></div>
-                                            <div class="col-md-3">${details.name || '-'}</div>
-                                            <div class="col-md-3"><strong>Father/Husband Name:</strong></div>
-                                            <div class="col-md-3">${details.f_h_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Mobile:</strong></div>
-                                            <div class="col-md-3">${details.mob_no || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Community Category:</strong></div>
-                                            <div class="col-md-3">${details.category_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>DOB:</strong></div>
-                                            <div class="col-md-3">${details.dob || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Address:</strong></div>
-                                            <div class="col-md-3">${details.residental_address || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Gender:</strong></div>
-                                            <div class="col-md-3">${details.gender || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Pincode:</strong></div>
-                                            <div class="col-md-3">${details.present_pincode || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Differently Abled:</strong></div>
-                                            <div class="col-md-3">${diffAbledDisplay || '-'}</div>
-                                            
-                                            <div class="col-md-3"><strong>Vendor Image:</strong></div>
-                                            <div class="col-md-3">${vendorPhotoBtn || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Aadhaar front Image:</strong></div>
-                                            <div class="col-md-3">${aadharFrontBtn}</div>
-
-                                            <div class="col-md-3"><strong>Ration card Image:</strong></div>
-                                            <div class="col-md-3">${rationCardBtn}</div>
-
-                                            <div class="col-md-3"><strong>Aadhaar back Image:</strong></div>
-                                            <div class="col-md-3">${aadharBackBtn}</div>
-                                            </div>
-                                        </div>
-
-                                        <!-- Business Details -->
-                                        <div class="card mb-3">
-                                            <div class="card-header bg-success text-white">Business Details</div>
-                                            <div class="card-body row">
-                                            <div class="col-md-3"><strong>Type of Business:</strong></div>
-                                            <div class="col-md-3">${details.vending_category_name || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Zone:</strong></div>
-                                            <div class="col-md-3">${details.zone || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Business Space (sq.ft):</strong></div>
-                                            <div class="col-md-3">${details.vending_space || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Ward:</strong></div>
-                                            <div class="col-md-3">${details.ward || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Address:</strong></div>
-                                            <div class="col-md-3">${details.business_address || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Pincode:</strong></div>
-                                            <div class="col-md-3">${details.vending_pincode || '-'}</div>
-
-                                            <div class="col-md-3"><strong>PM SVANidhi Loan Availed:</strong></div>
-                                            <div class="col-md-3">${pmLoanDisplay || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Do you Have Bank Account?:</strong></div>
-                                            <div class="col-md-3">${bankAccDisplay || '-'}</div>
-
-                                            <div class="col-md-3"><strong>Bank Passbook Image:</strong></div>
-                                            <div class="col-md-3">${bankPassbookBtn}</div>
-
-                                            </div>
-                                        </div>
-                                                                                                                  
-                                        </div>
-                                    </div>
-                                `;                                                           
-                                
-                                $('#modalBodyContent').html(content);
-                                $('#viewModalLabel').text(`Vendor Details - ${id}`);
-                                $('#viewModal').modal('show');
-                            },
-                            error: function (xhr) {
-                                console.error("Error fetching detail:", xhr.responseText);
-                                alert("Failed to fetch vendor details.");
-                            }
-                        });
-                    });
-                   
-                },
-
-                error: function (xhr, status, error) {
-                	$('#pageLoader').hide();
-                    console.error("Error fetching data:", error);
-                    alert("Failed to load vendor list.");
-                }
-            });
-        }
-        
-        
-        
-        function DisplayInModal(responseData){
-        	
-        	// clear previous search box value
-            $('#pac-input').val('');
-            
-    		
-        	$('#EditModal').modal('show');
-        	 let data = responseData[0];
-        	 
-        	 $("#latitude_field").val(data.latitude);
-        	 $("#longitude_field").val(data.longitude);
-        	 $('#EditModal').on('shown.bs.modal', function () {
-        	        myMap(data.latitude, data.longitude);
-        	    });
-        	 $("#zone").val(data.zone);
-        	 $("#ward").val(data.ward);
-        	 $("#landmark").val(data.vending_address);
-        	 $("#landmark_tamil").val(data.tamil_landmark);
-        	 $("#vendor_district").val(data.vending_district);
-        	 $("#vendor_district_tamil").val(data.tamil_present_district)
-        	 $("#vendor_pincode").val(data.vending_pincode);
-        	 $("#businesstype").val(data.vending_category);
-        	 $("#tamilbusinesstype").val(data.tamil_vending_category);
-        	 $("#business_space").val(data.vending_space);
-        	 if (data.pm_svanidhi_loan == null) {
-        		    $("input[name='svanidhi']").prop("checked", false); // clear both
-        		} else {
-        		    $("input[name='svanidhi'][value='" + (data.pm_svanidhi_loan ? "Yes" : "No") + "']")
-        		        .prop("checked", true);
-        		}
-
-        	 if (data.pm_svanidhi_loan == null) {
-        		    $("input[name='svanidhi']").prop("checked", false); // clear both
-        		} else {
-        		    $("input[name='svanidhi'][value='" + (data.pm_svanidhi_loan ? "Yes" : "No") + "']")
-        		        .prop("checked", true);
-        		}
-        	 
-        	 if (data.bank_acc_status === "1") {
-        		    $("input[name='bank_account'][value='Yes']").prop("checked", true);
-        		    $("#bank_passbook_container").show();
-        		} else if (data.bank_acc_status === "0") {
-        		    $("input[name='bank_account'][value='No']").prop("checked", true);
-        		    $("#bank_passbook_container").hide();
-        		} else {
-        		    // null → clear selection
-        		    $("input[name='bank_account']").prop("checked", false);
-        		    $("#bank_passbook_container").hide();
-        		}
-        	 
-        	 $("#name").val(data.name);
-        	 $("#name_tamil").val(data.tamil_name);
-        	 $("#father_name").val(data.f_h_name);
-        	 $("#father_name_tamil").val(data.tamil_f_h_name);
-        	 $("#mobile_no").val(data.mob_no);
-        	 if (data.gender == null) {
-        		    $("input[name='gender']").prop("checked", false); // clear all
-        		} else {
-        		    $("input[name='gender'][value='" + data.gender + "']").prop("checked", true);
-        		}
-        	 
-        	 if (data.tamil_gender == null) {
-     		    $("input[name='gender_tamil']").prop("checked", false); // clear all
-     		} else {
-     		    $("input[name='gender_tamil'][value='" + data.tamil_gender + "']").prop("checked", true);
-     		}
-        	 
-        	 $("#dob").val(data.dob);
-        	 $("#community").val(data.social_category);
-        	 if (data.diff_abled == null) {
-      		    $("input[name='differently_abled']").prop("checked", false); // clear both
-      		} else {
-      		    $("input[name='differently_abled'][value='" + (data.diff_abled ? "Yes" : "No") + "']")
-      		        .prop("checked", true);
-      		}
-        	 $("#education").val(data.education_status);
-        	 $("#maritalStatus").val(data.marital_status);
-        	 $("#familymembers").val(data.no_of_fam_mem);
-        	 
-        	 if (data.are_any_fam_mem_invol_str_ven == null) {
-       		    $("input[name='fam_vendor']").prop("checked", false); // clear both
-       		} else {
-       		    $("input[name='fam_vendor'][value='" + (data.are_any_fam_mem_invol_str_ven ? "Yes" : "No") + "']")
-       		        .prop("checked", true);
-       		}
-        	 
-        	 if (data.present_address) {
-       		    let parts = data.present_address.split(",").map(p => p.trim());
-
-       		    $("#doorno").val(parts[0] || "");
-       		    $("#streetname").val(parts[1] || "");
-       		    $("#areaname").val(parts[2] || "");
-       		} else {
-       		    $("#doorno").val("");
-       		    $("#streetname").val("");
-       		    $("#areaname").val("");
-       		}
-        	 
-        	 $("#district").val(data.present_district); 
-        	 $("#pincode").val(data.present_pincode); 
-        	 $("#aadhar_number").val(data.aadhar_no); 
-        	 $("#vendor_req_id").text(data.vendor_req_id);
-        	 
-        	 if (data.view_bank_passbook) {
-			    	
-			    	$('#bank_passbookpreview').show();
-			    	
-			        const fileName = data.view_bank_passbook.split('/').pop();
-			    	
-			        $('#bank_passbookpreview').html(`
-			            <a href="${data.view_bank_passbook}" target="_blank" style="color:blue;">${fileName}</a>
-			        `);
-			  } else {
-			        
-			        $('#bank_passbookpreview').hide();
-			  }
-        	 
-        	 if (data.view_street_vendor_photo) {
-			    	
-			    	$('#profilepreview').show();
-			    	// Extract file name from URL
-			        const fileName = data.view_street_vendor_photo.split('/').pop();
-			    	
-			        $('#profilepreview').html(`
-			            <a href="${data.view_street_vendor_photo}" target="_blank" style="color:blue;">${fileName}</a>
-			        `);
-			  } else {
-			        
-			        $('#profilepreview').hide();
-			  }
-        	 
-        	 if (data.view_aadhar_front_photo) {
-			    	
-			    	$('#aadharfrontimagepreview').show();
-			    	// Extract file name from URL
-			        const fileName = data.view_aadhar_front_photo.split('/').pop();
-			    	
-			        $('#aadharfrontimagepreview').html(`
-			            <a href="${data.view_aadhar_front_photo}" target="_blank" style="color:blue;">${fileName}</a>
-			        `);
-			  } else {
-			        
-			        $('#aadharfrontimagepreview').hide();
-			  }
-        	 
-        	 if (data.view_aadhar_back_photo) {
-			    	
-			    	$('#aadharbackimagepreview').show();
-			    	// Extract file name from URL
-			        const fileName = data.view_aadhar_back_photo.split('/').pop();
-			    	
-			        $('#aadharbackimagepreview').html(`
-			            <a href="${data.view_aadhar_back_photo}" target="_blank" style="color:blue;">${fileName}</a>
-			        `);
-			  } else {
-			        
-			        $('#aadharbackimagepreview').hide();
-			  }
-        	 
-        	 if (data.view_ration_card_photo) {
-			    	
-			    	$('#ration_card_preview').show();
-			    	// Extract file name from URL
-			        const fileName = data.view_ration_card_photo.split('/').pop();
-			    	
-			        $('#ration_card_preview').html(`
-			            <a href="${data.view_ration_card_photo}" target="_blank" style="color:blue;">${fileName}</a>
-			        `);
-			  } else {
-			        
-			        $('#ration_card_preview').hide();
-			  }
-        	 
-        	 
-        	 $('#raw_bank_passbook').text(data.bank_passbook);
-        	 $('#raw_street_vendor_photo').text(data.street_vendor_photo);
-        	 $('#raw_aadhar_front_photo').text(data.aadhar_front_photo);
-        	 $('#raw_aadhar_back_photo').text(data.aadhar_back_photo);
-        	 $('#raw_ration_card_photo').text(data.ration_card_photo);
-        	 	 
-        }
-     
-        
-     // Form submit
-	    $('#vendorForm').submit(function (e) {
-	    	//console.log("hiiii");
-	    	
-	    	e.preventDefault();
-	    	
-	    	let formData = new FormData(this);
-	        $('#submitBtn').prop('disabled', true).text('Updating...');
-	        
-	        $('#pageLoader').show();
-	        
-	        
-	        let bankpassbook_Preview= $('#bank_passbookpreview');
-	        let profile_Preview = $('#profilepreview');
-	        let aadharfront_Preview= $('#aadharfrontimagepreview');
-	        let aadharback_Preview = $('#aadharbackimagepreview');
-	        let rationcard_Preview = $('#ration_card_preview');
-	        
-	        let raw_bank_passbook = $('#raw_bank_passbook').text();	        
-	        let raw_street_vendor_photo= $('#raw_street_vendor_photo').text();
-	        let raw_aadhar_front_photo= $('#raw_aadhar_front_photo').text();
-	        let raw_aadhar_back_photo = $('#raw_aadhar_back_photo').text();
-	        let raw_ration_card_photo = $('#raw_ration_card_photo').text();
-	        
-			/* console.log("==========raw_bank_passbook========"+raw_bank_passbook);
-	        console.log("==========raw_street_vendor_photo========"+raw_street_vendor_photo);
-	        console.log("==========raw_aadhar_front_photo========"+raw_aadhar_front_photo);
-	        console.log("==========raw_aadhar_back_photo========"+raw_aadhar_back_photo);
-	        console.log("==========raw_ration_card_photo========"+raw_ration_card_photo); */
-	        
-	        function setIfPresent(formData, key, value) {
-                if (value !== undefined && value !== null && value !== "") {
-                    formData.set(key, value);
-                }
-            }
-        	
-        	function setFileIfPresent(formData, key, fileInput) {
-        	    if (fileInput && fileInput.files && fileInput.files.length > 0) {
-        	        formData.set(key, fileInput.files[0]);
-        	    }
-        	}
-        	
-        	let userId = document.getElementById('userIdSpan').textContent;
-        	console.log("userId="+userId);
-        	
-        	// pm_svanidhi_loan
-        	let svanidhiVal = $("input[name='svanidhi']:checked").val();
-        	setIfPresent(formData, "pm_svanidhi_loan", svanidhiVal === undefined ? "" : svanidhiVal === "Yes");
-        	//formData.set("pm_svanidhi_loan", svanidhiVal === undefined ? "" : svanidhiVal === "Yes");
-
-        	// bank_acc_status
-        	let bankVal = $("input[name='bank_account']:checked").val();
-        	setIfPresent(formData, "bank_acc_status",bankVal === undefined ? "" : bankVal === "Yes");
-
-        	// diff_abled
-        	let diffVal = $("input[name='differently_abled']:checked").val();
-        	setIfPresent(formData, "diff_abled", diffVal === undefined ? "" : diffVal === "Yes");
-
-        	// are_any_fam_mem_invol_str
-        	let famVal = $("input[name='fam_vendor']:checked").val();
-        	setIfPresent(formData, "are_any_fam_mem_invol_str", famVal === undefined ? "" : famVal === "Yes");
-        	
-        	const isBankYes = $("input[name='bank_account']:checked").val() === "Yes";
-        	const bankPassbook = $('#bank_passbook')[0]?.files[0];
-        	if(isBankYes){
-        		
-        		if(bankpassbook_Preview.html().trim() === '' && !bankPassbook){
-        			$('#pageLoader').hide();
-        			Swal.fire('Missing Bank Passbook', 'Bank passbook is required because Bank Account Status is Yes.', 'warning');
-		            $('#submitBtn').prop('disabled', false).text('Update');
-		            return; 
-        		} 
-        		if(bankPassbook){
-        			setFileIfPresent(formData, "bank_passbook", $('#bank_passbook')[0].files[0]);
-        		}
-        		if(bankpassbook_Preview.html().trim() !== ''){
-        			setIfPresent(formData, "raw_bank_passbook", raw_bank_passbook);
-        		}
-        	}
-        	else{
-        		setFileIfPresent(formData, "bank_passbook", null);
-        		setIfPresent(formData, "raw_bank_passbook", null);
-        	}
-        	
-        	// Lat/Lng
-	        const latitude = $('#latitude_field').val().trim();
-	        const longitude = $('#longitude_field').val().trim();
-	        
-	        setIfPresent(formData, "latitude", latitude);
-	        setIfPresent(formData, "longitude", longitude);
-	        
-	        const landmarkval = $('#landmark').val().trim();
-	        setIfPresent(formData, "landmark", landmarkval);
-	        
-	        const zone = $('#zone').val().trim();
-	        const ward = $('#ward').val().trim();
-	        
-	        
-	        setIfPresent(formData, "zone", zone);
-	        setIfPresent(formData, "ward", ward);
-        	
-	     // Pincode validation
-	        const vendingPincode = $('#vendor_pincode').val().trim();
-	        if (vendingPincode !=="" && !/^\d{6}$/.test(vendingPincode)) {
-	        	$('#pageLoader').hide();
-	            Swal.fire("Invalid vending place pincode", "Pincode must be 6 digits.", "error");
-	            $('#submitBtn').prop('disabled', false).text('Update');
-	            return;
-	        }
-	        setIfPresent(formData, "vending_pincode", vendingPincode);
-
-	        const presentPincode = $('#pincode').val().trim();
-	        if (presentPincode !=="" && !/^\d{6}$/.test(presentPincode)) {
-	        	$('#pageLoader').hide();
-	            Swal.fire("Invalid Present place Pincode", "Pincode must be 6 digits.", "error");
-	            $('#submitBtn').prop('disabled', false).text('Update');
-	            return;
-	        }						        
-	        setIfPresent(formData, "present_pincode", presentPincode);
-
-	        // Aadhaar validation
-	        const aadharNo = $('#aadhar_number').val().trim();
-	        if (aadharNo !=="" && !/^\d{12}$/.test(aadharNo)) {
-	        	$('#pageLoader').hide();
-	            Swal.fire("Invalid Aadhaar Number", "Aadhaar number must be 12 digits.", "error");
-	            $('#submitBtn').prop('disabled', false).text('Update');
-	            return;
-	        }
-	       
-	        setIfPresent(formData, "aadharNo", aadharNo);
-	        
-	        const mobileNumber = $('#mobile_no').val();
-	        if (!/^\d{10}$/.test(mobileNumber)) {
-	        	$('#pageLoader').hide();
-	            Swal.fire("Invalid Mobile Number", "Enter a valid 10-digit number.", "error");
-	            $('#submitBtn').prop('disabled', false).text('Update');
-	            return;
-	        }
-	        	        
-	        setIfPresent(formData, "mobile_number", mobileNumber);
-
-            // Set other fields
-            setIfPresent(formData, "vending_district", $('#vendor_district').val());
-			setIfPresent(formData, "vending_category", $('#businesstype').val());
-			setIfPresent(formData, "tamilvending_category", $('#tamilbusinesstype').val());
-			setIfPresent(formData, "vending_space", $('#business_space').val());
-            
-           
-            
-            setIfPresent(formData, "name", $('#name').val());
-            setIfPresent(formData, "f_h_name", $('#father_name').val());
-            setIfPresent(formData, "dob", $('#dob').val());
-            			                   
-	        
-	        let genderVal = $("input[name='gender']:checked").val();
-	        setIfPresent(formData, "gender", genderVal);
-	        
-        	setIfPresent(formData, "social_category", $('#community').val());
-        	setIfPresent(formData, "education_status", $('#education').val());
-        	setIfPresent(formData, "marital_status", $('#maritalStatus').val());
-        	setIfPresent(formData, "no_of_fam_mem", $('#familymembers').val());
-
-        	setIfPresent(formData, "door_no", $('#doorno').val());
-        	setIfPresent(formData, "streetname", $('#streetname').val());
-        	setIfPresent(formData, "areaname", $('#areaname').val());
-        	setIfPresent(formData, "present_district", $('#district').val());
-        	        	
-        	setIfPresent(formData, "userId", userId);
-        	
-        	let vendor_req_id= document.getElementById('vendor_req_id').textContent;
-        	setIfPresent(formData, "vendor_req_id", vendor_req_id);
-        	
-        	setFileIfPresent(formData, "street_vendor_photo", $('#profileimage')[0]);
-			setFileIfPresent(formData, "ration_card_photo", $('#ration_card_photo')[0]);
-			setFileIfPresent(formData, "aadhar_front_photo", $('#aadharfrontimage')[0]);
-			setFileIfPresent(formData, "aadhar_back_photo", $('#aadharbackimage')[0]);
-			
-			if(profile_Preview.html().trim() !== ''){
-    			setIfPresent(formData, "raw_street_vendor_photo", raw_street_vendor_photo);
-    		}
-			
-			if(aadharfront_Preview.html().trim() !== ''){
-    			setIfPresent(formData, "raw_aadhar_front_photo", raw_aadhar_front_photo);
-    		}
-			if(aadharback_Preview.html().trim() !== ''){
-    			setIfPresent(formData, "raw_aadhar_back_photo", raw_aadhar_back_photo);
-    		}
-			if(rationcard_Preview.html().trim() !== ''){
-    			setIfPresent(formData, "raw_ration_card_photo", raw_ration_card_photo);
-    		}
-			
-			
-			setIfPresent(formData, "tamil_name", $('#name_tamil').val());
-            setIfPresent(formData, "tamil_f_h_name", $('#father_name_tamil').val());
-            let landmarkvaltamil = $('#landmark_tamil').val().trim();
-	        setIfPresent(formData, "tamil_landmark", landmarkvaltamil);
-	        setIfPresent(formData, "tamil_present_district", $('#vendor_district_tamil').val());
-	        let genderValtamil = $("input[name='gender_tamil']:checked").val();
-	        setIfPresent(formData, "tamil_gender", genderValtamil);
-			
-			for (let pair of formData.entries()) {
-                console.log(pair[0] + ':', pair[1]);
-            }
-			
-			 $.ajax({
-                url: '/gcc/api/streetvendor/updateDetails',
-                type: 'POST',
-                data: formData,
-                enctype: 'multipart/form-data',
-                processData: false,
-                contentType: false,
-                success: function (response) {
-                	$('#pageLoader').hide();
-                    if (response.status) {
-                    	Swal.fire({
-	                        icon: 'success',
-	                        title: 'Success',
-	                        text: response.description ,
-	                        allowOutsideClick: false, 
-		                    allowEscapeKey: false,
-		                    allowEnterKey: false, 
-		                    showConfirmButton: true
-	                    }).then((result) => {
-		                    if (result.isConfirmed) {		                    	
-		                    	location.reload();		                    			                    	
-		                    }
-		                });                       
-                    } else {
-                    	$('#pageLoader').hide();
-                    	 Swal.fire({
-		                        icon: 'error',
-		                        title: 'Update Failed',
-		                        text: response.description || 'Something went wrong!'
-		                    });
-                    }
-                    $('#submitBtn').prop('disabled', false).text('Update');
-                },
-                error: function () {
-                	$('#pageLoader').hide();
-                	Swal.fire({
-	                    icon: 'error',
-	                    title: 'Submission Error',
-	                    text: 'Something went wrong while updating the form.'
-	                });
-                    $('#submitBtn').prop('disabled', false).text('Update');
-                }
-            }); 
-			
-	    });
-        
-
-        </script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vtrack/.DS_Store b/src/main/resources/templates/modules/vtrack/.DS_Store
deleted file mode 100644
index 581fe914aa550575fa082a791533bc1e9f0fefcc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKF;2rk5S)b+k!VsvcQ1&<4~{4)sQCbdAV4y5k<h#2*<p6~fJ7!O1)8;X=WcJu
zXHVhv0kFmU<{Fp*n9?2b;bCmP?mn`!mN6oo_jtfFp3vbH+fnuJ3FltnjjS!NL;enP
zykN(*j-#G&^OL#l`p0$GugUgDzoF0fVI0Y%fE17dQa}nwfzt|j@1;#I5*4L@6p#Yn
z3i$V-&>d^TAu&E33~>Y?PM8kkIL;Ep;t67HI3zMdv!oJ}YVC+&NoT&ay4r9^Ogb!f
z=6%}E)=nrEyE9*+999z*rGOMTR^U9RGw=T^`ib-ZF-bEiAO-%F0ybIREf;*H)>}s}
w=e@Sj@9AI0+9+p;R!odm%!#++%Y(Y&W3JbRLt@aG4?0ml0<Mcp3jBovpM0Jm&;S4c

diff --git a/src/main/resources/templates/modules/vtrack/messagelist.html b/src/main/resources/templates/modules/vtrack/messagelist.html
deleted file mode 100644
index 1fd356e9..00000000
--- a/src/main/resources/templates/modules/vtrack/messagelist.html
+++ /dev/null
@@ -1,535 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-
-    .modal-content {
-        width: 150%;
-    }
-
-
-</style>
-<body>
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header mb-2">
-                    <div class="row align-items-end">
-                        <div class="col-lg-8">
-                            <div class="page-header-title">
-                                <i class="fa fa-list-alt bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>V Track Message</h5>
-                                    <span>Send Message</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-4">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                    <li class="breadcrumb-item" aria-current="page">V Track Message</li>
-                                    <li class="breadcrumb-item active" aria-current="page">Send Message</li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row mt-4">
-                    <div class="col-md-12">
-                        <div class="card">
-                            <div class="card-block">
-                                <h5 style="font-weight:bold;">Enter Details</h5>
-                                <div class="row">
-
-                                    <div class="col-md-3">
-                                        <label for="selectedDate" class="form-label fw-bold"> Date<span
-                                                class="text-danger">*</span></label>
-                                        <input type="date" id="selectedDate" class="form-control"
-                                               onclick="this.showPicker()">
-                                    </div>
-
-                                    <div class="col-md-3">
-                                        <label for="selectType" class="form-label fw-bold"> Select Type<span
-                                                class="text-danger">*</span></label>
-                                        <select id="selectType" class="form-control" style="width: 100%;">
-                                            <option value="" selected>-- Select Category --</option>
-                                        </select>
-                                    </div>
-
-                                    <div class="col-md-3">
-                                        <label for="uploadImage">Upload image:<span class="text-danger">*</span></label>
-                                        <input type="file" class="form-control" id="uploadImage">
-                                        <small id="fileError" class="text-danger" style="display:none;">
-                                            Only image files (.jpg, .jpeg, .png) are allowed.
-                                        </small>
-                                    </div>
-
-
-                                    <div class="col-md-4 mt-20">
-                                        <button id="submitButton" class="btn btn-primary mt-2 mx-2">Submit</button>
-                                        <button id="resetButton" class="btn btn-secondary mt-2">Reset</button>
-
-                                    </div>
-
-                                </div>
-                            </div>
-                            <div class="card-block">
-
-                                <table id="VDatable" class="table table-striped table-bordered table-hover dataTable"
-                                       role="grid">
-                                    <thead class="thead-dark">
-                                    <tr role="row">
-                                        <th class="text-center">S.No</th>
-                                        <th class="text-center">Date</th>
-                                        <th class="text-center">Type</th>
-                                        <th class="text-center">Image</th>
-                                        <th class="text-center">Action</th>
-                                        <th class="text-center">Status</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody style="text-align:center;">
-                                    <!-- Thymeleaf loop to populate data -->
-                                    <tr th:each="vtmsg, iterStat : ${VehicleLists}">
-                                        <td th:text="${iterStat.index + 1}" class="text-center"></td>
-                                        <td th:text="${vtmsg['msg_date'] != null ? #dates.format(vtmsg['msg_date'], 'dd-MM-yyyy') : 'N/A'}"
-                                            class="text-center"></td>
-                                        <td th:text="${vtmsg['template_name']}" class="text-center"></td>
-                                        <!--<td th:text="${vtmsg['msg_attachfile']}" class="text-center"></td>-->
-                                        <td class="text-center">
-                                            <img th:src="${vtmsg['msg_attachfile']}" alt="Image" class="img-thumbnail"
-                                                 style="width: 50px; height: 50px; cursor: pointer;"
-                                                 data-bs-toggle="modal" data-bs-target="#imageModal"
-                                                 th:attr="data-bs-src=${vtmsg['msg_attachfile']}">
-                                        </td>
-                                        <td id='sendmsgbtn' class="text-center">
-                                            <button class="btn btn-primary btn-sm view-btn"
-                                                    th:disabled="${vtmsg['isdelete']} == 1"
-                                                    th:onclick="'sendmessage(\'' + ${vtmsg['msgid']} + '\')'">
-                                                Send
-                                            </button>
-                                        </td>
-                                        <td class="text-center">
-                                            <button id="inactivebtn" class="btn btn-primary btn-sm btn-danger"
-                                                    th:unless="${vtmsg['isdelete']} == 1"
-                                                    th:onclick="'disablemessage(\'' + ${vtmsg['msgid']} + '\')'">
-                                                Disable
-                                            </button>
-
-                                            <button id="activebtn" class="btn btn-primary btn-sm btn-success"
-                                                    th:if="${vtmsg['isdelete']} == 1"
-                                                    th:onclick="'enablemessage(\'' + ${vtmsg['msgid']} + '\')'">
-                                                Enable
-                                            </button>
-                                        </td>
-                                    </tr>
-                                    </tbody>
-                                </table>
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-
-        </div>
-
-        <div id="pageLoader"
-             style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-            <div style="position: relative; top: 50%; transform: translateY(-50%);">
-                <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                    <span class="sr-only">Loading...</span>
-                </div>
-                <!-- Add the 'Please wait' text below the spinner -->
-                <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-            </div>
-        </div>
-
-        <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-    </div>
-
-</div>
-
-<!-- Bootstrap Modal -->
-<div class="modal fade" id="imageModal" tabindex="-1" aria-labelledby="imageModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="imageModalLabel">Image Preview</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-            </div>
-            <div class="modal-body text-center">
-                <img id="modalImage" src="" class="img-fluid">
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-
-<script th:replace="~{fragments/modules/base/script :: script}"></script>
-<script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-<!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-
-<script>
-
-    const table = $('#VDatable').DataTable({
-        dom: 'Bftip',
-        columnDefs: [
-            {targets: 'no-sort', orderable: false}
-        ],
-        lengthMenu: [
-            [50, 100, 200, 500, -1],
-            ['50 rows', '100 rows', '200 rows', 'Show all']
-        ],
-        scrollY: '50vh',
-        buttons: [
-            {extend: 'pageLength', className: 'btn btn-warning'},
-            {title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary'},
-            {extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary'},
-            {extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary'},
-            {extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary'}
-        ],
-        fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
-        searching: true,
-        select: false,
-        processing: false
-    });
-
-    $(document).ready(function () {
-        function loadTemplates() {
-            $.ajax({
-                url: "/gcc/api/vtrack/getTemplateDetails", // Ensure this is the correct endpoint
-                type: "GET",
-                dataType: "json",
-                success: function (response) {
-                    console.log("Templates Loaded:", response); // Debugging
-
-                    if (response.length === 0) {
-                        console.warn("No Templates found!");
-                        return;
-                    }
-
-                    let $categoryDropdown = $("#selectType");
-                    // $categoryDropdown.empty().append('<option value="">-- Select Category --</option>');
-
-                    response.forEach(template => {
-                        $categoryDropdown.append(`<option value="${template.id}">${template.template_name}</option>`);
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error("Error fetching categories:", xhr.responseText);
-                    Swal.fire({
-                        icon: "error",
-                        title: "Error Fetching Data",
-                        text: "Failed to load categories. Please try again later.",
-                    });
-                }
-            });
-        }
-
-        // Call function to load categories when the page is ready
-        loadTemplates();
-
-        $('#resetButton').on('click', function () {
-            window.location.href = "/gcc/vtrack/messagelist";
-        });
-
-        document.getElementById('uploadImage').addEventListener('change', function (event) {
-            var fileInput = event.target;
-            var filePath = fileInput.value;
-            var allowedExtensions = /(\.jpg|\.jpeg|\.png)$/i;
-
-            if (!allowedExtensions.exec(filePath)) {
-                document.getElementById('fileError').style.display = 'block'; // Show error message
-                fileInput.value = ''; // Clear the input
-            } else {
-                document.getElementById('fileError').style.display = 'none'; // Hide error message
-            }
-        });
-
-        $('#submitButton').on('click', function () {
-
-            var selectedDate = $('#selectedDate').val();
-            var selectType = $('#selectType').val();
-            var uploadImage = $('#uploadImage')[0].files[0];
-
-            if (!selectedDate) {
-
-                Swal.fire({
-                    icon: 'info',
-                    title: 'Missing!',
-                    text: 'Please select a date..',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            if (!selectType) {
-
-                Swal.fire({
-                    icon: 'info',
-                    title: 'Missing!',
-                    text: 'Please select a Type.',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            if (!uploadImage) {
-
-                Swal.fire({
-                    icon: 'info',
-                    title: 'Missing!',
-                    text: 'Please upload an image.',
-                    confirmButtonText: 'OK'
-                });
-                return;
-            }
-
-            console.log('Selected Date:', selectedDate);
-            console.log('Selected Type:', selectType);
-            console.log('Uploaded Image:', uploadImage.name);
-
-            // Create FormData to handle file uploads
-            var formData = new FormData();
-            formData.append('date', selectedDate);
-            formData.append('templateType', selectType);
-            formData.append('image', uploadImage);  // Correct way to append file data
-
-            $('#pageLoader').show();
-            $('#submitButton').prop('disabled', true).text('Processing...');
-            $.ajax({
-                url: '/gcc/api/vtrack/saveMessageDetails',
-                type: 'POST',
-                data: formData,
-                processData: false, // Important: Prevents jQuery from automatically processing the data
-                contentType: false, // Important: Prevents jQuery from adding `Content-Type` header
-                success: function (response) {
-                    $('#submitButton').prop('disabled', false).text('Submit');
-                    $('#pageLoader').hide();
-                    if (response === "success") {
-
-                        Swal.fire({
-                            icon: 'success',
-                            title: 'Saved Successfully',
-                            text: response,
-                            allowOutsideClick: false,
-                            allowEscapeKey: false,
-                            allowEnterKey: false,
-                            confirmButtonText: 'OK'
-                        }).then((result) => {
-                            if (result.isConfirmed) {
-                                location.reload();
-                            }
-                        });
-                    } else {
-
-                        Swal.fire({
-                            icon: 'error',
-                            title: 'Error',
-                            text: response,
-                            allowOutsideClick: false,
-                            allowEscapeKey: false,
-                            allowEnterKey: false,
-                            confirmButtonText: 'OK'
-                        });
-                    }
-
-                },
-                error: function (xhr, status, error) {
-                    $('#pageLoader').hide();
-                    $('#submitButton').prop('disabled', false).text('Submit');
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Failed to save details. Please try again.',
-                        confirmButtonText: 'OK'
-                    });
-                    console.error('Error:', xhr.responseText);
-                }
-            });
-
-        });
-
-    });
-
-    function sendmessage(msgId) {
-        console.log('Message ID:', msgId);
-
-        let URL = "https://gccservices.in/gcc/api/vtrack/sendmessage?msgid=" + msgId;
-
-        // Use fetch to make the API request
-        fetch(URL, {
-            method: 'GET',
-            headers: {
-                'Content-Type': 'application/json',
-            }
-        })
-        	.then(response => response.text())
-            .then(data => {
-                console.log('Response:', data);
-                alert("Response from server: " + JSON.stringify(data));
-            })
-            .catch(error => {
-                console.error('Error:', error);
-                alert('An error occurred while sending the message.');
-            });
-    }
-
-    function disablemessage(msgId) {
-        console.log('Message ID:', msgId);
-
-        // Create FormData to handle file uploads
-        var formData = new FormData();
-        formData.append("msgId", msgId);
-
-        $('#pageLoader').show();
-        $('#inactivebtn').prop('disabled', true).text('Processing...');
-        $.ajax({
-            url: '/gcc/api/vtrack/disablemessage',
-            type: 'POST',
-            data: formData,
-            processData: false, // Important: Prevents jQuery from automatically processing the data
-            contentType: false, // Important: Prevents jQuery from adding `Content-Type` header
-            success: function (response) {
-                $('#inactivebtn').prop('disabled', false).text('Disable');
-                $('#pageLoader').hide();
-                if (response === "success") {
-
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Disabled Successfully',
-                        text: response,
-                        allowOutsideClick: false,
-                        allowEscapeKey: false,
-                        allowEnterKey: false,
-                        confirmButtonText: 'OK'
-                    }).then((result) => {
-                        if (result.isConfirmed) {
-                            location.reload();
-                        }
-                    });
-                } else {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: response,
-                        allowOutsideClick: false,
-                        allowEscapeKey: false,
-                        allowEnterKey: false,
-                        confirmButtonText: 'OK'
-                    });
-                }
-
-            },
-            error: function (xhr, status, error) {
-                $('#pageLoader').hide();
-                $('#inactivebtn').prop('disabled', false).text('Submit');
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error',
-                    text: 'Failed to save details. Please try again.',
-                    confirmButtonText: 'OK'
-                });
-                console.error('Error:', xhr.responseText);
-            }
-        });
-    }
-
-    function enablemessage(msgId) {
-        console.log('Message ID:', msgId);
-
-        // Create FormData to handle file uploads
-        var formData = new FormData();
-        formData.append("msgId", msgId);
-
-        $('#pageLoader').show();
-        $('#activebtn').prop('disabled', true).text('Processing...');
-        $.ajax({
-            url: '/gcc/api/vtrack/enablemessage',
-            type: 'POST',
-            data: formData,
-            processData: false, // Important: Prevents jQuery from automatically processing the data
-            contentType: false, // Important: Prevents jQuery from adding `Content-Type` header
-            success: function (response) {
-                $('#activebtn').prop('disabled', false).text('Enable');
-                $('#pageLoader').hide();
-                if (response === "success") {
-
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Enabled Successfully',
-                        text: response,
-                        allowOutsideClick: false,
-                        allowEscapeKey: false,
-                        allowEnterKey: false,
-                        confirmButtonText: 'OK'
-                    }).then((result) => {
-                        if (result.isConfirmed) {
-                            location.reload();
-                        }
-                    });
-                } else {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: response,
-                        allowOutsideClick: false,
-                        allowEscapeKey: false,
-                        allowEnterKey: false,
-                        confirmButtonText: 'OK'
-                    });
-                }
-
-            },
-            error: function (xhr, status, error) {
-                $('#pageLoader').hide();
-                $('#inactivebtn').prop('disabled', false).text('Submit');
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error',
-                    text: 'Failed to update details. Please try again.',
-                    confirmButtonText: 'OK'
-                });
-                console.error('Error:', xhr.responseText);
-            }
-        });
-    }
-
-    document.addEventListener("DOMContentLoaded", function() {
-        document.querySelectorAll("img[data-bs-toggle='modal']").forEach(img => {
-            img.addEventListener("click", function() {
-                document.getElementById("modalImage").src = this.getAttribute("data-bs-src");
-            });
-        });
-    });
-
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vtrack/messagelist.html.old.html b/src/main/resources/templates/modules/vtrack/messagelist.html.old.html
deleted file mode 100644
index 2d9258b7..00000000
--- a/src/main/resources/templates/modules/vtrack/messagelist.html.old.html
+++ /dev/null
@@ -1,367 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-
-
-</style>
-<body>
-    <!--[if lt IE 8]>
-        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-    <![endif]-->
-
-    <div class="wrapper">
-        <!-- header top menu Start -->
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <!-- header top menu end -->
-
-        <div class="page-wrap">
-            <!--=============== Left Menu side Start ================-->
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <!--=============== Left side End ================-->
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header mb-2">
-                        <div class="row align-items-end">
-                            <div class="col-lg-8">
-                                <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
-                                    <div class="d-inline">	
-                                        <h5>V Track Message</h5>
-                                        <span>Send Message</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-lg-4">
-                                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                    <ol class="breadcrumb">
-                                        <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">V Track Message</li>                                 
-                                        <li class="breadcrumb-item active" aria-current="page">Send Message</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                        
-					<div class="row mt-4">
-					    <div class="col-md-12">
-					        <div class="card">
-					        	 <div class="card-block">
-					        	  <h5 style="font-weight:bold;">Enter Details</h5>
-					        	 <div class="row">								
-								  
-									 <div class="col-md-3">
-				                        <label for="selectedDate" class="form-label fw-bold"> Date<span class="text-danger">*</span></label>
-				                        <input type="date" id="selectedDate" class="form-control" onclick="this.showPicker()"   >
-			                    	</div>
-			                    	
-			                    	<div class="col-md-3">
-									    <label for="selectType" class="form-label fw-bold"> Select Type<span class="text-danger">*</span></label>
-									    <select id="selectType" class="form-control" style="width: 100%;">
-									        <option value="" selected>-- Select Category --</option>
-									    </select>
-									</div>
-									
-									<div class="col-md-3">
-									    <label for="uploadImage">Upload image:<span class="text-danger">*</span></label>
-									    <input type="file" class="form-control" id="uploadImage">
-									    <small id="fileError" class="text-danger" style="display:none;">
-									        Only image files (.jpg, .jpeg, .png) are allowed.
-									    </small>
-									</div>
-																		
-									
-									<div class="col-md-4 mt-20">
-								        <button id="submitButton" class="btn btn-primary mt-2 mx-2">Submit</button>
-								        <button id="resetButton" class="btn btn-secondary mt-2">Reset</button>
-								        
-								    </div>
-			                    
-					        	 </div>
-					        	 </div>
-					            <div class="card-block">				            					               
-					             
-					                    <table id="VDatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
-					                        <thead class="thead-dark">
-					                            <tr role="row">
-					                                <th class="text-center">S.No</th>
-					                                <th class="text-center">Date</th>
-					                                <th class="text-center">Type</th>
-					                                <th class="text-center">Image</th>
-					                                <th class="text-center">Action</th>					                                
-					                            </tr>
-					                        </thead>
-					                        <tbody style="text-align:center;">
-    <!-- Thymeleaf loop to populate data -->
-    <tr th:each="vtmsg, iterStat : ${VehicleLists}">
-        <td th:text="${iterStat.index + 1}" class="text-center"></td>
-        <td th:text="${vtmsg['msg_date'] != null ? #dates.format(vtmsg['msg_date'], 'dd-MM-yyyy') : 'N/A'}" class="text-center"></td>
-        <td th:text="${vtmsg['template_name']}" class="text-center"></td>
-        <td th:text="${vtmsg['msg_attachfile']}" class="text-center"></td>
-        <td class="text-center">
-		    <button class="btn btn-primary btn-sm view-btn" 
-		            th:onclick="'sendmessage(\'' + ${vtmsg['msgid']} + '\')'" >
-		        Send
-		    </button>
-		</td>
-    </tr>
-</tbody>
-					                    </table>
-					                
-					            </div>
-					        </div>
-					    </div>
-					</div>
-
-                   </div>
-
-                    </div>
-                    
-                    <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
-				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-				            <span class="sr-only">Loading...</span>
-				        </div>
-				        <!-- Add the 'Please wait' text below the spinner -->
-				        <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-				    </div>
-				</div>
-                    
-                      <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-                </div>
-
-        </div>
-
-    
-
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>     
-    <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    
-    
-
-	<script>
-	
-	 const table = $('#VDatable').DataTable({
-	        dom: 'Bftip',
-	        columnDefs: [
-	            { targets: 'no-sort', orderable: false }
-	        ],
-	        lengthMenu: [
-	            [50, 100, 200, 500, -1],
-	            ['50 rows', '100 rows', '200 rows', 'Show all']
-	        ],
-	        scrollY: '50vh',
-	        buttons: [
-	            { extend: 'pageLength', className: 'btn btn-warning' },
-	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
-	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
-	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
-	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
-	        ],
-	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
-	        searching: true,
-	        select: false,
-	        processing: false
-	    });
-	
-	 $(document).ready(function () {
-		    function loadTemplates() {
-		        $.ajax({
-		            url: "/gcc/api/vtrack/getTemplateDetails", // Ensure this is the correct endpoint
-		            type: "GET",
-		            dataType: "json",
-		            success: function (response) {
-		                console.log("Templates Loaded:", response); // Debugging
-
-		                if (response.length === 0) {
-		                    console.warn("No Templates found!");
-		                    return;
-		                }
-
-		                let $categoryDropdown = $("#selectType");
-		               // $categoryDropdown.empty().append('<option value="">-- Select Category --</option>');
-
-		                response.forEach(template => {
-		                	 $categoryDropdown.append(`<option value="${template.id}">${template.template_name}</option>`);
-		                });
-		            },
-		            error: function (xhr, status, error) {
-		                console.error("Error fetching categories:", xhr.responseText);
-		                Swal.fire({
-		                    icon: "error",
-		                    title: "Error Fetching Data",
-		                    text: "Failed to load categories. Please try again later.",
-		                });
-		            }
-		        });
-		    }
-
-		    // Call function to load categories when the page is ready
-		    loadTemplates();
-		    
-		    $('#resetButton').on('click', function () {
-		    	window.location.href = "/gcc/vtrack/messagelist";
-		    });
-		    
-		    document.getElementById('uploadImage').addEventListener('change', function (event) {
-		        var fileInput = event.target;
-		        var filePath = fileInput.value;
-		        var allowedExtensions = /(\.jpg|\.jpeg|\.png)$/i;
-
-		        if (!allowedExtensions.exec(filePath)) {
-		            document.getElementById('fileError').style.display = 'block'; // Show error message
-		            fileInput.value = ''; // Clear the input
-		        } else {
-		            document.getElementById('fileError').style.display = 'none'; // Hide error message
-		        }
-		    });
-		    
-		    $('#submitButton').on('click', function () {
-		    	
-		    	 var selectedDate = $('#selectedDate').val();
-		    	 var selectType = $('#selectType').val();
-		    	 var uploadImage = $('#uploadImage')[0].files[0];
-		    	 
-		    	 if (!selectedDate) {
-		    	       
-		    	        Swal.fire({
-		                    icon: 'info',
-		                    title: 'Missing!',
-		                    text: 'Please select a date..',
-		                    confirmButtonText: 'OK'
-		                });
-		    	        return;
-		    	    }
-
-		    	    if (!selectType) {
-		    	        
-		    	        Swal.fire({
-		                    icon: 'info',
-		                    title: 'Missing!',
-		                    text: 'Please select a Type.',
-		                    confirmButtonText: 'OK'
-		                });
-		    	        return;
-		    	    }
-
-		    	    if (!uploadImage) {
-		    	       
-		    	        Swal.fire({
-		                    icon: 'info',
-		                    title: 'Missing!',
-		                    text: 'Please upload an image.',
-		                    confirmButtonText: 'OK'
-		                });
-		    	        return;
-		    	    }
-		    	    
-		    	    console.log('Selected Date:', selectedDate);
-		    	    console.log('Selected Type:', selectType);
-		    	    console.log('Uploaded Image:', uploadImage.name);
-		    	    
-		    	 	// Create FormData to handle file uploads
-		    	    var formData = new FormData();
-		    	    formData.append('date', selectedDate);
-		    	    formData.append('templateType', selectType);
-		    	    formData.append('image', uploadImage);  // Correct way to append file data
-		    	    
-		    	    $('#pageLoader').show();
-		    	    $('#submitButton').prop('disabled', true).text('Processing...');
-		    	    $.ajax({
-		      	        url: '/gcc/api/vtrack/saveMessageDetails',
-		      	        type: 'POST',
-		      	      data: formData,
-		              processData: false, // Important: Prevents jQuery from automatically processing the data
-		              contentType: false, // Important: Prevents jQuery from adding `Content-Type` header
-		      	        success: function (response) {
-		      	        	$('#submitButton').prop('disabled', false).text('Submit');
-		      	        	$('#pageLoader').hide();
-		      	        	if(response ==="success"){
-		      	        		
-		      	        		 Swal.fire({
-				      	                icon: 'success',
-				      	                title: 'Saved Successfully',
-				      	                text: response,
-				      	               	allowOutsideClick: false,
-				      	              	allowEscapeKey: false,
-				      	              	allowEnterKey: false,
-				      	                confirmButtonText: 'OK'
-				      	            }).then((result) => {
-				    	                        if (result.isConfirmed) {		    	                        	
-				    	                        	location.reload();				    	                           
-				    	                        }
-				      	            });
-		      	        	}
-		      	        	
-		      	        	else{
-		      	        		
-		      	        		Swal.fire({
-			      	                icon: 'error',
-			      	                title: 'Error',
-			      	                text: response,
-			      	               	allowOutsideClick: false,
-			      	              	allowEscapeKey: false,
-			      	              	allowEnterKey: false,
-			      	                confirmButtonText: 'OK'
-			      	            });
-		      	        	}
-		      	           
-		      	        },
-		      	        error: function (xhr, status, error) {
-		      	        	$('#pageLoader').hide();
-		      	        	$('#submitButton').prop('disabled', false).text('Submit');
-		      	            Swal.fire({
-		      	                icon: 'error',
-		      	                title: 'Error',
-		      	                text: 'Failed to save details. Please try again.',
-		      	                confirmButtonText: 'OK'
-		      	            });
-		      	            console.error('Error:', xhr.responseText);
-		      	        }
-		      	    });
-		    	
-		    });
-		    
-		});
-	 
-	 	function sendmessage(msgId) {
-		    console.log('Message ID:', msgId);
-		    
-		    let URL = "https://gccservices.in/gcc/api/vtrack/sendmessage?msgid=" + msgId;
-
-		    // Use fetch to make the API request
-		    fetch(URL, {
-		        method: 'GET', 
-		        headers: {
-		            'Content-Type': 'application/json',
-		        }
-		    })
-		    .then(response => response.json()) 
-		    .then(data => {
-		        console.log('Response:', data);
-		        alert("Response from server: " + JSON.stringify(data));
-		    })
-		    .catch(error => {
-		        console.error('Error:', error);
-		        alert('An error occurred while sending the message.');
-		    });
-		}
-	 
-	</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/ward_sabha/complaint_list.html b/src/main/resources/templates/modules/ward_sabha/complaint_list.html
deleted file mode 100644
index bc477865..00000000
--- a/src/main/resources/templates/modules/ward_sabha/complaint_list.html
+++ /dev/null
@@ -1,882 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Complaint List</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Complaint List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <!-- <div class="card">
-                                    
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-										
-										<div class="form-group">
-                                            <label for="eventid">Select Event / நிகழ்வை தேர்ந்தெடுக்கவும்</label>
-                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required onchange="get_complaint_list(this.value);">
-												<option value=""></option>
-											</select>
-                                        </div>
-                                        
-                                        <div>
-											<table id="complaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<!-- <th class="text-center">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Address&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th> -->
-														<!-- <th class="text-center">Postal Code</th> -->
-						                                <!-- <th class="text-center">Type of Complaint</th> -->
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-													</tr>
-                                                </tfoot> -->
-                                                 
-                                            </table>
-                                        </div>
-                                   <!--  </div>
-                                </div>-->
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/ward_sabha/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/ward_sabha/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_complaint_data(id){
-	        	
-	        	var apiUrl = '/gcc/api/ward_sabha/getComplaintList?eventId='+id+'&loginId='+createdBy;
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-	        
-	        
-	        /* Get Complaints List */
-	        function get_complaint_list(id){
-	        	call_loading();
-	        	get_complaint_data(id).then(function(complaintList) {
-	    		    // Handle the complaint list
-	    		    generate_table(complaintList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching complaint list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching complaint list:', error);
-			        }
-	    		});
-			}
-	        
-	        function viewPetitionSummary(petitionNo){
-alert(petitionNo);
-	        	$("#viewpetition").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				var url = '/gcc/ward_sabha/view-petition-modal?petitionNo='+petitionNo;
-				$.ajax({
-				    url: url,
-				    type: 'GET',
-				    dataType: 'html',
-				    success: function(data) {
-				      $('#viewPetitionBoxBody').html(data); // Inject content into modal body
-				    },
-				    error: function(xhr, status, error) {
-				      console.error("Error loading URL:", error);
-				      // Handle error, display a message, etc.
-				    }
-				  });
-				
-				return false;
-			}
-	        
-	        function updateStatus(mapId){
-	        	$("#ComplaintStatusBox").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				callComplaintDetails(mapId);
-				return false;
-			}
-	        
-	        function callComplaintDetails(mapId){
-	        	loading_text_msg = getLoadingMessage(); // get Loading random text
-	        	var loading=searchinfo("<b>"+loading_text_msg+"</b>");
-	    		var complaintContentHTML=`
-	    							<div class="row">
-	    							    <div class="col-lg-6">
-	    						        <div class="block block-rounded">
-	    						           
-	    						                <div id="leftContainer">${loading}</div>
-	    						            
-	    						        </div>
-	    						    </div>
-	    						    
-	    						    <div class="col-lg-6 printack2">
-	    						        <div class="block block-rounded">
-	    						            
-	    						                <div id="rightContainer">${loading}</div>
-	    						           
-	    						        </div>
-	    						    </div>
-	    						    <!--<div class="col-lg-12 text-center block-options pt-10">
-	    						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-	    						    </div>-->
-	    						</div>`;
-	    		
-	    		$('#ComplaintStatusBoxBody').html(complaintContentHTML); // Box content (Body)
-	    		
-	    		getComplaintData(mapId,false);
-			}
-	        
-	        function getComplaintData(mapId,edit=false){
-				//alert(mapId);
-	        	get_complaint_details_byId(mapId).then(function(complaintDetails) {
-	        		
-	        		var complaintStatus = complaintDetails[0].status;
-					
-	        		var statusBadge = complaintStatus.charAt(0).toUpperCase() + complaintStatus.slice(1);
-	        		var refRibben = `<div class="card-header-right" style="top:auto;">
-	        							Ref ID: ${mapId}
-				              	      </div>`;
-           	        var statusRibben = ""; 
-	        		if(complaintStatus=='pending'){
-	        			statusRibben = `<div class="ribbon">
-		              	      <div class="wrap">
-		              	        <span class="ribbon6 bg-danger"><div styel="color:#fff;">${statusBadge}</div></span>
-		              	      </div>
-		              	    </div>`;
-		              	statusRibben = "";    
-	        			statusBadge = `<span class="badge badge-danger" style="font-size:10px;padding:0.25em 0.4em;">${statusBadge}</span>`;
-	        			
-					}
-	        		else if(complaintStatus=='close'){   
-	        			statusBadge = `<span class="badge badge-success" style="font-size:10px;padding:0.25em 0.4em;">${statusBadge}</span>`;
-					}
-	        		var complaintRightBody = "";
-					var complaintLeftBody = `<div class="card mb-0">
-								             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                	<h3>Complaint Details</h3>
-								                	${statusRibben}
-								                </div>
-								                <div class="card-body">
-									                <table class="table table-borderless table-vcenter mb-0" style="font-size:12px;">
-												      <tbody>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${convertdate(complaintDetails[0].cdate)}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petition_no}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petitioner_name}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petitioner_mobile}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th colspan="2" style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:<br><p class="fw-semibold mb-0" style="font-weight:normal;">${complaintDetails[0].complaint_nature}</p></th>
-												        </tr>
-												        <tr>
-												        	<td colspan="2" style="padding: 0.45rem 0.45rem;">
-													        	<table class="table table-bordered table-vcenter mb-0">
-													                <thead>
-													                  <tr>
-													                    <th>Complaint <i class="fa fa-arrow-right"></i> Status</th>
-													                    <th class="text-right" id="complaint_forward_link"><!--<a href="javascript:void(0);" onclick="return forward_compliant(${complaintDetails[0].mapid}, '${complaintDetails[0].complaint_type}');" class="link" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Click here to forward this complaint to another department officer."><i class="far fa-share-square"></i> Click to forward </a>--></th>
-													                  </tr>
-													                </thead>
-												                	<tbody>
-												                 		<tr>
-															            	<td colspan="2" class="fw-semibold">
-															            	${complaintDetails[0].petition_no} <i class="fa fa-arrow-right"></i> ${statusBadge} <i class="fa fa-arrow-right"></i> ${complaintDetails[0].off_nm}
-														                    </td>
-													                  	</tr>
-												                	</tbody>
-												              	</table>
-												        	</td>
-												        </tr>
-												      </tbody>
-												    </table>
-								                </div>
-								            </div>`;
-					
-					$('#leftContainer').html(complaintLeftBody);
-					
-					if(complaintStatus!='close'|| edit){
-						if(edit){
-							get_complaint_action_byId(mapId).then(function(complaintAction) {
-							complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-													<div class="card mb-0">
-								                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                    		<h3>Complaint Update Details</h3>
-								                    	    ${refRibben}
-								                		</div>
-								                		<div class="card-body">
-									                		<div class="form-group">
-						                                    	<label for="complaintActionText">நடவடிக்கை / Action:</label>
-										   						<textarea class="form-control" id="complaintActionText" name="complaintActionText" rows="6" maxlength="250" placeholder="புகாரின் தன்மை..." required>${complaintAction[0].comments}</textarea>
-										   					</div>
-										   					
-										   					<div class="form-group">
-										                       <label for="action_san_page1">ஆவணப் பதிவேற்றம் / Document Upload:</label>
-															   <input name="action_san_page1" id="action_san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*" required>
-															 </div>
-															 <div class="form-group mb-0 text-center">
-															 	<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveandclose(${mapId},${complaintDetails[0].petition_id},'${complaintDetails[0].petition_no}');" id="updatebtn"><i class="ik ik-save"></i> Save and Close </button>
-															 </div>
-								                		</div>
-								            		</div>
-							            		</form>`;
-							$('#rightContainer').html(complaintRightBody);
-							}).catch(function(error) {
-				    		    // Handle errors
-				    		    console.error('Error fetching action details ('+mapId+'):', error);
-				    		});	
-							//alert(complaintRightBody);
-							
-						}
-						else{
-							complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-													<div class="card mb-0">
-								                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                    		<h3>Complaint Update Details</h3>
-								                    	    ${refRibben}
-								                		</div>
-								                		<div class="card-body">
-									                		<div class="form-group">
-						                                    	<label for="complaintActionText">நடவடிக்கை / Action:</label>
-										   						<textarea class="form-control" id="complaintActionText" name="complaintActionText" rows="6" maxlength="250" placeholder="புகாரின் தன்மை..." required></textarea>
-										   					</div>
-										   					
-										   					<div class="form-group">
-										                       <label for="action_san_page1">ஆவணப் பதிவேற்றம் / Document Upload:</label>
-															   <input name="action_san_page1" id="action_san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*" required>
-															 </div>
-															 <div class="form-group mb-0 text-center">
-															 	<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveandclose(${mapId},${complaintDetails[0].petition_id},'${complaintDetails[0].petition_no}');" id="updatebtn"><i class="ik ik-save"></i> Save and Close </button>
-															 </div>
-								                		</div>
-								            		</div>
-							            		</form>`;
-						}
-						$('#rightContainer').html(complaintRightBody);
-					}
-					else{
-						// first remove forward link
-						$("#complaint_forward_link").html("");
-						
-						get_complaint_action_byId(mapId).then(function(complaintAction) {
-							var fileType = complaintAction[0].file_type;
-							fileType = fileType.split("/").pop();
-							var filetypeico = "file-lines";
-							if(fileType=='pdf'){
-								filetypeico = "file-pdf";
-							}
-							else{
-								filetypeico = "file-image";
-							}
-							
-							complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-													<div class="card mb-0">
-								                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                    		<h3>Complaint Update Details</h3>
-								                    	    ${refRibben} 
-								                		</div>
-								                		<div class="card-body">
-									                		<div>
-									                			<b>நடவடிக்கை தேதி / Action Date:</b> ${convertdate(complaintAction[0].cdate)}
-					                                            <hr>
-					                                            <b>நடவடிக்கை / Action:</b><br>
-					                                            <p class="mt-10">${complaintAction[0].comments}</p>
-					                                        </div>
-					                                        	<hr>
-					                                        <div class="like-comm mt-20 mb-0"> 
-					                                        	<b>ஆவணப் பதிவேற்றம் / Document Upload:</b><br>
-					                                        	
-						                                        	<table class="table table-bordered table-vcenter mb-0">
-														                <thead>
-														                  <tr>
-														                    <th>S.no</th>
-														                    <th>File Name</th>
-														                    <th>Size</th>
-														                    <th>Type</th>
-														                    <th><i class="ik ik-more-horizontal"></i></th>
-														                  </tr>
-														                </thead>
-													                	<tbody>
-													                 		<tr>
-																            	<td class="fw-semibold">1</td>
-																            	<td class="fw-semibold">${complaintAction[0].file_name}</td>
-																            	<td class="fw-semibold">${formatFileSize(complaintAction[0].file_size)}</td>
-																            	<td class="fw-semibold">${fileType}</td>
-																            	<td class="fw-semibold">
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="downloadFile('action','${complaintAction[0].file_name}','${complaintAction[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Download File"><i class="fa fa-fw fa-download" style="font-size: 18px;"></i></a>
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="viewFile('action','${complaintAction[0].file_name}','${complaintAction[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View File"><i class="far fa-3x fa-${filetypeico}" style="font-size: 18px;"></i></a>
-																            	</td>
-														                  	</tr>
-													                	</tbody>
-													              	</table>
-					                                   		</div>
-								                		</div>
-								                		<!--<a href="javascript:void(0)" onclick="getComplaintData(${mapId}, true);">Edit</a>-->
-								                		<button type="button" class="btn btn-success" id="edit" onclick="getComplaintData(${mapId}, true);"><i class="ik ik-edit"></i>Edit</button>
-								            		</div>
-							            		</form>`;
-							$('#rightContainer').html(complaintRightBody);
-							// Enable tooltips for all elements with data-toggle="tooltip"
-				            $('[data-toggle="tooltip"]').tooltip();
-						}).catch(function(error) {
-			    		    // Handle errors
-			    		    console.error('Error fetching action details ('+mapId+'):', error);
-			    		});	 
-						
-					}
-					// Enable tooltips for all elements with data-toggle="tooltip"
-		            $('[data-toggle="tooltip"]').tooltip();
-	        	}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching Complaint details ('+mapId+'):', error);
-	    		});	            
-	        	
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	$('#complaintDatatable').DataTable().destroy();
-	        	
-	            var table = $('#complaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        //scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: false,
-				        searching: true,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	            	var complaint_status=row["status"];
-					complaint_status=complaint_status.charAt(0).toUpperCase() + complaint_status.slice(1);
-					
-					actionHTML = `<div class="dropdown d-inline-block show">
-			                        <a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="ik ik-more-horizontal"></i></a>
-			                        <!--<div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-			                        Action for: `+row['petition_no']+` 
-			                        	<a class="dropdown-item" href="" onclick="return viewAck('`+row['petition_no']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Acknowledgement"><i class="ik ik-eye"></i> Acknowledgement</a>
-			                        	<a class="dropdown-item" href="/gcc/ward_sabha/petition-ack/`+row['petition_no']+`" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Print Acknowledgement"><i class="ik ik-printer"></i> Acknowledgement</a>
-			                        </div>-->
-			                    </div>`
-	                table.row.add([
-	                	rowNum++,
-	                    //'<a href="/gcc/ward_sabha/update-petition?petitionNo='+row['petitionNoEncode']+'" onclick="return viewPetitionSummary(\''+row['petitionNoEncode']+'\');">'+row['petition_no']+'</a>',
-	                    row['petition_no'],
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    //row['petitioner_address'],
-	                    //row['petitioner_pincode'],
-	                    //row['complaint_type'],
-	                    convertdate(row['cdate']),
-	                    '<a href="#" class="link" onclick="return updateStatus('+row['mapid']+');" style="text-transform: capitalize;"">'+complaint_status+'</a>',
-	                    row['off_nm'],
-	                    actionHTML
-	                ]).draw(false);
-	            });
-	            
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-			}
-			
-	        /* Get Event Data */
-	        function get_event_data(){
-	        	get_event_list().then(function(eventList) {
-	        		$('#ward').empty();
-					if(eventList.length>0){
-						// Iterate through the department list and add options to the select element
-		    		    $.each(eventList, function(index, events) {
-		    	            // Create an option element
-		    	            //alert(events.name);
-		    	            var option = $('<option>', {
-		    	            	value: events.id, // case-sensitive as per object
-		    	                text: events.name
-		    	            });
-		    	            // Append the option to the select element
-		    	            $('#eventid').append(option);
-		    	        });
-					}
-					else{
-						$("#card-body").html("<center>No Active Event Found!</center>");
-					}
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching event list:', error);
-	    		    
-	    		});
-	        	remove_loading();
-			}
-	        
-	      //Save Forward Details
-			function saveForward(mapid){
-				
-				var offidto = $("#dept2").val();
-				
-				if(offidto=='' || offidto==0){
-					var formError= "Select Department Required!";
-					$('#forwardFormError').html(formError);
-					return false;
-				}
-				
-				var comments = $("#forwardcomp").val();
-				var textLength = comments.length;
-				var formError= "";
-				if(textLength<=10){
-					formError= "Forward Comments Required!";
-					$('#forwardFormError').html(formError);
-					return false;
-				}
-				else{
-					$('#forwardFormError').html(formError);
-				}
-				
-				$.ajax({
-				    type: "POST",
-				    url: '/api/insertForwardLog',
-				    data: {
-				        'mapid': mapid,
-						'comments':comments,
-						'offidto':offidto
-				    },
-				}).done(function(response) {
-				      Swal.fire(
-				        'Complaint Forward Status!',
-				        'Complaint Forwarded Successfully!',
-				        'success'
-				      ).then(() => {
-							    location.reload();
-							 });
-					console.log(response);
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					/*
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-				    console.error("URL: /api/setEventId");
-				    console.error("Query parameters:", {
-				        'upass': upass
-				    });
-					*/
-				});
-				return false;
-			}
-	     	
-	      // Save New Action  
-			function saveandclose(mapId,petitionId,petitionNo){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var comments = $('#complaintActionText');
-				var textLength = comments.val().length;
-				comments.removeClass('is-invalid');
-				
-				var fileInput = $("#action_san_page1");
-				fileInput.removeClass('is-invalid');
-				var selectedFile = fileInput.val();
-				
-				if (textLength>=10 && selectedFile) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#action-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        formData.append('mapId',mapId);
-			        formData.append('petitionId',petitionId);
-			        formData.append('petitionNo',petitionNo);
-			        formData.append('complaintStatus','close');
-			        
-			        saveActionFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Complaint action saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					$("#ComplaintStatusBox").modal('hide');
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save complaint action. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					if(textLength<10){
-						comments.addClass('is-invalid');
-					}
-					
-					if (!selectedFile) {
-						fileInput.addClass('is-invalid');
-					}
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveActionFormData(formData){
-				var apiUrl = '/gcc/api/ward_sabha/saveComplanitStatus';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#updatebtn").prop("disabled", false);
-				$("#updatebtn").html('<i class="ik ik-save"></i> Save and Close ');
-			}
-			
-			function form_btn_disable(){
-				$("#updatebtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#updatebtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			// For Complient Map Select HTML 
-			function calloffice(val,id){
-				if(val==1){ // Intenal
-					var officeSelectHTML = `<div class="mb-4">
-	                							<label for="office${id}">Select Office</label>
-	                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-									                <option value="0">Select Office</option>
-									                <option value="1">HQ</option>
-									                <option value="2">Zonal Office</option>
-							                	</select>
-						                	</div>`;
-					$("#officedata"+id).html(officeSelectHTML);
-				}
-				else if(val==2){ // External
-					$("#officers"+id).html('');
-					var ExSelectHTML = getselect(id,"ExSelect");
-					var departmentSelectHTML = `<div class="mb-4">
-													<label for="dept3">Select Department</label>
-													${ExSelectHTML}
-											 	</div>`;
-					$("#officedata"+id).html(departmentSelectHTML);
-				}
-				else{
-					$("#officedata"+id).html('');
-					$("#officers"+id).html('');
-				}
-				$("#officers"+id).html('');
-			}
-			
-			function callofficers(val,id){
-				
-				if(val==1){
-					// HQ
-					var HQSelectHTML = getselect(id,"HQSelect");
-				 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-				}
-				else if(val==2){
-					// Zone Office
-					var ZoneSelectHTML = getselect(id,"ZoneSelect");
-					$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-				}
-				else{
-					$("#officers"+id).html('');
-				}
-				
-			}
-			
-			function getselect(comid,type){
-		  	  var HQSelect = '';
-		  	  var ZoneSelect = '';
-		  	  var ExSelect = '';
-		  
-		  	  for (var i = 0; i < officerMasterList.length; i++) {
-		  		  if(officerMasterList[i].zone_id=="HQ"){
-		  			  HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else if(officerMasterList[i].zone_id=="99"){
-		  			  ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else{
-		  			  ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  	  }
-		  	  
-		  	// Forward Save Button
-			  var forward_Btn = `<div class="col-12 pt-3 mb-0 pb-0" id="submitdiv">
-									<label class="form-label" for="forwardcomp">Forward Comments</label>
-									<textarea class="js-maxlength form-control" id="forwardcomp" name="forwardcomp" rows="6" maxlength="250" placeholder="கருத்துகள்..." data-always-show="true" data-placement="right" th:utext="" required></textarea>
-			  						<div class="text-center pt-3">
-									<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveForward(${comid});" id="updatebtn"><i class="si si-rocket me-1"></i> Save and Forward</button>
-			  						<div id="forwardFormError" class="text-danger"></div>
-			  						</div>
-								</div>`;
-								
-		  	  if(type=="HQSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ZoneSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ExSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  return '';
-			}
-			$(document).ready(function() {
-				call_loading();
-				get_officer_master_data();
-				get_event_data();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/ward_sabha/new_event.html b/src/main/resources/templates/modules/ward_sabha/new_event.html
deleted file mode 100644
index c60bda6c..00000000
--- a/src/main/resources/templates/modules/ward_sabha/new_event.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-    <link rel="stylesheet" type="text/css" href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css">
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Add New Event</h5>
-                                            <span>Ward Sabha Meeting</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Ward Sabha Meeting</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Add New Event</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-                        	<div class="col-md-2"></div>
-							<div class="col-md-8">
-                                <div class="card">
-									<form class="request-form" id="request-form" onsubmit="return saveRequest();" enctype="multipart/form-data">
-	                                    <div class="card-header"><h3>New Event Form</h3></div>
-	                               		<div class="card-body" id="card-body">
-	                               			<div class="row">
-	                               				<div class="col-lg-6">
-													<div class="form-group">
-			                                            <label for="zone">Select Zone / தேர்வு செய்யும் மண்டலம்</label>
-			                                            <!-- <select class="form-control" id="zone" name="zone" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." onchange="get_ward_list(this.value);" required>
-															<option value=""></option>
-														</select> -->
-			                                           <!-- <div class="form-radio" id="petition_type"></div> -->
-			                                        </div>
-		                                      	</div>
-	                                        	<div class="col-lg-6">
-			                                        <div class="form-group">
-			                                            <label for="ward">Select Ward / தேர்வு செய்யும் வார்டு</label>
-			                                            <!-- <select class="form-control" id="ward" name="ward" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required  onchange="get_councillor_details(this.value);">
-															<option value=""></option>
-														</select> -->
-			                                           <!-- <div class="form-radio" id="petition_type"></div> -->
-			                                        </div>
-	                                        	</div>
-	                                        	
-	                               				<div class="col-lg-12">
-													<div class="form-group">
-			                                            <label for="eventdate">Select Event Date</label>
-			                                            <input type="text" class="form-control" name="eventdate" id="eventdate"
-                                                       placeholder="Event Date" autocomplete="off" required>
-			                                        </div>
-		                                      	</div>
-	                                        </div>
-	                                        <div class="row">
-	                               				<div class="col-lg-12">
-													<div class="form-group">
-								                       <label for="action_san_page1">ஆவணப் பதிவேற்றம் / Document Upload:</label>
-													   <input name="event_page1" id="event_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*" required>
-													 </div>
-			                                    </div>
-			                                </div>
-											
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-							<div class="col-md-2"></div>
-                        </div>
-                    </div>
-                </div>
-				</div>
-                 <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-           
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/ward_sabha/script :: script}"></script>
-        
-		<script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var complaintTypeList = "";
-			var zoneList="";
-			var wardList="";
-			
-			// Save New petition 
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#request-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        saveFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'New minutes data saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					// Reload the current page
-		        					//location.reload();
-		        					// Navigate to a Ack page
-		        					//window.location = "/gcc/ward_sabha/petition-ack/"+response;
-		        					window.location = "/gcc/ward_sabha/new_petition";
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save minutes data. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveFormData(formData){
-				var apiUrl = '/gcc/api/ward_sabha/savePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#resetFormBtn").prop("disabled", false);
-				$("#requestSubmitBtn").prop("disabled", false);
-				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-			}
-			
-			function form_btn_disable(){
-				$("#resetFormBtn").prop("disabled", true);
-				$("#requestSubmitBtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			$(document).ready(function() {
-				// For datetime picker
-		        jQuery('#eventdate').datetimepicker({
-		            //minTime:'10:00',
-		            //maxTime:'18:01',
-		            //minDate: 0, // Today
-		            //minDate:'-1970/01/2',
-		            //maxDate:'+1970/01/2',
-		            timepicker: false, // Disable time picker
-		            mask: true,
-		            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-		            //disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-		            format: 'd-m-Y', // Date format (you can change it as per your needs)
-		        });
-				
-				//get_event_data();
-				//get_zone_ward_data();
-				//get_complaint_type_data();
-				//$('#petitionerMobile').mask('0000000000');
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/ward_sabha/new_petition.html b/src/main/resources/templates/modules/ward_sabha/new_petition.html
deleted file mode 100644
index 7f0da2dc..00000000
--- a/src/main/resources/templates/modules/ward_sabha/new_petition.html
+++ /dev/null
@@ -1,456 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Add Minutes</h5>
-                                            <span>Ward Sabha Meeting</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Ward Sabha Meeting</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Add Minutes</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-                        	<div class="col-md-2"></div>
-							<div class="col-md-8">
-                                <div class="card">
-									<form class="request-form" id="request-form" onsubmit="return saveRequest();" enctype="multipart/form-data">
-	                                    <div class="card-header"><h3>New Petition Form</h3></div>
-	                               		<div class="card-body" id="card-body">
-	                               			<div class="row">
-	                               				<div class="col-lg-12">
-													<div class="form-group">
-			                                            <label for="eventid">Select Current Event / ததற்போதைய நிகழ்வை தேர்ந்தெடுக்கவும்</label>
-			                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required>
-															<option value=""></option>
-														</select>
-			                                           <!-- <div class="form-radio" id="petition_type"></div> -->
-			                                        </div>
-		                                      	</div>
-	                               				<div class="col-lg-6">
-													<div class="form-group">
-			                                            <label for="zone">Select Zone / தேர்வு செய்யும் மண்டலம்</label>
-			                                            <select class="form-control" id="zone" name="zone" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." onchange="get_ward_list(this.value);" required>
-															<option value=""></option>
-														</select>
-			                                           <!-- <div class="form-radio" id="petition_type"></div> -->
-			                                        </div>
-		                                      	</div>
-	                                        	<div class="col-lg-6">
-			                                        <div class="form-group">
-			                                            <label for="ward">Select Ward / தேர்வு செய்யும் வார்டு</label>
-			                                            <select class="form-control" id="ward" name="ward" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required  onchange="get_councillor_details(this.value);">
-															<option value=""></option>
-														</select>
-			                                           <!-- <div class="form-radio" id="petition_type"></div> -->
-			                                        </div>
-	                                        	</div>
-	                                        </div>
-	                                        <div class="row">
-	                               				<div class="col-lg-6">
-													<div class="form-group">
-			                                            <label for="councillorName">Councillor Name / கௌன்சிலர் பெயர்</label>
-			                                            <input type="text" readonly class="form-control" name="councillorName" id="councillorName" autocomplete="off" placeholder="கௌன்சிலர் பெயர்"  maxlength="250" required>
-			                                        </div>
-			                                    </div>
-	                                        	<div class="col-lg-6">
-			                                        <div class="form-group">
-			                                            <label for="councillorMobile">Mobile NO / கைபேசி எண்</label>
-					                       				<input type="text" readonly class="js-maxlength form-control" id="councillorMobile" name="councillorMobile" autocomplete="off" placeholder="கைபேசி எண்" maxlength="10" data-always-show="true" data-placement="top" required>
-			                                        </div>
-			                                     </div>
-			                                </div>
-			                                <div class="form-group">
-	                                        	<label for="complaintNature">புகாரின் தன்மை / Nature Of Complaint</label>
-						   						<textarea class="form-control" id="complaintNature" name="complaintNature" rows="6" placeholder="புகாரின் தன்மை..."></textarea>
-						   					</div>
-											<!-- 
-	                                        <div class="row">
-												 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page1">Petition Page 1 / மனு பக்கம் 1</label>
-													   <input name="san_page1" id="san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*">
-													 </div>
-												 </div>
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page2">Petition Page 2 / மனு பக்கம் 2</label>
-													   <input name="san_page2" id="san_page2" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-												 
-											</div>	 
-											<div class="row">	 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page3">Petition Page 3 / மனு பக்கம் 3</label>
-													   <input name="san_page3" id="san_page3" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-												 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page4">Petition Page 4 / மனு பக்கம் 4</label>
-													   <input name="san_page4" id="san_page4" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-											</div>
-										 	
-	                                  	</div>
-	                                  	 -->
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-							<div class="col-md-2"></div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/ward_sabha/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var complaintTypeList = "";
-			var zoneList="";
-			var wardList="";
-			
-			/* Get Event Data */
-	        function get_event_data(){
-	        	get_current_event_list().then(function(eventList) {
-	        		$('#ward').empty();
-					if(eventList.length>0){
-						// Iterate through the department list and add options to the select element
-		    		    $.each(eventList, function(index, events) {
-		    	            // Create an option element
-		    	            //alert(events.name);
-		    	            var option = $('<option>', {
-		    	            	value: events.id, // case-sensitive as per object
-		    	                text: events.name
-		    	            });
-		    	            // Append the option to the select element
-		    	            $('#eventid').append(option);
-		    	        });
-					}
-					else{
-						$("#card-body").html("<center>No Active Event Found!</center>");
-					}
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching event list:', error);
-	    		    
-	    		});
-			}
-			
-			/* Get Zone and Ward Data */
-	        function get_zone_ward_data(){
-	        	get_zone_ward_list().then(function(zoneWard) {
-	    		    // Handle the zoneward list
-	    		    zoneWardList = zoneWard;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(zoneWardList, function(index, zoneWards) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: zoneWards.zone, // case-sensitive as per object
-	    	                text: "Zone "+ zoneWards.zone
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#zone').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			
-	        /* Get Ward List */
-	        function get_ward_list(zone) {
-
-	            // Assuming get_zone_ward_list() returns a promise that resolves to the zoneWardList
-	            get_zone_ward_list().then(function(zoneWard) {
-	                // Handle the zoneWard list
-	                zoneWardList = zoneWard;
-	                
-	                // Clear any existing options in the ward dropdown
-	                $('#ward').empty();
-	                
-	                var option = $('<option>', {
-                        value:"" ,  // Set ward number as the value
-                        text:""  // Display as "Ward 1", "Ward 2", etc.
-                    });
-	                
-	                $('#ward').append(option);
-	                
-	                $('#councillorName').val('');
-					$('#councillorMobile').val('');
-					
-	            	 // Find the correct zone in the zoneWardList
-	                var selectedZone = zoneWardList.find(function(zoneWards) {	                    
-						return zoneWards.zone == zone;  // Compare the zone value
-	                });
-	                // If the zone is found, iterate over its wards and add options
-	                if (selectedZone) {
-	                    var wardsArray = selectedZone.wards.split(',');  // Split wards string into array
-	                    $.each(wardsArray, function(index, ward) {
-	                        // Create an option element
-	                        option = $('<option>', {
-	                            value: ward.trim(),  // Set ward number as the value
-	                            text: 'Ward ' + ward.trim()  // Display as "Ward 1", "Ward 2", etc.
-	                        });
-	                        // Append the option to the select element
-	                        $('#ward').append(option);
-	                    });
-	                } else {
-	                    console.error('Zone not found');
-	                }
-
-	            }).catch(function(error) {
-	                // Handle errors
-	                console.error('Error fetching ward list:', error);
-	            });
-	        }
-	        
-	        /* Get Ward List */
-	        function get_councillor_details(ward) {
-
-	            // Assuming get_zone_ward_list() returns a promise that resolves to the zoneWardList
-	            get_councillor_list(ward).then(function(councillors) {
-	                // Handle the zoneWard list
-	                councillorList = councillors;
-	                
-	                // Clear any existing options in the ward dropdown
-	                $('#councillorName').val('');
-					$('#councillorMobile').val('');
-	                
-				   	// Iterate through the department list and add options to the select element
-				   	$.each(councillorList, function(index, councillor) {
-				   		$('#councillorName').val(councillor.name)
-		                $('#councillorMobile').val(councillor.mobile1);
-				   	});   
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-	        }
-	        
-	       
-			/* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(complaintTypeList, function(index, complaintType) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: complaintType.complaint_typeid, // case-sensitive as per object
-	    	                text: complaintType.complaint_type
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#complaintType').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			
-	        /* Get Petition Type Data */
-	        function get_petition_type_data(){
-	        	var petitionTypeHTML="";
-	    		get_petition_type_list().then(function(petitionTypes) {
-	    		    // Handle the Complaint list
-	    		    petitionTypeList = petitionTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(petitionTypeList, function(index, petitionType) {
-	    	            // Create an option element
-	    	            
-	    	            petitionTypeHTML +=`<div class="radio radiofill ${petitionType.color_class} radio-inline">
-						                            <label class="cursure_poiter">
-						                            <input type="radio" name="petitionType" value="${petitionType.petition_type_id}">
-						                            <i class="helper"></i>${petitionType.name}
-						                        </label>
-						                    </div>`;
-	    	        });
-	    		 // Append the option to the select element
-    	         $('#petition_type').html(petitionTypeHTML);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching petition type list:', error);
-	    		});
-			}
-			 
-			// Save New petition 
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#request-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        saveFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Petition data saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					// Reload the current page
-		        					//location.reload();
-		        					// Navigate to a Ack page
-		        					//window.location = "/gcc/ward_sabha/petition-ack/"+response;
-		        					window.location = "/gcc/ward_sabha/new_petition";
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save petition data. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveFormData(formData){
-				var apiUrl = '/gcc/api/ward_sabha/savePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#resetFormBtn").prop("disabled", false);
-				$("#requestSubmitBtn").prop("disabled", false);
-				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-			}
-			
-			function form_btn_disable(){
-				$("#resetFormBtn").prop("disabled", true);
-				$("#requestSubmitBtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			$(document).ready(function() {
-				get_event_data();
-				get_zone_ward_data();
-				get_complaint_type_data();
-				$('#petitionerMobile').mask('0000000000');
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/ward_sabha/petition_ack.html b/src/main/resources/templates/modules/ward_sabha/petition_ack.html
deleted file mode 100644
index d7d85dba..00000000
--- a/src/main/resources/templates/modules/ward_sabha/petition_ack.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5 th:utext="'Petition Acknowledgement ('+${petitionNo}+')'">Petition Acknowledgement</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition Acknowledgement</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr class="print_no">
-                        <!-- 
-                        <div class="row">
-                        	<div class="col-lg-6">
-								<div class="block block-rounded ack ack-container">
-									<div id="ack1table" style="border: 1px solid black;">
-										<div id="ack1"></div>
-									</div>
-								</div>
-							</div>
-						 
-							<div class="col-lg-6">
-								<div class="block block-rounded ack ack-container">
-									<div id="ack2table" style="border: 1px solid black;">
-										<div id="ack2"></div>
-									</div>
-								</div>
-							</div>
-		   	 	            <div class="col-lg-12 text-center block-options pt-10">
-		   	 					<button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-		   	 	            </div>
-                        </div>
-                         -->
-                        <div class="row">
-						    <div class="col-lg-6">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack1table" class="ack-content">
-						                <div id="ack1">This is ack1</div>
-						            </div>
-						        </div>
-						    </div>
-						    
-						    <div class="col-lg-6 printack2">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack2table" class="ack-content">
-						                <div id="ack2">This is ack2</div>
-						            </div>
-						        </div>
-						    </div>
-						    <div class="col-lg-12 text-center block-options pt-10">
-						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-						    </div>
-						</div>
-						                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/ward_sabha/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var complaintTypeList = "";
-			
-			 /* Get Complaint Type Data */
-			function get_complaint_type_data(){
-			
-				get_complaint_type_list().then(function(complaintTypes) {
-				    // Handle the Complaint list
-				    complaintTypeList = complaintTypes;
-					
-				    // After Complaint Type list created we call petition details
-				    get_petition_data();
-				    
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching complaint type list:', error);
-				});
-			}
-			
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint_txt;
-					
-					var complaintArray = complaint.split(',');
-					
-					for(j = 0; j < complaintArray.length; j++){
-						if(j>0){
-							complaintHTML+="<br>";
-						}
-						complaintHTML+= (j+1)+') '+complaintArray[j];
-					}
-					var ack =`
-					<table class="table table-borderless table-vcenter p-0 m-0">
-					  <tbody>
-					    <tr>
-					      <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-					      <td class="fw-semibold text-center">
-								<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-								மக்களை தேடி மேயர் திட்டம்<br>
-								ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-						  </td>
-						  <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-					    </tr>
-					</tbody>
-					</table>
-					<hr style="margin:0px">
-					  <div class="block-content p-0 m-0">
-					    <table class="table table-borderless table-vcenter" style="font-size:12px;">
-					      <tbody>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${convertdate(petitionDetails[0].cdate)}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petition_no}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petitioner_name}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petitioner_mobile}
-					          </td>
-					        </tr>
-					        <tr style="font-size:12px;">
-					          <th style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${complaintHTML}
-							</td>
-					        </tr>
-					        <tr>
-					          <td scope="row" colspan="2" style="font-size:10px">இம்மனுவின் ஒப்புகைச் சீட்டு எண் மனு தாரரின் கைபேசி எண்ணிற்கு குறுஞ்செய்தி மூலம் அனுப்பி வைக்கப்படும் . இம்மனுவின் நிலை குறித்து https://chennaicorporation.gov.in/MTM/ என்ற இணையதளத்தில் மனுவின் எண்ணை குறிப்பிட்டு அறிந்துகொள்ளலாம்</th>
-					        </tr>
-					        <tr style="text-align: right;">
-					          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-					        </tr>
-					      </tbody>
-					    </table>
-					  `;
-				    
-					$("#ack1").html(ack);
-					$("#ack2").html(ack);
-					  
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition details ('+petitionNo+'):', error);
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/ward_sabha/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                resolve(jsonResponse);
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			$(document).ready(function() {
-				get_complaint_type_data();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/ward_sabha/petition_list.html b/src/main/resources/templates/modules/ward_sabha/petition_list.html
deleted file mode 100644
index 469c0d41..00000000
--- a/src/main/resources/templates/modules/ward_sabha/petition_list.html
+++ /dev/null
@@ -1,325 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Minutes List</h5>
-                                            <span>Ward Sabha</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Ward Sabha</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Minutes List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                               <!--  <div class="card">
-                                    
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-										
-										<div class="form-group">
-                                            <label for="eventid">Select Event / நிகழ்வை தேர்ந்தெடுக்கவும்</label>
-                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required onchange="get_petitions_list(this.value);">
-												<option value=""></option>
-											</select>
-                                        </div>
-			                                        
-                                        <div>
-                                        	
-											<table id="petitionDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered" style="font-size:10px;">
-						                                <th class="text-center no-sort" width="3%">S.No</th>
-														<th class="text-center" width="10%">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<!-- <th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>-->
-						                                <th class="text-center">Content</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center" width="7%">Status</th>
-						                                <!--<th class="text-center">Petition Type</th>-->
-						                                <th class="text-center no-sort no-exportable no-print" width="5%">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- 
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-													</tr>
-                                                </tfoot> -->
-                                            </table>
-                                        </div>
-                                    <!--</div>
-                                </div>-->
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/ward_sabha/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/ward_sabha/script :: script}"></script>
-        <script th:inline="javascript">
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-			/* Get Event Data */
-	        function get_event_data(){
-	        	get_event_list().then(function(eventList) {
-	        		$('#ward').empty();
-					if(eventList.length>0){
-						// Iterate through the department list and add options to the select element
-		    		    $.each(eventList, function(index, events) {
-		    	            // Create an option element
-		    	            //alert(events.name);
-		    	            var option = $('<option>', {
-		    	            	value: events.id, // case-sensitive as per object
-		    	                text: events.name
-		    	            });
-		    	            // Append the option to the select element
-		    	            $('#eventid').append(option);
-		    	        });
-					}
-					else{
-						$("#card-body").html("<center>No Active Event Found!</center>");
-					}
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching event list:', error);
-	    		    
-	    		});
-	        	remove_loading();
-			}
-			
-	        /* Get Complaints Data */
-	        function get_petitions_data(id){
-	        	var apiUrl = '/gcc/api/ward_sabha/getPetitionList?eventId='+id;
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_petitions_list(id){
-	        	call_loading();
-	        	get_petitions_data(id).then(function(petitionList) {
-	    		    // Handle the department list
-	    		    generate_table(petitionList);
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching petition list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching petition list:', error);
-			        }
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-
-	        	if ( $.fn.dataTable.isDataTable('#petitionDatatable') ) {
-	        	    $('#petitionDatatable').DataTable().destroy();  // Destroy the existing instance
-	        	}
-	        	
-	            var table = $('#petitionDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        //scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: false,
-				        searching: true,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-
-	            	//View Acknowledgement: View the acknowledgement for petition MP10000001.
-					//Print Acknowledgement: Print the acknowledgement for petition MP10000001.
-					//View Petition Details: View the details of petition MP10000001.
-					//View Uploaded Files: View the files uploaded for petition MP10000001.
-
-					actionHTML = `<div class="dropdown d-inline-block show">
-			                        <a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="ik ik-more-horizontal"></i></a>
-			                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-			                        
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the acknowledgement for petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Acknowledgement</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Print the acknowledgement for petition `+row['petition_no']+`."><i class="ik ik-printer"></i> Print Acknowledgement</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the details of petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Petition Details</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the files uploaded for petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Uploaded Files</a>
-			                        </div>
-			                    </div>`
-			                    
-			        actionHTML =`<i class="ik ik-more-horizontal"></i>`
-			        
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/ward_sabha/update-petition?petitionNo='+row['petitionNoEncode']+'" class="link">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    //row['petitioner_address'],
-	                    //row['petitioner_pincode'],
-	                    row['complaint_nature'],
-	                    convertdate(row['cdate']),
-	                    row['status'],
-	                    //row['petition_type_name'],
-	                    actionHTML
-	                ]).draw(false);
-	            });
-	            
-	           // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-				get_event_data();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/ward_sabha/petition_not_mapped_list.html b/src/main/resources/templates/modules/ward_sabha/petition_not_mapped_list.html
deleted file mode 100644
index 8c179ed4..00000000
--- a/src/main/resources/templates/modules/ward_sabha/petition_not_mapped_list.html
+++ /dev/null
@@ -1,463 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Unmapped Petition List</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Unmapped Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <!-- <div class="card">
-                                	<div class="card-header">
-                                        <h3>These are the petitions that are currently not assigned to any department officer:</h3>
-                                    </div>
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-										
-										<div class="form-group">
-                                            <label for="eventid">Select Event / நிகழ்வை தேர்ந்தெடுக்கவும்</label>
-                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required onchange="get_petitions_list(this.value);">
-												<option value=""></option>
-											</select>
-                                        </div>
-                                        
-                                        <div>
-                                        <p style="font-size:12px">These are the petitions that are currently not assigned to any department officer:</p>
-											<table id="petitionDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Zone</th>
-														<th class="text-center">Ward</th>
-						                                <th class="text-center">Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-													</tr>
-                                                </tfoot>-->
-                                            </table>
-                                        </div>
-                                   <!-- </div>
-                                </div> --> 
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/ward_sabha/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/ward_sabha/script :: script}"></script>
-        <script th:inline="javascript">
-        	var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_petitions_data(id){
-	        	var apiUrl = '/gcc/api/ward_sabha/getUnmapPetitionList?eventId='+id;
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_petitions_list(id){
-	        	call_loading();
-	        	get_petitions_data(id).then(function(petitionList) {
-	    		    // Handle the department list
-	    		    generate_table(petitionList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching petition list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching petition list:', error);
-			        }
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-
-	        	$('#petitionDatatable').DataTable().destroy();
-	        	
-	            var table = $('#petitionDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-				        	{ targets: 'no-sort', "orderable": false },
-							{ targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				       // scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: false,
-				        searching: true,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/ward_sabha/update-petition?petitionNo='+row['petitionNoEncode']+'">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['zone'],
-	                    row['ward'],
-	                    row['complaint_nature'],
-	                    convertdate(row['cdate']),
-	                    row['status'],
-	                    '<a href="#" onclick="return compliant_mapping(\''+row['petition_id']+'\',\'Assign to the Department Officer\',\''+row['petition_no']+'\');"data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Assign to the Department Officer."><i class="far fa-handshake"></i></a>',
-	                ]).draw(false);
-	            });
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            
-	            remove_loading(); // remove Loading 
-			}
-	        
-	        /* Get Event Data */
-	        function get_event_data(){
-	        	get_event_list().then(function(eventList) {
-	        		$('#ward').empty();
-					if(eventList.length>0){
-						// Iterate through the department list and add options to the select element
-		    		    $.each(eventList, function(index, events) {
-		    	            // Create an option element
-		    	            //alert(events.name);
-		    	            var option = $('<option>', {
-		    	            	value: events.id, // case-sensitive as per object
-		    	                text: events.name
-		    	            });
-		    	            // Append the option to the select element
-		    	            $('#eventid').append(option);
-		    	        });
-					}
-					else{
-						$("#card-body").html("<center>No Active Event Found!</center>");
-					}
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching event list:', error);
-	    		    
-	    		});
-	        	remove_loading();
-			}
-			
-	        function get_mapped_list(petitionId){
-	        	var apiUrl = '/gcc/api/ward_sabha/getPetitionMappingDetails2?petitionId='+petitionId
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            //data: formData,
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                console.error('Error fetching petition maping details ('+petitionNo+'):', error);
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-			}
-	        
-	     	// For Complient Map Select HTML 
-			function calloffice(val,id){
-				if(val==1){ // Intenal
-					var officeSelectHTML = `<div class="mb-4">
-	                							<label for="office${id}">Select Office</label>
-	                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-									                <option value="0">Select Office</option>
-									                <option value="1">HQ</option>
-									                <option value="2">Zonal Office</option>
-							                	</select>
-						                	</div>`;
-					$("#officedata"+id).html(officeSelectHTML);
-				}
-				else if(val==2){ // External
-					$("#officers"+id).html('');
-					var ExSelectHTML = getselect(id,"ExSelect");
-					var departmentSelectHTML = `<div class="mb-4">
-													<label for="dept3">Select Department</label>
-													${ExSelectHTML}
-											 	</div>`;
-					$("#officedata"+id).html(departmentSelectHTML);
-				}
-				else{
-					$("#officedata"+id).html('');
-					$("#officers"+id).html('');
-				}
-				$("#officers"+id).html('');
-			}
-			
-			function callofficers(val,id){
-				
-				if(val==1){
-					// HQ
-					var HQSelectHTML = getselect(id,"HQSelect");
-				 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-				}
-				else if(val==2){
-					// Zone Office
-					var ZoneSelectHTML = getselect(id,"ZoneSelect");
-					$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-				}
-				else{
-					$("#officers"+id).html('');
-				}
-				
-			}
-			
-			function getselect(comid,type){
-		  	  var HQSelect = '';
-		  	  var ZoneSelect = '';
-		  	  var ExSelect = '';
-		  
-		  	  for (var i = 0; i < officerMasterList.length; i++) {
-		  		  if(officerMasterList[i].zone_id=="HQ"){
-		  			  HQSelect+=`<option value="${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else if(officerMasterList[i].zone_id=="99"){
-		  			  ExSelect+=`<option value="${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else{
-		  			  ZoneSelect+=`<option value="${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  	  }
-		  	  
-		  	  // Forward Save Button
-			  var forward_Btn = `<div class="col-12 pt-3 mb-0 pb-0 text-center" id="submitdiv">
-									<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveMappingDepatment();" id="updatebtn"><i class="si si-rocket me-1"></i>Save</button>
-			  						<div id="forwardFormError" class="text-danger"></div>
-			  						</div>
-								</div>`;
-								
-		  	  if(type=="HQSelect"){
-		  	  	 return `<select name="mapOfficerid" id="mapOfficerid" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ZoneSelect"){
-		  	  	 return `<select name="mapOfficerid" id="mapOfficerid" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ExSelect"){
-		  	  	 return `<select name="mapOfficerid" id="mapOfficerid" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  return '';
-			}
-			
-			/* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-		
-	     	//Save Forward Details
-			function saveMappingDepatment(){
-				
-				var offidto = $("#mapOfficerid").val();
-				var petitionId = $("#petitionid").val();
-				var petitionNo = $("#petitionno").val();
-				var formError= "";
-				if(offidto=='' || offidto==0){
-					formError= "Select Department Required!";
-					$('#forwardFormError').html(formError);
-					return false;
-				}
-				
-				$.ajax({
-				    type: "POST",
-				    url: '/gcc/api/ward_sabha/mapPetitionToOfficer',
-				    data: {
-				        'petitionId': petitionId,
-				        'petitionNo': petitionNo,
-				        'createdBy':createdBy,
-						'offidto':offidto
-				    },
-				}).done(function(response) {
-				      Swal.fire(
-				        'Petition Mappiing Status!',
-				        'Petition Mapped Successfully!',
-				        'success'
-				      ).then(() => {
-							    //location.reload();
-				    	  	updateModelBox(petitionId,'Assign to the Department Officer',petitionNo)
-							 });
-					console.log(response);
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					
-				});
-				return false;
-			}
-		     	
-			$(document).ready(function() {
-				call_loading();
-				get_officer_master_data();
-				get_event_data();
-				//get_petitions_list();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/ward_sabha/petition_update.html b/src/main/resources/templates/modules/ward_sabha/petition_update.html
deleted file mode 100644
index d9445454..00000000
--- a/src/main/resources/templates/modules/ward_sabha/petition_update.html
+++ /dev/null
@@ -1,775 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Edit / Update Petition</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Edit/Update Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card" id="petitionUpdateForm">
-									<form class="update-request-form" id="update-request-form" onsubmit="return updateRequest();">
-										<div class="card-header">
-		                                    <h3>Edit / Update Petition Form</h3>
-		                                    <div class="card-header-right">
-	                                            <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-	                                        </div>
-	                                    </div>
-	                               		<div class="card-body">
-	                               			<div class="row">
-	                               				<!-- <div class="col-12">
-	                               					<div class="form-group">
-			                                            <label for="petitionerName">Petition Type / மனுவின் வகை</label>
-			                                            <div class="form-radio" id="petition_type">
-				                                          
-				                                        </div>
-			                                        </div>
-	                               				</div> -->
-												<div class="col-6">
-													<div class="form-group">
-			                                            <label for="petitionerName">Petitioner's Name / மனுதாரரின் பெயர்</label>
-			                                            <input type="text" readonly class="form-control" name="petitionerName" id="petitionerName" autocomplete="off" placeholder="மனுதாரரின் பெயர்">
-			                                        </div>
-			                                    </div>
-												<div class="col-6">
-			                                        <div class="form-group">
-			                                            <label for="petitionerMobile">Mobile NO / கைபேசி எண்</label>
-					                       				<input type="text" readonly class="form-control" id="petitionerMobile" name="petitionerMobile" autocomplete="off" placeholder="கைபேசி எண்">
-			                                        </div>
-			                                   	</div>
-												<div class="col-6">
-			                                      	<div class="form-group">
-			                                        	<label for="complaintNature">புகாரின் தன்மை / Nature Of Complaint</label>
-								   						<textarea class="form-control" id="complaintNature" name="complaintNature" rows="6" placeholder="புகாரின் தன்மை..."></textarea>
-								   					</div>
-								   				</div>
-												<div class="col-6">
-													<!-- 
-													<div class="form-group">
-														<label for="petitionerAddress">Address of petitioner / மனுதாரரின் முகவரி</label>
-									   					<textarea class="form-control" id="petitionerAddress" name="petitionerAddress" rows="6" maxlength="250" placeholder="மனுதாரரின் முகவரி..."></textarea>
-													</div>
-													
-													<div class="form-group">
-														<label for="petitionerPincode">Postal code / தபால் குறியீடு</label>
-	   			                       					<input type="text" class="form-control" id="petitionerPincode" name="petitionerPincode" placeholder="தபால் குறியீடு" maxlength="6" required>
-													</div>
-													-->
-													<div class="form-group">
-		                                          		<label for="complaintType">Type of complaint / புகார் வகை (பலவற்றை தேர்ந்தெடு..) </label>
-														<select class="select2" id="complaintType" name="complaintType" style="width: 100%;" data-placeholder="பலவற்றை தேர்ந்தெடு.." multiple required onchange="javascript:load_mapper();">
-															<option></option>
-														</select>
-													</div>
-												</div>
-												<div class="col-12">
-													<div class="block-content" id="userinfo2">
-														<div id="comp_mapping_to_officers" class="row"></div>
-													</div>
-											 	</div>
-											</div>
-	                                  	</div>
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/ward_sabha/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Iterate through the Master Complanint Type and add options to the select element
-	    		    $.each(complaintTypeList, function(index, complaintType) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: complaintType.complaint_typeid, // case-sensitive as per object
-	    	                text: complaintType.complaint_type
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#complaintType').append(option);
-	    	        });
-	    		    // Call Petition function to fetch the data
-	    		    get_petition_data();
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-	        /* Get Petition Type Data */
-	        function get_petition_type_data(){
-	        	var petitionTypeHTML="";
-	    		get_petition_type_list().then(function(petitionTypes) {
-	    		    // Handle the Complaint list
-	    		    petitionTypeList = petitionTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(petitionTypeList, function(index, petitionType) {
-	    	            // Create an option element
-	    	            
-	    	            petitionTypeHTML +=`<div class="radio radiofill ${petitionType.color_class} radio-inline">
-						                            <label class="cursure_poiter">
-						                            <input type="radio" name="petitionType" id="petition_type_${petitionType.petition_type_id}" value="${petitionType.petition_type_id}" disable>
-						                            <i class="helper"></i>${petitionType.name}
-						                        </label>
-						                    </div>`;
-	    	        });
-	    		 // Append the option to the select element
-    	         $('#petition_type').html(petitionTypeHTML);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching petition type list:', error);
-	    		});
-			}
-	        
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-			 
-	     	// Function to get complaint_type and complaint_typeid by complaint_typeid
-	        function getComplaintTypeById(complaintTypeId) {
-	            for (var i = 0; i < complaintTypeList.length; i++) {
-	                if (complaintTypeList[i].complaint_typeid == complaintTypeId) {
-	                    return {
-	                        complaint_type: complaintTypeList[i].complaint_type,
-	                        complaint_typeid: complaintTypeList[i].complaint_typeid
-	                    };
-	                }
-	            }
-	            return null; // Return null if no matching complaint_typeid is found
-	        }
-	     
-			// Save New petition 
-			function updateRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#update-request-form')[0]);
-			        formData.append('petitionNo',petitionNo);
-			        formData.append('createdBy',createdBy);
-			        formData.append('petitionId',petitionId);
-			        updateFormData(formData).then(function(response) {
-		    		    // Handle the response
-		    		    if(response==true){
-							// Delete Old data in Petition Mapping table
-		    		    	savePetitionMapData(formData).then(function(response) {
-		    		    		if(response==true){
-		    		    			Swal.fire({
-				        				title: 'Petition updated successfully!',
-				        				customClass: {
-				        			        title: 'swal-title-custom' // Add a custom class for the title
-				        			    },
-				        				//text: "Error",
-				        				icon: 'success',
-				        				showCancelButton: false,
-				        				confirmButtonColor: '#3085d6',
-				        				cancelButtonColor: '#d33',
-				        				confirmButtonText: 'Ok',
-				        				}).then(function(result) {
-				        				if (result.isConfirmed) {
-				        					form_btn_enable();
-				        				}
-				        			});
-		    		    		}
-		    		    		else{
-		    		    			Swal.fire({
-				        				title: 'Petition details have been updated, but mapping the complaint to the officer has failed.',
-				        				customClass: {
-				        			        title: 'swal-title-custom' // Add a custom class for the title
-				        			    },
-				        				//text: "Error",
-				        				icon: 'warning',
-				        				showCancelButton: false,
-				        				confirmButtonColor: '#3085d6',
-				        				cancelButtonColor: '#d33',
-				        				confirmButtonText: 'Ok',
-				        				}).then(function(result) {
-				        				if (result.isConfirmed) {
-				        					form_btn_enable();
-				        				}
-				        			});
-								}
-		    		    	}).catch(function(error) {
-		    	    		    // Handle errors
-		    	    		    console.error('Error fetching offcier master data:', error);
-		    	    		    form_btn_enable();
-		    	    		});
-		    		    	
-						}
-		    		    else{
-		    		    	Swal.fire({
-		        				title: 'Failed to update petition details!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-	    		    	
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					//inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function updateFormData(formData){
-				var apiUrl = '/gcc/api/ward_sabha/updatePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function savePetitionMapData(formData){
-				var apiUrl = '/gcc/api/ward_sabha/mapComplientToOfficer';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint;
-					
-					var complaintArray;
-					
-					petitionId = petitionDetails[0].petition_id;
-					if (complaint != null && complaint !== '') {
-					    complaintArray = complaint.split(",");
-					} else {
-					    complaintArray = [];  // Initialize to an empty array
-					}
-					//complaintArray = complaint.split(",");
-					
-					$("#complaintType").val(complaintArray);
-					
-					$('#complaintType').trigger('change');
-					
-					closedComplaintsList = complaintArray;
-					//var petition_type = "#petition_type_"+petitionDetails[0].petition_type;
-					// Suppose you want to select the radio button with the value 'option2'
-					//$(petition_type).prop('checked', true);
-
-					$("#petitionerName").val(petitionDetails[0].petitioner_name);
-					$("#petitionerMobile").val(petitionDetails[0].petitioner_mobile);
-					$("#petitionerAddress").val(petitionDetails[0].petitioner_address);
-					$("#petitionerPincode").val(petitionDetails[0].petitioner_pincode);
-					
-					$("#complaintNature").val(petitionDetails[0].complaint_nature);
-					
-					//load_mapper(); // Call for Complaint Mapping Form
-					
-					// IDs of the values you want to prevent from being deselected
-					var valuesToPreventDeselection = closedComplaintsList;//['value1', 'value2', 'value3'];
-
-					$('#complaintType').on('select2:unselect', function (e) {
-					    var deselectedValue = e.params.data.id;
-					    
-					    // Check if the deselected value should be prevented from being deselected
-					    if (valuesToPreventDeselection.includes(deselectedValue)) {
-					        // Prevent the deselection
-					        e.preventDefault();
-					    	// Re-select the deselected value to prevent it from being deselected
-					        $(this).val(valuesToPreventDeselection).trigger('change.select2');
-					        // Optionally, you can display a message or perform any other action
-					        console.log('Deselection of value ' + deselectedValue + ' prevented');
-					        alert('Deselection of value ' + deselectedValue + ' prevented');
-					    }
-					});
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition Data ('+petitionNo+'):', error.message);
-				    call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/ward_sabha/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                //alert(jsonResponse.length);
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			function load_mapper(){
-			  	var complaintArray = $("#complaintType").val();
-			  	//var complaintArray = complaint.split(',');
-				var compPetitionNo = petitionNo;
-				var compPetitionId = petitionId;
-				
-				var compmapHTML='';
-				for(j = 0; j < complaintArray.length; j++){
-					var complaintTypeDetails = getComplaintTypeById(complaintArray[j]); // Pass the complaint_typeid
-					var title=(j+1)+') '+ complaintTypeDetails.complaint_type; // Map form title
-					var compID="comp"+j;
-					var complaintTypeId = complaintTypeDetails.complaint_typeid;
-					
-					getMappingByComplaintsID(complaintTypeId);
-					
-					compmapHTML+=`<div class="col-lg-6" id="comp${complaintArray[j]}">
-										
-										<div class="widget">
-					                        <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                            <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-					                        </div>
-					                        <div class="widget-body">
-					                        	<div class="form-group">
-						                        	<label for="dept${complaintArray[j]}">Select Department Type</label>
-													<select name="dept[]" id="dept${complaintArray[j]}" class="form-control" onchange="javascript:calloffice(this.value,${complaintArray[j]})">
-														<option value="0">Select Department</option>
-														<option value="1">GCC Department</option>
-														<option value="2">External Department</option>
-												    </select>
-												</div>
-												<div id="officedata${complaintArray[j]}"></div>
-												<div id="officers${complaintArray[j]}"></div>
-					                        </div>
-					                    </div>
-									
-								  </div>`;
-						
-				}
-				$('#comp_mapping_to_officers').html(compmapHTML);
-				
-			  }
-			
-		</script>
-		
-		<script>
-		// For Complient Map Select HTML 
-		function calloffice(val,id){
-			if(val==1){ // Intenal
-				var officeSelectHTML = `<div class="mb-4">
-                							<label for="office${id}">Select Office</label>
-                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-								                <option value="0">Select Office</option>
-								                <option value="1">HQ</option>
-								                <option value="2">Zonal Office</option>
-						                	</select>
-					                	</div>`;
-				$("#officedata"+id).html(officeSelectHTML);
-			}
-			else if(val==2){ // External
-				$("#officers"+id).html('');
-				var ExSelectHTML = getselect(id,"ExSelect");
-				var departmentSelectHTML = `<div class="mb-4">
-												<label for="dept3">Select Department</label>
-												${ExSelectHTML}
-										 	</div>`;
-				$("#officedata"+id).html(departmentSelectHTML);
-			}
-			else{
-				$("#officedata"+id).html('');
-				$("#officers"+id).html('');
-			}
-			$("#officers"+id).html('');
-		}
-		
-		function callofficers(val,id){
-			
-			if(val==1){
-				// HQ
-				var HQSelectHTML = getselect(id,"HQSelect");
-			 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-			}
-			else if(val==2){
-				// Zone Office
-				var ZoneSelectHTML = getselect(id,"ZoneSelect");
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-			}
-			else{
-				$("#officers"+id).html('');
-			}
-			
-		}
-		
-		function getselect(comid,type){
-	  	  var HQSelect = '';
-	  	  var ZoneSelect = '';
-	  	  var ExSelect = '';
-	  
-	  	  for (var i = 0; i < officerMasterList.length; i++) {
-	  		  if(officerMasterList[i].zone_id=="HQ"){
-	  			  HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  		  else if(officerMasterList[i].zone_id=="99"){
-	  			  ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  		  else{
-	  			  ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  	  }
-	  	  
-	  	  if(type=="HQSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>`;
-	  	  }
-	  	  if(type=="ZoneSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>`;
-	  	  }
-	  	  if(type=="ExSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>`;
-	  	  }
-	  	  return '';
-		}
-		
-		function form_btn_enable(){
-			$("#resetFormBtn").prop("disabled", false);
-			$("#requestSubmitBtn").prop("disabled", false);
-			$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-		}
-		
-		function form_btn_disable(){
-			$("#resetFormBtn").prop("disabled", true);
-			$("#requestSubmitBtn").prop("disabled", true);
-			// Show the loading icon on the button
-			$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-		}
-		
-		function getMappingByComplaintsID(complaintTypeId){
-				
-				$.ajax({
-				    type: "GET",
-				    url: '/gcc/api/ward_sabha/getComplaintMappingDetails',
-				    data: {
-				        'petitionId': petitionId,
-						'petitionNo': petitionNo,
-						'complaintTypeId': complaintTypeId
-				    },
-					dataType: 'json',
-				}).done(function(response) {
-					
-					//console.log(response);
-					
-					if(response.length>0){
-						var comid = response[0]["complaint_typeid"];
-						var offid = response[0]["off_id"];
-						var mapid = response[0]["mapid"];
-						loadSelectforUpdate(comid,offid,comid);
-					}
-					
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-						
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-					    
-				});
-		}
-		
-		function loadSelectforUpdate(comid,offid,id){
-			var type ="NULL";
-	  	  	var HQSelect = '';
-	  	  	var ZoneSelect = '';
-	  	  	var ExSelect = '';
-	  
-			for (var i = 0; i < officerMasterList.length; i++) {
-		  		//console.log(officerMasterList[i]);
-				if(officerMasterList[i].zone_id=="HQ"){
-			  
-				  	if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "HQSelect";
-				  		HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-				  	}
-				  	else{
-				  		HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-				  	}
-					  
-				}
-				else if(officerMasterList[i].zone_id=="99"){
-					if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "ExSelect";
-						ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-		  			}
-		  			else{
-		  				ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  			}
-				}
-				else{
-					if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "ZoneSelect";
-						//console.log(type + " === "+ officerMasterList[i].offId +" == "+ offid);
-						ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-				  	}
-				  	else{
-				  		ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-				  	}  
-				}
-			}  
-			
-			//console.log("comid : "+comid +",\noffid : "+offid+",\nid : "+id+",\ntype : "+type);
-			
-			if(type=="HQSelect"){
-				//console.log("I am from HQSelect: \n #officers"+id);
-				$("#officedata"+id).html('<div class="mb-4">' +
-				           '<label for="office$'+id+'">Select Office</label>' +
-				           '<select name="office[]" id="office$'+id+'" class="form-control" onchange="javascript:callofficers(this.value,'+id+')">' +
-				           '<option value="0">Select Office</option>' +
-				           '<option value="1" Selected>HQ</option>' +
-				           '<option value="2">Zonal Office</option>' +
-				           '</select>' +
-				           '</div>');
-			  	 HQSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>`;
-		 		$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${HQSelectHTML}</div>`);
-		 
-			}
-			if(type=="ZoneSelect"){
-				//console.log("I am from ZoneSelect: \n #officers"+id);
-				$("#officedata"+id).html('<div class="mb-4">' +
-				           '<label for="office$'+id+'">Select Office</label>' +
-				           '<select name="office[]" id="office$'+id+'" class="form-control" onchange="javascript:callofficers(this.value,'+id+')">' +
-				           '<option value="0">Select Office</option>' +
-				           '<option value="1">HQ</option>' +
-				           '<option value="2" Selected>Zonal Office</option>' +
-				           '</select>' +
-				           '</div>');
-				  
-				ZoneSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>`;
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${ZoneSelectHTML}</div>`);
-			}
-			if(type=="ExSelect"){
-				//console.log("I am from ExSelect: \n #officers"+id);
-				ExSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>`;
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${ExSelectHTML}</div>`);
-			}
-		 
-		}
-		
-		function call_petition_search_from(errorTXT){
-			var errorHTML = "";
-			if(errorTXT!=""){
-				errorHTML = `<div class="form-group text-center text-danger">${errorTXT}</div>`;
-			}
-			var searchFormHTML = `<form class="search-form" id="search-form" onsubmit="return searchRequest();">
-										<div class="card-header">
-						                <h3>Edit / Update Petition Form</h3>
-						                <div class="card-header-right">
-						                    <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-						                </div>
-						            </div>
-						       		<div class="card-body">
-						       			<div class="row">
-											<div class="col-12 text-center">
-												${errorHTML}
-												<div class="form-group">
-						                            <label for="petitionNoSearch">Petition No / மனு எண் </label>
-						                            <input type="text" class="form-control text-center" name="petitionNoSearch" id="petitionNoSearch" autocomplete="off" placeholder="ZH00000000" maxlength="11" required>
-						                        </div>
-						                        
-											</div>
-											<div class="col-12">
-												<div class="block-content" id="userinfo2">
-													<div id="comp_mapping_to_officers" class="row"></div>
-												</div>
-										 	</div>
-										</div>
-						          	</div>
-						          	<div class="card-footer text-center">
-										<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            	<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						        	</div>
-						    	</form>`;
-			
-			$("#petitionUpdateForm").html(searchFormHTML);
-			$('#petitionNoSearch').mask('ZH00000000');
-		}
-		
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/ward_sabha/update-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			
-			if(petitionNo!=null && petitionNo!="error"){
-				get_complaint_type_data();
-				//get_petition_type_data();
-				get_officer_master_data();
-			}
-			else{
-				if(petitionNo=="error"){
-					call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				}
-				else{
-					call_petition_search_from("");
-				}
-			}
-			
-		});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/ward_sabha/petition_view.html b/src/main/resources/templates/modules/ward_sabha/petition_view.html
deleted file mode 100644
index 1290d4af..00000000
--- a/src/main/resources/templates/modules/ward_sabha/petition_view.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>View Petition</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">View Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Petition Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="window.print()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">நாள் / Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="cdate_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petition_no_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_name_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_mobile_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Address of petitioner / மனுதாரரின் முகவரி:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_address_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">புகாரின் தன்மை / Nature of complaint:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="complaint_nature_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											      	<tr>
-											          <th style="padding: 0.45rem 0.45rem;">Petition Status: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_status_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total number of complaints in this petition: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Completed:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_completed_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Pending:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_pending_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-												
-												
-												<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th id="petition_summary_title">Pending Summary</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-									                	<tr style="background-color:#fbffe0;">
-												          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_summary_html"></td>
-												        </tr>
-								                	</tbody>
-								              	</table>
-								              	
-											</div>
-										</div>
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/ward_sabha/script :: script}"></script>
-        <script th:replace="~{fragments/modules/ward_sabha/petition_view_script :: script}"></script>
-       	
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/ward_sabha/petition_view_modal_page.html b/src/main/resources/templates/modules/ward_sabha/petition_view_modal_page.html
deleted file mode 100644
index 14e2bbe0..00000000
--- a/src/main/resources/templates/modules/ward_sabha/petition_view_modal_page.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Petition Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="window.print()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">நாள் / Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="cdate_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petition_no_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_name_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_mobile_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">மனுதாரரின் முகவரி / Address of petitioner:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_address_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">புகாரின் தன்மை / Nature of complaint:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="complaint_nature_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											      	<tr>
-											          <th style="padding: 0.45rem 0.45rem;">Petition Status: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_status_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total number of complaints in this petition: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Completed:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_completed_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Pending:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_pending_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-												
-												
-												<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th id="petition_summary_title">Pending Summary</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-									                	<tr style="background-color:#fbffe0;">
-												          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_summary_html"></td>
-												        </tr>
-								                	</tbody>
-								              	</table>
-								              	
-											</div>
-										</div>
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/ward_sabha/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/ward_sabha/petition_view_script :: script}"></script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/ward_shaba/eventcreation.html b/src/main/resources/templates/modules/ward_shaba/eventcreation.html
deleted file mode 100644
index fdba3755..00000000
--- a/src/main/resources/templates/modules/ward_shaba/eventcreation.html
+++ /dev/null
@@ -1,315 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<title>Create Ward Shaba Event</title>
-<style>
-	.container {
-		max-width: 1000px;
-		margin: 40px auto;
-		padding: 30px;
-		background: white;
-		border-radius: 12px;
-		box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
-		text-align: center;
-	}
-
-	label,
-	input {
-		display: block;
-		width: 100%;
-		margin-top: 10px;
-	}
-
-	button {
-		margin-top: 15px;
-		padding: 10px;
-		background-color: #28a745;
-		color: white;
-		border: none;
-		border-radius: 5px;
-		cursor: pointer;
-	}
-
-	table {
-		width: 100%;
-		margin-top: 20px;
-		border-collapse: collapse;
-	}
-
-	th,
-	td {
-		border: 1px solid #ddd;
-		padding: 8px;
-		text-align: left;
-	}
-
-	th {
-		background-color: #f2f2f2;
-	}
-
-	.add-minutes {
-		font-size: 20px;
-		color: #007bff;
-		text-decoration: none;
-		cursor: pointer;
-	}
-</style>
-</head>
-
-<body>
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="far fa-calendar-plus bg-blue"></i>
-									<div class="d-inline">
-										<h5>Add Ward Sabha</h5>
-										<span>Ward Sabha Minutes</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item" aria-current="page">Ward Sabha Minutes</li>
-										<li class="breadcrumb-item active" aria-current="page">Add Ward Sabha</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<hr>
-
-					<div class="container">
-						<div class="d-flex justify-content-between align-items-center">
-							<h4>Create Ward Sabha Event</h4>
-						</div>
-						<div class="row">
-							<div class="col-md-6">
-								<label for="eventDate">Select Date:<span style="color: red;">*</span></label>
-								<input class="form-control" type="date" id="eventDate" required>
-							</div>
-							<div class="col-md-6">
-								<label for="attachment">Attachment:<span style="color: red;">*</span></label>
-								<input class="form-control" type="file" id="attachment" required>
-							</div>
-						</div>
-
-
-						<button id="createEventBtn">Create Event</button>
-
-						<h3 id="eventName"></h3>
-						<h3 id="minutes_id"></h3>
-
-						<table id="eventTable">
-							<thead>
-								<tr>
-									<th>Event Name</th>
-									<th>Minutes Image</th>
-									<th>Minutes Count</th>
-									<th>New Minutes</th>
-								</tr>
-							</thead>
-							<tbody></tbody>
-						</table>
-					</div>
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-
-		</div>
-	</div>
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-
-	<script th:inline="javascript">
-		var createdBy = /*[[${LoginUserId}]]*/'';
-		var ward = /*[[${myWard}]]*/'';
-		
-		$(document).ready(function () {
-			let events = [];
-
-			// Function to load events when the page loads
-			function loadEvents() {
-				$.ajax({
-					type: "GET",
-					url: "/gcc/api/ward_shaba/getAllEvents?ward="+ward,
-					success: function (response) {
-						events = response; // Store the events
-						updateEventList();
-					},
-					error: function (xhr) {
-						console.error("Error loading events:", xhr.responseText);
-						Swal.fire({
-							icon: "error",
-							title: "Error!",
-							text: "Failed to load events.",
-							confirmButtonColor: "#d33",
-							confirmButtonText: "OK"
-						});
-					}
-				});
-			}
-
-			// Function to create a new event
-			$("#createEventBtn").click(function () {
-				let date = $("#eventDate").val();
-				let fileInput = $("#attachment")[0].files[0];
-
-				if (!date) {
-					Swal.fire({
-						icon: "warning",
-						title: "Warning!",
-						text: "Please select a date.",
-						confirmButtonColor: "#f39c12",
-						confirmButtonText: "OK"
-					});
-					return;
-				}
-
-				if (!fileInput) {
-					Swal.fire({
-						icon: "warning",
-						title: "Warning!",
-						text: "Please attach a file.",
-						confirmButtonColor: "#f39c12",
-						confirmButtonText: "OK"
-					});
-					return;
-				}
-
-				if (date) {
-					let formattedDate = new Date(date).toISOString().split("T")[0]; // Format as YYYY-MM-DD
-					let eventName = `Ward Sabha - ${ward} - ${formattedDate}`;
-					
-					// Create FormData for multipart request
-					let formData = new FormData();
-					formData.append("minutesDate", formattedDate);
-					formData.append("ward", ward);
-					formData.append("minutesName", eventName);
-					if (fileInput) {
-						formData.append("attachment", fileInput);
-					}
-					
-					$.ajax({
-						type: "POST",
-						url: "/gcc/api/ward_shaba/saveevent",
-						data: formData,
-						processData: false,
-						contentType: false,
-						success: function (response) {
-							console.log("API Response:", response);
-							Swal.fire({
-								icon: "success",
-								title: "Success!",
-								text: "Event created successfully!",
-								confirmButtonColor: "#3085d6",
-								confirmButtonText: "OK"
-							}).then(() => {
-								window.location.reload();
-							});
-
-							// Add new event to the list
-							let newEvent = {
-								minutes_id: response.minutesId,
-								minutes_name: response.minutesName,
-								minutes_img: response.minutes_img
-							};
-							events.push(newEvent);
-							updateEventList();
-						},
-						error: function (xhr) {
-							console.error("Error:", xhr.responseText);
-							Swal.fire({
-								icon: "error",
-								title: "Error!",
-								text: "Failed to save event.",
-								confirmButtonColor: "#d33",
-								confirmButtonText: "OK"
-							});
-						}
-					});
-				}
-			});
-
-			function updateEventList() {
-				let tableBody = $("#eventTable tbody");
-				tableBody.empty();
-
-				events.forEach(event => {
-					let row = $("<tr></tr>");
-					let nameCell = $("<td></td>").text(event.minutes_name);
-
-					let countCell = $("<td></td>");
-					let countLink = $("<a></a>")
-						.attr("href", `/gcc/ward_shaba/minutes-list?event=${encodeURIComponent(event.minutes_name)}&eventid=${encodeURIComponent(event.minutes_id)}`)
-						.text(event.minutes_count)
-						.addClass("clickable-count");
-					countCell.append(countLink);
-
-					let imageCell = $("<td></td>");
-					if (event.minutes_img) {
-						let imageUrl = `/gcc/files/${event.minutes_img}`.replace(/\/{2,}/g, "/"); // Fix double slashes
-
-						let imgLink = $("<a></a>")
-							.attr("href", imageUrl)
-							.attr("target", "_blank")
-							.html("<center>View File</center>")
-							/*
-							.append(
-								
-								$("<img>")
-									.attr("src", imageUrl)
-									.attr("alt", "Event Image")
-									.css({width: "50px", height: "50px", "border-radius": "5px", cursor: "pointer"})
-									
-								
-							);*/
-						imageCell.append(imgLink);
-					} else {
-						imageCell.text("No Image");
-					}
-
-					let actionCell = $("<td></td>");
-
-					let addMinutesLink = $("<a></a>")
-						.attr("href", `/gcc/ward_shaba/new_minutes?event=${encodeURIComponent(event.minutes_name)}&eventid=${encodeURIComponent(event.minutes_id)}`)
-						.html("➕")
-						.addClass("add-minutes");
-
-					actionCell.append(addMinutesLink);
-
-					row.append(nameCell, imageCell, countCell, actionCell);
-					tableBody.append(row);
-				});
-			}
-
-
-			// Load events on page load
-			loadEvents();
-		});
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/ward_shaba/minutes_list.html b/src/main/resources/templates/modules/ward_shaba/minutes_list.html
deleted file mode 100644
index 68ceb004..00000000
--- a/src/main/resources/templates/modules/ward_shaba/minutes_list.html
+++ /dev/null
@@ -1,934 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-6">
-								<div class="page-header-title">
-									<i class="far fa-list-alt bg-blue"></i>
-									<div class="d-inline">
-										<h5>Minutes List</h5>
-										<span>Ward Sabha Minutes</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-6">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="/index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item" aria-current="page">Ward Sabha Minutes</li>
-										<li class="breadcrumb-item active" aria-current="page">Minutes List</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-
-					<hr>
-					<div class="row">
-						<div class="col-md-12">
-							<!--  <div class="card">
-                                    
-                                    <div class="card-block"> -->
-							<div id="tableLoading"></div>
-							<input type="hidden" id="eventName" th:value="${eventName}">
-							<input type="hidden" id="eventId" th:value="${eventId}">
-
-							<div class="d-flex justify-content-end">
-							<!-- 
-								<button onclick="return redirectToNewMinutes();" class="btn btn-secondary">+ New
-									Minutes</button>
-									 -->
-							</div>
-
-
-							<label for="eventid">Select Current Minutes / தற்போதைய நிகழ்வை தேர்ந்தெடுக்கவும்</label>
-
-							<select class="form-control" id="eventid" name="eventid" style="width: 100%;"
-								data-placeholder="தேர்ந்தெடு.." th:attr="data-selected=${eventId}">
-								<option value="">Select</option>
-								<option th:if="${eventName}" th:value="${eventId}" th:text="${eventName}" selected>
-								</option>
-							</select>
-
-							<div>
-
-								<br>
-								<br>
-
-								<table id="petitionDatatable"
-									class="table table-striped table-bordered table-hover dataTable" role="grid"
-									width="100%">
-									<thead class="thead-dark">
-										<tr class="table-bordered" style="font-size:10px;">
-											<th class="text-center no-sort" width="3%">S.No</th>
-											<th class="text-center" width="10%">Minutes No.</th>
-											<th class="text-center">Details</th>
-											<th class="text-center">Date</th>
-											<th class="text-center" width="7%">Status</th>
-											<th class="text-center" width="7%">Remarks</th>
-										</tr>
-									</thead>
-									<tbody id="petitionTableBody"></tbody>
-
-								</table>
-							</div>
-
-						</div>
-					</div>
-
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-	<!-- Reply Form Modal -->
-	<div class="modal fade" id="replyFormModal" tabindex="-1" aria-labelledby="replyModalLabel" aria-hidden="true">
-		<div class="modal-dialog modal-xl">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="replyModalLabel">Reply to Petition</h5>
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body">
-					<form id="replyForm">
-						<input type="hidden" id="MinutesId" name="MinutesId">
-						<div class="form-group">
-							<div class="modal-body">
-								<div class="row">
-									<div class="col-lg-6">
-										<div class="block block-rounded">
-
-											<div id="leftContainer">
-												<div class="card mb-0">
-													<div class="card-header"
-														style="color: #004085;background-color: #e7eff7;">
-														<h3>Minutes Details</h3>
-
-													</div>
-													<div class="card-body">
-														<table class="table table-borderless table-vcenter mb-0"
-															style="font-size:12px;">
-															<tbody>
-																<tr>
-																	<th style="padding: 0.45rem 0.45rem;">
-																		Date : </th>
-																	<td class="fw-semibold"
-																		style="padding: 0.45rem 0.45rem;">
-
-																	</td>
-																</tr>
-																<tr>
-																	<th style="padding: 0.45rem 0.45rem;">minutes_no
-																	</th>
-																	<td class="fw-semibold"
-																		style="padding: 0.45rem 0.45rem;">
-
-																	</td>
-																</tr>
-																<tr>
-																	<th style="padding: 0.45rem 0.45rem;">
-																		Minutes Details :</th>
-																	<td class="fw-semibold"
-																		style="padding: 0.45rem 0.45rem;">
-
-																	</td>
-																</tr>
-
-															</tbody>
-														</table>
-													</div>
-												</div>
-											</div>
-
-										</div>
-									</div>
-
-									<div class="col-lg-6 printack2">
-										<div class="block block-rounded">
-
-											<form class="action-form" id="action-form" onsubmit="return saveandclose();"
-												enctype="multipart/form-data">
-												<div class="card mb-0">
-													<div class="card-header"
-														style="color: #004085;background-color: #e7eff7;">
-														<h3>Complaint Update Details</h3>
-														<input type="text" id="minutesNo" name="minutesNo" hidden>
-													</div>
-													<div class="card-body" id="rightContainer">
-														<div class="form-group">
-															<label for="replyMessage">நடவடிக்கை /
-																Action:</label>
-															<textarea class="form-control" id="replyMessage"
-																name="replyMessage" rows="6" maxlength="250"
-																placeholder="புகாரின் தன்மை..." required=""></textarea>
-
-
-														</div>
-
-														<div class="form-group">
-															<label for="action_san_page1">ஆவணப் பதிவேற்றம் /
-																Document Upload:</label>
-															<input name="action_san_page1" id="action_san_page1"
-																class="form-control" type="file" capture="camera"
-																accept="application/pdf, image/*" required="">
-														</div>
-														<div class="form-group mb-0 text-center">
-															<button type="button"
-																class="btn btn-sm rounded-pill btn-hero btn-success me-1"
-																id="updatebtn"><i class="ik ik-save"></i> Save
-																and Close </button>
-														</div>
-
-
-													</div>
-												</div>
-											</form>
-
-
-										</div>
-									</div>
-
-								</div>
-							</div>
-
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<!-- Reply Form Modal -->
-	<div class="modal fade" id="actiontakenForm" tabindex="-1" aria-labelledby="actionModalLabel" aria-hidden="true">
-		<div class="modal-dialog modal-xl">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="actionModalLabel">Reply to Petition</h5>
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body">
-					<form id="acttakenForm">
-						<input type="hidden" id="MinutesId">
-						<div class="form-group">
-							<div class="modal-body">
-								<div class="row">
-									<div class="col-lg-6">
-										<div class="block block-rounded">
-
-											<div id="leftContainer">
-												<div class="card mb-0">
-													<div class="card-header"
-														style="color: #004085;background-color: #e7eff7;">
-														<h3>Minutes Details</h3>
-
-
-													</div>
-													<div class="card-body">
-														<table class="table table-borderless table-vcenter mb-0"
-															style="font-size:12px;">
-															<tbody>
-																<tr>
-																	<th style="padding: 0.45rem 0.45rem;">
-																		Date : </th>
-																	<td class="fw-semibold"
-																		style="padding: 0.45rem 0.45rem;">
-
-																	</td>
-																</tr>
-																<tr>
-																	<th style="padding: 0.45rem 0.45rem;">minutes_no
-																	</th>
-																	<td class="fw-semibold"
-																		style="padding: 0.45rem 0.45rem;">
-
-																	</td>
-																</tr>
-																<tr>
-																	<th style="padding: 0.45rem 0.45rem;">
-																		Minutes Details :</th>
-																	<td class="fw-semibold"
-																		style="padding: 0.45rem 0.45rem;">
-
-																	</td>
-																</tr>
-
-															</tbody>
-														</table>
-													</div>
-												</div>
-											</div>
-
-										</div>
-									</div>
-
-									<div class="col-lg-6 printack2">
-										<div class="block block-rounded">
-
-											<form class="action-form" id="action-form" onsubmit="return saveandclose();"
-												enctype="multipart/form-data">
-												<div class="card mb-0">
-													<div class="card-header"
-														style="color: #004085;background-color: #e7eff7;">
-														<h3>Complaint Update Details</h3>
-
-													</div>
-													<div id="repliedcontainer">
-														<div class="card-body">
-															<table class="table table-borderless table-vcenter mb-0"
-																style="font-size:12px;">
-																<tbody>
-																	<tr>
-																		<th style="padding: 0.45rem 0.45rem;">
-																			Action : </th>
-																		<td class="fw-semibold"
-																			style="padding: 0.45rem 0.45rem;">
-																		</td>
-																	</tr>
-
-																</tbody>
-															</table>
-															<div id="imgpreview"></div>
-														</div>
-													</div>
-												</div>
-											</form>
-
-
-										</div>
-									</div>
-
-								</div>
-							</div>
-
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
-	<!-- Image Preview Modal -->
-	<div class="modal fade" id="imagePreviewModal" tabindex="-1" role="dialog">
-		<div class="modal-dialog modal-dialog-centered" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title">Image Preview</h5>
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body text-center">
-					<!-- Image will be inserted dynamically here -->
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--<script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>-->
-	<script th:inline="javascript">
-	
-	var createdBy = /*[[${LoginUserId}]]*/'';
-	var ward = /*[[${myWard}]]*/'';
-	
-		var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-
-		// Loading Div id
-		const loading = $("#tableLoading");
-
-		// DataTables buttons configuration
-		var buttons = [
-			{
-				extend: 'pageLength',
-				className: 'btn btn-warning'
-			},
-			{
-				title: 'Data export',
-				extend: 'copyHtml5',
-				text: 'Copy',
-				className: 'btn btn-secondary',
-				id: 'copyBtn'
-			},
-			{
-				extend: 'excelHtml5',
-				text: 'Excel',
-				className: 'btn btn-secondary',
-				id: 'excelBtn',
-				title: 'Petition List'
-			},
-			{
-				extend: 'csvHtml5',
-				text: 'CSV',
-				className: 'btn btn-secondary',
-				id: 'csvBtn',
-				title: 'Petition List'
-			},
-			{
-				extend: 'pdfHtml5',
-				text: 'PDF',
-				className: 'btn btn-secondary',
-				id: 'pdfBtn',
-				title: 'Petition List'
-			},
-			{
-				extend: 'print',
-				text: 'Print',
-				className: 'btn btn-secondary',
-				id: 'printBtn',
-				title: 'Petition List',
-				exportOptions: {
-					columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-				}
-			}
-		];
-
-
-
-		$(document).ready(function () {
-			$('#petitionDatatable').DataTable({
-				dom: 'Bftip',
-				columnDefs: [
-					{targets: 'no-sort', "orderable": false},
-					{targets: 'no-exportable', "exportable": false}
-				],
-				lengthMenu: [
-					[50, 100, 200, 500, -1],
-					['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-				],
-				fixedColumns: {left: 0, right: 0},
-				buttons: [buttons],
-				responsive: false,
-				searching: true,
-				select: false,
-				processing: false,
-			});
-		});
-
-		$(document).ready(function () {
-			console.log("Document is ready. Fetching event list...");
-
-			// Fetch Minutes Names in Dropdown
-			$.ajax({
-				url: '/gcc/api/ward_shaba/getMinutesNames?ward='+ward,
-				type: 'GET',
-				success: function (response) {
-					console.log("API Response:", response);
-
-					let dropdown = $('#eventid');
-					dropdown.empty().append('<option value="Select">Select</option>');
-
-					if (!response || response.length === 0) {
-						console.warn("No events found.");
-						return;
-					}
-
-					$.each(response, function (index, item) {
-						let selected = item.minutes_id == $('#eventid').attr('data-selected') ? "selected" : "";
-						dropdown.append(`<option value="${item.minutes_id}" ${selected}>${item.minutes_name}</option>`);
-					});
-
-					// Fetch details after dropdown is populated
-					const selectedEventId = dropdown.attr('data-selected');
-					if (selectedEventId) {
-						fetchMinutesDetails(selectedEventId);
-					}
-				},
-				error: function (xhr) {
-					console.error("Error fetching minutes names:", xhr.responseText);
-				}
-			});
-
-		});
-
-		$(document).ready(function () {
-			// Get URL parameters
-			const urlParams = new URLSearchParams(window.location.search);
-			const eventId = urlParams.get('eventid');
-
-			if (eventId) {
-				console.log("Event ID from URL:", eventId);
-				$('#eventid').attr('data-selected', eventId);
-				fetchMinutesDetails(eventId,ward);
-			}
-
-			$('#eventid').change(function () {
-				var selectedMinutes = $('#eventid').val();
-
-				if (!selectedMinutes || selectedMinutes === "Select") {
-					console.warn("Invalid selection");
-					return;
-				}
-
-				fetchMinutesDetails(selectedMinutes,ward);
-			});
-		});
-
-
-
-		// Fetch minutes details when dropdown changes
-
-		function fetchMinutesDetails(minutesId,ward) {
-			console.log("Fetching details for Minutes ID:", minutesId);
-
-			if (!minutesId || isNaN(minutesId)) {
-				console.error("Invalid minutesId:", minutesId);
-				return;
-			}
-
-			$.ajax({
-				url: '/gcc/api/ward_shaba/getMinutesDetails?ward='+ward,
-				type: 'GET',
-				data: {minutesId: minutesId},
-				success: function (response) {
-					console.log("API Response:", response);
-
-					var table = $('#petitionDatatable').DataTable();
-					table.clear();
-
-					if (!response || response.length === 0) {
-						console.warn("No data received from API");
-						table.draw();
-						return;
-					}
-
-					$.each(response, function (index, item) {
-						let statusBadge;
-						if (item.remarks && item.remarks.trim() !== "") {
-							statusBadge = `
-		                        <span class="badge badge-success replied-badge" 
-		                              data-minutesid="${item.minutes_id}" 
-		                              data-minutesno="${item.minutes_no}" 
-		                              data-minutesdetails="${item.minutes_details}" 
-		                              data-minutesname="${item.minutes_name || 'N/A'}"
-		                              data-createddate="${item.created_date}" 
-		                              data-remarks="${item.remarks}"
-									  data-refimg="${item.ref_img}"
-									  data-minutesimg="${item.minutes_img}"
-		                              style="cursor:pointer;">
-		                            Closed
-		                        </span>
-		                    `;
-						} else {
-							statusBadge = `
-		                        <span class="badge badge-warning reply-badge" 
-		                              data-minutesid="${item.minutes_id}" 
-		                              data-minutesno="${item.minutes_no}" 
-		                              data-minutesdetails="${item.minutes_details}" 
-		                              data-minutesname="${item.minutes_name || 'N/A'}"
-		                              data-createddate="${item.created_date}" 
-		                              data-remarks="${item.remarks}"
-									  data-minutesimg="${item.minutes_img}"
-		                              style="cursor:pointer;">
-		                            Pending
-		                        </span>
-		                    `;
-						}
-
-						table.row.add([
-							index + 1,
-							item.minutes_no ?? 'N/A',
-							item.minutes_details ?? 'N/A',
-							item.created_date ?? 'N/A',
-							statusBadge,
-							item.remarks ?? 'N/A'
-						]);
-					});
-
-					table.draw();
-				},
-				error: function (xhr) {
-					console.error("Error fetching data:", xhr.responseText);
-				}
-			});
-		}
-
-		// Handle "Pending" badge click
-		$(document).on("click", ".reply-badge", function () {
-			let minutesId = $(this).data("minutesid");
-			let minutesNo = $(this).data("minutesno");
-			let minutesDetails = $(this).data("minutesdetails");
-			let minutesName = $(this).data("minutesname");
-			let createdDate = $(this).data("createddate");
-			let remarks = $(this).data("remarks");
-			let minutesImg = $(this).data("minutesimg");
-
-			openPendingReplyForm(minutesId, minutesNo, minutesDetails, minutesName, createdDate, remarks, minutesImg);
-
-			function openPendingReplyForm(minutesId, minutesNo, minutesDetails, minutesName, createdDate, remarks, minutesImg) {
-				console.log("Opening reply form for Minutes ID:", minutesId, "Minutes Name:", minutesName, "Minutes No:", minutesNo);
-
-				$("#MinutesId").val(minutesId);
-				$("#minutesNo").val(minutesNo);
-				$("#replyModalLabel").text("Reply to Petition - " + minutesNo);
-
-				let imageHtml = minutesImg
-					? `<table class="table table-bordered">
-			                <thead>
-			                    <tr>
-			                        <th>S.No</th>
-			                        <th>File Name</th>
-			                        <th>Actions</th>
-			                    </tr>
-			                </thead>
-			                <tbody>
-			                    ${minutesImg.split(',').map((img, index) => {
-						let fileName = img.split('/').pop(); // Extract file name
-						let fileUrl = `/gcc/files${img}`; // Construct file URL
-
-						return `
-			                            <tr>
-			                                <td>${index + 1}</td>
-			                                <td>${fileName}</td>
-			                                <td>
-			                                    <a href="${fileUrl}" download class="btn btn-sm btn-primary" title="Download File">
-			                                        <i class="fa fa-download"></i> 
-			                                    </a>
-			                                    <a href="${fileUrl}" target="_blank" class="btn btn-sm btn-info" title="View File">
-			                                        <i class="fa fa-eye"></i> 
-			                                    </a>
-			                                </td>
-			                            </tr>`;
-					}).join('')}
-			                </tbody>
-			           </table>`
-					: `<span class="text-muted">No Image Available</span>`;
-
-				$("#replyFormModal .modal-body tbody").html(`
-			        <tr>
-			            <th>Date :</th>
-			            <td>${createdDate}</td>
-			        </tr>
-			        <tr>
-			            <th>Minutes No :</th>
-			            <td>${minutesNo}</td>
-			        </tr>
-			        <tr>
-			            <th>Minutes Name :</th>
-			            <td>${minutesName}</td>
-			        </tr>
-			        <tr>
-			            <th>Minutes Details :</th>
-			            <td>${minutesDetails}</td>
-			        </tr>
-			        <tr>
-			            <td colspan="2">Minutes File : <br> ${imageHtml}</td>
-			        </tr>
-			    `);
-
-				// Show or hide the right container based on remarks
-				if (!remarks || remarks.trim() === "") {
-					$("#rightContainer").show();
-					$("#replyMessage").val(""); // Clear previous input
-				} else {
-					$("#rightContainer").hide();
-				}
-
-				$("#replyFormModal").modal("show");
-			}
-
-		});
-
-		// Handle "Replied" badge click
-		$(document).on("click", ".replied-badge", function () {
-			var minutesId = $(this).data("minutesid");
-			var minutesNo = $(this).data("minutesno");
-			var minutesDetails = $(this).data("minutesdetails");
-			var minutesName = $(this).data("minutesname");
-			var createdDate = $(this).data("createddate");
-			var remarks = $(this).data("remarks");
-			var refImg = $(this).data("refimg");
-			let minutesImg = $(this).data("minutesimg");
-
-			openRepliedReplyForm(minutesId, minutesNo, minutesDetails, minutesName, createdDate, remarks, refImg, minutesImg);
-
-			function openRepliedReplyForm(minutesId, minutesNo, minutesDetails, minutesName, createdDate, remarks, refImg) {
-				console.log("Opening reply form for Minutes ID:", minutesId, "Minutes Name:", minutesName, "refImg===", refImg);
-
-				$("#MinutesId").val(minutesId);
-				$("#actionModalLabel").text("Reply to Petition - " + minutesNo);
-
-				let imageHtml = minutesImg
-					? `<table class="table table-bordered">
-				            <thead>
-				                <tr>
-				                    <th>S.No</th>
-				                    <th>File Name</th>
-				                    <th>Actions</th>
-				                </tr>
-				            </thead>
-				            <tbody>
-				                ${minutesImg.split(',').map((img, index) => {
-						let fileName = img.split('/').pop(); // Extract file name
-						let fileUrl = `/gcc/files${img}`; // Construct file URL
-
-						return `
-				                        <tr>
-				                            <td>${index + 1}</td>
-				                            <td>${fileName}</td>
-				                            <td>
-				                                <a href="${fileUrl}" download class="btn btn-sm btn-primary" title="Download File">
-				                                    <i class="fa fa-download"></i> 
-				                                </a>
-				                                <a href="${fileUrl}" target="_blank" class="btn btn-sm btn-info" title="View File">
-				                                    <i class="fa fa-eye"></i> 
-				                                </a>
-				                            </td>
-				                        </tr>`;
-					}).join('')}
-				            </tbody>
-				       </table>`
-					: `<span class="text-muted">No Image Available</span>`;
-
-				$("#actiontakenForm .modal-body tbody").html(`
-				    <tr>
-				        <th>Date :</th>
-				        <td>${createdDate}</td>
-				    </tr>
-				    <tr>
-				        <th>Minutes No :</th>
-				        <td>${minutesNo}</td>
-				    </tr>
-				    <tr>
-				        <th>Minutes Name :</th>
-				        <td>${minutesName || 'N/A'}</td>
-				    </tr>
-				    <tr>
-				        <th>Minutes Details :</th>
-				        <td>${minutesDetails}</td>
-				    </tr>
-					<tr> <td colspan="2">Minutes File : <br> ${imageHtml}</td> </tr>
-				`);
-
-
-
-				if (!remarks || remarks.trim() === "") {
-					$("#rightContainer").hide();
-					$("#replyMessage").val("");  // Clear any previous value
-				} else {
-					if (refImg) {
-						let imageUrl = `/gcc/files/${refImg}`.replace(/\/{2,}/g, "/"); // Ensure correct path format
-						let fileName = refImg.split("/").pop(); // Extract file name
-						let fileType = fileName.split(".").pop(); // Extract file type
-
-						// Default file size placeholder
-						let fileSize = "Fetching...";
-
-						// AJAX request to get file size
-						$.ajax({
-							url: `/gcc/api/ward_shaba/get-file-size?filePath=${encodeURIComponent(imageUrl)}`, // Replace with your backend API
-							method: "GET",
-							success: function (response) {
-								fileSize = response.size ? formatFileSize(response.size) : "N/A"; // Convert bytes to readable format
-								$("#fileSizeCell").text(fileSize); // Update file size in table
-							},
-							error: function () {
-								fileSize = "N/A"; // Set N/A if request fails
-								$("#fileSizeCell").text(fileSize);
-							},
-						});
-
-						let imageHtml = `
-							              <div class="like-comm mt-20 mb-0">
-							                  <b>ஆவணப் பதிவேற்றம் / Document Upload:</b><br>
-							                  <table class="table table-bordered table-vcenter mb-0">
-							                      <thead>
-							                          <tr>
-							                              <th>S.no</th>
-							                              <th>File Name</th>
-							                              <!--<th>Size</th>-->
-							                              <th>Type</th>
-							                              <th><i class="ik ik-more-horizontal"></i></th>
-							                          </tr>
-							                      </thead>
-							                      <tbody>
-							                          <tr>
-							                              <td class="fw-semibold">1</td>
-							                              <td class="fw-semibold">${fileName}</td>
-							                             <!-- <td class="fw-semibold" id="fileSizeCell">${fileSize}</td>--> <!-- File size updated via AJAX -->
-							                              <td class="fw-semibold">${fileType}</td>
-							                              <td class="fw-semibold">
-							                                  <a href="${imageUrl}" download class="link mr-10" data-toggle="tooltip" title="Download File">
-							                                      <i class="fa fa-fw fa-download" style="font-size: 18px;"></i>
-							                                  </a>
-							                                  <a href="${imageUrl}" target="_blank" class="link mr-10" data-toggle="tooltip" title="View File">
-							                                      <i class="far fa-3x fa-file-image" style="font-size: 18px;"></i>
-							                                  </a>
-							                              </td>
-							                          </tr>
-							                      </tbody>
-							                  </table>
-							              </div>`;
-
-						$("#repliedcontainer").html(`
-							              <div class="form-group">
-							                  <strong>நடவடிக்கை / Action:</strong> ${remarks}
-							              </div>
-							              ${imageHtml}
-							          `);
-					} else {
-						$("#repliedcontainer").html(`
-							              <div class="form-group">
-							                  <strong>நடவடிக்கை /Action:</strong> ${remarks}
-							              </div>
-							              <div><strong>Reference Image:</strong> No image available</div>
-							          `);
-					}
-				}
-
-				$("#actiontakenForm").modal("show");
-			}
-		});
-
-		// Function to format file size (bytes to KB/MB)
-		function formatFileSize(bytes) {
-			if (bytes < 1024) return bytes + " B";
-			else if (bytes < 1048576) return (bytes / 1024).toFixed(2) + " KB";
-			else return (bytes / 1048576).toFixed(2) + " MB";
-		}
-
-
-
-		// Handle click event to show full-size image in a modal
-		$(document).on("click", "#previewImage", function () {
-			let imgSrc = $(this).attr("src");
-			$("#imagePreviewModal .modal-body").html(`<img src="${imgSrc}" style="width: 100%; height: auto;">`);
-			$("#imagePreviewModal").modal("show");
-		});
-
-
-
-
-		$("#updatebtn").click(function (e) {
-			e.preventDefault();
-
-			var minutesNo = $("#minutesNo").val(); // ✅ Corrected
-			var minutesId = $("#MinutesId").val();
-			var replyMessage = $("#replyMessage").val().trim();
-
-			console.log("Set Minutes No:", $("#minutesNo").val());
-			console.log("Minutes No:", minutesNo, "Minutes ID:", minutesId, "Reply:", replyMessage);
-
-			if (!minutesId || !minutesNo) {
-				alert("Minutes ID or Minutes No is missing!");
-				return;
-			}
-
-			if (!replyMessage) {
-
-				swal.fire({
-					icon: "warning",
-					title: "warning!",
-					text: "Please enter the complaint action",
-					confirmButtonColor: "#3085d6",
-					confirmButtonText: "OK"
-				});
-				return;
-			}
-			var fileInput = $("#action_san_page1")[0].files[0];
-			
-			if (!fileInput) {
-				swal.fire({
-					icon: "warning",
-					title: "warning!",
-					text: "Please Upload the complaint image",
-					confirmButtonColor: "#3085d6",
-					confirmButtonText: "OK"
-				}); return;
-			}
-
-			var formData = new FormData();
-			formData.append("minutesNo", minutesNo);
-			formData.append("MinutesId", minutesId);
-			formData.append("replyMessage", replyMessage);
-			if (fileInput) {
-				formData.append("document", fileInput);
-			}
-
-			console.log("FormData Entries:");
-			for (let [key, value] of formData.entries()) {
-				console.log(key, value);
-			}
-
-			$.ajax({
-				url: "/gcc/api/ward_shaba/saveComplaintUpdate",
-				type: "POST",
-				data: formData,
-				processData: false,
-				contentType: false,
-				success: function (response) {
-					Swal.fire({
-						icon: "success",
-						title: "Success!",
-						text: "Complaint updated successfully!",
-						confirmButtonColor: "#3085d6",
-						confirmButtonText: "OK"
-					}).then(() => {
-						fetchMinutesDetails(minutesId);  // Fetch updated details
-						location.reload();
-					});
-				},
-				error: function (xhr) {
-					console.error("Error updating complaint:", xhr.responseText);
-					Swal.fire({
-						icon: "error",
-						title: "Error!",
-						text: "Failed to update complaint.",
-						confirmButtonColor: "#d33",
-						confirmButtonText: "OK"
-					});
-				}
-			});
-		});
-
-		function redirectToNewMinutes() {
-			//alert(document.getElementById("eventName").value+"    "+document.getElementById("eventId").value);
-			const eventName = document.getElementById('eventName').value;
-			const eventId = document.getElementById('eventId').value;
-
-			if (!eventNameInput || !eventIdInput) {
-				alert("Event details are missing!");
-				return;
-			}
-
-			if (!eventName || !eventId) {
-				alert("Event details are empty!");
-				return;
-			}
-
-			window.location.href = `/gcc/ward_shaba/new_minutes?event=${encodeURIComponent(eventName)}&eventid=${encodeURIComponent(eventId)}`;
-		}
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/ward_shaba/new_minutes.html b/src/main/resources/templates/modules/ward_shaba/new_minutes.html
deleted file mode 100644
index 942a13aa..00000000
--- a/src/main/resources/templates/modules/ward_shaba/new_minutes.html
+++ /dev/null
@@ -1,322 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-
-<body>
-	<!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-	<div class="wrapper">
-		<!-- header top menu Start -->
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<!-- header top menu end -->
-
-		<div class="page-wrap">
-			<!--=============== Left Menu side Start ================-->
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<!--=============== Left side End ================-->
-			<div class="main-content">
-				<div class="container-fluid">
-					<div class="page-header">
-						<div class="row align-items-end">
-							<div class="col-lg-8">
-								<div class="page-header-title">
-									<i class="far fa-calendar-plus bg-blue"></i>
-									<div class="d-inline">
-										<h5>Add New Minutes</h5>
-										<span>Ward Sabha Minutes</span>
-									</div>
-								</div>
-							</div>
-							<div class="col-lg-4">
-								<nav class="breadcrumb-container" aria-label="breadcrumb">
-									<ol class="breadcrumb">
-										<li class="breadcrumb-item">
-											<a href="index"><i class="ik ik-home"></i></a>
-										</li>
-										<li class="breadcrumb-item" aria-current="page">Ward Sabha Minutes</li>
-										<li class="breadcrumb-item active" aria-current="page">Add Minutes</li>
-									</ol>
-								</nav>
-							</div>
-						</div>
-					</div>
-					<hr>
-					<div class="row">
-						<div class="col-md-2"></div>
-						<div class="col-md-8">
-							<div class="card">
-								<form class="request-form" id="request-form" onsubmit="return saveRequest();"
-									enctype="multipart/form-data">
-									<div class="card-header">
-										<h3>New Minutes Form</h3>
-									</div>
-									<div class="card-body" id="card-body">
-										<div class="row">
-											<div class="col-lg-12">
-												<div class="form-group">
-													<label for="eventid">Select Current Minutes / தற்போதைய நிகழ்வை
-														தேர்ந்தெடுக்கவும்</label>
-													<select class="form-control" id="eventid" name="eventid"
-														style="width: 100%;" data-placeholder="தேர்ந்தெடு.."
-														th:attr="data-selected=${eventId}" required>
-														<option value="">Select</option>
-														<option th:if="${eventName}" th:value="${eventId}"
-															th:text="${eventName}" selected ></option>
-													</select>
-												</div>
-											</div>
-											<input class="form-control" id="zone" name="zone" style="width: 100%;" type="hidden" value="00">
-											<input class="form-control" id="ward" name="ward" style="width: 100%;" type="hidden" value="000">
-											
-										</div>
-
-										<div class="form-group">
-											<label for="complaintNature">நிமிட விவரங்களை உள்ளிடவும் / Enter Minutes
-												Details</label>
-											<textarea class="form-control" id="complaintNature" name="complaintNature"
-												rows="6" placeholder="நிமிட விவரங்களை உள்ளிடவும்..." required></textarea>
-										</div>
-										<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i
-													class="ik ik-refresh-cw"></i>Reset</button>
-											<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i
-													class="ik ik-save"></i>Save</button>
-										</div>
-								</form>
-							</div>
-						</div>
-						<div class="col-md-2"></div>
-					</div>
-				</div>
-			</div>
-
-			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-		</div>
-	</div>
-
-
-	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-	<script th:replace="~{fragments/modules/base/script :: script}"></script>
-	<!--<script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>-->
-	<script th:inline="javascript">
-		var createdBy = /*[[${LoginUserId}]]*/'';
-		var ward = /*[[${myWard}]]*/'';
-		
-		var complaintTypeList = "";
-		var zoneList = "";
-		var wardList = "";
-
-		/* Get Event Data */
-
-
-		// Save New petition 
-		function saveRequest() {
-			// Disable the button to prevent multiple clicks
-			form_btn_disable();
-
-			var inputElementMobileNo = $('#petitionerMobile');
-			var mobileNo = inputElementMobileNo.val();
-			var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-			inputElementMobileNo.removeClass('is-invalid');
-
-			var inputElementComplaintType = $('#complaintType');
-			var complaintType = inputElementComplaintType.val();
-
-			if (mobileNo !== null) {
-
-				// Serialize form data
-				var formData = new FormData($('#request-form')[0]);
-				formData.append('createdBy', createdBy);
-				saveFormData(formData).then(function (response) {
-					if (response != "error") {
-						// Handle the response
-						Swal.fire({
-							title: 'Petition data saved successfully.',
-							customClass: {
-								title: 'swal-title-custom' // Add a custom class for the title
-							},
-							//text: "Error",
-							icon: 'success',
-							showCancelButton: false,
-							confirmButtonColor: '#3085d6',
-							cancelButtonColor: '#d33',
-							confirmButtonText: 'Ok',
-						}).then(function (result) {
-							if (result.isConfirmed) {
-								// Reload the current page
-								//location.reload();
-								// Navigate to a Ack page
-								//window.location = "/gcc/zerohours_petition/petition-ack/"+response;
-								window.location = "/gcc/ward_shaba/new_minutes";
-							}
-						});
-					}
-					else {
-						// Handle the response
-						// if response == "error"
-						Swal.fire({
-							title: 'Failed to save petition data. Please try again!',
-							customClass: {
-								title: 'swal-title-custom' // Add a custom class for the title
-							},
-							//text: "Error",
-							icon: 'error',
-							showCancelButton: false,
-							confirmButtonColor: '#3085d6',
-							cancelButtonColor: '#d33',
-							confirmButtonText: 'Ok',
-						}).then(function (result) {
-							if (result.isConfirmed) {
-								form_btn_enable();
-							}
-						});
-					}
-
-
-				}).catch(function (error) {
-					// Handle errors
-					console.error('Error on save petition:', error.message);
-					form_btn_enable();
-				});
-			}
-			else {
-				inputElementMobileNo.addClass('is-invalid');
-				form_btn_enable();
-			}
-			return false;
-		}
-
-		function saveFormData(formData) {
-			var apiUrl = '/gcc/api/ward_shaba/savePetition';
-
-			return new Promise(function (resolve, reject) {
-				$.ajax({
-					url: apiUrl,
-					type: 'POST',
-					data: formData,
-					processData: false,
-					contentType: false,
-					success: function (response) {
-						console.log("API Response:", response); // Debugging log
-
-						if (response.minutes_no) { // ✅ Ensure JSON key is correct
-							Swal.fire({
-								title: "Success",
-								text: "Form submitted successfully. Minutes No: " + response.minutes_no,
-								icon: "success",
-								confirmButtonText: "OK"
-							}).then(() => {
-								$("#minutesNo").text(response.minutes_no);
-								window.location.reload();
-							});
-						} else {
-							Swal.fire({
-								title: "Error",
-								text: "Minutes No is missing from response",
-								icon: "error",
-								confirmButtonText: "OK"
-							});
-						}
-					},
-					error: function (xhr, status, error) {
-						console.error('Error:', xhr.responseText); // ✅ Log error response
-						Swal.fire({
-							title: "Error",
-							text: xhr.responseText || "Failed to save minutes!",
-							icon: "error",
-							confirmButtonText: "OK"
-						});
-						reject(error);
-					}
-				});
-			});
-		}
-
-		$(document).ready(function () {
-			console.log("Document is ready. Fetching event list...");
-
-			// Fetch Minutes Names in Dropdown
-			$.ajax({
-				url: '/gcc/api/ward_shaba/getMinutesNames?ward='+ward,
-				type: 'GET',
-				success: function (response) {
-					console.log("API Response:", response);
-
-					let dropdown = $('#eventid');
-					dropdown.empty().append('<option value="Select">Select</option>');
-
-					if (!response || response.length === 0) {
-						console.warn("No events found.");
-						return;
-					}
-
-					$.each(response, function (index, item) {
-						let selected = item.minutes_id == $('#eventid').attr('data-selected') ? "selected" : "";
-						dropdown.append(`<option value="${item.minutes_id}" ${selected}>${item.minutes_name}</option>`);
-					});
-
-					// Fetch details after dropdown is populated
-					const selectedEventId = dropdown.attr('data-selected');
-					if (selectedEventId) {
-						fetchMinutesDetails(selectedEventId);
-					}
-				},
-				error: function (xhr) {
-					console.error("Error fetching minutes names:", xhr.responseText);
-				}
-			});
-
-		});
-
-		$(document).ready(function () {
-			// Get URL parameters
-			const urlParams = new URLSearchParams(window.location.search);
-			const eventId = urlParams.get('eventid');
-
-			if (eventId) {
-				console.log("Event ID from URL:", eventId);
-				$('#eventid').attr('data-selected', eventId);
-				// fetchMinutesDetails(eventId);
-			}
-		});
-		// Fetch minutes details when dropdown changes
-		$('#eventid').change(function () {
-			var selectedMinutes = $('#eventid').val();
-
-			if (!selectedMinutes || selectedMinutes === "Select") {
-				console.warn("Invalid selection");
-				return;
-			}
-
-			//fetchMinutesDetails(selectedMinutes);
-		});
-		function form_btn_enable() {
-			$("#resetFormBtn").prop("disabled", false);
-			$("#requestSubmitBtn").prop("disabled", false);
-			$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-		}
-
-		function form_btn_disable() {
-			$("#resetFormBtn").prop("disabled", true);
-			$("#requestSubmitBtn").prop("disabled", true);
-			// Show the loading icon on the button
-			$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-		}
-
-		$(document).ready(function () {
-			get_event_data();
-			/*get_zone_ward_data();
-			get_complaint_type_data();
-			$('#petitionerMobile').mask('0000000000');*/
-		});
-
-
-	</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/works/.DS_Store b/src/main/resources/templates/modules/works/.DS_Store
deleted file mode 100644
index 402442c19f8f6e9b390e9361794d90b73fdd96b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHM+e!m55Is>Jih?L!@I_ce5FaY|2dn6V&wjvKwP<m*rL|sOWZ(S<f5A`GGfA}B
zuBjKK2u>iGCCQwbImvFAEC93HKivja0MuAT&dsp-pvbt?N}2FIvy_JVK!zT!(ZCs+
zmD$>%3@8K2fHI&AC<A|i0iM}XYLRo_jcTh5C<FhJ0r@^8tRhn{3n%TTgN;oAD5uzM
z3!j+>Se?Yn)XTz2t4d6lJs7WQe2QV5I>!^4PMLaHIO)`3oH~rRY<z}dtaa)ob~;Sz
zq_)a{GEikea`z=>>!)Zja}V?P43}uLzkwWEIOpgk@`Jp6a-6r1sU<Jk4qvo~7h5d!
z0+G7tppIMWc5%V`fI9VC_FiBF3bq0i@u!N?C$4yN&CwXrGrb6rmOawIn>Sw)oY2D#
z?xR=|+ic*~d=x9@%`n1STvcx}`jRuc2$ESHiffvTUU7aCcTt_kA)RGvv{~yuj`A8c
zh!(Xk>x`#>i$#y+)~Om#Bo4^>ggC1RS2YWE%{O<VVYH>y+9Yz%Mp{M{&g6!wMZSC7
z?`8Xg9iMS;xO=P-v6L)se9__!Z8sTd_<ntAO?E)Z+IoqrUyI7_v~Y#iM%wvVEV45P
zHrxTO=RZl&q700Yfk|g;Me_gs`2GJFJyKK3fHE*{2F%pn;odH-nuuk|wG-AORw**C
oaMG%<vFSLaJ<TcKe;D#P;Z)H{y)2w$4~t#|SQ@lZ2FA+3E8CYSuK)l5

diff --git a/src/main/resources/templates/modules/works/edit_stage_modal.html b/src/main/resources/templates/modules/works/edit_stage_modal.html
deleted file mode 100644
index 65af0d88..00000000
--- a/src/main/resources/templates/modules/works/edit_stage_modal.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row" id="printarea">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-12">
-												<table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Stages Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-											          	<input type="text" class="form-control" name="stagename" id="stagename_stage"
-                                                       placeholder="Stage Name" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Order By:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-											          	<input type="text" class="form-control" name="orderby" id="orderby_stage"
-                                                       placeholder="Order By" autocomplete="off" required>
-											          </td>
-											        </tr>
-								                   </tbody>
-								              	</table>
-											</div>
-										</div>
-										
-					                </div>
-					            </div>
-                            </div>
-                            <input type="text" class="form-control" name="tmid" id="tmid_stage" required>
-                            <input type="text" class="form-control" name="estid" id="estid_stage" required>
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/works/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/works/edit_stage_script :: script}"></script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/works/erp-works-list.html b/src/main/resources/templates/modules/works/erp-works-list.html
deleted file mode 100644
index f0a14958..00000000
--- a/src/main/resources/templates/modules/works/erp-works-list.html
+++ /dev/null
@@ -1,761 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<link rel="stylesheet"
-      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
-<link rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .is-invalid {
-        border: 2px solid red !important;
-        background-color: #ffcccc !important;
-    }
-
-    .checkbox-large {
-        width: 20px;
-        height: 20px;
-    }
-
-    .readonly-select {
-        pointer-events: none; /* Prevent user interaction */
-        background-color: #e9ecef; /* Light grey background (like disabled) */
-    }
-</style>
-
-<body>
-<link rel="stylesheet" type="text/css"
-      href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css"/>
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header">
-                    <div class="row align-items-end">
-                        <div class="col-lg-8">
-                            <div class="page-header-title">
-                                <i class="far fa-calendar-plus bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>List of Works</h5>
-                                    <span>ERP Works list</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-4">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item"><a href="index"><i
-                                            class="ik ik-home"></i></a></li>
-                                    <li class="breadcrumb-item" aria-current="page">ERP Works
-                                        list
-                                    </li>
-                                    </li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-
-                <div class="col-md-14">
-                    <div class="card p-3">
-                        
-
-                        <div class="row">
-                            <div class="col-md-2">
-                                <label for="filterType">Financial year: <font style="color: red"></font></label> 
-                                <select class="form-control" id="finYear">
-	                                <option value="2025-26" >2025-26</option>
-	                                <option value="2024-25" selected>2024-25</option>
-	                                <option value="2023-24" >2023-24</option>
-	                                <option value="2022-23" >2022-23</option>
-	                                <option value="2021-22" >2021-22</option>
-	                                <option value="" >All</option>
-                            	</select>
-                            </div>
-                            
-                            <div class="col-md-2">
-                                <label for="filterType">Order Value: <font style="color: red"></font></label> 
-                                <select class="form-control" id="oValue">
-								    <option value="max50">Up to 50 Lakhs</option>
-								    <option value="50to75">Above 50 Lakhs to 75 Lakhs</option>
-								    <option value="75to99">Above 75 Lakhs to 99 Lakhs</option>
-								    <option value="min1c" selected>1 Crore and Above</option>
-								    <option value="" >All</option>
-								</select>
-                            </div>
-                            
-                            <div class="col-md-2 d-flex align-items-end gap-2">
-                                <button id="submitFilter" class="btn btn-primary" onclick="get_erp_works_data_list()">Submit</button>
-                                <button class="btn btn-danger mt-2" onclick="resetpage()"
-                                        name="reset" type="reset">Reset
-                                </button>
-                                <!--<button type="button" class="btn btn-sm btn-success mt-2" name="downloadBtn"
-                                        onclick="downloadExcel()">Download Excel</button>-->
-                            </div>
-                        </div>
-                       
-                    </div>
-                </div>
-                <br>
-                <div class="row">
-                    <div class="card-block">
-                    <div id="tableLoading"></div>
-                        <div>
-                            <table id="worksDatatable"
-                                   class="table table-striped table-bordered table-hover"
-                                   width="99.5%">
-                                <!--			   <button id="exportExcel" class="btn btn-success mb-2">Download Excel</button>
--->
-                                <thead class="thead-dark">
-                                <tr>
-                                    <th>S.No</th>
-                                    <th>Estimate No</th>
-                                    <th>Estimate Date</th>
-                                    <th>Zone</th>
-                                    <th>Ward</th>
-                                    <th>Department</th>
-                                    <th>Category</th>
-                                    <th>Sub Category</th>
-                                    <th>Project Name</th>
-                                    <th>Estimation Amount</th>
-                                    <th>Order Value</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                
-                                </tbody>
-                            </table>
-
-                            <!-- Pagination Controls -->
-                            <div class="pagination-container">
-                                <div
-                                        class="d-flex justify-content-between align-items-center my-3">
-                                    <span id="entriesInfo" class="text-muted"></span>
-                                    <ul id="pagination" class="pagination mb-0"></ul>
-                                </div>
-                                <ul class="pagination justify-content-center"
-                                    style="justify-content: right !important;" id="pagination"></ul>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-</div>
-
-	<div th:replace="~{fragments/modules/works/modal-box :: div}"></div> 
-	
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script th:replace="~{fragments/modules/works/script :: script}"></script>
-    
-    <script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-    <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-    <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-    <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-    <script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-    <script th:inline="javascript">
-        var loginUserID = /*[[${LoginUserId}]]*/'';
-        var createdBy = /*[[${LoginUserId}]]*/'';
-        
-        var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        
-     	// Loading Div id
-    	const loading = $("#tableLoading");
-     	
-    	// DataTables buttons configuration
-        var buttons = [
-        	{
-				extend: 'pageLength',
-				className: 'btn btn-warning'
-			},
-            {
-				title: 'Data export',
-                extend: 'copyHtml5',
-                text: 'Copy',
-                className: 'btn btn-secondary',
-                id: 'copyBtn'
-            },
-            {
-                extend: 'excelHtml5',
-                text: 'Excel',
-                className: 'btn btn-secondary',
-                id: 'excelBtn',
-                title: 'Works List'
-            },
-            {
-                extend: 'csvHtml5',
-                text: 'CSV',
-                className: 'btn btn-secondary',
-                id: 'csvBtn',
-                title: 'Works List'
-            },
-            {
-                extend: 'pdfHtml5',
-                text: 'PDF',
-                className: 'btn btn-secondary',
-                id: 'pdfBtn',
-                title: 'Works List'
-            },
-            {
-                extend: 'print',
-                text: 'Print',
-                className: 'btn btn-secondary',
-                id: 'printBtn',
-                title: 'Works List',
-                exportOptions: {
-                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-                }
-            },
-            {
-				extend: 'colvis',
-				className: 'btn btn-warning'
-			},
-        ];
-		
-    	
-        function call_loading(){
-			loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-		}
-		
-		function remove_loading(){
-			loading.html("");
-		}
-		
-        /* 
-        	===============================================================================================
-        	===============================================================================================
-        */
-        
-        function form_btn_enable() {
-            $("#resetFormBtn").prop("disabled", false);
-            $("#requestSubmitBtn").prop("disabled", false);
-            $("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-        }
-
-        function form_btn_disable() {
-            $("#resetFormBtn").prop("disabled", true);
-            $("#requestSubmitBtn").prop("disabled", true);
-            // Show the loading icon on the button
-            $("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-        }
-
-        function validateEndDate() {
-            const startDate = document.getElementById('fromDate').value;
-            const endDateInput = document.getElementById('toDate');
-
-            if (startDate) {
-                const startDateObj = new Date(startDate);
-                const minEndDateISO = startDateObj.toISOString().split('T')[0];
-                endDateInput.setAttribute('min', minEndDateISO);
-
-                // Clear endDate if it's less than startDate
-                if (endDateInput.value && new Date(endDateInput.value) < startDateObj) {
-                    endDateInput.value = '';
-                }
-            }
-        }
-
-        /*
-        =========================================================================================
-        */
-
-        
-        /* Get works data List */
-        function get_erp_works_data_list(){
-        	
-        	call_loading();
-        	var table = $('#worksDatatable').DataTable();
-        	table.clear();
-        	// Destroy the DataTable before reinitializing
-        	table.destroy();
-        	
-        	
-        	get_erp_work_data().then(function(erpWorksDataList) {
-    		    // Handle the data list
-    		    generate_table(erpWorksDataList);
-    		    
-    		}).catch(function(error) {
-    		    // Handle errors
-		        if (error && error.message) {
-		            console.error('Error fetching ERP Data list:', error.message);
-		        } else {
-		            console.error('An error occurred while fetching ERP Data list:', error);
-		        }
-    		});
-		}
-        
-        /* Get Erp works Data */
-        async function get_erp_work_data() {
-
-        	var finYear = document.getElementById('finYear').value;
-            var oValue = document.getElementById('oValue').value;
-            
-            //alert("finYear:"+finYear);
-            //alert("oValue:"+oValue);
-            
-        	var apiUrl = '/gcc/works/api/estimates/getFilteredERpWorksList?loginId='+createdBy+'&finYear='+finYear+'&oValue='+oValue;
-    	    // Return a Promise
-    	    return new Promise(function(resolve, reject) {
-    	        $.ajax({
-    	            url: apiUrl,
-    	            type: 'GET',
-    	            dataType: 'json',
-    	            success: function(jsonResponse) {
-    	                // Resolve the Promise with the department list
-    	                resolve(jsonResponse);
-    	            },
-    	            error: function(xhr, status, error) {
-    	                // Reject the Promise with the error message
-    	                reject(error);
-    	            }
-    	        });
-    	    });
-        }
-        
-        /* Call DataTable function */
-        function generate_table(data){
-        	var table = $('#worksDatatable').DataTable();
-
-        	// Destroy the DataTable before reinitializing
-        	table.destroy();
-
-        	// Now, reinitialize the table
-        	table = $('#worksDatatable').DataTable({
-        	    dom: 'Bftip',
-        	    deferRender: true,  // Delays rendering of non-visible rows
-        	    columnDefs: [
-        	        { targets: 'no-sort', "orderable": false },
-        	        { targets: 'no-exportable', "exportable": false }
-        	    ],
-        	    lengthMenu: [
-        	        [50, 100, 200, 500, -1],
-        	        ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-        	    ],
-        	    fixedColumns: {
-        	        left: 0,
-        	        right: 0
-        	    },
-        	    buttons: [buttons],
-        	    responsive: false,
-        	    searching: true,
-        	    select: false,
-        	    processing: true, // Enables processing indicator
-        	});
-            
-        	// Clearn Table data
-        	table.clear();
-        	            
-        	// Add rows to DataTable
-        	var rowNum = 1;
-        	$.each(data, function(index, row) {
-        	    actionHTML = `<div class="dropdown d-inline-block show">
-        	                     <a class="nav-link dropdown-toggle text-warning" href="#" id="moreDropdown" role="button" 
-        	                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-animation="true" 
-        	                    data-placement="top" data-html="true" title="`+row['ESTIMATE_NO']+`" >`+row['ESTIMATE_NO']+`</a>
-        	                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-        	                    	<a class="dropdown-item" href="" onclick="return viewWorksSummary('`+row['id']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Full Details"><i class="ik ik-printer"></i> View Details</a>
-        	                    	<a class="dropdown-item" href="" onclick="return updateWorksSummary('`+row['id']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Update Details"><i class="ik ik-edit"></i> Update Details</a>
-        	                    </div>
-        	              </div>`;
-
-        	    table.row.add([
-        	        rowNum++,
-        	        actionHTML,
-        	        convertdate(row['ESTIMATE_DATE']),
-        	        row['ZONE'],
-        	        row['WARD'],
-        	        row['DEPARTMENT_NAME'],
-        	        row['CATEGORY'],
-        	        row['SUB_CATEGORY'],
-        	        row['PROJECT_NAME'],
-        	        row['ESTIMATION_AMOUNT'],
-        	        row['EST_VAL_WITH_OH']
-        	    ]);
-        	});
-        	
-        	
-
-        	// **Call draw() only once**
-        	table.draw(false);
-            
-            // Enable tooltips for all elements with data-toggle="tooltip"
-            $('[data-toggle="tooltip"]').tooltip();
-            remove_loading(); // remove Loading 
-		}
-        
-        
-        function viewWorksSummary(estid){
-        	$("#viewWorks").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-			
-			var url = '/gcc/works/view-works-details-modal?estid='+estid;
-			$.ajax({
-			    url: url,
-			    type: 'GET',
-			    dataType: 'html',
-			    success: function(data) {
-					$('#viewWorksTitle').html("Works Details");
-			      	$('#viewWorksBoxBody').html(data); // Inject content into modal body
-			    },
-			    error: function(xhr, status, error) {
-			      console.error("Error loading URL:", error);
-			      // Handle error, display a message, etc.
-			    }
-			  });
-			
-			return false;
-		}
-        
-        function updateWorksSummary(estid){
-        	$("#viewWorks").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-			
-			var url = '/gcc/works/update-works-details-modal?estid='+estid;
-			$.ajax({
-			    url: url,
-			    type: 'GET',
-			    dataType: 'html',
-			    success: function(data) {
-				  $('#viewWorksTitle').html("Works Details");
-			      $('#viewWorksBoxBody').html(data); // Inject content into modal body
-			    },
-			    error: function(xhr, status, error) {
-			      console.error("Error loading URL:", error);
-			      // Handle error, display a message, etc.
-			    }
-			  });
-			
-			return false;
-		}
-        
-        function formatDBDate(inputDate) {
-            let parts = inputDate.split("-");
-            if (parts.length === 3) {
-                return `${parts[2]}-${parts[1]}-${parts[0]}`; // Convert to YYYY-MM-DD
-            }
-            return inputDate; // Return as-is if format is incorrect
-        }
-        
-        function saveData(){
-        	let formData = new FormData();
-        	
-        	// Append form fields
-            formData.append("estid", estid);
-            formData.append("loginid", loginUserID);
-         	// Append files (only if a file is selected)
-         	
-         	
-         	let projecttype = document.getElementById("projecttype");
-            let projecttypeValue = projecttype.value; // Get selected value
-
-	         // Validate selected
-	         if (!projecttypeValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please select a project type before submission.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-            
-	         formData.set("projecttype", projecttypeValue);
-            
-            let govtfund = document.getElementById("govtfund");
-            let govtfundValue = govtfund.value; // Get selected value
-
-	         // Validate selection
-        	 if (!govtfundValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please select whether the project is government-funded before submission.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-	      	
-	        formData.set("govtfund", govtfundValue);
-            
-	        
-         	let specialcat = document.getElementById("specialcat");
-         	let specialcatValue = specialcat.value; // Get selected value
-
-	         // Validate selection
-	         if (!specialcatValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please select whether the project falls under a special category before submission.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-
-         	// Set the form data
-         	formData.set("specialcat", specialcatValue);
-         	
-         	
-         	// Get date input values
-			let techSanctionDate = $("#erptechsanctiondate").val().trim();
-			let adminSanctionDate = $("#erpadminsanctiondate").val().trim();
-			let tenderCallDate = $("#erptendercalldate").val().trim();
-			let tenderFinalizedDate = $("#erptenderfinalizeddate").val().trim();
-
-			let loaDate = $("#erploadate").val().trim();
-			let agreementDate = $("#erpagreementdate").val().trim();
-			let workOrderDate = $("#erpworkorderdate").val().trim();
-			let workCommencedDate = $("#erpworkcommenceddate").val().trim();
-			
-			// Convert to Date format
-		    function parseDate(dateStr) {
-		        return dateStr ? new Date(dateStr.split("-").reverse().join("-")) : null;
-		    }
-
-		    let techDate = parseDate(techSanctionDate);
-		    let adminDate = parseDate(adminSanctionDate);
-		    let tenderDate = parseDate(tenderCallDate);
-		    let finalizedDate = parseDate(tenderFinalizedDate);
-		    let loa = parseDate(loaDate);
-		    let agreement = parseDate(agreementDate);
-		    let workOrder = parseDate(workOrderDate);
-		    let workCommenced = parseDate(workCommencedDate);
-			/*
-		 	// Validation checks
-		    if (!adminDate && !techDate) {
-		    	Swal.fire("Missing Dates", "Both Admin and Tech Sanction Dates are required.", "error");
-		        return;
-		    }
-		 	*/
-		 	// Parent-child dependency checks
-		    if (!techDate && (adminDate || tenderDate || finalizedDate || loa || agreement || workOrder || workCommenced)) {
-		        Swal.fire("Error", "Tech Sanction Date is required before entering other dates.", "error");
-		        return;
-		    }
-
-		    if (!adminDate && (tenderDate || finalizedDate || loa || agreement || workOrder || workCommenced)) {
-		        Swal.fire("Error", "Admin Sanction Date is required before entering Tender and later dates.", "error");
-		        return;
-		    }
-
-		    if (!tenderDate && (finalizedDate || loa || agreement || workOrder)) {
-		        Swal.fire("Error", "Tender Call Date is required before entering Finalized and later dates.", "error");
-		        return;
-		    }
-
-		    if (!finalizedDate && (loa || agreement || workOrder)) {
-		        Swal.fire("Error", "Tender Finalized Date is required before entering LOA and later dates.", "error");
-		        return;
-		    }
-
-		    if (!loa && (agreement || workOrder)) {
-		        Swal.fire("Error", "LOA Date is required before entering Agreement and later dates.", "error");
-		        return;
-		    }
-
-		    if (!agreement && (workOrder)) {
-		        Swal.fire("Error", "Agreement Date is required before entering Work Order and later dates.", "error");
-		        return;
-		    }
-/*
-		    if (!workOrder && workCommenced) {
-		        Swal.fire("Error", "Work Order Date is required before entering Work Commenced Date.", "error");
-		        return;
-		    }
-*/
-		    // Chronological validations
-		    if (adminDate && techDate && adminDate < techDate) {
-		        Swal.fire("Error", "Admin Sanction Date must be on or after Tech Sanction Date.", "error");
-		        return;
-		    }
-
-		    if (tenderDate && adminDate && tenderDate < adminDate) {
-		        Swal.fire("Error", "Tender Call Date must be on or after Admin Sanction Date.", "error");
-		        return;
-		    }
-
-		    if (finalizedDate && tenderDate && finalizedDate < tenderDate) {
-		        Swal.fire("Error", "Tender Finalized Date must be on or after Tender Call Date.", "error");
-		        return;
-		    }
-
-		    if (loa && finalizedDate && loa < finalizedDate) {
-		        Swal.fire("Error", "LOA Date must be on or after Tender Finalized Date.", "error");
-		        return;
-		    }
-
-		    if (agreement && loa && agreement < loa) {
-		        Swal.fire("Error", "Agreement Date must be on or after LOA Date.", "error");
-		        return;
-		    }
-
-		    if (workOrder && agreement && workOrder <= agreement) {
-		        Swal.fire("Error", "Work Order Date must be after Agreement Date.", "error");
-		        return;
-		    }
-/*
-		    if (workCommenced && workOrder && workCommenced <= workOrder) {
-		        Swal.fire("Error", "Work Commenced Date must be after Work Order Date.", "error");
-		        return;
-		    }
-		    */
-		    if (!workCommenced && workCommenced && loa && workCommenced < loa) {
-		        Swal.fire("Error", "Work Commenced Date must be on or after LOA Date.", "error");
-		        return;
-		    }
-		    
-		    /*
-			// Validate if all fields are filled
-			if (!techSanctionDate || !adminSanctionDate || !tenderCallDate || !tenderFinalizedDate ||
-    		!loaDate){
-    		//|| !agreementDate || !workOrderDate || !workCommencedDate) {
-			    Swal.fire({
-			        title: "Error",
-			        text: "All date fields are required before submission.",
-			        icon: "error",
-			        confirmButtonText: "OK"
-			    });
-			    return; // Stop execution if any date is missing
-			}
-			*/
-			
-         	// Get file inputs
-		    let adminSanctionFile = $("#adminsanctionfile")[0].files[0];
-		    let loaFile = $("#loafile")[0].files[0];
-		    let agreementFile = $("#agreementfile")[0].files[0];
-		    let workOrderFile = $("#workorderfile")[0].files[0];
-		/*
-		    // Validate if all files are selected
-		    if (!adminSanctionFile || !loaFile || !agreementFile || !workOrderFile) {
-		        Swal.fire({
-		            title: "Error",
-		            text: "All files are required before submission.",
-		            icon: "error",
-		            confirmButtonText: "OK"
-		        });
-		        return; // Stop execution if any file is missing
-		    }
-		    */
-		    
-		    let missingFiles = [];
-
-		    if (adminDate && !adminSanctionFile) {
-		        missingFiles.push("Admin Sanction File");
-		    }
-		    if (loa && !loaFile) {
-		        missingFiles.push("LOA File");
-		    }
-		    if (agreement && !agreementFile) {
-		        missingFiles.push("Agreement File");
-		    }
-		    if (workOrder && !workOrderFile) {
-		        missingFiles.push("Work Order File");
-		    }
-
-		    if (missingFiles.length > 0) {
-		        Swal.fire({
-		            title: "Error",
-		            html: "Please upload the following required file(s):<br><b>" + missingFiles.join(", ") + "</b>",
-		            icon: "error",
-		            confirmButtonText: "OK"
-		        });
-		        return;
-		    }
-		    
-		 	// Append date to formData
-		    formData.append("techSanctionDate", formatDBDate(techSanctionDate));
-		    formData.append("adminSanctionDate", formatDBDate(adminSanctionDate));
-		    formData.append("tenderCallDate", formatDBDate(tenderCallDate));
-		    formData.append("tenderFinalizedDate", formatDBDate(tenderFinalizedDate));
-		    
-		 	// Append date to formData
-		    formData.append("loaDate", formatDBDate(loaDate));
-		    formData.append("agreementDate", formatDBDate(agreementDate));
-		    formData.append("workOrderDate", formatDBDate(workOrderDate));
-		    formData.append("workCommencedDate", formatDBDate(workCommencedDate));
-		    
-		 	// Append files to formData
-		    formData.append("admin_sanction_file", adminSanctionFile);
-		    formData.append("loa_file", loaFile);
-		    formData.append("agreement_file", agreementFile);
-		    formData.append("work_order_file", workOrderFile);
-            
-            let iconicProjectCheckbox = document.getElementById("isiconic");
-            let iconicProjectValue = iconicProjectCheckbox.checked ? "1" : "0"; // Set 1 if checked, else 0
-            formData.set("isiconic", iconicProjectValue);
-            
-            $.ajax({
-                url: "/gcc/works/api/estimates/saveEstimateWorkDetails",
-                type: "POST",
-                contentType: false,
-                processData: false,
-                data: formData,
-                success: function (response) {
-                    // console.log(formData);
-                    Swal.fire({
-                        title: "Updated!",
-                        text: "Estimate details have been updated successfully.",
-                        icon: "success",
-                        confirmButtonText: "OK",
-                    }).then(() => {
-                        location.reload();
-                    });
-                },
-                error: function (xhr, status, error) {
-                    // console.log(xhr.responseText);
-                    Swal.fire({
-                        title: "Error",
-                        text: "Failed to update estimate." + "Error: " + error + "\nStatus: " + status + "\nResponse: " + xhr.responseText,
-                        icon: "error",
-                        confirmButtonText: "OK",
-                    });
-                }
-            });
-        	
-        }
-        
-        /*
-        	===============================================================
-        */
-        
-        $(document).ready(function () {
-        	//call_loading();
-           // loadWardsFilter();
-           // loadDepartmentFilter();
-           // loadSourceFilter();
-            get_erp_works_data_list();
-        });
-        
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/works/erp-works-update.html b/src/main/resources/templates/modules/works/erp-works-update.html
deleted file mode 100644
index 79796719..00000000
--- a/src/main/resources/templates/modules/works/erp-works-update.html
+++ /dev/null
@@ -1,928 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .is-invalid {
-        border: 2px solid red !important;
-        background-color: #ffcccc !important;
-    }
-
-    .readonly-select {
-        pointer-events: none; /* Prevent user interaction */
-        background-color: #e9ecef; /* Light grey background (like disabled) */
-    }
-
-</style>
-<body>
-<link rel="stylesheet" type="text/css" href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css"/>
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header">
-                    <div class="row align-items-end">
-                        <div class="col-lg-8">
-                            <div class="page-header-title">
-                                <i class="far fa-calendar-plus bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>ERP Update Form</h5>
-                                    <span>Works Module</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-4">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item">
-                                        <a href="index"><i class="ik ik-home"></i></a>
-                                    </li>
-                                    <li class="breadcrumb-item" aria-current="page">Works Module</li>
-                                    <li class="breadcrumb-item active" aria-current="page">ERP - Works Update Form
-                                    </li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="card">
-                            <form class="request-form" id="request-form" onsubmit="return searchRequest();">
-                                <div class="card-header">
-                                    <h3>Search By Estimate Number </h3>
-                                    <span style="color: red;">(eg: BR/2017-2018/1234)</span>
-                                </div>
-                                <div class="card-body">
-                                    <div class="form-group">
-
-                                        <div class="row">
-                                            <div class="col-md-3">
-                                                <label for="estcode">Department Code</label>
-                                                <select class="form-control" name="estcode" id="estcode" required>
-                                                    <option value="">Select Code</option>
-                                                    <option value="B">B</option>
-                                                    <option value="BR">BR</option>
-                                                    <option value="D">D</option>
-                                                    <option value="J">J</option>
-                                                    <option value="L">L</option>
-                                                    <option value="NA">NA</option>
-                                                    <option value="NB">NB</option>
-                                                    <option value="ND">ND</option>
-                                                    <option value="NE">NE</option>
-                                                    <option value="NF">NF</option>
-                                                    <option value="NH">NH</option>
-                                                    <option value="NK">NK</option>
-                                                    <option value="NL">NL</option>
-                                                    <option value="NM">NM</option>
-                                                    <option value="NN">NN</option>
-                                                    <option value="NP">NP</option>
-                                                    <option value="NQ">NQ</option>
-                                                    <option value="P">P</option>
-                                                    <option value="Q">Q</option>
-                                                    <option value="SP">SP</option>
-                                                </select>
-                                            </div>
-                                            <div class="col-md-1 text-center"
-                                                 style="padding-top:35px;width:10px;margin:0px;">&sol;
-                                            </div>
-                                            <div class="col-md-3">
-                                                <label for="estyear">Year</label>
-                                                <select class="form-control" name="estyear" id="estyear" required>
-                                                    <option value=""> Select year</option>
-                                                    <option value="2017-18">2017-18</option>
-                                                    <option value="2018-19">2018-19</option>
-                                                    <option value="2019-20">2019-20</option>
-                                                    <option value="2020-21">2020-21</option>
-                                                    <option value="2021-22">2021-22</option>
-                                                    <option value="2022-23">2022-23</option>
-                                                    <option value="2023-24">2023-24</option>
-                                                    <option value="2024-25">2024-25</option>
-                                                </select>
-                                            </div>
-                                            <div class="col-md-1 text-center"
-                                                 style="padding-top:35px; width:10px;margin:0px;">&sol;
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="estnumber">Estimate Number</label>
-                                                <input type="number" class="form-control" name="estnumber"
-                                                       id="estnumber" placeholder="Estimate Number"
-                                                       autocomplete="off" required>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                </div>
-                                <div class="card-footer text-right">
-                                    <button class="btn btn-secondary mr-2" id="resetFormBtn" onclick="resetpage()"><i
-                                            class="ik ik-refresh-cw" ></i>Reset
-                                    </button>
-                                    <button type="submit" class="btn btn-success" id="estsearchbtn"><i
-                                            class="ik ik-search"></i>Search
-                                    </button>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                    <div class="col-md-12">
-                        <div class="card">
-                            <form class="erp-form" id="erp-form" onsubmit="saveERPform(event)"
-                                  enctype="multipart/form-data">
-                                <div class="card-header">
-                                    <h3>EST - Update Form</h3>
-                                </div>
-                                <div class="card-body" id="ptaxPersonalInfo">
-                                    <div class="form-group">
-                                        <div class="title text-warning">
-                                            <h5>1. Basic Details</h5>
-                                            <hr>
-                                        </div>
-
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="estno">Estimate No <font style="color:red">*</font>
-                                                </label>
-                                                <input type="text" class="form-control" name="estno" id="estno"
-                                                       placeholder="Estimate No" autocomplete="off" required readonly>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="estdate">Estimate Date <font style="color:red">*</font>
-                                                </label>
-                                                <input type="text" class="form-control" name="estdate" id="estdate"
-                                                       placeholder="Estimate Date" autocomplete="off" required readonly>
-                                            </div>
-                                            <div class="col-md-2">
-                                                <label for="zone">Zone <font style="color:red">*</font></label>
-                                                <select class="form-control readonly-select" id="zone" name="zone" onchange="loadWards()"
-                                                        required>
-                                                    <option value="" selected>Select Zone</option>
-                                                    <option th:each="zone : ${zones}" th:value="${zone}"
-                                                            th:text="${zone}"></option>
-                                                </select>
-                                            </div>
-                                            <div class="col-md-2">
-                                                <label for="ward">Ward <font style="color:red">*</font></label>
-                                                <select class="form-control readonly-select" id="ward" name="ward" required>
-                                                    <option value="" selected>Select Ward</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="projectname">Project Description <font style="color:red">*
-                                                </font></label>
-                                                <textarea class="form-control" name="projectname"
-                                                          id="projectname" placeholder="Project Name" autocomplete="off"
-                                                          required readonly></textarea>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="location">Location <font style="color:red">*</font>
-                                                </label>
-                                                <textarea type="textarea" class="form-control" name="location"
-                                                          id="location" placeholder="Location" autocomplete="off"
-                                                          required readonly></textarea>
-                                            </div>
-
-												<div class="col-md-4">
-													<label><font style="color: red"></font></label>
-													<br>
-                                                    <!--<div class="col-md-4">
-                                                        <div style="padding: 10px; font-size: 1.2rem;">
-                                                            <input type="hidden" id="iconicProjectHidden" name="iconicProject"
-                                                                   value="1">
-                                                            <input type="checkbox" id="iconicProject" name="iconicProject"
-                                                                   value="0" style="width: 20px; height: 20px;">
-                                                            <label for="iconicProject" style="font-size: 1.2rem;">Iconic
-                                                                Project</label>
-                                                        </div>
-                                                    </div>-->
-                                                    <div style="padding: 10px; font-size: 1.2rem;">
-                                                        <input type="hidden" name="iconicProject" value="0">
-                                                        <input type="checkbox" id="iconicProject" name="iconicProject" value="1" style="width: 20px; height: 20px;">
-                                                        <label for="iconicProject" style="font-size: 1.2rem;">Iconic Project</label>
-                                                    </div>
-												</div>
-
-											</div>
-                                        			
-                                        <br>
-                                        <div class="title text-warning">
-                                            <h5>2. Department and Contractor Details</h5>
-                                            <hr>
-                                        </div>
-
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="department">Department <font
-                                                        style="color:red">*</font></label>
-                                                <select class="form-control readonly-select" id="department" name="department" required>
-                                                    <option value="" selected>Select Department</option>
-                                                </select>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="contractorname">Contractor Name <font style="color:red">
-                                                    *</font></label>
-                                                <input type="text" class="form-control" name="contractorname"
-                                                       id="contractorname" placeholder="Contractor Name"
-                                                       autocomplete="off" required readonly>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="contractorperiod">Contractor Period <font
-                                                        style="color:red">*</font></label>
-                                                <input type="text" class="form-control" name="contractorperiod"
-                                                       id="contractorperiod" placeholder="Contractor Period"
-                                                       autocomplete="off" required readonly>
-                                            </div>
-                                        </div>
-
-                                        <br>
-                                        <div class="title text-warning">
-                                            <h5>3. Funding and Scheme Details</h5>
-                                            <hr>
-                                        </div>
-
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="fundsource">Details Source of Fund <font
-                                                        style="color:red">*</font></label>
-                                                <select class="form-control readonly-select" id="fundsource" name="fundsource" required>
-                                                    <option value="" selected>Select Source of Fund</option>
-                                                </select>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="scheme">Scheme<font style="color:red">*</font></label>
-                                                <select class="form-control readonly-select" id="scheme" name="scheme" required>
-                                                    <option value="" selected>Select Scheme</option>
-                                                </select>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="category">Category<font style="color:red">*</font></label>
-                                                <select class="form-control readonly-select" id="category" name="category" required>
-                                                    <option value="" selected>Select Category</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="subcategory">Sub-Category<font
-                                                        style="color:red">*</font></label>
-                                                <select class="form-control readonly-select" id="subcategory" name="subcategory"
-                                                        required>
-                                                    <option value="" selected>Select SubCategory</option>
-                                                </select>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="estamount">Estimation Amount<font style="color:red">*
-                                                </font></label>
-                                                <input type="number" class="form-control" name="estamount"
-                                                       id="estamount" placeholder="Estimation Amount"
-                                                       autocomplete="off"  step="1" min="0" required readonly>
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="title text-warning">
-                                            <h5>4. Sanctions and Tender Process</h5>
-                                            <hr>
-                                        </div>
-
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="techsanctiondate">Tech Sanction Date<font style="color:red">*</font> </label>
-                                                <input type="text" class="form-control" name="techsanctiondate"
-                                                       id="techsanctiondate" placeholder="Tech Sanction Date"
-                                                       autocomplete="off" required>
-                                            </div>
-                                            <div class="col-md-8">
-
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="adminsanctiondate">Admin Sanction Date<font style="color:red">*</font></label>
-                                                <input type="text" class="form-control" name="adminsanctiondate"
-                                                       id="adminsanctiondate" placeholder="Admin Sanction Date"
-                                                       autocomplete="off" required>
-                                            </div>
-                                            <div class="col-md-8">
-                                                <label for="adminsanctionfile">Admin Sanction File<font style="color:red">*</font></label>
-                                                <input name="adminsanctionfile" id="adminsanctionfile"
-                                                       class="form-control" type="file" capture="camera"
-                                                       accept="application/pdf, image/*" required>
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="tendercalldate">Tender Called Date <font style="color:red">*</font></label>
-                                                <input type="text" class="form-control" name="tendercalldate"
-                                                       id="tendercalldate" placeholder="Tender Called Date"
-                                                       autocomplete="off" required >
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="tenderfinalizeddate">Tender Finalized Date <font style="color:red">*</font> </label>
-                                                <input type="text" class="form-control" name="tenderfinalizeddate"
-                                                       id="tenderfinalizeddate" placeholder="Tender Finalized Date"
-                                                       autocomplete="off" required>
-                                            </div>
-                                        </div>
-
-                                        <br>
-                                        <div class="title text-warning">
-                                            <h5>5. Contract and Execution Details</h5>
-                                            <hr>
-                                        </div>
-
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="loadate">LOA Date <font style="color:red">*</font> </label>
-                                                <input type="text" class="form-control" name="loadate" id="loadate"
-                                                       placeholder="LOA Date" autocomplete="off" required>
-                                            </div>
-                                            <div class="col-md-8">
-                                                <label for="loafile">LOA File <font style="color:red">*</font></label>
-                                                <input name="loafile" id="loafile" class="form-control" type="file"
-                                                       capture="camera" accept="application/pdf, image/*" required>
-                                            </div>
-                                        </div>
-
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="agreementdate">Agreement Date <font style="color:red">*</font> </label>
-                                                <input type="text" class="form-control" name="agreementdate"
-                                                       id="agreementdate" placeholder="Agreement Date"
-                                                       autocomplete="off" required>
-                                            </div>
-                                            <div class="col-md-8">
-                                                <label for="agreementfile">Agreement File<font style="color:red">*</font></label>
-                                                <input name="agreementfile" id="agreementfile" class="form-control"
-                                                       type="file" capture="camera" accept="application/pdf, image/*" required>
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="workorderdate">Work Order Date <font style="color:red">*</font></label>
-                                                <input type="text" class="form-control" name="workorderdate"
-                                                       id="workorderdate" placeholder="Sub-Category" autocomplete="off" required>
-                                            </div>
-                                            <div class="col-md-8">
-                                                <label for="workorderfile">Work Order File <font style="color:red">*</font></label>
-                                                <input name="workorderfile" id="workorderfile" class="form-control"
-                                                       type="file" capture="camera" accept="application/pdf, image/*" required>
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="workcommenceddate">Work Commenced Date<font style="color:red">*</font></label>
-                                                <input type="text" class="form-control" name="workcommenceddate"
-                                                       id="workcommenceddate" placeholder="Work Commenced Date"
-                                                       autocomplete="off" required>
-                                            </div>
-                                            <div class="col-md-4">
-
-                                            </div>
-                                            <div class="col-md-4">
-
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="card-footer text-right">
-                                   <!--   <button type="reset" class="btn btn-secondary mr-2" id="resetButton"><i
-                                            class="ik ik-refresh-cw"></i>Reset
-                                    </button>-->
-                                    <button type="submit" class="btn btn-success" id="requestSubmitBtn"><i
-                                            class="ik ik-save"></i>Save
-                                    </button>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-    </div>
-</div>
-
-
-<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-<script th:replace="~{fragments/modules/base/script :: script}"></script>
-<script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-<script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-<script src="node_modules/amcharts3/amcharts/serial.js"></script>
-<script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-<script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-<script th:inline="javascript">
-    var loginUserID = /*[[${LoginUserId}]]*/'';
-    $(document).ready(function () {
-        // Input masking for the desired format
-        $('#ptax').mask('00-000-00000-000');
-        $('#mobileno').mask('0000000000');
-
-        // For datetime picker
-        jQuery('#estdate').datetimepicker({
-            //minTime:'10:00',
-            //maxTime:'18:01',
-            //minDate: 0, // Today
-            //minDate:'-1970/01/2',
-            //maxDate:'+1970/01/2',
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            //disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#techsanctiondate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#adminsanctiondate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false,
-        });
-
-        jQuery('#tendercalldate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#tenderfinalizeddate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#loadate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#agreementdate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#workorderdate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#workcommenceddate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-    });
-	function resetpage() {
-		window.location.href = "/gcc/works/erp-works-update";
-	}
-	
-    function searchRequest() {
-
-        // Disable the button to prevent multiple clicks
-        $("#estsearchbtn").prop("disabled", true);
-
-        // Get form values
-        var estCode = $("#estcode").val();
-        var estYear = $("#estyear").val();
-        var estNumber = $("#estnumber").val();
-
-        // Validate inputs (optional)
-        if (!estCode || !estYear || !estNumber) {
-            alert("Please fill in all required fields.");
-            return false;
-        }
-
-        // Prepare request data
-        var requestData = {
-            estCode: estCode,
-            estYear: estYear,
-            estNumber: estNumber
-        };
-
-        // AJAX call
-        $.ajax({
-            url: "/gcc/works/api/estimates/getERPWorksDetails",
-            type: "GET",
-            data: requestData,
-            dataType: "json",
-            success: function (response) {
-
-                console.log(response);
-
-                let zoneDropDown = $('#zone');
-                let wardDropDown = $('#ward');
-                let depDropDown = $('#department');
-                let schemeDropDown = $('#scheme');
-                let fundDropDown = $('#fundsource');
-                let catDropDown = $('#category');
-                let subCatdDropDown = $('#subcategory');
-
-                zoneDropDown.append(`<option value="${response.zonename}">${response.zonename}</option>`); // not in db
-                wardDropDown.append(`<option value="${response.wardname}">${response.wardname}</option>`);
-                depDropDown.append(`<option value="${response.zonename}">${response.zonename}</option>`);
-                schemeDropDown.append(`<option value="${response.schemename}">${response.schemename}</option>`);
-                fundDropDown.append(`<option value="${response.schemename}">${response.schemename}</option>`); //not in db
-                catDropDown.append(`<option value="${response.workcategory}">${response.workcategory}</option>`);
-                subCatdDropDown.append(`<option value="${response.typeofwork}">${response.typeofwork}</option>`);
-
-                //alert("Search successful!");
-                $('#estno').val(response.abs_est_number);
-                $('#estdate').val(formatDate(response.asdate)); // doubt with date
-                $('#zone').val(response.zonename);
-                $('#ward').val(response.wardname);
-                $('#projectname').val(response.nameofwork);
-                $('#location').val(response.location);
-                $('#department').val(response.zonename); // not present in table
-                $('#contractorname').val(response.nameofwork); // not present in table
-                $('#contractorperiod').val(response.agreementperiod);
-                $('#fundsource').val(response.schemename); //not present in table
-                $('#scheme').val(response.schemename);
-                $('#category').val(response.workcategory);
-                $('#subcategory').val(response.typeofwork);
-                $('#estamount').val(response.valueofwork);
-                $('#techsanctiondate').val(formatDate(response.technicalsanctiondate));
-                $('#adminsanctiondate').val(formatDate(response.administrationsanctioned));
-                $('#tendercalldate').val(formatDate(response.tenderannounced));
-                $('#tenderfinalizeddate').val(formatDate(response.tenderannounced));
-                $('#loadate').val(formatDate(response.loaissued));
-                $('#agreementdate').val(formatDate(response.agreementdate));
-                $('#workorderdate').val(formatDate(response.workorderissued));
-                $('#workcommenceddate').val(formatDate(response.workcommenced));
-
-                if (response.iconic_project === 1) {
-                    $('#iconicProject').prop('checked', true);
-                } else {
-                    $('#iconicProject').prop('checked', false);
-                }
-            },
-            error: function (xhr, status, error) {
-                console.error(error); // Handle errors
-                //alert("Enter fetching estimate.");
-                Swal.fire({
-                    icon: "warning",
-                    title: "Estimate Number",
-                    text: "Please Enter Valid Estimate Number",
-                    confirmButtonText: "OK",
-                });
-                $("#estsearchbtn").prop("disabled", false);
-            }
-        });
-
-        return false; // Prevent form submission
-    }
-
-    function formatDate(dateString) {
-        return dateString.split('-').reverse().join('-');
-    }
-
-
-    function displayEstInfo() {
-
-        // Disable the button to prevent multiple clicks
-        $("#estsearchbtn").prop("disabled", true);
-
-        // Show the loading icon on the button
-        $("#estsearchbtn").html('<i class="fas fa-spinner fa-spin"></i>');
-
-        var estcodeElement = $('#estcode');
-        var estcode = estcodeElement.val();
-
-        var estyearElement = $('#estyear');
-        var estyear = estyearElement.val();
-
-        var estnumberElement = $('#estnumber');
-        var estnumber = estnumberElement.val();
-
-        var formatRegex = /^\d{2}-\d{3}-\d{5}-\d{3}$/; //'04-042-03251-000';
-
-        // Check if the tax value is not null and follows the format
-        if (estnumber !== null && formatRegex.test(estnumber)) {
-            console.log('estnumber value is valid:', estnumber);
-            // Check if the tax value has the correct length as per the format (15 characters)
-            if (ptax.length === 16) {
-                console.log('ptax value length is correct.');
-                getPtaxInfo(ptax);
-            } else {
-                console.log('ptax value length is incorrect.');
-
-                inputElement.addClass('is-invalid');
-
-                $("#ptaxsearchbtn").prop("disabled", false);
-                $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-            }
-        } else {
-            console.log('ptax value is not valid or null.');
-
-            inputElement.addClass('is-invalid'); //Error
-
-            $("#ptaxsearchbtn").prop("disabled", false);
-            $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-        }
-    }
-
-</script>
-
-
-<script>
-
-document.addEventListener("DOMContentLoaded", function () {
-    let checkbox = document.getElementById("iconicProject");
-    checkbox.addEventListener("change", function () {
-        checkbox.previousElementSibling.disabled = checkbox.checked;
-    });
-});
-
-
-//for restrict other documents ak
-document.addEventListener("DOMContentLoaded", function () {
-    document.querySelectorAll('input[type="file"]').forEach(input => {
-        input.addEventListener("change", function () {
-            let allowedTypes = ["application/pdf", "image/png", "image/jpeg", "image/jpg"];
-            let file = this.files[0];
-
-            if (file && !allowedTypes.includes(file.type)) {
-                alert("Only PDF and image files (JPG, JPEG, PNG) are allowed!");
-                this.value = ""; // Reset file input
-            }
-        });
-    });
-});
-
-    function validateDateFormat(dateStr) {
-        // Regex to validate date in dd-mm-yyyy format
-        const datePattern = /^\d{2}-\d{2}-\d{4}$/;
-        return datePattern.test(dateStr); // returns true if it matches the format
-    }
-
-    function loadWards() {
-        var zone = document.getElementById("zone").value;
-        var wardDropdown = document.getElementById("ward");
-        wardDropdown.innerHTML = '<option value="" selected>Select a Ward</option>';
-
-        if (zone) {
-            fetch('/gcc/works/wards?zone=' + zone)
-                .then(response => response.json())
-                .then(data => {
-                    data.forEach(ward => {
-                        var option = document.createElement("option");
-                        option.value = ward;
-                        option.textContent = ward;
-                        wardDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error loading wards:', error));
-        }
-    }
-
-    function loadScheme() {
-        fetch('/gcc/works/api/estimates/getSchemeList')
-            .then(response => response.json())
-            .then(data => {
-                let schemeDropdown = document.getElementById('scheme');
-                schemeDropdown.innerHTML = '<option value="" selected>Select Scheme</option>'; // Reset dropdown
-
-                data.forEach(scheme => {
-                    let option = document.createElement('option');
-                    option.value = scheme.name;  // Use ID as the value
-                    option.textContent = scheme.name; // Display Name
-                    schemeDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching schemes:', error));
-    }
-
-    function loadCategory() {
-        fetch('/gcc/works/api/estimates/getCategoryList')
-            .then(response => response.json())
-            .then(data => {
-                let categoryDropdown = document.getElementById('category');
-                categoryDropdown.innerHTML = '<option value="" selected>Select Category</option>'; // Reset dropdown
-
-                data.forEach(category => {
-                    let option = document.createElement('option');
-                    option.value = category.name;  // Use ID as the value
-                    option.textContent = category.name; // Display Name
-                    categoryDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Category:', error));
-    }
-
-    function loadSubCategory() {
-        fetch('/gcc/works/api/estimates/getSubCategoryList')
-            .then(response => response.json())
-            .then(data => {
-                let subCategoryDropdown = document.getElementById('subcategory');
-                subCategoryDropdown.innerHTML = '<option value="" selected>Select SubCategory</option>'; // Reset dropdown
-
-                data.forEach(subCategory => {
-                    let option = document.createElement('option');
-                    option.value = subCategory.description;  // Use ID as the value
-                    option.textContent = subCategory.description; // Display Name
-                    subCategoryDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching subCategory:', error));
-    }
-
-    function loadDepartment() {
-        fetch('/gcc/works/api/estimates/getDepartmentList')
-            .then(response => response.json())
-            .then(data => {
-                let departmentDropdown = document.getElementById('department');
-                departmentDropdown.innerHTML = '<option value="" selected>Select Department</option>'; // Reset dropdown
-
-                data.forEach(department => {
-                    let option = document.createElement('option');
-                    option.value = department.dept_name;  // Use ID as the value
-                    option.textContent = department.dept_name; // Display Name
-                    departmentDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Department:', error));
-    }
-
-    function loadSource() {
-        fetch('/gcc/works/api/estimates/getSourceofFundList')
-            .then(response => response.json())
-            .then(data => {
-                let SourceDropDown = document.getElementById('fundsource');
-                SourceDropDown.innerHTML = '<option value="" selected>Select Source of Fund</option>'; // Reset dropdown
-
-                data.forEach(source => {
-                    let option = document.createElement('option');
-                    option.value = source.name;  // Use ID as the value
-                    option.textContent = source.name; // Display Name
-                    SourceDropDown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Department:', error));
-    }
-
-    function loadEstCode() {
-        fetch('/gcc/works/api/estimates/getEstimateCode')
-            .then(response => response.json())
-            .then(data => {
-                let estCodeDropdown = document.getElementById('estcode');
-                estCodeDropdown.innerHTML = '<option value="" selected>Select Est Code</option>'; // Reset dropdown
-
-                data.forEach(estCode => {
-                    let option = document.createElement('option');
-                    option.value = estCode.DEPT_NAME;  // Use ID as the value
-                    option.textContent = estCode.DEPT_NAME; // Display Name
-                    estCodeDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Department:', error));
-
-    }
-
-    function saveERPform(event) {
-        event.preventDefault();
-
-        var formData = new FormData(document.getElementById("erp-form"));
-        let isValid = true;
-
-        // Get all required input fields
-        let inputs = document.querySelectorAll("#erp-form input[required]");
-
-        // Loop through all required inputs and validate
-        inputs.forEach(function (input) {
-            // Trigger browser's native required validation
-            if (!input.checkValidity()) {
-                isValid = false;
-                input.classList.add("is-invalid");
-            } else {
-                input.classList.remove("is-invalid");
-            }
-        });
-
-        var requiredDates = [
-            '#estdate', '#techsanctiondate', '#adminsanctiondate', '#tendercalldate',
-            '#tenderfinalizeddate', '#loadate', '#agreementdate', '#workorderdate', '#workcommenceddate'
-        ];
-
-        // Validate date fields
-        requiredDates.forEach(function (dateFieldSelector) {
-            var dateField = document.querySelector(dateFieldSelector);
-            console.log("Validating:", dateField.value); // Log the value for debugging
-
-            if (!dateField.value || !validateDateFormat(dateField.value)) {
-                isValid = false;
-                dateField.classList.add("is-invalid");
-            } else {
-                dateField.classList.remove("is-invalid");
-            }
-        });
-
-        // If form is valid, submit the form
-        if (isValid) {
-            console.log("Form is valid, submitting data...");
-        } else {
-            console.log("Form has errors. Please fill out all required fields.");
-        }
-
-        // Optionally, log form data to console for debugging
-        for (let pair of formData.entries()) {
-            console.log(pair[0] + ': ' + pair[1]);
-        }
-
-        $.ajax({
-            url: "/gcc/works/api/estimates/save",
-            type: "POST",
-            data: formData,
-            processData: false,
-            contentType: false,
-            success: function (response) {
-                console.log("Form submitted successfully:", response);
-                Swal.fire({
-                    title: "Success",
-                    text: "Form submitted successfully",
-                    icon: "success",
-                    confirmButtonText: "OK",
-                }).then(() => {
-                    window.location.reload();
-                });
-            },
-            error: function (xhr, status, error) {
-                console.error("Error:", xhr.responseText);
-            }
-        });
-
-        return false;
-    }
-
-    function form_btn_enable() {
-        $("#resetFormBtn").prop("disabled", false);
-        $("#requestSubmitBtn").prop("disabled", false);
-        $("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-    }
-
-    function form_btn_disable() {
-        $("#resetFormBtn").prop("disabled", true);
-        $("#requestSubmitBtn").prop("disabled", true);
-        // Show the loading icon on the button
-        $("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-    }
-
-    /*$(document).ready(function () {
-        //loadEstCode();
-        loadScheme();
-        loadCategory();
-        loadSubCategory();
-        loadDepartment();
-        loadSource();
-    });*/
-</script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/works/erpworkslist.html b/src/main/resources/templates/modules/works/erpworkslist.html
deleted file mode 100644
index 59b2cebd..00000000
--- a/src/main/resources/templates/modules/works/erpworkslist.html
+++ /dev/null
@@ -1,777 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<link rel="stylesheet"
-      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
-<link rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .is-invalid {
-        border: 2px solid red !important;
-        background-color: #ffcccc !important;
-    }
-
-    .checkbox-large {
-        width: 20px;
-        height: 20px;
-    }
-
-    .readonly-select {
-        pointer-events: none; /* Prevent user interaction */
-        background-color: #e9ecef; /* Light grey background (like disabled) */
-    }
-</style>
-
-<body>
-<link rel="stylesheet" type="text/css"
-      href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css"/>
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header">
-                    <div class="row align-items-end">
-                        <div class="col-lg-8">
-                            <div class="page-header-title">
-                                <i class="far fa-calendar-plus bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>List of Works</h5>
-                                    <span>ERP Works list</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-4">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item"><a href="index"><i
-                                            class="ik ik-home"></i></a></li>
-                                    <li class="breadcrumb-item" aria-current="page">ERP Works
-                                        list
-                                    </li>
-                                    </li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-
-                <div class="col-md-14">
-                    <div class="card p-3">
-                        <div class="row">
-                            <div class="col-md-2">
-                                <label for="filterType">Financial year: <font style="color: red"></font></label> 
-                                <select class="form-control" id="finYear">
-	                                <option value="2025-26" >2025-26</option>
-	                                <option value="2024-25" selected>2024-25</option>
-	                                <option value="2023-24" >2023-24</option>
-	                                <option value="2022-23" >2022-23</option>
-	                                <option value="2021-22" >2021-22</option>
-	                                <option value="" >All</option>
-                            	</select>
-                            </div>
-                            
-                            <div class="col-md-2">
-                                <label for="filterType">Order Value: <font style="color: red"></font></label> 
-                                <select class="form-control" id="oValue">
-								    <option value="max50">Up to 50 Lakhs</option>
-								    <option value="50to75">Above 50 Lakhs to 75 Lakhs</option>
-								    <option value="75to99">Above 75 Lakhs to 99 Lakhs</option>
-								    <option value="min1c" selected>1 Crore and Above</option>
-								    <option value="">All</option>
-								</select>
-                            </div>
-                            
-                            <div class="col-md-2 d-flex align-items-end gap-2">
-                                <button id="submitFilter" class="btn btn-primary" onclick="get_erp_works_data_list()">Submit</button>
-                                <button class="btn btn-danger mt-2" onclick="resetpage()"
-                                        name="reset" type="reset">Reset
-                                </button>
-                                <!--<button type="button" class="btn btn-sm btn-success mt-2" name="downloadBtn"
-                                        onclick="downloadExcel()">Download Excel</button>-->
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <br>
-                <div class="row">
-                    <div class="card-block">
-                    <div id="tableLoading"></div>
-                        <div>
-                            <table id="worksDatatable"
-                                   class="table table-striped table-bordered table-hover"
-                                   width="99.5%">
-                                <!--			   <button id="exportExcel" class="btn btn-success mb-2">Download Excel</button>
--->
-                                <thead class="thead-dark">
-                                <tr>
-                                    <th>S.No</th>
-                                    <th>Estimate No</th>
-                                    <th>Estimate Date</th>
-                                    <th>Zone</th>
-                                    <th>Ward</th>
-                                    <th>Department</th>
-                                    <th>Category</th>
-                                    <th>Sub Category</th>
-                                    <th>Project Name</th>
-                                   
-                                    <th>Estimation Amount</th>
-                                    <th>Order Value</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                
-                                </tbody>
-                            </table>
-
-                            <!-- Pagination Controls -->
-                            <div class="pagination-container">
-                                <div
-                                        class="d-flex justify-content-between align-items-center my-3">
-                                    <span id="entriesInfo" class="text-muted"></span>
-                                    <ul id="pagination" class="pagination mb-0"></ul>
-                                </div>
-                                <ul class="pagination justify-content-center"
-                                    style="justify-content: right !important;" id="pagination"></ul>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-</div>
-
-	<div th:replace="~{fragments/modules/works/modal-box :: div}"></div> 
-	
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script th:replace="~{fragments/modules/works/script :: script}"></script>
-    
-    <script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-    <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-    <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-    <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-    <script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-    <script th:inline="javascript">
-        var loginUserID = /*[[${LoginUserId}]]*/'';
-        var createdBy = /*[[${LoginUserId}]]*/'';
-        
-        var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        
-     	// Loading Div id
-    	const loading = $("#tableLoading");
-     	
-    	// DataTables buttons configuration
-        var buttons = [
-        	{
-				extend: 'pageLength',
-				className: 'btn btn-warning'
-			},
-            {
-				title: 'Data export',
-                extend: 'copyHtml5',
-                text: 'Copy',
-                className: 'btn btn-secondary',
-                id: 'copyBtn'
-            },
-            {
-                extend: 'excelHtml5',
-                text: 'Excel',
-                className: 'btn btn-secondary',
-                id: 'excelBtn',
-                title: 'Works List'
-            },
-            {
-                extend: 'csvHtml5',
-                text: 'CSV',
-                className: 'btn btn-secondary',
-                id: 'csvBtn',
-                title: 'Works List'
-            },
-            {
-                extend: 'pdfHtml5',
-                text: 'PDF',
-                className: 'btn btn-secondary',
-                id: 'pdfBtn',
-                title: 'Works List'
-            },
-            {
-                extend: 'print',
-                text: 'Print',
-                className: 'btn btn-secondary',
-                id: 'printBtn',
-                title: 'Works List',
-                exportOptions: {
-                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-                }
-            },
-            {
-				extend: 'colvis',
-				className: 'btn btn-warning'
-			},
-        ];
-		
-    	
-        function call_loading(){
-			loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-		}
-		
-		function remove_loading(){
-			loading.html("");
-		}
-		
-        /* 
-        	===============================================================================================
-        	===============================================================================================
-        */
-        
-        function form_btn_enable() {
-            $("#resetFormBtn").prop("disabled", false);
-            $("#requestSubmitBtn").prop("disabled", false);
-            $("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-        }
-
-        function form_btn_disable() {
-            $("#resetFormBtn").prop("disabled", true);
-            $("#requestSubmitBtn").prop("disabled", true);
-            // Show the loading icon on the button
-            $("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-        }
-
-        //document.getElementById('fromDate').addEventListener('change', validateEndDate);
-
-        function validateEndDate() {
-            const startDate = document.getElementById('fromDate').value;
-            const endDateInput = document.getElementById('toDate');
-
-            if (startDate) {
-                const startDateObj = new Date(startDate);
-                const minEndDateISO = startDateObj.toISOString().split('T')[0];
-                endDateInput.setAttribute('min', minEndDateISO);
-
-                // Clear endDate if it's less than startDate
-                if (endDateInput.value && new Date(endDateInput.value) < startDateObj) {
-                    endDateInput.value = '';
-                }
-            }
-        }
-
-        /*
-        =========================================================================================
-        */
-
-        
-        /* Get works data List */
-        function get_erp_works_data_list(){
-        	
-        	call_loading();
-        	
-        	var table = $('#worksDatatable').DataTable();
-        	table.clear();
-        	// Destroy the DataTable before reinitializing
-        	table.destroy();
-        	
-        	
-        	get_erp_work_data().then(function(erpWorksDataList) {
-    		    // Handle the data list
-    		    generate_table(erpWorksDataList);
-    		    
-    		}).catch(function(error) {
-    		    // Handle errors
-		        if (error && error.message) {
-		            console.error('Error fetching complaint list:', error.message);
-		        } else {
-		            console.error('An error occurred while fetching complaint list:', error);
-		        }
-    		});
-		}
-        
-        /* Get Erp works Data */
-        async function get_erp_work_data() {
-        	var finYear = document.getElementById('finYear').value;
-            var oValue = document.getElementById('oValue').value;
-            //alert(finYear);
-            //alert(oValue);
-        	var apiUrl = '/gcc/works/api/estimates/getFilteredERpWorksListByLogin?loginId='+createdBy+'&finYear='+finYear+'&oValue='+oValue;
-    	    // Return a Promise
-    	    return new Promise(function(resolve, reject) {
-    	        $.ajax({
-    	            url: apiUrl,
-    	            type: 'GET',
-    	            dataType: 'json',
-    	            success: function(jsonResponse) {
-						//alert(jsonResponse);
-    	                // Resolve the Promise with the department list
-    	                resolve(jsonResponse);
-    	            },
-    	            error: function(xhr, status, error) {
-    	                // Reject the Promise with the error message
-    	                reject(error);
-    	            }
-    	        });
-    	    });
-        }
-        
-        /* Call DataTable function */
-        function generate_table(data){
-        	
-        	var table = $('#worksDatatable').DataTable();
-
-        	// Destroy the DataTable before reinitializing
-        	table.destroy();
-
-        	// Now, reinitialize the table
-        	table = $('#worksDatatable').DataTable({
-        	    dom: 'Bftip',
-        	    deferRender: true,  // Delays rendering of non-visible rows
-        	    columnDefs: [
-        	        { targets: 'no-sort', "orderable": false },
-        	        { targets: 'no-exportable', "exportable": false }
-        	    ],
-        	    lengthMenu: [
-        	        [50, 100, 200, 500, -1],
-        	        ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-        	    ],
-        	    fixedColumns: {
-        	        left: 0,
-        	        right: 0
-        	    },
-        	    buttons: [buttons],
-        	    responsive: false,
-        	    searching: true,
-        	    select: false,
-        	    processing: true, // Enables processing indicator
-        	});
-            
-        	// Clearn Table data
-        	table.clear();
-        	            
-        	// Add rows to DataTable
-        	var rowNum = 1;
-        	$.each(data, function(index, row) {
-        	    actionHTML = `<div class="dropdown d-inline-block show">
-        	                     <a class="nav-link dropdown-toggle text-warning" href="#" id="moreDropdown" role="button" 
-        	                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-animation="true" 
-        	                    data-placement="top" data-html="true" title="`+row['estimate_no']+`" >`+row['estimate_no']+`</a>
-        	                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-        	                    	<a class="dropdown-item" href="" onclick="return viewUserWorksSummary('`+row['estid']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Full Details"><i class="ik ik-printer"></i> View Details</a>
-        	                    	<a class="dropdown-item" href="" onclick="return updateUserWorksSummary('`+row['estid']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Update Details"><i class="ik ik-edit"></i> Update Details</a>
-        	                    	<!--<a class="dropdown-item" href="" onclick="return updateUserWorksStage('`+row['estid']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Add/Edit Work Stages"><i class="ik ik-edit"></i> Update Work Stages</a>
-        	                    	<a class="dropdown-item" href="" onclick="return updateUserWorksListBreakup('`+row['estid']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Add/Edit Work Breakup"><i class="ik ik-edit"></i> Update Work tasks</a>-->
-        	                    </div>
-        	              </div>`;
-
-        	    table.row.add([
-        	        rowNum++,
-        	        actionHTML,
-        	        convertdate(row['estimate_date']),
-        	        row['zone'],
-        	        row['ward'],
-        	        row['department'],
-        	        row['category'],
-        	        row['sub_category'],
-        	        row['project_name'],
-        	        row['estimation_amount'],
-        	        row['est_val_with_oh']
-        	    ]);
-        	});
-
-        	// **Call draw() only once**
-        	table.draw(false);
-            
-            // Enable tooltips for all elements with data-toggle="tooltip"
-            $('[data-toggle="tooltip"]').tooltip();
-            remove_loading(); // remove Loading 
-		}
-        
-        
-        function viewUserWorksSummary(estid){
-        	$("#viewWorks").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-			
-			var url = '/gcc/works/user-view-works-details-modal?estid='+estid;
-			$.ajax({
-			    url: url,
-			    type: 'GET',
-			    dataType: 'html',
-			    success: function(data) {
-					$('#viewWorksTitle').html("Works Details");
-			      	$('#viewWorksBoxBody').html(data); // Inject content into modal body
-			    },
-			    error: function(xhr, status, error) {
-			      console.error("Error loading URL:", error);
-			      // Handle error, display a message, etc.
-			    }
-			  });
-			
-			return false;
-		}
-        
-        function updateUserWorksSummary(estid){
-        	$("#viewWorks").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-			
-			var url = '/gcc/works/user-update-works-details-modal?estid='+estid;
-			$.ajax({
-			    url: url,
-			    type: 'GET',
-			    dataType: 'html',
-			    success: function(data) {
-				  $('#viewWorksTitle').html("Works Details");
-			      $('#viewWorksBoxBody').html(data); // Inject content into modal body
-			    },
-			    error: function(xhr, status, error) {
-			      console.error("Error loading URL:", error);
-			      // Handle error, display a message, etc.
-			    }
-			  });
-			
-			return false;
-		}
-        
-        function updateUserWorksStage(estid){
-        	$("#viewWorks").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-			
-			var url = '/gcc/works/update_works_stage_modal?estid='+estid;
-			$.ajax({
-			    url: url,
-			    type: 'GET',
-			    dataType: 'html',
-			    success: function(data) {
-				  $('#viewWorksTitle').html("Add Work Stage");
-			      $('#viewWorksBoxBody').html(data); // Inject content into modal body
-			      get_works_stage_data(estid);
-			    },
-			    error: function(xhr, status, error) {
-			      console.error("Error loading URL:", error);
-			      // Handle error, display a message, etc.
-			    }
-			  });
-			
-			return false;
-		}
-        
-        function formatDBDate(inputDate) {
-            let parts = inputDate.split("-");
-            if (parts.length === 3) {
-                return `${parts[2]}-${parts[1]}-${parts[0]}`; // Convert to YYYY-MM-DD
-            }
-            return inputDate; // Return as-is if format is incorrect
-        }
-        
-        function updateData(){
-        	let formData = new FormData();
-        	
-        	// Append form fields
-            formData.append("estid", estid);
-            formData.append("loginid", loginUserID);
-         	// Append files (only if a file is selected)
-         	
-         	
-         	let projecttype = document.getElementById("projecttype");
-            let projecttypeValue = projecttype.value; // Get selected value
-
-	         // Validate selected
-	         if (!projecttypeValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please select a project type before submission.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-            
-	         formData.set("projecttype", projecttypeValue);
-            
-            let govtfund = document.getElementById("govtfund");
-            let govtfundValue = govtfund.value; // Get selected value
-
-	         // Validate selection
-        	 if (!govtfundValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please select whether the project is government-funded before submission.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-	      	
-	        formData.set("govtfund", govtfundValue);
-            
-	        
-         	let specialcat = document.getElementById("specialcat");
-         	let specialcatValue = specialcat.value; // Get selected value
-
-	         // Validate selection
-	         if (!specialcatValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please select whether the project falls under a special category before submission.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-
-         	// Set the form data
-         	formData.set("specialcat", specialcatValue);
-         	
-         	
-         	// Get date input values
-			let techSanctionDate = $("#erptechsanctiondate").val().trim();
-			let adminSanctionDate = $("#erpadminsanctiondate").val().trim();
-			let tenderCallDate = $("#erptendercalldate").val().trim();
-			let tenderFinalizedDate = $("#erptenderfinalizeddate").val().trim();
-			
-			
-			
-			let loaDate = $("#erploadate").val().trim();
-			let agreementDate = $("#erpagreementdate").val().trim();
-			let workOrderDate = $("#erpworkorderdate").val().trim();
-			let workCommencedDate = $("#erpworkcommenceddate").val().trim();
-			
-			// Convert to Date format
-		    function parseDate(dateStr) {
-		        return dateStr ? new Date(dateStr.split("-").reverse().join("-")) : null;
-		    }
-
-		    let techDate = parseDate(techSanctionDate);
-		    let adminDate = parseDate(adminSanctionDate);
-		    let tenderDate = parseDate(tenderCallDate);
-		    let finalizedDate = parseDate(tenderFinalizedDate);
-		    let loa = parseDate(loaDate);
-		    let agreement = parseDate(agreementDate);
-		    let workOrder = parseDate(workOrderDate);
-		    let workCommenced = parseDate(workCommencedDate);
-		    
-		    //alert(finalizedDate +">"+ tenderDate);
-		    /*
-		    // Validation checks
-		    if (!adminDate && !techDate) {
-		    	Swal.fire("Missing Dates", "Both Admin and Tech Sanction Dates are required.", "error");
-		        return;
-		    }
-		 	*/
-		 	// Parent-child dependency checks
-		    if (!techDate && (adminDate || tenderDate || finalizedDate || loa || agreement || workOrder || workCommenced)) {
-		        Swal.fire("Error", "Tech Sanction Date is required before entering other dates.", "error");
-		        return;
-		    }
-
-		    if (!adminDate && (tenderDate || finalizedDate || loa || agreement || workOrder || workCommenced)) {
-		        Swal.fire("Error", "Admin Sanction Date is required before entering Tender and later dates.", "error");
-		        return;
-		    }
-
-		    if (!tenderDate && (finalizedDate || loa || agreement || workOrder)) {
-		        Swal.fire("Error", "Tender Call Date is required before entering Finalized and later dates.", "error");
-		        return;
-		    }
-
-		    if (!finalizedDate && (loa || agreement || workOrder)) {
-		        Swal.fire("Error", "Tender Finalized Date is required before entering LOA and later dates.", "error");
-		        return;
-		    }
-
-		    if (!loa && (agreement || workOrder)) {
-		        Swal.fire("Error", "LOA Date is required before entering Agreement and later dates.", "error");
-		        return;
-		    }
-
-		    if (!agreement && (workOrder)) {
-		        Swal.fire("Error", "Agreement Date is required before entering Work Order and later dates.", "error");
-		        return;
-		    }
-			
-		    /*
-		    if (!workOrder && workCommenced) {
-		        Swal.fire("Error", "Work Order Date is required before entering Work Commenced Date.", "error");
-		        return;
-		    }
-			*/
-			
-		    // Chronological validations
-		    if (adminDate && techDate && adminDate < techDate) {
-		        Swal.fire("Error", "Admin Sanction Date must be on or after Tech Sanction Date.", "error");
-		        return;
-		    }
-
-		    if (tenderDate && adminDate && tenderDate < adminDate) {
-		        Swal.fire("Error", "Tender Call Date must be on or after Admin Sanction Date.", "error");
-		        return;
-		    }
-
-		    if (finalizedDate && tenderDate && finalizedDate < tenderDate) {
-		        Swal.fire("Error", "Tender Finalized Date must be on or after Tender Call Date.", "error");
-		        return;
-		    }
-
-		    if (loa && finalizedDate && loa < finalizedDate) {
-		        Swal.fire("Error", "LOA Date must be on or after Tender Finalized Date.", "error");
-		        return;
-		    }
-
-		    if (agreement && loa && agreement < loa) {
-		        Swal.fire("Error", "Agreement Date must be on or after LOA Date.", "error");
-		        return;
-		    }
-
-		    if (workOrder && agreement && workOrder <= agreement) {
-		        Swal.fire("Error", "Work Order Date must be after Agreement Date.", "error");
-		        return;
-		    }
-			/*
-		    if (workCommenced && workOrder && workCommenced <= workOrder) {
-		        Swal.fire("Error", "Work Commenced Date must be after Work Order Date.", "error");
-		        return;
-		    }
-			*/	    
-		    if (workCommenced && loa && workCommenced < loa) {
-		        Swal.fire("Error", "Work Commenced Date must be on or after LOA Date.", "error");
-		        return;
-		    }
-		    /*
-			// Validate if all fields are filled
-			if (!techSanctionDate || !adminSanctionDate || !tenderCallDate || !tenderFinalizedDate ||
-    		!loaDate){
-    		//|| !agreementDate || !workOrderDate || !workCommencedDate) {
-			    Swal.fire({
-			        title: "Error",
-			        text: "All date fields are required before submission.",
-			        icon: "error",
-			        confirmButtonText: "OK"
-			    });
-			    return; // Stop execution if any date is missing
-			}
-			*/
-			
-         	// Get file inputs
-		    let adminSanctionFile = $("#adminsanctionfile")[0].files[0];
-		    let loaFile = $("#loafile")[0].files[0];
-		    let agreementFile = $("#agreementfile")[0].files[0];
-		    let workOrderFile = $("#workorderfile")[0].files[0];
-			/*
-		    // Validate if all files are selected
-		    if (!adminSanctionFile || !loaFile || !agreementFile || !workOrderFile) {
-		        Swal.fire({
-		            title: "Error",
-		            text: "All files are required before submission.",
-		            icon: "error",
-		            confirmButtonText: "OK"
-		        });
-		        return; // Stop execution if any file is missing
-		    }
-		    */
-		 	// Append date to formData
-		    formData.append("techSanctionDate", formatDBDate(techSanctionDate));
-		    formData.append("adminSanctionDate", formatDBDate(adminSanctionDate));
-		    formData.append("tenderCallDate", formatDBDate(tenderCallDate));
-		    formData.append("tenderFinalizedDate", formatDBDate(tenderFinalizedDate));
-		    
-		 	// Append date to formData
-		    formData.append("loaDate", formatDBDate(loaDate));
-		    formData.append("agreementDate", formatDBDate(agreementDate));
-		    formData.append("workOrderDate", formatDBDate(workOrderDate));
-		    formData.append("workCommencedDate", formatDBDate(workCommencedDate));
-		    
-		 	// Append files to formData
-		 	if(adminSanctionFile){
-		 		formData.append("admin_sanction_file", adminSanctionFile);
-			}
-		 	if(loaFile){
-		    	formData.append("loa_file", loaFile);
-		 	}
-		 	if(agreementFile){
-		    	formData.append("agreement_file", agreementFile);
-		 	}
-		 	if(workOrderFile){
-		    	formData.append("work_order_file", workOrderFile);
-		 	}
-            
-            let iconicProjectCheckbox = document.getElementById("isiconic");
-            let iconicProjectValue = iconicProjectCheckbox.checked ? "1" : "0"; // Set 1 if checked, else 0
-            formData.set("isiconic", iconicProjectValue);
-            
-            $.ajax({
-                url: "/gcc/works/api/estimates/updateEstimateWorkDetails",
-                type: "POST",
-                contentType: false,
-                processData: false,
-                data: formData,
-                success: function (response) {
-                    // console.log(formData);
-                    Swal.fire({
-                        title: "Updated!",
-                        text: "Estimate details have been updated successfully.",
-                        icon: "success",
-                        confirmButtonText: "OK",
-                    }).then(() => {
-                        location.reload();
-                    });
-                },
-                error: function (xhr, status, error) {
-                    // console.log(xhr.responseText);
-                    Swal.fire({
-                        title: "Error",
-                        text: "Failed to update estimate." + "Error: " + error + "\nStatus: " + status + "\nResponse: " + xhr.responseText,
-                        icon: "error",
-                        confirmButtonText: "OK",
-                    });
-                }
-            });
-        	
-        }
-        
-        /*
-        	===============================================================
-        */
-        
-        $(document).ready(function () {
-			
-        	/*
-        	=================================
-        	*/
-        	//call_loading();
-            //loadWardsFilter();
-            //loadDepartmentFilter();
-            //loadSourceFilter();
-            get_erp_works_data_list();
-        });
-        
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/works/erpworkslist_old.html b/src/main/resources/templates/modules/works/erpworkslist_old.html
deleted file mode 100644
index 22593b63..00000000
--- a/src/main/resources/templates/modules/works/erpworkslist_old.html
+++ /dev/null
@@ -1,2960 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css">
-
-
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
-<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .is-invalid {
-        border: 2px solid red !important;
-        background-color: #ffcccc !important;
-    }
-
-    .checkbox-large {
-        width: 20px;
-        height: 20px;
-    }
-
-    #returnworksdetailsModal .modal-body {
-
-        max-height: 80vh;
-        overflow-y: auto;
-    }
-
-    .remove-card {
-        width: 150px; /* Adjust the width as needed */
-        display: block;
-        margin: 10px auto; /* Centers the button */
-    }
-
-
-    .input-group .form-select {
-        max-width: 80px; /* Adjust the width of dropdown */
-    }
-
-    .readonly-select {
-        pointer-events: none; /* Prevent user interaction */
-        background-color: #e9ecef; /* Light grey background (like disabled) */
-    }
-
-</style>
-
-<body>
-<link rel="stylesheet" type="text/css" href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css"/>
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header">
-                    <div class="row align-items-end">
-                        <div class="col-lg-8">
-                            <div class="page-header-title">
-                                <i class="far fa-calendar-plus bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>List of Works</h5>
-                                    <span>Non-ERP Works list</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-4">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item">
-                                        <a href="index"><i class="ik ik-home"></i></a>
-                                    </li>
-                                    <li class="breadcrumb-item" aria-current="page">Non-ERP Works list</li>
-                                    </li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-
-                <div class="col-md-14">
-                    <div class="card p-3">
-                        <!-- <form id="downloadForm" action="/gcc/works/api/estimates/downloadexcel" method="GET"> -->
-
-                        <div class="row">
-                            <div class="col-md-2">
-                                <label for="filterType">Filter By <font style="color:red"></font></label>
-                                <select class="form-control" id="filterType" name="filterType"
-                                        onchange="handleFilterSelection()">
-                                    <option value="" disabled selected>Select Filter Option</option>
-                                    <option value="estimateDate">Estimate Date</option>
-                                    <option value="erpWorks">ERP Works</option>
-                                    <option value="nonErpWorks">Non ERP Works</option>
-                                </select>
-                            </div>
-                            <div class="col-md-2" id="estimateDateFields" style="display: none;">
-                                <label>From Date <font style="color:red"></font></label>
-
-                                <input type="date" id="fromDate" name="fromDate" class="form-control"
-                                       placeholder="From Date" required>
-                            </div>
-                            <div class="col-md-2" id="estimatetoDateFields" style="display: none;">
-                                <label>To Date <font style="color:red"></font></label>
-
-                                <input type="date" id="toDate" name="toDate" class="form-control"
-                                       placeholder="To Date" required>
-
-                            </div>
-
-
-                            <div class="col-md-2">
-                                <label for="zonef">Zone <font style="color:red"></font></label>
-                                <select class="form-control" id="zonef" name="zonef" onchange="loadWardsFilter()">
-                                    <option value="" disabled selected>Select Zone</option>
-                                    <option th:each="zone : ${zones}" th:value="${zone}" th:text="${zone}">
-                                    </option>
-                                </select>
-                            </div>
-                            <div class="col-md-2">
-                                <label for="wardf">Ward <font style="color:red"></font></label>
-                                <select class="form-control" id="wardf" name="wardf">
-                                    <option value="" disabled selected>Select Ward</option>
-                                </select>
-                            </div>
-                            <div class="col-md-4">
-                                <label for="departmentf">Department <font style="color:red"></font></label>
-                                <select class="form-control" id="departmentf" name="departmentf">
-                                    <option value="" disabled selected>Select Department</option>
-                                </select>
-                            </div>
-                            <div class="col-md-4">
-                                <label for="fundsourcef">Details Source of Fund <font style="color:red"></font>
-                                </label>
-                                <select class="form-control" id="fundsourcef" name="fundsourcef">
-                                    <option value="" disabled selected>Select Scheme</option>
-                                </select>
-                            </div>
-
-                            <div class="col-md-2">
-                                <label for="estimateno">Estimate No </label>
-                                <!--<select class="form-control" id="fundsource" name="fundsource">
-                                    <option value="" disabled selected>Select Scheme</option>
-                                </select>-->
-                                <input class="form-control" id="estimateno" name="estimateno" type="text">
-                            </div>
-
-                            <div class="col-md-2 d-flex align-items-end gap-2">
-                                <button id="submitFilter" class="btn btn-primary">Submit</button>
-                                <button class="btn btn-danger mt-2" onclick="resetpage()" name="reset"
-                                        type="reset">Reset
-                                </button>
-                                <!--<button type="button" class="btn btn-sm btn-success mt-2" name="downloadBtn"
-                                    onclick="downloadExcel()">Download Excel</button>-->
-                            </div>
-                        </div>
-                        </form>
-                    </div>
-                </div>
-                <br>
-                <div class="row">
-                    <div class="card-block">
-                        <div>
-                            <table id="worksDatatable" class="table table-striped table-bordered table-hover"
-                                   role="grid" style="text-align:center;">
-
-                                <thead class="thead-dark">
-                                <tr role="row">
-                                    <th>S.No</th>
-                                    <th>Estimate No</th>
-                                    <th>Estimate Date</th>
-                                    <th>Zone</th>
-                                    <th>Ward</th>
-                                    <th>Category</th>
-                                    <th>Sub Category</th>
-                                    <th>Add Works</th>
-                                    <th>Action</th>
-
-                                </tr>
-                                </thead>
-                                <tbody style="text-align:center;">
-                                <tr th:each="work,status : ${workDetails}">
-                                    <!-- <td th:text="${work['id']}"></td>-->
-                                    <td th:text="${status.index + 1}"></td>
-                                    <td th:text="${work['estimate_no']}" style="cursor: pointer;"></td>
-                                    <td th:text="${#dates.format(work['estimate_date'], 'dd-MM-yyyy')}"></td>
-                                    <td th:text="${work['zone']}"></td>
-                                    <td th:text="${work['ward']}"></td>
-                                    <td th:text="${work['category']}"></td>
-                                    <td th:text="${work['sub_category']}"></td>
-                                    <td>
-                                        <button class="btn btn-primary btn-sm view-btn"
-                                                th:attr="data-id=${work['estimate_no']}">
-                                            Add Works
-                                        </button>
-                                    </td>
-                                    <td>
-                                        <button class="btn btn-primary btn-sm btn-view"
-                                                th:attr="data-id=${work['estimate_no']}">
-                                            View
-                                        </button>
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-
-                            <!-- Pagination Controls -->
-                            <div class="pagination-container">
-                                <div class="d-flex justify-content-between align-items-center my-3">
-                                    <span id="entriesInfo" class="text-muted"></span>
-                                    <ul id="pagination" class="pagination mb-0"></ul>
-                                </div>
-                                <ul class="pagination justify-content-center"
-                                    style="justify-content: right !important;" id="pagination"></ul>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-        <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-
-    </div>
-</div>
-
-    <!-- add works model box -->
-
-    <div class="modal fade" id="returnworksdetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel"
-         aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="detailsModalLabel">
-                        Estimate List(<span id="modalEstimateCode"></span>)
-                    </h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-
-                        <!-- Estimate No -->
-                        <div class="col-md-4">
-                            <label for="estimatenumber" class="form-label fw-bold">Estimate No</label>
-                            <input type="text" id="estimatenumber" class="form-control" readonly>
-                        </div>
-
-                        <!-- Estimate Date -->
-                        <div class="col-md-4">
-                            <label for="estimateddate" class="form-label fw-bold">Estimate Date </label>
-                            <input type="date" id="estimateddate" class="form-control" readonly>
-                        </div>
-
-                        <!-- Zone -->
-                        <div class="col-md-4">
-                            <label for="estimatezone" class="form-label fw-bold">Zone</label>
-                            <input type="text" id="estimatezone" class="form-control" readonly>
-                        </div>
-
-                        <!-- Ward -->
-                        <div class="col-md-4">
-                            <label for="estimateward" class="form-label fw-bold">Ward</label>
-                            <input type="text" id="estimateward" class="form-control" readonly>
-                        </div>
-
-                        <!-- Project Name -->
-                        <div class="col-md-4">
-                            <label for="estimateproject" class="form-label fw-bold">Project Name</label>
-                            <input type="text" id="estimateproject" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- Location -->
-                        <div class="col-md-4">
-                            <label for="estimatelocation" class="form-label fw-bold">Location</label>
-                            <input type="text" id="estimatelocation" class="form-control" readonly>
-                        </div>
-
-                        <!-- Department -->
-                        <div class="col-md-4">
-                            <label for="estimatedepartment" class="form-label fw-bold">Department</label>
-                            <input type="text" id="estimatedepartment" class="form-control" readonly>
-                        </div>
-
-                        <!-- Estimate Amount -->
-                        <div class="col-md-4">
-                            <label for="estimateamounts" class="form-label fw-bold">Estimate Amount</label>
-                            <input type="text" id="estimateamounts" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- source fund -->
-                        <div class="col-md-4">
-                            <label for="sourcefund" class="form-label fw-bold">Source Of Fund</label>
-                            <input type="text" id="sourcefund" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- Scheme -->
-                        <div class="col-md-4">
-                            <label for="estimatescheme" class="form-label fw-bold">Scheme</label>
-                            <input type="text" id="estimatescheme" class="form-control" onclick="this.showPicker()"
-                                   readonly>
-                        </div>
-
-                        <!-- Category -->
-                        <div class="col-md-4">
-                            <label for="estimatecategory" class="form-label fw-bold">Category</label>
-                            <input type="text" id="estimatecategory" class="form-control" readonly></input>
-                        </div>
-
-                        <!-- Sub Category -->
-                        <div class="col-md-4">
-                            <label for="estimatesubcategory" class="form-label fw-bold">Sub-Category</label>
-                            <input type="text" id="estimatesubcategory" class="form-control" readonly></input>
-                        </div>
-
-
-                    </div>
-
-                    <hr>
-
-                    <div class="container mt-4">
-                        <div class="row mb-4">
-                            <div class="col-md-6">
-                                <h5 style="font-weight:bold;">Add Works Details</h5>
-                            </div>
-                            <div class="col-md-6 button-container d-flex justify-content-end">
-                                <button type="button" class="btn btn-primary" id="addMore">Add More</button>
-                            </div>
-                        </div>
-
-                        <div id="dynamicCardsViewContainer"></div>
-                        <div id="dynamicCardsContainer" style="display: none"></div>
-                        <!-- Container for dynamically added cards -->
-
-                        <div class="row mb-2 mt-2">
-                            <div class="col-md-12 d-flex justify-content-center">
-                                <button type="button" class="btn btn-success " style="display: none;" id="saveWorks">
-                                    Save
-                                </button>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <div class="row mb-2 mt-2">
-                        <div class="col-md-12 d-flex justify-content-center">
-                            <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-
-
-    <!-- view model box -->
-    <div class="modal fade" id="viewworksdetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel"
-         aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="detailsModalLabel">
-                        Estimate List(<span id="modalEstimateCode"></span>)
-                    </h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-
-                        <!-- Estimate No -->
-                        <div class="col-md-4">
-                            <label for="esnumber" class="form-label fw-bold">Estimate No</label>
-                            <input type="text" id="esnumber" class="form-control" readonly>
-                        </div>
-
-                        <!-- Estimate Date -->
-                        <div class="col-md-4">
-                            <label for="esdate" class="form-label fw-bold">Estimate Date </label>
-                            <input type="date" id="esdate" class="form-control" readonly>
-                        </div>
-
-                        <!-- Zone -->
-                        <div class="col-md-4">
-                            <label for="eszone" class="form-label fw-bold">Zone</label>
-                            <input type="text" id="eszone" class="form-control" readonly>
-                        </div>
-
-                        <!-- Ward -->
-                        <div class="col-md-4">
-                            <label for="esward" class="form-label fw-bold">Ward</label>
-                            <input type="text" id="esward" class="form-control" readonly>
-                        </div>
-
-                        <!-- Project Name -->
-                        <div class="col-md-4">
-                            <label for="esproject" class="form-label fw-bold">Project Name</label>
-                            <input type="text" id="esproject" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- Location -->
-                        <div class="col-md-4">
-                            <label for="eslocation" class="form-label fw-bold">Location</label>
-                            <input type="text" id="eslocation" class="form-control" readonly>
-                        </div>
-
-                        <!-- Department -->
-                        <div class="col-md-4">
-                            <label for="esdepartment" class="form-label fw-bold">Department</label>
-                            <input type="text" id="esdepartment" class="form-control" readonly>
-                        </div>
-
-                        <!-- Estimate Amount -->
-                        <div class="col-md-4">
-                            <label for="esamounts" class="form-label fw-bold">Estimate Amount</label>
-                            <input type="text" id="esamounts" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- source fund -->
-                        <div class="col-md-4">
-                            <label for="essourcefund" class="form-label fw-bold">Source Of Fund</label>
-                            <input type="text" id="essourcefund" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- Scheme -->
-                        <div class="col-md-4">
-                            <label for="esscheme" class="form-label fw-bold">Scheme</label>
-                            <input type="text" id="esscheme" class="form-control" onclick="this.showPicker()" readonly>
-                        </div>
-
-                        <!-- Category -->
-                        <div class="col-md-4">
-                            <label for="escategory" class="form-label fw-bold">Category</label>
-                            <input type="text" id="escategory" class="form-control" readonly></input>
-                        </div>
-
-                        <!-- Sub Category -->
-                        <div class="col-md-4">
-                            <label for="essubcategory" class="form-label fw-bold">Sub-Category</label>
-                            <input type="text" id="essubcategory" class="form-control" readonly></input>
-                        </div>
-
-
-                    </div>
-                    <div class="row mb-2 mt-2">
-                        <div class="col-md-12 d-flex justify-content-center">
-                            <button type="button" class="btn btn-secondary" data-dismiss="modal" id="backbutton">Back
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-
-
-    <!-- Non ERP Modal Structure -->
-    <!--<div class="modal fade" id="nonErpWorksDetailsModal" tabindex="-1" role="dialog"
-         aria-labelledby="nonErpWorksDetailsModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="nonErpWorksDetailsModalLabel">List of Works Details</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <form id="updateNonErpWorksForm" method="post" enctype="multipart/form-data">
-
-                        <div class="card-body" id="ptaxPersonalInfo">
-                            <div class="form-group">
-                                <div class="title text-warning">
-                                    <h5>1. Basic Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="estno">Estimate No <font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="estno" id="estno"
-                                               placeholder="Estimate No" th:value="${temp_id}" autocomplete="off"
-                                               readonly>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="estdate">Estimate Date <font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="estdate" id="estdate"
-                                               placeholder="Estimate Date" autocomplete="off">
-                                    </div>
-                                    <div class="col-md-2">
-                                        <label for="zone">Zone <font style="color:red">*</font></label>
-                                        <select class="form-control" id="zone" name="zone" onchange="loadWards()"
-                                                required>
-                                            <option value="" disabled selected>Select Zone</option>
-                                            <option th:each="zone : ${zones}" th:value="${zone}" th:text="${zone}">
-                                            </option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-2">
-                                        <label for="ward">Ward <font style="color:red">*</font></label>
-                                        <select class="form-control" id="ward" name="ward" required>
-                                            <option value="" disabled selected>Select Ward</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="projectname">Project Name <font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="projectname" id="projectname"
-                                               placeholder="Project Name" autocomplete="off">
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="location">Location <font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="location" id="location"
-                                               placeholder="Location" autocomplete="off">
-                                    </div>
-
-                                    <div class="col-md-4 d-flex align-items-center">
-                                        <label for="nonErpIconicProject">Iconic Project</label>
-
-                                        &lt;!&ndash; Hidden input ensures "0" is sent when unchecked &ndash;&gt;
-                                        <input type="checkbox" id="nonErpIconicProject" class="mr-2 checkbox-large"
-                                               th:checked="${work != null and work['iconic_project'] != null and work['iconic_project'] == 1}"
-                                               onchange="updateIconicProjectValue()">
-
-                                        &lt;!&ndash; Hidden input to store actual value (0 or 1) &ndash;&gt;
-                                        <input type="hidden" id="hiddenNonErpIconicProject" name="nonErpIconicProject"
-                                               th:value="${work != null and work['iconic_project'] != null and work['iconic_project'] == 1 ? 1 : 0}">
-                                    </div>
-
-                                </div>
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>2. Department and Contractor Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="department">Department <font style="color:red">*</font></label>
-                                        <select class="form-control" id="department" name="department" required>
-                                            <option value="" disabled selected>Select Department</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="contractorname">Contractor Name <font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="contractorname"
-                                               id="contractorname" placeholder="Contractor Name" autocomplete="off">
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="contractorperiod">Contractor Period <font style="color:red">*
-                                        </font>
-                                        </label>
-                                        <input type="text" class="form-control" name="contractorperiod"
-                                               id="contractorperiod" placeholder="Contractor Period"
-                                               autocomplete="off">
-                                    </div>
-                                </div>
-
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>3. Funding and Scheme Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="fundsource">Details Source of Fund <font style="color:red">*
-                                        </font>
-                                        </label>
-                                        <select class="form-control" id="fundsource" name="fundsource" required>
-                                            <option value="" disabled selected>Select Scheme</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="scheme">Scheme<font style="color:red">*</font></label>
-                                        <select class="form-control" id="scheme" name="scheme" required>
-                                            <option value="" disabled selected>Select Scheme</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="category">Category<font style="color:red">*</font></label>
-                                        <select class="form-control" id="category" name="category" required>
-                                            <option value="" disabled selected>Select Category</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="subcategory">Sub-Category<font style="color:red">*</font>
-                                        </label>
-                                        <select class="form-control" id="subcategory" name="subcategory" required>
-                                            <option value="" disabled selected>Select SubCategory</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="estamount">Estimation Amount<font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="estamount" id="estamount"
-                                               placeholder="Estimation Amount" autocomplete="off">
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>4. Sanctions and Tender Process</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="techsanctiondate">Tech Sanction Date <font style="color:red">*
-                                        </font></label>
-                                        <input type="text" class="form-control" name="techsanctiondate"
-                                               id="techsanctiondate" placeholder="Tech Sanction Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                    <div class="col-md-8">
-
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="adminsanctiondate">Admin Sanction Date<font style="color:red">*
-                                        </font></label>
-                                        <input type="text" class="form-control" name="adminsanctiondate"
-                                               id="adminsanctiondate" placeholder="Admin Sanction Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>Admin Sanction File<font style="color:red">*
-                                        </font></label>
-                                        <input name="adminsanctionfile" id="adminsanctionfile" class="form-control"
-                                               type="file" capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="adminsanctionfilePreview"></div>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="tendercalldate">Tender Called Date<font style="color:red">*
-                                        </font>
-                                        </label>
-                                        <input type="text" class="form-control" name="tendercalldate"
-                                               id="tendercalldate" placeholder="Tender Called Date" autocomplete="off"
-                                               required>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="tenderfinalizeddate">Tender Finalized Date <font
-                                                style="color:red">*
-                                        </font></label>
-                                        <input type="text" class="form-control" name="tenderfinalizeddate"
-                                               id="tenderfinalizeddate" placeholder="Tender Finalized Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                </div>
-
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>5. Contract and Execution Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="loadate">LOA Date<font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="loadate" id="loadate"
-                                               placeholder="LOA Date" autocomplete="off" required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>LOA File<font style="color:red">*</font></label>
-                                        <input name="loafile" id="loafile" class="form-control" type="file"
-                                               capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="loafilePreview"></div>
-                                    </div>
-                                </div>
-
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="agreementdate">Agreement Date<font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="agreementdate"
-                                               id="agreementdate" placeholder="Agreement Date" autocomplete="off"
-                                               required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>Agreement File<font style="color:red">*</font>
-                                        </label>
-                                        <input name="agreementfile" id="agreementfile" class="form-control"
-                                               type="file" capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="agreementfilePreview"></div>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="workorderdate">Work Order Date<font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="workorderdate"
-                                               id="workorderdate" placeholder="Sub-Category" autocomplete="off"
-                                               required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>Work Order File<font style="color:red">*</font>
-                                        </label>
-                                        <input name="workorderfile" id="workorderfile" class="form-control"
-                                               type="file" capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="workorderfilePreview"></div>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="workcommenceddate">Work Commenced Date<font style="color:red">*
-                                        </font></label>
-                                        <input type="text" class="form-control" name="workcommenceddate"
-                                               id="workcommenceddate" placeholder="Work Commenced Date"
-                                               autocomplete="off" required>
-                                    </div>
-
-                                    <div class="col-md-4">
-                                        <label for="Reason">Select Reason <font style="color:red">*
-                                        </font></label>
-                                        <select id="Reason" name="reason" class="form-control"
-                                                onchange="toggleRemarks()">
-                                            <option value="">Select Reason</option>
-                                            <option th:each="reason : ${reasons}" th:value="${reason.reasons}"
-                                                    th:text="${reason.reasons}"></option>
-                                        </select>
-
-                                    </div>
-                                    <div class="col-md-4" id="remarksContainer"
-                                         style="display: none;">
-                                        <label for="remarks">Remarks <font style="color:red">*
-                                        </font></label>
-                                        <textarea class="form-control" id="remarks" name="remarks"
-                                                  placeholder="Enter remarks if needed"></textarea>
-                                    </div>
-                                    &lt;!&ndash; <div class="col-md-4">
-                                 <label for="workcommenceddate">Work Description<font style="color:red">*</font>
-                                 </label>
-                                 <input type="text" class="form-control" name="worksdesc" id="worksdesc"
-                                        autocomplete="off" readonly>
-
-                             </div>&ndash;&gt;
-
-                                </div>
-                            </div>
-                        </div>
-
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" id="updateEstimate" class="btn btn-primary">Update</button>
-                    <button type="button" class="btn btn-secondary closebutton" data-dismiss="modal">Close</button>
-                </div>
-            </div>
-        </div>
-    </div>-->
-
-<!--ERP Work Details Modal-->
-    <div class="modal fade" id="erpWorksDetailsModal" tabindex="-1" role="dialog"
-         aria-labelledby="erpWorksDetailsModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="erpWorksDetailsModalLabel">List of Works Details</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <form id="updateErpWorksForm" method="post" enctype="multipart/form-data">
-
-                        <div class="card-body">
-                            <div class="form-group">
-                                <div class="title text-warning">
-                                    <h5>1. Basic Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erpestno">Estimate No <font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="erpestno" id="erpestno"
-                                               placeholder="Estimate No" th:value="${temp_id}" autocomplete="off"
-                                               readonly>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="erpestdate">Estimate Date <font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="erpestdate" id="erpestdate"
-                                               placeholder="Estimate Date" autocomplete="off" readonly>
-                                    </div>
-                                    <div class="col-md-2">
-                                        <label for="erpzone">Zone <font style="color:red">*</font></label>
-                                        <select class="form-control readonly-select" id="erpzone" name="erpzone"
-                                                onchange="loadWards()"
-                                                required>
-                                            <option value="" disabled selected>Select Zone</option>
-                                            <option th:each="zone : ${zones}" th:value="${zone}" th:text="${zone}">
-                                            </option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-2">
-                                        <label for="erpward">Ward <font style="color:red">*</font></label>
-                                        <select class="form-control readonly-select" id="erpward" name="erpward"
-                                                required>
-                                            <option value="" selected>Select Ward</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erpprojectname">Project Name <font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="erpprojectname"
-                                               id="erpprojectname"
-                                               placeholder="Project Name" autocomplete="off" readonly>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="erplocation">Location <font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="erplocation" id="erplocation"
-                                               placeholder="Location" autocomplete="off" readonly>
-                                    </div>
-
-                                    <div class="col-md-4 d-flex align-items-center">
-                                        <label for="erpIconicProject">Iconic Project</label>
-
-                                        <!-- Hidden input ensures "No" is sent when unchecked -->
-                                        <input type="hidden" name="erpIconicProject" value="No">
-
-                                        <!-- Disabled checkbox (read-only for ERP) -->
-                                        <input type="checkbox" id="erpIconicProject" name="erpIconicProject" value="Yes"
-                                               th:checked="${work != null and work['iconic_project'] != null and work['iconic_project'] == 1}"
-                                               class="mr-2 checkbox-large" disabled>
-                                    </div>
-
-                                </div>
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>2. Department and Contractor Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erpdepartment">Department <font style="color:red">*</font></label>
-                                        <select class="form-control readonly-select" id="erpdepartment"
-                                                name="erpdepartment" required>
-                                            <option value="" selected>Select Department</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="erpcontractorname">Contractor Name <font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="erpcontractorname"
-                                               id="erpcontractorname" placeholder="Contractor Name" autocomplete="off"
-                                               readonly>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="erpcontractorperiod">Contractor Period <font style="color:red">*
-                                        </font>
-                                        </label>
-                                        <input type="text" class="form-control" name="erpcontractorperiod"
-                                               id="erpcontractorperiod" placeholder="Contractor Period"
-                                               autocomplete="off" readonly>
-                                    </div>
-                                </div>
-
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>3. Funding and Scheme Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erpfundsource">Details Source of Fund <font style="color:red">*
-                                        </font>
-                                        </label>
-                                        <select class="form-control readonly-select" id="erpfundsource"
-                                                name="erpfundsource" required>
-                                            <option value="" selected>Select Scheme</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="erpscheme">Scheme<font style="color:red">*</font></label>
-                                        <select class="form-control readonly-select" id="erpscheme" name="erpscheme"
-                                                required>
-                                            <option value="" selected>Select Scheme</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="erpcategory">Category<font style="color:red">*</font></label>
-                                        <select class="form-control readonly-select" id="erpcategory" name="erpcategory"
-                                                required>
-                                            <option value="" selected>Select Category</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erpsubcategory">Sub-Category<font style="color:red">*</font>
-                                        </label>
-                                        <select class="form-control readonly-select" id="erpsubcategory"
-                                                name="erpsubcategory" required>
-                                            <option value="" selected>Select SubCategory</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="erpestamount">Estimation Amount<font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="erpestamount" id="erpestamount"
-                                               placeholder="Estimation Amount" autocomplete="off" readonly>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>4. Sanctions and Tender Process</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erptechsanctiondate">Tech Sanction Date <font style="color:red">*
-                                        </font></label>
-                                        <input type="text" class="form-control" name="erptechsanctiondate"
-                                               id="erptechsanctiondate" placeholder="Tech Sanction Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                    <div class="col-md-8">
-
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erpadminsanctiondate">Admin Sanction Date<font style="color:red">*
-                                        </font></label>
-                                        <input type="text" class="form-control" name="erpadminsanctiondate"
-                                               id="erpadminsanctiondate" placeholder="Admin Sanction Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>Admin Sanction File<font style="color:red">*
-                                        </font></label>
-                                        <input name="erpadminsanctionfile" id="erpadminsanctionfile"
-                                               class="form-control"
-                                               type="file" capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="erpadminsanctionfilePreview"></div>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erptendercalldate">Tender Called Date<font style="color:red">*
-                                        </font>
-                                        </label>
-                                        <input type="text" class="form-control" name="erptendercalldate"
-                                               id="erptendercalldate" placeholder="Tender Called Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="erptenderfinalizeddate">Tender Finalized Date <font
-                                                style="color:red">*
-                                        </font></label>
-                                        <input type="text" class="form-control" name="erptenderfinalizeddate"
-                                               id="erptenderfinalizeddate" placeholder="Tender Finalized Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                </div>
-
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>5. Contract and Execution Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erploadate">LOA Date<font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="erploadate" id="erploadate"
-                                               placeholder="LOA Date" autocomplete="off" required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>LOA File<font style="color:red">*</font></label>
-                                        <input name="erploafile" id="erploafile" class="form-control" type="file"
-                                               capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="erploafilePreview"></div>
-                                    </div>
-                                </div>
-
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erpagreementdate">Agreement Date<font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="erpagreementdate"
-                                               id="erpagreementdate" placeholder="Agreement Date" autocomplete="off"
-                                               required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>Agreement File<font style="color:red">*</font>
-                                        </label>
-                                        <input name="erpagreementfile" id="erpagreementfile" class="form-control"
-                                               type="file" capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="erpagreementfilePreview"></div>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erpworkorderdate">Work Order Date<font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="erpworkorderdate"
-                                               id="erpworkorderdate" placeholder="Sub-Category" autocomplete="off"
-                                               required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>Work Order File<font style="color:red">*</font>
-                                        </label>
-                                        <input name="erpworkorderfile" id="erpworkorderfile" class="form-control"
-                                               type="file" capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="erpworkorderfilePreview"></div>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="erpworkcommenceddate">Work Commenced Date<font style="color:red">*
-                                        </font></label>
-                                        <input type="text" class="form-control" name="erpworkcommenceddate"
-                                               id="erpworkcommenceddate" placeholder="Work Commenced Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" id="updateErpWorks" class="btn btn-primary">Update</button>
-                    <button type="button" class="btn btn-secondary closebutton" data-dismiss="modal">Close</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-    <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-    <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-    <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-
-
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/perfect-scrollbar/1.5.5/perfect-scrollbar.min.js"></script>
-
-    <!-- Bootstrap Bundle with Popper -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-
-    <script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-
-    <script th:inline="javascript">
-
-
-        var loginUserID = /*[[${LoginUserId}]]*/'';
-        $(document).ready(function () {
-            // Input masking for the desired format
-            /*$('#ptax').mask('00-000-00000-000');
-            $('#mobileno').mask('0000000000');*/
-
-            // For datetime picker
-            /*jQuery('#estdate').datetimepicker({
-                //minTime:'10:00',
-                //maxTime:'18:01',
-                //minDate: 0, // Today
-                //minDate:'-1970/01/2',
-                //maxDate:'+1970/01/2',
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                //disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#techsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#adminsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#tendercalldate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#tenderfinalizeddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#loadate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#agreementdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#workorderdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#workcommenceddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });*/
-
-            // For datetime picker
-            jQuery('#erpestdate').datetimepicker({
-                //minTime:'10:00',
-                //maxTime:'18:01',
-                //minDate: 0, // Today
-                //minDate:'-1970/01/2',
-                //maxDate:'+1970/01/2',
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                //disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erptechsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpadminsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erptendercalldate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erptenderfinalizeddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erploadate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpagreementdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpworkorderdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpworkcommenceddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-        });
-
-
-        function searchRequest() {
-            displayEstInfo();
-            return false;
-        }
-
-        function validateDateFormat(dateStr) {
-            // Regex to validate date in dd-mm-yyyy format
-            const datePattern = /^\d{2}-\d{2}-\d{4}$/;
-            return datePattern.test(dateStr); // returns true if it matches the format
-        }
-
-        $(document).ready(function () {
-            var rowsPerPage = 50;
-            var rows;
-            var totalRows;
-            var totalPages;
-            var currentPage = 1;
-
-            function showPage(page) {
-                var start = (page - 1) * rowsPerPage;
-                var end = Math.min(start + rowsPerPage, totalRows);
-                rows.hide().slice(start, end).show();
-                $("#entriesInfo").text(`Showing ${start + 1}-${end} of ${totalRows} entries`);
-            }
-
-            function setupPagination() {
-                $("#pagination").empty();
-
-                if (totalPages <= 1) return; // Hide pagination if only 1 page
-
-                var prevDisabled = currentPage === 1 ? "disabled" : "";
-                var nextDisabled = currentPage === totalPages ? "disabled" : "";
-
-                // First button
-                $("#pagination").append(`<li class="page-item ${prevDisabled}"><a class="page-link" href="#" data-page="1">«</a></li>`);
-
-                // Previous button
-                $("#pagination").append(`<li class="page-item ${prevDisabled}"><a class="page-link" href="#" data-page="${currentPage - 1}">‹</a></li>`);
-
-                // Page numbers
-                for (var i = 1; i <= totalPages; i++) {
-                    var activeClass = i === currentPage ? "active" : "";
-                    $("#pagination").append(`<li class="page-item ${activeClass}"><a class="page-link" href="#" data-page="${i}">${i}</a></li>`);
-                }
-
-                // Next button
-                $("#pagination").append(`<li class="page-item ${nextDisabled}"><a class="page-link" href="#" data-page="${currentPage + 1}">›</a></li>`);
-
-                // Last button
-                $("#pagination").append(`<li class="page-item ${nextDisabled}"><a class="page-link" href="#" data-page="${totalPages}">»</a></li>`);
-            }
-
-            $(document).on("click", "#pagination li a", function (event) {
-                event.preventDefault();
-                var page = parseInt($(this).attr("data-page"));
-                if (!isNaN(page) && page >= 1 && page <= totalPages) {
-                    currentPage = page;
-                    showPage(currentPage);
-                    setupPagination();
-                }
-            });
-
-
-            $("#submitFilter").on("click", function () {
-                var zone = $("#zonef").val();
-                var ward = $("#wardf").val();
-                var department = $("#departmentf").val();
-                var fundsource = $('#fundsourcef').val();
-                var fromDate = $('#fromDate').val();
-                var toDate = $('#toDate').val();
-                var filterType = $('#filterType').val();
-                var estno = $('#estimateno').val();
-
-                var filterDropdown = document.getElementById("filterType");
-
-                if (filterDropdown.value === "estimateDate" && (!fromDate || !toDate)) {
-                    Swal.fire({
-                        icon: "warning",
-                        title: "Date Required",
-                        text: "Please select Both From date and To Date",
-                        confirmButtonText: "OK",
-                    });
-                } else {
-                    $.ajax({
-                        url: "/gcc/works/api/estimates/getFilteredWorks",
-                        type: "GET",
-                        data: {
-                            zone: zone,
-                            ward: ward,
-                            department: department,
-                            fundsource: fundsource,
-                            fromDate: fromDate,
-                            toDate: toDate,
-                            filterType: filterType,
-                            estno: estno
-                        },
-                        success: function (data) {
-                            updateTable(data);
-                        }
-                    });
-                }
-            });
-
-            function updateTable(data) {
-                var tbody = $("#worksDatatable tbody");
-                tbody.empty(); // Clear existing rows
-
-                if (data.length === 0) {
-                    tbody.append("<tr><td colspan='14' class='text-center'>No data found</td></tr>");
-                    $("#entriesInfo").text("Showing 0 of 0 entries");
-                    $("#pagination").empty(); // Remove pagination when no results
-                    return;
-                }
-
-                data.forEach(function (work, index) {
-                    var row = `<tr>
-			                <td>${index + 1}</td>
-			                <td>${work.estimate_no}</td>
-			                <td>${work.estimate_date}</td>
-			                <td>${work.zone}</td>
-			                <td>${work.ward}</td>
-			                <td>${work.category}</td>
-			                <td>${work.sub_category}</td>
-			                <td>
-                        <button class="btn btn-primary btn-sm view-btn" data-id="${work.estimate_no}">
-                            Add Works
-                        </button>
-                    </td>
-                    <td>
-                        <button class="btn btn-primary btn-sm btn-view" data-id="${work.estimate_no}">
-                            View
-                        </button>
-                    </td>
-			            </tr>`;
-                    tbody.append(row);
-                });
-
-                // Update pagination values
-                rows = $("#worksDatatable tbody tr"); // Get the updated rows
-                totalRows = rows.length;
-                totalPages = Math.ceil(totalRows / rowsPerPage) || 1;
-                currentPage = 1; // Reset to first page
-
-                showPage(currentPage);
-                setupPagination();
-            }
-
-
-            // Initial pagination setup
-            rows = $("#worksDatatable tbody tr");
-            totalRows = rows.length;
-            totalPages = Math.ceil(totalRows / rowsPerPage) || 1;
-            showPage(currentPage);
-            setupPagination();
-        });
-
-
-        function resetpage() {
-            window.location.href = "/gcc/works/erpworkslist";
-        }
-
-        function handleFilterSelection() {
-            var filterDropdown = document.getElementById("filterType");
-            var estimateDateFields = document.getElementById("estimateDateFields");
-
-            if (filterDropdown.value === "estimateDate") {
-                estimateDateFields.style.display = "block";
-                estimatetoDateFields.style.display = "block";
-
-            } else {
-                estimateDateFields.style.display = "none";
-                estimatetoDateFields.style.display = "none";
-
-            }
-        }
-
-        function downloadExcel() {
-            const form = document.getElementById('downloadForm');
-
-            // Explicitly get the form element by ID to avoid conflicts
-            if (form && form.tagName.toLowerCase() === 'form') {
-                // Use the HTMLFormElement prototype to call submit directly to avoid any shadowing issues
-                HTMLFormElement.prototype.submit.call(form);
-            } else {
-                console.error('The element with id "downloadForm" is not a form.');
-            }
-        }
-
-        $('#worksDatatable').on('click', 'td:nth-child(2)', function () {
-            var estimateNo = $(this).text().trim();
-            $.ajax({
-                url: '/gcc/works/api/estimates/fetchERPdetails',
-                method: 'GET',
-                data: {estimateNo: estimateNo},
-                success: function (response) {
-                    console.log(response);
-
-                    /*if (response.status === "NonErp") {
-                        // Populate Non-ERP Works Form
-                        $('#iconicProject').prop('checked', response.iconic_project === 1);
-                        $('#iconicProject').prop('disabled', false); // ✅ Editable in Non-ERP
-                        $('#Reason').val(response.reason || ""); // Set Reason
-                        $('#remarks').val(response.remarks || ""); // Set Remarks
-
-                        if (response.status === "NonErp") {
-                            // ✅ Populate Non-ERP form
-                            $('#nonErpIconicProject').prop('checked', response.iconic_project === 1);
-                            $('#hiddenNonErpIconicProject').val(response.iconic_project === 1 ? "1" : "0");
-
-                            $('#Reason').val(response.reason || ""); // Populate reason dropdown
-                            $('#remarks').val(response.remarks || ""); // Populate remarks field
-
-                            if (response.reason && response.reason.toLowerCase() === "other") {
-                                $('#remarksContainer').show();
-                            } else {
-                                $('#remarksContainer').hide();
-                            }
-
-                            // Show modal
-                            $('#nonErpWorksDetailsModal').modal('show');
-                        } else {
-                            // ✅ Populate ERP form (Iconic Project is read-only)
-                            $('#erpIconicProject').prop('checked', response.iconic_project === 1);
-                            $('#erpIconicProject').prop('disabled', true);
-
-                            $('#erpWorksDetailsModal').modal('show');
-
-                        }
-                        // Open Non-ERP Modal
-                    } else {*/
-                        // Populate ERP Works Form
-                        $('#erpiconicProject').prop('checked', response.iconic_project === 1);
-                        $('#erpiconicProject').prop('disabled', true); // ❌ Not Editable in ERP
-
-                        $('#erpWorksDetailsModal').modal('show'); // Open ERP Modal
-
-
-                   /* }
-
-                    if (response.status == "NonErp") {
-                        let zoneDropDown = $('#zone');
-                        let wardDropDown = $('#ward');
-                        let depDropDown = $('#department');
-                        let schemeDropDown = $('#scheme');
-                        let catDropDown = $('#category');
-                        let subCatdDropDown = $('#subcategory');
-                        let sourceDropDown = $('#fundsource');
-
-                        zoneDropDown.append(`<option value="${response.zone}" selected>${response.zone}</option>`);
-                        wardDropDown.append(`<option value="${response.ward}" selected>${response.ward}</option>`);
-                        depDropDown.append(`<option value="${response.zonename}" selected>${response.department}</option>`); //not available in db
-                        schemeDropDown.append(`<option value="${response.schemename}" selected>${response.scheme}</option>`);
-                        catDropDown.append(`<option  value="${response.workcategory}" selected>${response.category}</option>`);
-                        subCatdDropDown.append(`<option  value="${response.typeofwork}" selected>${response.subcategory}</option>`);
-                        sourceDropDown.append(`<option value="${response.fundsource}" selected>${response.fundsourcename}</option>`);
-
-                        // Populate text fields
-                        $('#estno').val(response.estimate_no);
-                        $('#estdate').val(formatDate(response.estimate_date));
-                        $('#zone').val(response.zone);
-                        $('#ward').val(response.ward);
-                        $('#projectname').val(response.project_name);
-                        $('#location').val(response.location);
-                        // $('#department').val(response.department);
-                        $('#contractorname').val(response.contractor_name);
-                        $('#contractorperiod').val(response.contractor_period);
-                        // $('#fundsource').val(response.fund_source);
-                        // $('#scheme').val(response.scheme);
-                        // $('#category').val(response.category);
-                        // $('#subcategory').val(response.sub_category);
-                        $('#estamount').val(response.est_amount);
-                        $('#techsanctiondate').val(response.tech_sanc_date ? formatDate(response.tech_sanc_date) : '');
-                        $('#adminsanctiondate').val(response.admin_sanc_date ? formatDate(response.admin_sanc_date) : '');
-                        $('#tendercalldate').val(response.tender_call_date ? formatDate(response.tender_call_date) : '');
-                        $('#tenderfinalizeddate').val(response.tender_fin_date ? formatDate(response.tender_fin_date) : '');
-                        $('#loadate').val(response.loa_date ? formatDate(response.loa_date) : '');
-                        $('#agreementdate').val(response.agreement_date ? formatDate(response.agreement_date) : '');
-                        $('#workorderdate').val(response.work_order_date ? formatDate(response.work_order_date) : '');
-                        $('#workcommenceddate').val(response.work_comm_date ? formatDate(response.work_comm_date) : '');
-
-                        if (response.reason) {
-                            $('#Reason').val(response.reason);
-                        } else {
-                            $('#Reason').val(""); // Default empty if no reason
-                        }
-
-                        if (response.remarks) {
-                            $('#remarks').val(response.remarks);
-                            $('#remarksContainer').show(); // Show remarks if a reason exists
-                        } else {
-                            $('#remarks').val("");
-                            $('#remarksContainer').hide(); // Hide remarks if empty
-                        }
-
-
-                        if (response.iconic_project === 1) {
-                            $('#iconicProject').prop('checked', true);
-                        } else {
-                            $('#iconicProject').prop('checked', false);
-                        }
-                        $('#iconicProject').prop('disabled', false);
-
-                        // File preview for uploaded documents
-                        showPreview('adminsanctionfilePreview', "/gcc/files" + response.adm_san_file);
-                        showPreview('loafilePreview', "/gcc/files" + response.loa_file);
-                        showPreview('agreementfilePreview', "/gcc/files" + response.agreement_file);
-                        showPreview('workorderfilePreview', "/gcc/files" + response.work_order_file);
-
-                        // Open the modal
-                        $('#nonErpWorksDetailsModal').modal('show');
-                    } else {*/
-                        let zoneDropDown = $('#erpzone');
-                        let wardDropDown = $('#erpward');
-                        let depDropDown = $('#erpdepartment');
-                        let schemeDropDown = $('#erpscheme');
-                        let catDropDown = $('#erpcategory');
-                        let subCatdDropDown = $('#erpsubcategory');
-                        let sourceDropDown = $('#erpfundsource');
-
-                        zoneDropDown.append(`<option value="${response.zone}" selected>${response.zone}</option>`);
-                        wardDropDown.append(`<option value="${response.ward}" selected>${response.ward}</option>`);
-                        depDropDown.append(`<option value="${response.department}" selected>${response.dept_name}</option>`); //not available in db
-                        schemeDropDown.append(`<option value="${response.schemeid}" selected>${response.scheme}</option>`);
-                        catDropDown.append(`<option  value="${response.categoryid}" selected>${response.category}</option>`);
-                        subCatdDropDown.append(`<option  value="${response.subcategoryid}" selected>${response.sub_category}</option>`);
-                        sourceDropDown.append(`<option value="${response.fundsource}" selected>${response.fund_source}</option>`); //not available in db
-
-                        // Populate text fields
-                        $('#erpestno').val(response.estimate_no);
-                        $('#erpestdate').val(formatDate(response.estimate_date));
-                        $('#erpzone').val(response.zone);
-                        $('#erpward').val(response.ward);
-                        $('#erpprojectname').val(response.project_name);
-                        $('#erplocation').val(response.location);
-
-                        if (response.iconic_project == 1) {
-                            $('#erpIconicProject').prop('checked', true);
-                        } else {
-                            $('#erpIconicProject').prop('checked', false);
-                        }
-                        $('#erpIconicProject').prop('disabled', true);
-
-                        // $('#erpdepartment').val(response.zone);
-                        $('#erpcontractorname').val(response.contractor_name);
-                        $('#erpcontractorperiod').val(response.contractor_period);
-                        // $('#erpfundsource').val(response.scheme);
-                        // $('#erpscheme').val(response.scheme);
-                        // $('#erpcategory').val(response.category);
-                        // $('#erpsubcategory').val(response.sub_category);
-                        $('#erpestamount').val(response.est_amount);
-                        $('#erptechsanctiondate').val(response.tech_sanc_date ? formatDate(response.tech_sanc_date) : '');
-                        $('#erpadminsanctiondate').val(response.admin_sanc_date ? formatDate(response.admin_sanc_date) : '');
-                        $('#erptendercalldate').val(response.tender_call_date ? formatDate(response.tender_call_date) : '');
-                        $('#erptenderfinalizeddate').val(response.tender_fin_date ? formatDate(response.tender_fin_date) : '');
-                        $('#erploadate').val(response.loa_date ? formatDate(response.loa_date) : '');
-                        $('#erpagreementdate').val(response.agreement_date ? formatDate(response.agreement_date) : '');
-                        $('#erpworkorderdate').val(response.work_order_date ? formatDate(response.work_order_date) : '');
-                        $('#erpworkcommenceddate').val(response.work_comm_date ? formatDate(response.work_comm_date) : '');
-
-                        // File preview for uploaded documents
-                        showPreview('erpadminsanctionfilePreview', "/gcc/files" + response.adm_san_file);
-                        showPreview('erploafilePreview', "/gcc/files" + response.loa_file);
-                        showPreview('erpagreementfilePreview', "/gcc/files" + response.agreement_file);
-                        showPreview('erpworkorderfilePreview', "/gcc/files" + response.work_order_file);
-
-                        // Open the modal
-                        $('#erpWorksDetailsModal').modal('show');
-                    /*}*/
-
-                },
-                error: function () {
-                    alert('Error fetching estimate details.');
-                }
-            });
-        });
-        //for restrict other documents ak
-        document.addEventListener("DOMContentLoaded", function () {
-            document.querySelectorAll('input[type="file"]').forEach(input => {
-                input.addEventListener("change", function () {
-                    let allowedTypes = ["application/pdf", "image/png", "image/jpeg", "image/jpg"];
-                    let file = this.files[0];
-
-                    if (file && !allowedTypes.includes(file.type)) {
-                        alert("Only PDF and image files (JPG, JPEG, PNG) are allowed!");
-                        this.value = ""; // Reset file input
-                    }
-                });
-            });
-        });
-
-        /*$("#updateEstimate").click(function () {
-            var formData = new FormData(document.getElementById("updateNonErpWorksForm"));
-
-            // Ensure reason and remarks are not empty
-            let reason = $("#Reason").val();
-            if (!reason) {
-                Swal.fire({
-                    title: "Error",
-                    text: "Please select a reason before submitting.",
-                    icon: "warning",
-                    confirmButtonText: "OK",
-                });
-                return;
-            }
-
-            let remarks = $("#remarks").val();
-            if (reason.toLowerCase() === "other" && !remarks) {
-                Swal.fire({
-                    title: "Error",
-                    text: "Please enter remarks when selecting 'Other' as the reason.",
-                    icon: "warning",
-                    confirmButtonText: "OK",
-                });
-                return;
-            }
-
-            var requiredDates = [
-                '#estdate', '#techsanctiondate', '#adminsanctiondate', '#tendercalldate',
-                '#tenderfinalizeddate', '#loadate', '#agreementdate', '#workorderdate', '#workcommenceddate'
-            ];
-
-            // Validate date fields
-            requiredDates.forEach(function (dateFieldSelector) {
-                var dateField = document.querySelector(dateFieldSelector);
-                console.log("Validating:", dateField.value); // Log the value for debugging
-
-                if (!dateField.value || !validateDateFormat(dateField.value)) {
-                    isValid = false;
-                    dateField.classList.add("is-invalid");
-                } else {
-                    dateField.classList.remove("is-invalid");
-                }
-            });
-
-            // If form is valid, submit the form
-            if (isValid) {
-                console.log("Form is valid, submitting data...");
-            } else {
-                console.log("Form has errors. Please fill out all required fields.");
-            }
-
-
-            for (let pair of formData.entries()) {
-                console.log(pair[0] + ':', pair[1]); // Log each form field and file
-            }
-
-            $.ajax({
-                url: "/gcc/works/api/estimates/updateEstimate",
-                type: "POST",
-                contentType: false,
-                processData: false,
-                data: formData,
-                success: function (response) {
-                    // console.log(formData);
-                    Swal.fire({
-                        title: "Updated!",
-                        text: "Estimate details have been updated successfully.",
-                        icon: "success",
-                        confirmButtonText: "OK",
-                    }).then(() => {
-                        location.reload();
-                    });
-                },
-                error: function (xhr, status, error) {
-                    // console.log(xhr.responseText);
-                    Swal.fire({
-                        title: "Error",
-                        text: "Failed to update estimate. " + xhr.responseText,
-                        icon: "error",
-                        confirmButtonText: "OK",
-                    });
-                }
-            });
-        });*/
-
-
-        $("#updateErpWorks").click(function () {
-            var formData = new FormData(document.getElementById("updateErpWorksForm"));
-
-            var requiredDates = [
-                '#erpestdate', '#erptechsanctiondate', '#erpadminsanctiondate', '#erptendercalldate',
-                '#erptenderfinalizeddate', '#erploadate', '#erpagreementdate', '#erpworkorderdate', '#erpworkcommenceddate'
-            ];
-
-            let isValid = false;
-
-            // Validate date fields
-            requiredDates.forEach(function (dateFieldSelector) {
-                var dateField = document.querySelector(dateFieldSelector);
-                console.log("Validating:", dateField.value); // Log the value for debugging
-
-                if (!dateField.value || !validateDateFormat(dateField.value)) {
-                    isValid = false;
-                    dateField.classList.add("is-invalid");
-                    return false;
-                } else {
-                    isValid = true;
-                    dateField.classList.remove("is-invalid");
-                }
-            });
-
-            // If form is valid, submit the form
-            if (isValid) {
-                console.log("Form is valid, submitting data...");
-            } else {
-                console.log("Form has errors. Please fill out all required fields.");
-            }
-
-
-            for (let pair of formData.entries()) {
-                console.log(pair[0] + ':', pair[1]); // Log each form field and file
-            }
-
-            $.ajax({
-                url: "/gcc/works/api/estimates/updateERPEstimate",
-                type: "POST",
-                contentType: false,
-                processData: false,
-                data: formData,
-                success: function (response) {
-                    // console.log(formData);
-                    Swal.fire({
-                        title: "Updated!",
-                        text: "Estimate details have been updated successfully.",
-                        icon: "success",
-                        confirmButtonText: "OK",
-                    }).then(() => {
-                        location.reload();
-                    });
-                },
-                error: function (xhr, status, error) {
-                    // console.log(xhr.responseText);
-                    Swal.fire({
-                        title: "Error",
-                        text: "Failed to update estimate. " + xhr.responseText,
-                        icon: "error",
-                        confirmButtonText: "OK",
-                    });
-                }
-            });
-        });
-
-        // Function to show file preview with an edit icon
-        function showPreview(containerId, filePath) {
-            const previewContainer = document.getElementById(containerId);
-            previewContainer.innerHTML = ""; // Clear previous content
-            // console.log(filePath);
-
-            if (!filePath) {
-                previewContainer.innerHTML = "<p>No file available</p>";
-                return;
-            }
-
-            // Check if the filePath is a base64-encoded string
-            if (filePath.startsWith("data:image/")) {
-                // Display image preview from base64 data
-                const imgPreview = document.createElement("img");
-                imgPreview.src = filePath;
-                imgPreview.style.maxWidth = "200px";
-                imgPreview.style.maxHeight = "200px";
-                imgPreview.style.cursor = "pointer";
-                imgPreview.addEventListener("click", () => {
-                    window.open(filePath, "_blank");
-                });
-
-                // Create the edit icon
-                const editIcon = document.createElement("i");
-                editIcon.classList.add("fa", "fa-edit");
-                editIcon.style.cursor = "pointer";
-                editIcon.style.marginLeft = "10px";
-                editIcon.addEventListener("click", function () {
-                    openFileDialog(containerId, filePath); // Trigger file dialog for editing
-                });
-
-                // Append the image preview and edit icon
-                previewContainer.appendChild(imgPreview);
-                previewContainer.appendChild(editIcon);
-            } else {
-                const fileExtension = filePath.split('.').pop().toLowerCase();
-
-                if (["jpg", "jpeg", "png", "gif"].includes(fileExtension)) {
-                    // Display image preview for valid image formats
-                    const imgPreview = document.createElement("img");
-                    imgPreview.src = filePath;
-                    imgPreview.style.maxWidth = "200px";
-                    imgPreview.style.maxHeight = "200px";
-                    imgPreview.style.cursor = "pointer";
-                    imgPreview.addEventListener("click", () => {
-                        window.open(filePath, "_blank");
-                    });
-
-                    // Append the image preview and edit icon
-                    previewContainer.appendChild(imgPreview);
-                } else if (fileExtension === "pdf") {
-                    // Display PDF preview link
-                    const pdfPreview = document.createElement("a");
-                    pdfPreview.href = filePath;
-                    pdfPreview.target = "_blank";
-                    pdfPreview.textContent = "Preview PDF";
-                    pdfPreview.style.display = "block";
-                    pdfPreview.style.color = "blue";
-                    previewContainer.appendChild(pdfPreview);
-                } else {
-                    previewContainer.innerHTML = "<p>Unsupported file format</p>";
-                }
-            }
-        }
-
-        // Function to handle file dialog for editing
-        function openFileDialog(containerId, oldFilePath) {
-            const input = document.createElement('input');
-            input.type = 'file';
-            input.accept = 'image/*'; // Allow image files for editing
-
-            input.addEventListener('change', function (event) {
-                const file = event.target.files[0];
-                if (file) {
-                    const reader = new FileReader();
-                    reader.onload = function (e) {
-                        const newFilePath = e.target.result;
-                        showPreview(containerId, newFilePath);
-                    };
-
-                    reader.readAsDataURL(file); // Convert image to base64
-                }
-            });
-
-            // Trigger the file input click
-            input.click();
-        }
-
-        function formatDate(dateString) {
-            return dateString.split('-').reverse().join('-');
-        }
-
-        $(document).ready(function () {
-            loadScheme();
-            loadCategory();
-            loadSubCategory();
-            loadDepartment();
-            loadSource();
-            loadWardsFilter();
-            loadDepartmentFilter();
-            loadSourceFilter();
-
-        });
-
-        function loadWards() {
-            var zone = document.getElementById("erpzone").value;
-            var wardDropdown = document.getElementById("erpward");
-            wardDropdown.innerHTML = '<option value="" disabled selected>Select a Ward</option>';
-
-            if (zone) {
-                fetch('/gcc/works/wards?zone=' + zone)
-                    .then(response => response.json())
-                    .then(data => {
-                        data.forEach(ward => {
-                            var option = document.createElement("option");
-                            option.value = ward;
-                            option.textContent = ward;
-                            wardDropdown.appendChild(option);
-                        });
-                    })
-                    .catch(error => console.error('Error loading wards:', error));
-            }
-        }
-
-        function loadScheme() {
-            fetch('/gcc/works/api/estimates/getSchemeList')
-                .then(response => response.json())
-                .then(data => {
-                    let schemeDropdown = document.getElementById('erpscheme');
-                    schemeDropdown.innerHTML = '<option value="" disabled selected>Select Scheme</option>'; // Reset dropdown
-
-                    data.forEach(scheme => {
-                        let option = document.createElement('option');
-                        option.value = scheme.name;  // Use ID as the value
-                        option.textContent = scheme.name; // Display Name
-                        schemeDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching schemes:', error));
-        }
-
-        function loadCategory() {
-            fetch('/gcc/works/api/estimates/getCategoryList')
-                .then(response => response.json())
-                .then(data => {
-                    let categoryDropdown = document.getElementById('erpcategory');
-                    categoryDropdown.innerHTML = '<option value="" disabled selected>Select Category</option>'; // Reset dropdown
-
-                    data.forEach(category => {
-                        let option = document.createElement('option');
-                        option.value = category.name;  // Use ID as the value
-                        option.textContent = category.name; // Display Name
-                        categoryDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching Category:', error));
-        }
-
-        function loadSubCategory() {
-            fetch('/gcc/works/api/estimates/getSubCategoryList')
-                .then(response => response.json())
-                .then(data => {
-                    let subCategoryDropdown = document.getElementById('erpsubcategory');
-                    subCategoryDropdown.innerHTML = '<option value="" disabled selected>Select SubCategory</option>'; // Reset dropdown
-
-                    data.forEach(subCategory => {
-                        let option = document.createElement('option');
-                        option.value = subCategory.description;  // Use ID as the value
-                        option.textContent = subCategory.description; // Display Name
-                        subCategoryDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching subCategory:', error));
-        }
-
-        function loadDepartment() {
-            fetch('/gcc/works/api/estimates/getDepartmentList')
-                .then(response => response.json())
-                .then(data => {
-                    let departmentDropdown = document.getElementById('erpdepartment');
-                    departmentDropdown.innerHTML = '<option value="" disabled selected>Select Department</option>'; // Reset dropdown
-
-                    data.forEach(department => {
-                        let option = document.createElement('option');
-                        option.value = department.dept_name;  // Use ID as the value
-                        option.textContent = department.dept_name; // Display Name
-                        departmentDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching Department:', error));
-        }
-
-        function loadSource() {
-            fetch('/gcc/works/api/estimates/getSourceofFundList')
-                .then(response => response.json())
-                .then(data => {
-                    let SourceDropDown = document.getElementById('erpfundsource');
-                    SourceDropDown.innerHTML = '<option value="" disabled selected>Select Source of Fund</option>'; // Reset dropdown
-
-                    data.forEach(source => {
-                        let option = document.createElement('option');
-                        option.value = source.name;  // Use ID as the value
-                        option.textContent = source.name; // Display Name
-                        SourceDropDown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching Department:', error));
-        }
-
-        function loadWardsFilter() {
-            var zone = document.getElementById("zonef").value;
-            var wardDropdown = document.getElementById("wardf");
-            wardDropdown.innerHTML = '<option value="" disabled selected>Select a Ward</option>';
-
-            if (zone) {
-                fetch('/gcc/works/wards?zone=' + zone)
-                    .then(response => response.json())
-                    .then(data => {
-                        data.forEach(ward => {
-                            var option = document.createElement("option");
-                            option.value = ward;
-                            option.textContent = ward;
-                            wardDropdown.appendChild(option);
-                        });
-                    })
-                    .catch(error => console.error('Error loading wards:', error));
-            }
-        }
-
-        function loadDepartmentFilter() {
-            fetch('/gcc/works/api/estimates/getDepartmentList')
-                .then(response => response.json())
-                .then(data => {
-                    let departmentDropdown = document.getElementById('departmentf');
-                    departmentDropdown.innerHTML = '<option value="" disabled selected>Select Department</option>'; // Reset dropdown
-
-                    data.forEach(department => {
-                        let option = document.createElement('option');
-                        option.value = department.dept_name;  // Use ID as the value
-                        option.textContent = department.dept_name; // Display Name
-                        departmentDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching Department:', error));
-        }
-
-        function loadSourceFilter() {
-            fetch('/gcc/works/api/estimates/getSourceofFundList')
-                .then(response => response.json())
-                .then(data => {
-                    let SourceDropDown = document.getElementById('fundsourcef');
-                    SourceDropDown.innerHTML = '<option value="" disabled selected>Select Source of Fund</option>'; // Reset dropdown
-
-                    data.forEach(source => {
-                        let option = document.createElement('option');
-                        option.value = source.name;  // Use ID as the value
-                        option.textContent = source.name; // Display Name
-                        SourceDropDown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching Department:', error));
-        }
-
-
-        function form_btn_enable() {
-            $("#resetFormBtn").prop("disabled", false);
-            $("#requestSubmitBtn").prop("disabled", false);
-            $("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-        }
-
-        function form_btn_disable() {
-            $("#resetFormBtn").prop("disabled", true);
-            $("#requestSubmitBtn").prop("disabled", true);
-            // Show the loading icon on the button
-            $("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-        }
-
-
-        // close button function
-
-        $(document).ready(function () {
-
-            // Initialize the modal with static backdrop and disabled keyboard closing
-            $('#nonErpWorksDetailsModal').modal({
-                backdrop: 'static',
-                keyboard: false,
-                show: false // Ensure it doesn't auto-show on page load
-            });
-
-            // Initialize the modal with static backdrop and disabled keyboard closing
-            $('#erpWorksDetailsModal').modal({
-                backdrop: 'static',
-                keyboard: false,
-                show: false // Ensure it doesn't auto-show on page load
-            });
-
-
-            $('.closebutton').click(function () {
-                $('#nonErpWorksDetailsModal').modal('hide');
-                $('#erpWorksDetailsModal').modal('hide');
-
-            });
-        });
-
-
-        //model show view button function
-
-
-        function fetchEstimateInformation(estimateCode) {
-            $.ajax({
-                url: '/gcc/works/api/estimates/getestimatedetails', // API to fetch employee details
-                type: 'GET',
-                data: {estimateCode: estimateCode}, // Pass EMPLOYEE_CODE as a parameter
-                success: function (response) {
-                    if (response && response.length > 0) {
-
-                        let estimateDetails = response[0]; // Access the first object in the array
-                        // console.log("response:", response);
-
-                        // Populate modal fields
-                        $('#esnumber').val(estimateDetails.estimate_no);
-                        $('#eszone').val(estimateDetails.zone);
-                        $('#esward').val(estimateDetails.ward);
-                        $('#esdate').val(estimateDetails.estimate_date);
-                        $('#esproject').val(estimateDetails.project_name);
-                        $('#eslocation').val(estimateDetails.location);
-                        $('#esdepartment').val(estimateDetails.department);
-                        $('#esamounts').val(estimateDetails.est_amount);
-                        $('#essourcefund').val(estimateDetails.fund_source);
-                        $('#esscheme').val(estimateDetails.scheme);
-                        $('#escategory').val(estimateDetails.category);
-                        $('#essubcategory').val(estimateDetails.sub_category);
-
-
-                        // Update the modal title with the employee code
-                        $('#modalEstimateCode').text(estimateDetails.estimate_no);
-
-                        // Show the modal
-                        $('#viewworksdetailsModal').modal('show');
-
-                    } else {
-                        Swal.fire({
-                            icon: 'info',
-                            title: 'No Data',
-                            text: 'No details found.',
-                            confirmButtonText: 'OK',
-                        });
-                    }
-                },
-                error: function () {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Failed to fetch Estimate details. Please try again.',
-                        confirmButtonText: 'OK',
-                    });
-                },
-            });
-        }
-
-
-        //add works function
-
-        $(document).ready(function () {
-
-            $(document).on('click', '.view-btn', function () {
-                const estimateCode = $(this).data('id'); // Fetch `data-id` value
-
-                // console.log("estimateCode=====" + estimateCode);
-
-                // Hide the receivedcard section before showing the modal
-
-                fetchEstimateDetails(estimateCode); // Call the function to fetch employee details
-                // fetchEstimateworkDetails(estimateCode);
-
-
-            });
-
-
-            // Initialize the modal with static backdrop and disabled keyboard closing
-            $('#returnworksdetailsModal').modal({
-                backdrop: 'static',
-                keyboard: false,
-                show: false // Ensure it doesn't auto-show on page load
-            });
-
-
-            // Handle close button click
-            $('#back').click(function () {
-                $('#returnworksdetailsModal').modal('hide');
-                $("#saveWorks").hide();
-            });
-
-            $('.close').click(function () {
-                $('#returnworksdetailsModal').modal('hide');
-                $('#nonErpWorksDetailsModal').modal('hide');
-                $('#erpWorksDetailsModal').modal('hide');
-                $('#viewworksdetailsModal').modal('hide');
-
-                $("#saveWorks").hide();
-            });
-        });
-
-
-        // Action label  button functionality
-
-        $(document).ready(function () {
-
-            $(document).on('click', '.btn-view', function () {
-                const estimateCode = $(this).data('id'); // Fetch `data-id` value
-
-                // console.log("estimateCode=====" + estimateCode);
-
-                // Hide the receivedcard section before showing the modal
-
-                fetchEstimateInformation(estimateCode); // Call the function to fetch employee details
-
-
-            });
-
-
-            // Initialize the modal with static backdrop and disabled keyboard closing
-            $('#viewworksdetailsModal').modal({
-                backdrop: 'static',
-                keyboard: false,
-                show: false // Ensure it doesn't auto-show on page load
-            });
-
-
-            // Handle close button click
-            $('#backbutton').click(function () {
-                $('#viewworksdetailsModal').modal('hide');
-
-            });
-
-        });
-
-
-        function fetchEstimateDetails(estimateCode) {
-            $.ajax({
-                url: '/gcc/works/api/estimates/getestimatedetails', // API to fetch employee details
-                type: 'GET',
-                data: {estimateCode: estimateCode}, // Pass EMPLOYEE_CODE as a parameter
-                success: function (response) {
-                    if (response && response.length > 0) {
-
-                        let estimateDetails = response[0]; // Access the first object in the array
-                        // console.log("response:", response);
-
-                        // Populate modal fields
-                        $('#estimatenumber').val(estimateDetails.estimate_no);
-                        $('#estimatezone').val(estimateDetails.zone);
-                        $('#estimateward').val(estimateDetails.ward);
-                        $('#estimateddate').val(estimateDetails.estimate_date);
-                        $('#estimateproject').val(estimateDetails.project_name);
-                        $('#estimatelocation').val(estimateDetails.location);
-                        $('#estimatedepartment').val(estimateDetails.department);
-                        $('#estimateamounts').val(estimateDetails.est_amount);
-                        $('#sourcefund').val(estimateDetails.fund_source);
-                        $('#estimatescheme').val(estimateDetails.scheme);
-                        $('#estimatecategory').val(estimateDetails.category);
-                        $('#estimatesubcategory').val(estimateDetails.sub_category);
-
-
-                        // Update the modal title with the employee code
-                        $('#modalEstimateCode').text(estimateDetails.estimate_no);
-
-                        // Show the modal
-                        $('#returnworksdetailsModal').modal('show');
-
-                    } else {
-                        Swal.fire({
-                            icon: 'info',
-                            title: 'No Data',
-                            text: 'No details found.',
-                            confirmButtonText: 'OK',
-                        });
-                    }
-                },
-                error: function () {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Failed to fetch Estimate details. Please try again.',
-                        confirmButtonText: 'OK',
-                    });
-                },
-            });
-        }
-
-
-        $(document).ready(function () {
-            $.ajax({
-                url: "/gcc/works/api/estimates/reasonlist",
-                type: "GET",
-                dataType: "json",
-                success: function (response) {
-                    let reasonDropdown = $("#Reason");
-                    reasonDropdown.empty();
-                    reasonDropdown.append('<option value="">Select Reason</option>');
-                    $.each(response, function (index, reason) {
-                        reasonDropdown.append(`<option value="${reason.reasons}">${reason.reasons}</option>`);
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error("Error loading reasons:", xhr.responseText);
-                }
-            });
-        });
-
-        function toggleRemarks() {
-            var reasonDropdown = document.getElementById("Reason");
-            var remarksContainer = document.getElementById("remarksContainer");
-            var remarksField = document.getElementById("remarks");
-
-            if (reasonDropdown.value.toLowerCase() === "other") {
-                remarksContainer.style.display = "block";
-            } else {
-                remarksContainer.style.display = "none";
-                remarksField.value = ""; // Clear remarks when hidden
-            }
-        }
-
-        /*function updateIconicProjectValue() {
-            let checkbox = document.getElementById("nonErpIconicProject");
-            let hiddenField = document.getElementById("hiddenNonErpIconicProject");
-
-            // If checked, set value to 1, otherwise set to 0
-            hiddenField.value = checkbox.checked ? "1" : "0";
-        }*/
-
-        document.getElementById('fromDate').addEventListener('change', validateEndDate);
-
-        function validateEndDate() {
-            const startDate = document.getElementById('fromDate').value;
-            const endDateInput = document.getElementById('toDate');
-
-            if (startDate) {
-                const startDateObj = new Date(startDate);
-                const minEndDateISO = startDateObj.toISOString().split('T')[0];
-                endDateInput.setAttribute('min', minEndDateISO);
-
-                // Clear endDate if it's less than startDate
-                if (endDateInput.value && new Date(endDateInput.value) < startDateObj) {
-                    endDateInput.value = '';
-                }
-            }
-        }
-
-        $("#filterType").on("change", function () {
-            $("#zonef").val('');
-            $("#wardf").val('');
-            $("#departmentf").val('');
-            $('#fundsourcef').val('');
-            $('#fromDate').val('');
-            $('#toDate').val('');
-            $('#estimateno').val('');
-        });
-
-
-        // save function for dynamic concept
-
-        $(document).ready(function () {
-            $("#saveWorks").hide(); // Initially hide the Save button
-
-
-            $(document).on("click", "#addMore", function () {
-
-                let subCategoryId = $('#estimatesubcategory').val().trim(); // Get Sub-Category Name
-
-                $("#dynamicCardsContainer").show();
-                $("#saveWorks").show();
-
-
-                console.log("subCategoryId", subCategoryId)
-
-                if (!subCategoryId) {
-                    alert("Please select a sub-category first!");
-                    return;
-                }
-
-                // First, fetch the sub-category ID using its name
-               /* $.ajax({
-                    url: "/gcc/works/api/estimates/subcategory/id",
-                    //working one
-                    type: "GET",
-                    data: {name: subCategoryName},
-                    dataType: "json",
-                    success: function (response) {
-                        let subCategoryId = response.subCatId;
-                        console.log("subCategoryId", subCategoryId)
-                        fetchQuestions(subCategoryId);
-                    },
-                    error: function () {
-                        alert("Failed to fetch Sub-Category ID for: " + subCategoryName);
-                    }
-                });*/
-
-                fetchQuestions(subCategoryId);
-            });
-
-
-            function fetchQuestions(subCategoryId) {
-
-                console.log("subCategoryId", subCategoryId)
-
-                $.ajax({
-                    url: "/gcc/works/api/estimates/questions", // Your API endpoint
-                    type: "GET",
-                    data: {subCatId: subCategoryId},  // Passing sub_cat_id dynamically
-                    dataType: "json",
-                    success: function (data) {
-                        console.log("data", data)
-                        displayQuestions(data, subCategoryId);
-                    },
-                    error: function () {
-                        alert("Failed to load questions for Sub-Category ID: " + subCategory);
-                    }
-                });
-            }
-
-
-            function displayQuestions(questions, subCatId) {
-                let uniqueCardId = `card_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-                let formHtml = `<div class="card p-3 mb-3 "  data-subcat="${subCatId}" id="${uniqueCardId}">
-		    	  <button type="button" class="btn btn-danger btn-sm remove-card" data-id="${uniqueCardId}">Remove</button>`;
-
-                let groupedQuestions = {};
-
-                // Grouping questions by question_name
-                questions.forEach(question => {
-                    let key = question.question_name;
-
-                    if (!groupedQuestions[key]) {
-                        groupedQuestions[key] = {
-                            id: question.id,
-                            type: question.input_type_name,
-                            haschild: question.q_haschild,
-                            subCatCode: question.sub_cat_code,
-                            answers: []
-                        };
-                    }
-
-                    groupedQuestions[key].answers.push({
-                        id: question.answer_id,
-                        name: question.answer_name,
-                        haschild: question.a_haschild
-                    });
-                });
-
-                // Generate form fields dynamically
-                Object.keys(groupedQuestions).forEach(key => {
-                    let question = groupedQuestions[key];
-                    let uniqueName = `q_${question.id}_${uniqueCardId}`; // Unique name for each card
-
-                    formHtml += `<div class="form-group">
-		    	                    <label class="fw-bold">${key}</label>`;
-
-
-
-                    // ✅ Check for Length or Width for text and unit combination
-
-
-                    if (key.toLowerCase().includes("length") || key.toLowerCase().includes("width")) {
-                        formHtml += `<div class="input-group" style="max-width: 300px;">
-						                  <input type="text" class="form-control" name="${uniqueName}_value" placeholder="Enter ${key}" style="width: 70%;">
-						                  <select class="form-select" name="${uniqueName}_unit" style="width: 30%;">
-						                    <option value="km">KM</option>
-						                    <option value="m">M</option>
-						                  </select>
-						               </div>`;
-                        /* if (key.toLowerCase().includes("length") || key.toLowerCase().includes("width")) {
-                          formHtml += `<div class="d-flex">
-                                          <input type="text" class="form-control me-2" name="${uniqueName}_value" placeholder="Enter ${key}">
-                                          <select class="form-select" name="${uniqueName}_unit">
-                                            <option value="km">KM</option>
-                                            <option value="m">M</option>
-                                          </select>
-                                        </div>`; */
-                    }else {
-                        switch (question.type) {
-                            case "text":
-                                formHtml += `<input type="text" class="form-control text-answer" name="${uniqueName}" >`;
-                                break;
-
-                            case "radio":
-                                formHtml += `<div class="d-flex flex-wrap">`;
-                                question.answers.forEach(answer => {
-                                    let childClass = answer.haschild ? "child-trigger" : "child-remove";
-                                    formHtml += `<div class="form-check me-3">
-		    	                        <input type="radio" class="form-check-input ${childClass} answer-inputs" name="${uniqueName}" value="${answer.name}"
-		    	                        data-answer-id="${answer.id}" data-haschild="${answer.haschild}" data-hidestatus="${answer.hide_status}">
-		    	                        <label class="form-check-label">${answer.name}</label>
-		    	                    </div>`;
-                                });
-                                formHtml += `</div>`;
-                                break;
-
-                            case "checkbox":
-                                formHtml += `<div class="d-flex flex-wrap">`;
-                                question.answers.forEach(answer => {
-                                    let childClass = answer.haschild ? "child-trigger" : "child-remove";
-                                    formHtml += `<div class="form-check me-3">
-		    	                        <input type="checkbox" class="form-check-input ${childClass} answer-inputs" name="${uniqueName}" value="${answer.name}"
-		    	                        data-answer-id="${answer.id}" data-haschild="${answer.haschild}">
-		    	                        <label class="form-check-label">${answer.name}</label>
-		    	                    </div>`;
-                                });
-                                formHtml += `</div>`;
-                                break;
-
-                            case "dropdown":
-                                formHtml += `<select class="form-select child-trigger" name="${uniqueName}">`;
-                                formHtml += `<option value="">Select</option>`;
-                                question.answers.forEach(answer => {
-                                    formHtml += `<option value="${answer.name}" data-answer-id="${answer.id}" data-haschild="${answer.haschild}"
-		    	          class="${answer.haschild ? 'child-trigger' : 'child-remove'}">${answer.name}</option>`;
-                                });
-                                formHtml += `</select>`;
-                                break;
-
-                            case "textarea":
-                                formHtml += `<textarea class="form-control text-answer" name="${uniqueName}"></textarea>`;
-                                break;
-
-                            case "number":
-                                formHtml += `<input type="number" class="form-control" name="${uniqueName}">`;
-                                break;
-
-                            case "date":
-                                formHtml += `<input type="date" class="form-control" name="${uniqueName}">`;
-                                break;
-                        }
-                    }
-                    formHtml += `</div>`; // Closing form-group div
-                });
-
-                formHtml += `</div>`; // Closing card div
-
-                $("#dynamicCardsContainer").append(formHtml);
-            }
-
-
-            /*function displayQuestions(questions, subCatId) {
-                let formHtml = `<div class="card p-3" data-subcat="${subCatId}">`;
-
-                let groupedQuestions = {};
-
-                // Grouping questions by question_name
-                questions.forEach(question => {
-                    let key = question.question_name;
-
-                    if (!groupedQuestions[key]) {
-                        groupedQuestions[key] = {
-                            id: question.id,
-                            type: question.input_type_name,
-                            haschild: question.q_haschild,
-                            subCatCode: question.sub_cat_code,
-                            answers: []
-                        };
-                    }
-
-                    groupedQuestions[key].answers.push({
-                        id: question.answer_id,
-                        name: question.answer_name,
-                        haschild: question.a_haschild
-                    });
-                });
-
-                // Generate form fields dynamically
-                Object.keys(groupedQuestions).forEach(key => {
-                    let question = groupedQuestions[key];
-
-                    formHtml += `<div class="form-group">
-			                            <label class="fw-bold">${key}</label>`;
-
-                    switch (question.type) {
-                        case "text":
-                            formHtml += `<input type="text" class="form-control text-answer" name="q_${question.id}" >`;
-                            break;
-
-                        case "radio":
-                            formHtml += `<div class="d-flex flex-wrap">`;
-                            question.answers.forEach(answer => {
-                                let childClass = answer.haschild ? "child-trigger" : "child-remove";
-                                formHtml += `<div class="form-check me-3">
-			                                        <input type="radio" class="form-check-input ${childClass} answer-inputs" name="q_${question.id}" value="${answer.name}"
-			                                        data-answer-id="${answer.id}" data-haschild="${answer.haschild}" data-hidestatus="${answer.hide_status}" >
-			                                        <label class="form-check-label">${answer.name}</label>
-			                                    </div>`;
-                            });
-                            formHtml += `</div>`;
-                            break;
-
-                        case "checkbox":
-                            formHtml += `<div class="d-flex flex-wrap">`;
-                            question.answers.forEach(answer => {
-                                let childClass = answer.haschild ? "child-trigger" : "child-remove";
-                                formHtml += `<div class="form-check me-3">
-			                                        <input type="checkbox" class="form-check-input ${childClass} answer-inputs" name="q_${question.id}" value="${answer.name}"
-			                                        data-answer-id="${answer.id}" data-haschild="${answer.haschild}">
-			                                        <label class="form-check-label">${answer.name}</label>
-			                                    </div>`;
-                            });
-                            formHtml += `</div>`;
-                            break;
-
-                        case "dropdown":
-                            formHtml += `<select class="form-select child-trigger" name="q_${question.id}">`;
-                            formHtml += `<option value="">Select</option>`;
-                            question.answers.forEach(answer => {
-                                formHtml += `<option value="${answer.name}" data-answer-id="${answer.id}" data-haschild="${answer.haschild}"
-			                        class="${answer.haschild ? 'child-trigger' : 'child-remove'}">${answer.name}</option>`;
-                            });
-                            formHtml += `</select>`;
-                            break;
-
-                        case "textarea":
-                            formHtml += `<textarea class="form-control text-answer" name="q_${question.id}"></textarea>`;
-                            break;
-
-                        case "number":
-                            formHtml += `<input type="number" class="form-control" name="q_${question.id}">`;
-                            break;
-
-                        case "date":
-                            formHtml += `<input type="date" class="form-control" name="q_${question.id}">`;
-                            break;
-
-
-                    }
-
-                    formHtml += `</div>`; // Closing form-group div
-                });
-
-                formHtml += `</div>`; // Closing card div
-
-                $("#dynamicCardsContainer").append(formHtml);
-
-            }*/
-
-
-            $(document).on("change", ".form-check-input, .form-select", function () {
-                let selectedOption = $(this).find(":selected");
-                let answerId = selectedOption.data("answer-id") || $(this).data("answer-id");
-                let hasChild = selectedOption.data("haschild") || $(this).data("haschild");
-                let parentDiv = $(this).closest(".card");
-                let hideStatus = selectedOption.data("hidestatus") || $(this).data("hidestatus");
-
-                console.log("Selected answerId:", answerId, "Has Child:", hasChild);
-
-                let previousHasChild = parentDiv.data("previous-haschild") || false; // Store previous state
-
-                if (hasChild) {
-                    // If answer has a child, fetch new related questions
-                    fetchRelatedQuestions(answerId, parentDiv);
-                    //parentDiv.data("previous-haschild", true); // Set the flag
-                } else {
-                    if (hideStatus) {
-                        // If the previous answer was also haschild: false, remove child questions
-                        parentDiv.find(".child-questions").remove();
-                    }
-                    //parentDiv.data("previous-haschild", false); // Update the flag
-                }
-            });
-
-
-            function fetchRelatedQuestions(answerId, parentDiv) {
-                $.ajax({
-                    url: `/gcc/works/api/estimates/answerIdd?answerId=${answerId}`, // Your API URL
-                    type: "GET",
-                    dataType: "json",
-                    success: function (response) {
-                        console.log("Fetched Related Questions:", response);
-
-                        if (response && response.length > 0) {
-                            let questionDetails = response[0]; // The first object contains question details
-                            let answers = response.slice(1); // The rest are answers
-                            answers.forEach(answer => console.log(answer));
-
-                            let childHtml = `<div class="child-questions mt-3">
-			                                        <div class="form-group">
-			                                            <label class="fw-bold">${questionDetails.question_name}</label>
-			                                            <div class="d-flex flex-wrap">`;
-
-
-                            // Append answers based on input type
-                            if (questionDetails.input_type_name === "radio") {
-                                answers.forEach(answer => {
-                                    console.log(" radio answer.haschild..." + answer.haschild);
-                                    let childClass = answer.haschild ? "child-trigger" : "child-remove";
-
-                                    childHtml += `<div class="form-check me-3">
-			                                            <input type="radio" class="form-check-input ${childClass} answer-inputs" name="q_${questionDetails.id}" value="${answer.answer_name}"
-			                                            data-answer-id="${answer.AId}" data-haschild="${answer.haschild}" data-hidestatus="${answer.hide_status}">
-			                                            <label class="form-check-label">${answer.answer_name}</label>
-			                                          </div>`;
-                                });
-                            } else if (questionDetails.input_type_name === "checkbox") {
-
-                                answers.forEach(answer => {
-                                    console.log(" checkbox answer.haschild..." + answer.haschild);
-                                    let childClass = answer.haschild ? "child-trigger" : "child-remove";
-                                    childHtml += `<div class="form-check me-3">
-			                                            <input type="checkbox" class="form-check-input ${childClass} answer-inputs" name="q_${questionDetails.id}" value="${answer.answer_name}"
-			                                            data-answer-id="${answer.AId}" data-haschild="${answer.haschild}">
-			                                            <label class="form-check-label">${answer.answer_name}</label>
-			                                          </div>`;
-                                });
-                            } else if (questionDetails.input_type_name === "dropdown") {
-                                childHtml += `<select class="form-select child-trigger" name="q_${questionDetails.id}">
-			                                        <option value="">Select</option>`;
-                                answers.forEach(answer => {
-                                    console.log(" dropdown answer.haschild..." + answer.haschild);
-                                    childHtml += `<option value="${answer.answer_name}" data-answer-id="${answer.AId}" data-haschild="${answer.haschild}"
-			                            class="${answer.haschild ? 'child-trigger' : 'child-remove'}">${answer.answer_name}</option>`;
-                                });
-                                childHtml += `</select>`;
-                            }
-
-                            childHtml += `</div></div></div>`; // Closing tags
-
-                            // Append child questions inside the parent div
-                            parentDiv.append(childHtml);
-                        } else {
-                            console.log("No related questions found.");
-                        }
-                    },
-                    error: function () {
-                        alert("Failed to fetch related questions!");
-                    }
-                });
-            }
-
-
-        });
-
-
-        $("#saveWorks").on("click", function () {
-            let selectedData = [];
-            let subCatId=$('#estimatesubcategory').val();
-            let estimateNumber = $("#estimatenumber").val().trim();
-            // Collect checked answers
-            $(".answer-inputs:checked").each(function () {
-                let questionId = $(this).attr("name").split("_")[1];
-                let answerText = $(this).val();
-                let answerId = $(this).data("answer-id");
-               // let estimateNumber = $("#estimatenumber").val().trim();
-
-                selectedData.push({
-                    questionId: parseInt(questionId),
-                    answerText: answerText,
-                    answerId: parseInt(answerId),
-                    estimateNumber: estimateNumber,
-                    subCatId:subCatId
-                });
-            });
-
-            // Collect text input values
-            $(".text-answer").each(function () {
-                let questionId = $(this).attr("name").split("_")[1];
-                let answerText = $(this).val();
-
-
-                if (answerText.trim() !== "") { // Only add non-empty text inputs
-                    selectedData.push({
-                        questionId: parseInt(questionId),
-                        answerText: answerText,
-                        answerId: null, //No predefined answer ID for text fields
-                        estimateNumber: estimateNumber,
-                        subCatId:subCatId
-
-                    });
-                }
-            });
-
-            // ✅ Collect Length and Width with Units
-            $("input[name$='_value']").each(function () {
-                let questionId = $(this).attr("name").split("_")[1];
-                let answerText = $(this).val();
-                let unit = $(select[name="${$(this).attr('name').replace('_value', '_unit')}"]).val();
-
-                if (answerText.trim() !== "") {
-                    selectedData.push({
-                        questionId: parseInt(questionId),
-                        answerText:`${answerText} ${unit}` ,
-                        answerId: null,
-                        estimateNumber: estimateNumber,
-                        subCatId: subCatId
-                    });
-                }
-            });
-
-            if (selectedData.length === 0) {
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Validation Error',
-                    text: 'No answers selected! Please enter or select at least one answer.',
-                });
-                return;
-            }
-
-            $.ajax({
-                url: "/gcc/works/api/estimates/saveErplist",
-                type: "POST",
-                contentType: "application/json",
-                data: JSON.stringify(selectedData),
-                success:function(response){
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Success!',
-                        text: 'Answers saved successfully!',
-                        allowOutsideClick: false,
-                        confirmButtonText: 'OK',
-                    }).then(() => {
-                        // ✅ Reload Page after OK button click
-                        location.reload();
-                    });
-                },
-                error: function () {
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Error!',
-                    text: 'Failed to save answers. Please try again.',
-                });
-            }
-            });
-        });
-
-
-        // view function for saved data
-
-        $('#returnworksdetailsModal').on('show.bs.modal', function () {
-            $('#dynamicCardsContainer').empty(); // Clear old data before opening
-        });
-
-
-        $(document).on("click", ".view-btn", function () {
-            const estimateNo = $(this).closest('tr').find('td:eq(1)').text().trim();
-            console.log("estimateNo<<<<<<<<< : " + estimateNo);
-            $("#estimatenumber").val(estimateNo);
-            $("#dynamicCardsContainer").empty(); // Clear previous data
-
-
-            // Fetch Saved Data for the Estimate Number
-            $.ajax({
-                url: `/gcc/works/api/estimates/fetchErpData?estimateNumber=${encodeURIComponent(estimateNo)}`,
-                type: "GET",
-                success: function (response) {
-                    console.log("response>>>>>>>>>>>>>>", response)
-                    if (response.length > 0) {
-                        createCardHtml(response);
-                        /* response.forEach((item, index) => {
-                            const cardHtml = createCardHtml([item], item.sub_cat_code); // Pass data as an array
-                            $("#dynamicCardsContainer").append(cardHtml);
-                        }); */
-                    } else {
-                        // alert("No saved data found for this Estimate Number.");
-                    }
-                    $("#returnworksdetailsModal").modal("show"); // Open Modal
-                }
-                ,
-                error: function () {
-                    alert("Failed to fetch saved data.");
-                }
-            });
-        });
-
-
-        const responseData = [];
-
-        function createCardHtml(questions) {
-            const groupedQuestions = {};
-
-            questions.forEach((question) => {
-                const key = question.question_name;
-                if (!groupedQuestions[key]) {
-                    groupedQuestions[key] = {
-                        id: question.question_id,
-                        type: question.name || "text",
-                        answers: [],
-                        answerText: question.answer_text || "",
-                        answerId: question.ans_id,
-                    };
-                }
-                if (question.answer_name !== null) {
-                    groupedQuestions[key].answers.push({
-                        id: question.answer_id,
-                        name: question.answer_name,
-                        isSaved: question.is_saved_answer === 1,
-                    });
-                }
-            });
-
-            let formHtml = "";
-
-            Object.keys(groupedQuestions).forEach((key) => {
-                const question = groupedQuestions[key];
-
-
-                formHtml += `<div class="mb-3"><label class='fw-bold'>${key}</label>`;
-
-                switch (question.type) {
-                    case "radio":
-                        formHtml += `<div class="d-flex flex-wrap">`;
-                        question.answers.forEach((answer) => {
-                            const isChecked = answer.isSaved ? "checked" : "";
-                            formHtml += `<div class="form-check me-3">
-				                            <input type='radio' class='form-check-input' name='q_${question.id}' value='${answer.name}' ${isChecked} disabled>
-				                            <label class='form-check-label'>${answer.name}</label>
-				                          </div>`;
-                        });
-                        formHtml += `</div>`;
-                        break;
-
-                    case "text":
-                        formHtml += `<input type='text' class='form-control' value='${question.answerText}' readonly>`;
-                        break;
-
-                    case "textarea":
-                        formHtml += `<textarea class='form-control' readonly>${question.answerText}</textarea>`;
-                        break;
-                }
-
-                formHtml += `</div>`;
-            });
-
-            $("#dynamicCardsViewContainer").html(formHtml);
-        }
-
-
-        // card remove login
-
-        $(document).on("click", ".remove-card", function () {
-            let cardId = $(this).data("id");
-            $("#" + cardId).remove();
-        });
-
-
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/works/erpworkslist_report.html b/src/main/resources/templates/modules/works/erpworkslist_report.html
deleted file mode 100644
index 8c360991..00000000
--- a/src/main/resources/templates/modules/works/erpworkslist_report.html
+++ /dev/null
@@ -1,878 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<link rel="stylesheet"
-      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
-<link rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .is-invalid {
-        border: 2px solid red !important;
-        background-color: #ffcccc !important;
-    }
-
-    .checkbox-large {
-        width: 20px;
-        height: 20px;
-    }
-
-    .readonly-select {
-        pointer-events: none; /* Prevent user interaction */
-        background-color: #e9ecef; /* Light grey background (like disabled) */
-    }
-</style>
-
-<body>
-<link rel="stylesheet" type="text/css"
-      href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css"/>
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header">
-                    <div class="row align-items-end">
-                        <div class="col-lg-8">
-                            <div class="page-header-title">
-                                <i class="far fa-calendar-plus bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>List of Works</h5>
-                                    <span>ERP Works list</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-4">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item"><a href="index"><i
-                                            class="ik ik-home"></i></a></li>
-                                    <li class="breadcrumb-item" aria-current="page">ERP Works
-                                        list
-                                    </li>
-                                    </li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-
-                <div class="col-md-14">
-                    <div class="card p-3">
-                        <!--  	<form id="downloadForm" action="/gcc/works/api/estimates/downloadexcel" method="GET">-->
-
-                        <div class="row">
-                            <div class="col-md-2">
-                                <label for="filterType">Filter By <font
-                                        style="color: red"></font></label> <select class="form-control"
-                                                                                   id="filterType" name="filterType"
-                                                                                   onchange="handleFilterSelection()">
-                                <option value="" disabled selected>Select Filter
-                                    Option
-                                </option>
-                                <option value="estimateDate">Estimate Date</option>
-
-                            </select>
-                            </div>
-                            <div class="col-md-2" id="estimateDateFields"
-                                 style="display: none;">
-                                <label>From Date <font style="color: red"></font></label> <input
-                                    type="date" id="fromDate" name="fromDate" class="form-control"
-                                    placeholder="From Date">
-                            </div>
-                            <div class="col-md-2" id="estimatetoDateFields"
-                                 style="display: none;">
-                                <label>To Date <font style="color: red"></font></label> <input
-                                    type="date" id="toDate" name="toDate" class="form-control"
-                                    placeholder="To Date">
-
-                            </div>
-
-
-                            <div class="col-md-2">
-                                <label for="zonef">Zone <font style="color: red"></font></label>
-                                <select class="form-control" id="zonef" name="zonef"
-                                        onchange="loadWardsFilter()">
-                                    <option value="" disabled selected>Select Zone</option>
-                                    <option th:each="zone : ${zones}" th:value="${zone}"
-                                            th:text="${zone}"></option>
-                                </select>
-                            </div>
-                            <div class="col-md-2">
-                                <label for="wardf">Ward <font style="color: red"></font></label>
-                                <select class="form-control" id="wardf" name="wardf">
-                                    <option value="" disabled selected>Select Ward</option>
-                                </select>
-                            </div>
-                            <div class="col-md-4">
-                                <label for="departmentf">Department <font
-                                        style="color: red"></font></label> <select class="form-control"
-                                                                                   id="departmentf" name="departmentf">
-                                <option value="" disabled selected>Select Department</option>
-                            </select>
-                            </div>
-                            <div class="col-md-4">
-                                <label for="fundsourcef">Details Source of Fund <font
-                                        style="color: red"></font>
-                                </label> <select class="form-control" id="fundsourcef"
-                                                 name="fundsourcef">
-                                <option value="" disabled selected>Select Scheme</option>
-                            </select>
-                            </div>
-
-                            <div class="col-md-2">
-                                <label for="estimateno">Estimate No </label>
-                                <!--<select class="form-control" id="fundsource" name="fundsource">
-                                        <option value="" disabled selected>Select Scheme</option>
-                                    </select>-->
-                                <input class="form-control" id="estimateno" name="estimateno"
-                                       type="text">
-                            </div>
-
-                            <div class="col-md-2 d-flex align-items-end gap-2">
-                                <button id="submitFilter" class="btn btn-primary">Submit</button>
-                                <button class="btn btn-danger mt-2" onclick="resetpage()"
-                                        name="reset" type="reset">Reset
-                                </button>
-                                <!--<button type="button" class="btn btn-sm btn-success mt-2" name="downloadBtn"
-                                        onclick="downloadExcel()">Download Excel</button>-->
-                            </div>
-                        </div>
-                        </form>
-                    </div>
-                </div>
-                <br>
-                <div class="row">
-                    <div class="card-block">
-                    <div id="tableLoading"></div>
-                        <div>
-                            <table id="worksDatatable"
-                                   class="table table-striped table-bordered table-hover"
-                                   width="99.5%">
-                                <!--			   <button id="exportExcel" class="btn btn-success mb-2">Download Excel</button>
--->
-                                <thead class="thead-dark">
-                                <tr>
-                                    <th>S.No</th>
-                                    <th>Estimate No</th>
-                                    <th>Estimate Date</th>
-                                    <th>Zone</th>
-                                    <th>Ward</th>
-                                    <th>Department</th>
-                                    <th>Category</th>
-                                    <th>Sub Category</th>
-                                    <th>Project Name</th>
-                                    <th>Estimation Amount</th>
-                                    <th>Order Value</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                
-                                </tbody>
-                            </table>
-
-                            <!-- Pagination Controls -->
-                            <div class="pagination-container">
-                                <div
-                                        class="d-flex justify-content-between align-items-center my-3">
-                                    <span id="entriesInfo" class="text-muted"></span>
-                                    <ul id="pagination" class="pagination mb-0"></ul>
-                                </div>
-                                <ul class="pagination justify-content-center"
-                                    style="justify-content: right !important;" id="pagination"></ul>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-</div>
-
-	<div th:replace="~{fragments/modules/works/modal-box :: div}"></div> 
-	
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script th:replace="~{fragments/modules/works/script :: script}"></script>
-    
-    <script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-    <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-    <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-    <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-    <script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-    <script th:inline="javascript">
-        var loginUserID = /*[[${LoginUserId}]]*/'';
-        var createdBy = /*[[${LoginUserId}]]*/'';
-        
-        var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        
-     	// Loading Div id
-    	const loading = $("#tableLoading");
-     	
-    	// DataTables buttons configuration
-        var buttons = [
-        	{
-				extend: 'pageLength',
-				className: 'btn btn-warning'
-			},
-            {
-				title: 'Data export',
-                extend: 'copyHtml5',
-                text: 'Copy',
-                className: 'btn btn-secondary',
-                id: 'copyBtn'
-            },
-            {
-                extend: 'excelHtml5',
-                text: 'Excel',
-                className: 'btn btn-secondary',
-                id: 'excelBtn',
-                title: 'Works List'
-            },
-            {
-                extend: 'csvHtml5',
-                text: 'CSV',
-                className: 'btn btn-secondary',
-                id: 'csvBtn',
-                title: 'Works List'
-            },
-            {
-                extend: 'pdfHtml5',
-                text: 'PDF',
-                className: 'btn btn-secondary',
-                id: 'pdfBtn',
-                title: 'Works List'
-            },
-            {
-                extend: 'print',
-                text: 'Print',
-                className: 'btn btn-secondary',
-                id: 'printBtn',
-                title: 'Works List',
-                exportOptions: {
-                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-                }
-            },
-            {
-				extend: 'colvis',
-				className: 'btn btn-warning'
-			},
-        ];
-		
-    	
-        function call_loading(){
-			loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-		}
-		
-		function remove_loading(){
-			loading.html("");
-		}
-		
-        /* 
-        	===============================================================================================
-        	===============================================================================================
-        */
-        
-        function form_btn_enable() {
-            $("#resetFormBtn").prop("disabled", false);
-            $("#requestSubmitBtn").prop("disabled", false);
-            $("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-        }
-
-        function form_btn_disable() {
-            $("#resetFormBtn").prop("disabled", true);
-            $("#requestSubmitBtn").prop("disabled", true);
-            // Show the loading icon on the button
-            $("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-        }
-
-        document.getElementById('fromDate').addEventListener('change', validateEndDate);
-
-        function validateEndDate() {
-            const startDate = document.getElementById('fromDate').value;
-            const endDateInput = document.getElementById('toDate');
-
-            if (startDate) {
-                const startDateObj = new Date(startDate);
-                const minEndDateISO = startDateObj.toISOString().split('T')[0];
-                endDateInput.setAttribute('min', minEndDateISO);
-
-                // Clear endDate if it's less than startDate
-                if (endDateInput.value && new Date(endDateInput.value) < startDateObj) {
-                    endDateInput.value = '';
-                }
-            }
-        }
-
-        /*
-        =========================================================================================
-        */
-
-        
-        /* Get works data List */
-        function get_erp_works_data_list(){
-        	get_erp_work_data().then(function(erpWorksDataList) {
-    		    // Handle the data list
-    		    generate_table(erpWorksDataList);
-    		    
-    		}).catch(function(error) {
-    		    // Handle errors
-		        if (error && error.message) {
-		            console.error('Error fetching complaint list:', error.message);
-		        } else {
-		            console.error('An error occurred while fetching complaint list:', error);
-		        }
-    		});
-		}
-        
-        /* Get Erp works Data */
-        async function get_erp_work_data() {
-        	
-        	var apiUrl = '/gcc/works/api/estimates/getFilteredERpWorksListByLogin?loginId='+createdBy;
-    	    // Return a Promise
-    	    return new Promise(function(resolve, reject) {
-    	        $.ajax({
-    	            url: apiUrl,
-    	            type: 'GET',
-    	            dataType: 'json',
-    	            success: function(jsonResponse) {
-    	                // Resolve the Promise with the department list
-    	                resolve(jsonResponse);
-    	            },
-    	            error: function(xhr, status, error) {
-    	                // Reject the Promise with the error message
-    	                reject(error);
-    	            }
-    	        });
-    	    });
-        }
-        
-        /* Call DataTable function */
-        function generate_table(data){
-        	
-        	var table = $('#worksDatatable').DataTable({
-        	    dom: 'Bftip',
-        	    deferRender: true,  // Delays rendering of non-visible rows
-        	    columnDefs: [
-        	        { targets: 'no-sort', "orderable": false },
-        	        { targets: 'no-exportable', "exportable": false }
-        	    ],
-        	    lengthMenu: [
-        	        [50, 100, 200, 500, -1],
-        	        ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-        	    ],
-        	    fixedColumns: {
-        	        left: 0,
-        	        right: 0
-        	    },
-        	    buttons: [buttons],
-        	    responsive: false,
-        	    searching: true,
-        	    select: false,
-        	    processing: true, // Enables processing indicator
-        	});
-            
-        	// Clearn Table data
-        	table.clear();
-        	            
-        	// Add rows to DataTable
-        	var rowNum = 1;
-        	$.each(data, function(index, row) {
-        	    actionHTML = row['estimate_no'];
-
-        	    table.row.add([
-        	        rowNum++,
-        	        actionHTML,
-        	        convertdate(row['estimate_date']),
-        	        row['zone'],
-        	        row['ward'],
-        	        row['department'],
-        	        row['category'],
-        	        row['sub_category'],
-        	        row['project_name'],
-        	        row['estimation_amount'],
-        	        row['est_val_with_oh']
-        	    ]);
-        	});
-
-        	// **Call draw() only once**
-        	table.draw(false);
-            
-            // Enable tooltips for all elements with data-toggle="tooltip"
-            $('[data-toggle="tooltip"]').tooltip();
-            remove_loading(); // remove Loading 
-		}
-        
-        
-        function viewUserWorksSummary(estid){
-        	$("#viewWorks").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-			
-			var url = '/gcc/works/user-view-works-details-modal?estid='+estid;
-			$.ajax({
-			    url: url,
-			    type: 'GET',
-			    dataType: 'html',
-			    success: function(data) {
-					$('#viewWorksTitle').html("Works Details");
-			      	$('#viewWorksBoxBody').html(data); // Inject content into modal body
-			    },
-			    error: function(xhr, status, error) {
-			      console.error("Error loading URL:", error);
-			      // Handle error, display a message, etc.
-			    }
-			  });
-			
-			return false;
-		}
-        
-        function updateUserWorksSummary(estid){
-        	$("#viewWorks").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-			
-			var url = '/gcc/works/user-update-works-details-modal?estid='+estid;
-			$.ajax({
-			    url: url,
-			    type: 'GET',
-			    dataType: 'html',
-			    success: function(data) {
-				  $('#viewWorksTitle').html("Works Details");
-			      $('#viewWorksBoxBody').html(data); // Inject content into modal body
-			    },
-			    error: function(xhr, status, error) {
-			      console.error("Error loading URL:", error);
-			      // Handle error, display a message, etc.
-			    }
-			  });
-			
-			return false;
-		}
-        
-        function updateUserWorksStage(estid){
-        	$("#viewWorks").modal({
-			    backdrop: 'static',
-			    keyboard: false
-			}); // Show Modal Box
-			
-			var url = '/gcc/works/update_works_stage_modal?estid='+estid;
-			$.ajax({
-			    url: url,
-			    type: 'GET',
-			    dataType: 'html',
-			    success: function(data) {
-				  $('#viewWorksTitle').html("Add Work Stage");
-			      $('#viewWorksBoxBody').html(data); // Inject content into modal body
-			      get_works_stage_data(estid);
-			    },
-			    error: function(xhr, status, error) {
-			      console.error("Error loading URL:", error);
-			      // Handle error, display a message, etc.
-			    }
-			  });
-			
-			return false;
-		}
-        
-        function formatDBDate(inputDate) {
-            let parts = inputDate.split("-");
-            if (parts.length === 3) {
-                return `${parts[2]}-${parts[1]}-${parts[0]}`; // Convert to YYYY-MM-DD
-            }
-            return inputDate; // Return as-is if format is incorrect
-        }
-        
-        function updateData(){
-        	let formData = new FormData();
-        	
-        	// Append form fields
-            formData.append("estid", estid);
-            formData.append("loginid", loginUserID);
-         	// Append files (only if a file is selected)
-         	
-         	
-         	let projecttype = document.getElementById("projecttype");
-            let projecttypeValue = projecttype.value; // Get selected value
-
-	         // Validate selected
-	         if (!projecttypeValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please select a project type before submission.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-            
-	         formData.set("projecttype", projecttypeValue);
-            
-            let govtfund = document.getElementById("govtfund");
-            let govtfundValue = govtfund.value; // Get selected value
-
-	         // Validate selection
-        	 if (!govtfundValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please select whether the project is government-funded before submission.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-	      	
-	        formData.set("govtfund", govtfundValue);
-            
-	        
-         	let specialcat = document.getElementById("specialcat");
-         	let specialcatValue = specialcat.value; // Get selected value
-
-	         // Validate selection
-	         if (!specialcatValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please select whether the project falls under a special category before submission.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-
-         	// Set the form data
-         	formData.set("specialcat", specialcatValue);
-         	
-         	
-         	// Get date input values
-			let techSanctionDate = $("#erptechsanctiondate").val().trim();
-			let adminSanctionDate = $("#erpadminsanctiondate").val().trim();
-			let tenderCallDate = $("#erptendercalldate").val().trim();
-			let tenderFinalizedDate = $("#erptenderfinalizeddate").val().trim();
-			
-			
-			
-			let loaDate = $("#erploadate").val().trim();
-			let agreementDate = $("#erpagreementdate").val().trim();
-			let workOrderDate = $("#erpworkorderdate").val().trim();
-			let workCommencedDate = $("#erpworkcommenceddate").val().trim();
-			
-			// Convert to Date format
-		    function parseDate(dateStr) {
-		        return dateStr ? new Date(dateStr.split("-").reverse().join("-")) : null;
-		    }
-
-		    let techDate = parseDate(techSanctionDate);
-		    let adminDate = parseDate(adminSanctionDate);
-		    let tenderDate = parseDate(tenderCallDate);
-		    let finalizedDate = parseDate(tenderFinalizedDate);
-		    let loa = parseDate(loaDate);
-		    let agreement = parseDate(agreementDate);
-		    let workOrder = parseDate(workOrderDate);
-		    let workCommenced = parseDate(workCommencedDate);
-		    
-		    //alert(finalizedDate +">"+ tenderDate);
-		    
-		    // Validation checks
-		    if (!adminDate && !techDate) {
-		    	Swal.fire("Missing Dates", "Both Admin and Tech Sanction Dates are required.", "error");
-		        return;
-		    }
-		 
-		 	// Parent-child dependency checks
-		    if (!techDate && (adminDate || tenderDate || finalizedDate || loa || agreement || workOrder || workCommenced)) {
-		        Swal.fire("Error", "Tech Sanction Date is required before entering other dates.", "error");
-		        return;
-		    }
-
-		    if (!adminDate && (tenderDate || finalizedDate || loa || agreement || workOrder || workCommenced)) {
-		        Swal.fire("Error", "Admin Sanction Date is required before entering Tender and later dates.", "error");
-		        return;
-		    }
-
-		    if (!tenderDate && (finalizedDate || loa || agreement || workOrder || workCommenced)) {
-		        Swal.fire("Error", "Tender Call Date is required before entering Finalized and later dates.", "error");
-		        return;
-		    }
-
-		    if (!finalizedDate && (loa || agreement || workOrder || workCommenced)) {
-		        Swal.fire("Error", "Tender Finalized Date is required before entering LOA and later dates.", "error");
-		        return;
-		    }
-
-		    if (!loa && (agreement || workOrder || workCommenced)) {
-		        Swal.fire("Error", "LOA Date is required before entering Agreement and later dates.", "error");
-		        return;
-		    }
-
-		    if (!agreement && (workOrder || workCommenced)) {
-		        Swal.fire("Error", "Agreement Date is required before entering Work Order and later dates.", "error");
-		        return;
-		    }
-
-		    if (!workOrder && workCommenced) {
-		        Swal.fire("Error", "Work Order Date is required before entering Work Commenced Date.", "error");
-		        return;
-		    }
-
-		    // Chronological validations
-		    if (adminDate && techDate && adminDate < techDate) {
-		        Swal.fire("Error", "Admin Sanction Date must be on or after Tech Sanction Date.", "error");
-		        return;
-		    }
-
-		    if (tenderDate && adminDate && tenderDate < adminDate) {
-		        Swal.fire("Error", "Tender Call Date must be on or after Admin Sanction Date.", "error");
-		        return;
-		    }
-
-		    if (finalizedDate && tenderDate && finalizedDate < tenderDate) {
-		        Swal.fire("Error", "Tender Finalized Date must be on or after Tender Call Date.", "error");
-		        return;
-		    }
-
-		    if (loa && finalizedDate && loa < finalizedDate) {
-		        Swal.fire("Error", "LOA Date must be on or after Tender Finalized Date.", "error");
-		        return;
-		    }
-
-		    if (agreement && loa && agreement < loa) {
-		        Swal.fire("Error", "Agreement Date must be on or after LOA Date.", "error");
-		        return;
-		    }
-
-		    if (workOrder && agreement && workOrder <= agreement) {
-		        Swal.fire("Error", "Work Order Date must be after Agreement Date.", "error");
-		        return;
-		    }
-/*
-		    if (workCommenced && workOrder && workCommenced <= workOrder) {
-		        Swal.fire("Error", "Work Commenced Date must be after Work Order Date.", "error");
-		        return;
-		    }
-	*/	    
-		    if (workCommenced && loa && workCommenced < workOrder) {
-		        Swal.fire("Error", "Work Commenced Date must be on or after LOA Date.", "error");
-		        return;
-		    }
-		    /*
-			// Validate if all fields are filled
-			if (!techSanctionDate || !adminSanctionDate || !tenderCallDate || !tenderFinalizedDate ||
-    		!loaDate){
-    		//|| !agreementDate || !workOrderDate || !workCommencedDate) {
-			    Swal.fire({
-			        title: "Error",
-			        text: "All date fields are required before submission.",
-			        icon: "error",
-			        confirmButtonText: "OK"
-			    });
-			    return; // Stop execution if any date is missing
-			}
-			*/
-			
-         	// Get file inputs
-		    let adminSanctionFile = $("#adminsanctionfile")[0].files[0];
-		    let loaFile = $("#loafile")[0].files[0];
-		    let agreementFile = $("#agreementfile")[0].files[0];
-		    let workOrderFile = $("#workorderfile")[0].files[0];
-		/*
-		    // Validate if all files are selected
-		    if (!adminSanctionFile || !loaFile || !agreementFile || !workOrderFile) {
-		        Swal.fire({
-		            title: "Error",
-		            text: "All files are required before submission.",
-		            icon: "error",
-		            confirmButtonText: "OK"
-		        });
-		        return; // Stop execution if any file is missing
-		    }
-		    */
-		 	// Append date to formData
-		    formData.append("techSanctionDate", formatDBDate(techSanctionDate));
-		    formData.append("adminSanctionDate", formatDBDate(adminSanctionDate));
-		    formData.append("tenderCallDate", formatDBDate(tenderCallDate));
-		    formData.append("tenderFinalizedDate", formatDBDate(tenderFinalizedDate));
-		    
-		 	// Append date to formData
-		    formData.append("loaDate", formatDBDate(loaDate));
-		    formData.append("agreementDate", formatDBDate(agreementDate));
-		    formData.append("workOrderDate", formatDBDate(workOrderDate));
-		    formData.append("workCommencedDate", formatDBDate(workCommencedDate));
-		    
-		 	// Append files to formData
-		 	if(adminSanctionFile){
-		 		formData.append("admin_sanction_file", adminSanctionFile);
-			}
-		 	if(loaFile){
-		    	formData.append("loa_file", loaFile);
-		 	}
-		 	if(agreementFile){
-		    	formData.append("agreement_file", agreementFile);
-		 	}
-		 	if(workOrderFile){
-		    	formData.append("work_order_file", workOrderFile);
-		 	}
-            
-            let iconicProjectCheckbox = document.getElementById("isiconic");
-            let iconicProjectValue = iconicProjectCheckbox.checked ? "1" : "0"; // Set 1 if checked, else 0
-            formData.set("isiconic", iconicProjectValue);
-            
-            $.ajax({
-                url: "/gcc/works/api/estimates/updateEstimateWorkDetails",
-                type: "POST",
-                contentType: false,
-                processData: false,
-                data: formData,
-                success: function (response) {
-                    // console.log(formData);
-                    Swal.fire({
-                        title: "Updated!",
-                        text: "Estimate details have been updated successfully.",
-                        icon: "success",
-                        confirmButtonText: "OK",
-                    }).then(() => {
-                        location.reload();
-                    });
-                },
-                error: function (xhr, status, error) {
-                    // console.log(xhr.responseText);
-                    Swal.fire({
-                        title: "Error",
-                        text: "Failed to update estimate." + "Error: " + error + "\nStatus: " + status + "\nResponse: " + xhr.responseText,
-                        icon: "error",
-                        confirmButtonText: "OK",
-                    });
-                }
-            });
-        	
-        }
-        
-        /*
-        	===============================================================
-        */
-        
-        $(document).ready(function () {
-			
-        	/*
-            // Input masking for the desired format
-           
-            $('#mobileno').mask('0000000000');
-
-            // For datetime picker
-            jQuery('#erpestdate').datetimepicker({
-                //minTime:'10:00',
-                //maxTime:'18:01',
-                //minDate: 0, // Today
-                //minDate:'-1970/01/2',
-                //maxDate:'+1970/01/2',
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                //disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erptechsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpadminsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erptendercalldate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erptenderfinalizeddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erploadate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpagreementdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpworkorderdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpworkcommenceddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-			*/
-			
-        	/*
-        	=================================
-        	*/
-            
-        	call_loading();
-            loadWardsFilter();
-            loadDepartmentFilter();
-            loadSourceFilter();
-            get_erp_works_data_list();
-        });
-        
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/works/index.html b/src/main/resources/templates/modules/works/index.html
deleted file mode 100644
index a6f9e638..00000000
--- a/src/main/resources/templates/modules/works/index.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<body>
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header">
-                    <div class="row align-items-end">
-                        <div class="col-lg-8">
-                            <div class="page-header-title">
-                                <i class="ik ik-bar-chart-2 bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>1913 Tax Collection Module</h5>
-                                    <span>Tax collection appication for senior citizen and disability users</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-4">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item">
-                                        <a href="index"><i class="ik ik-home"></i></a>
-                                    </li>
-                                    <li class="breadcrumb-item">1913 Tax Collection</li>
-                                    <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-                <div class="row">
-
-                    <!-- analytic card start - First Tile Start -->
-                    <div class="col-xl-3 col-md-6">
-                        <a href="javascript:void(0)">
-                            <div class="card social-card">
-                                <div class="card-body text-center">
-                                    <h2 class="text-facebook mb-20"><i class="ik ik-layers"></i></h2>
-                                    <h3 class="text-facebook fw-700">6,750</h3>
-                                    <p>Assets</p>
-                                    <p class="mb-0 mt-15">View Assets List<i
-                                            class="fas fa-arrow-right ml-5 f-10 text-facebook"></i></p>
-                                </div>
-                            </div>
-                        </a>
-                    </div>
-                    <div class="col-xl-3 col-md-6">
-                        <a href="javascript:void(0)">
-                            <div class="card social-card">
-                                <div class="card-body text-center">
-                                    <h2 class="text-twitter mb-20"><i class="fas fa-comments"></i></h2>
-                                    <h3 class="text-twitter fw-700">9,752</h3>
-                                    <p>Feedbacks</p>
-                                    <p class="mb-0 mt-15">View Feedbacks List<i
-                                            class="fas fa-arrow-right ml-5 f-10 text-twitter"></i></p>
-                                </div>
-                            </div>
-                        </a>
-                    </div>
-                    <div class="col-xl-3 col-md-6">
-                        <a href="javascript:void(0)">
-                            <div class="card social-card">
-                                <div class="card-body text-center">
-                                    <h2 class="text-green mb-20"><i class="far fa-smile-beam"></i></h2>
-                                    <h3 class="text-green fw-700">8,752</h3>
-                                    <p>Positive Feedbacks</p>
-                                    <p class="mb-0 mt-15">View Positive Feedbacks<i
-                                            class="fas fa-arrow-right ml-5 f-10 text-green"></i></p>
-                                </div>
-                            </div>
-                        </a>
-                    </div>
-                    <div class="col-xl-3 col-md-6">
-                        <a href="javascript:void(0)">
-                            <div class="card social-card">
-                                <div class="card-body text-center">
-                                    <h2 class="text-red mb-20"><i class="far fa-frown"></i></h2>
-                                    <h3 class="text-red fw-700">952</h3>
-                                    <p>Negative Feedbacks</p>
-                                    <p class="mb-0 mt-15">View Negative Feedbacks<i
-                                            class="fas fa-arrow-right ml-5 f-10 text-red"></i></p>
-                                </div>
-                            </div>
-                        </a>
-                    </div>
-                    <!-- First Tile End -->
-
-                    <div class="col-md-12">
-                        <div class="card sale-card">
-                            <div class="card-header">
-                                <h3>Deals Analytics</h3>
-                            </div>
-                            <div class="card-block">
-                                <div id="deal-analytic-chart" class="chart-shadow" style="height:300px"></div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="col-md-12">
-                        <div class="card">
-                            <div class="card-header">
-                                <h3>Page Title</h3>
-                            </div>
-                            <div class="card-block">
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-    </div>
-</div>
-
-<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-
-<script th:replace="~{fragments/modules/base/script :: script}"></script>
-<script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-<script src="node_modules/amcharts3/amcharts/serial.js"></script>
-<script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-<script>
-
-    var chartData = [];
-    var currentDate = new Date();
-    var currentMonth = currentDate.getMonth() + 1;
-    var currentYear = currentDate.getFullYear();
-    var daysInMonth = new Date(currentYear, currentMonth, 0).getDate();
-
-    // Generate random data for each date in the current month
-    for (var i = 1; i <= daysInMonth; i++) {
-        var randomValue1 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-        var randomValue2 = Math.floor(Math.random() * 100); // Replace 100 with the maximum value you want
-
-        var dateString = currentYear + '-' + (currentMonth < 10 ? '0' : '') + currentMonth + '-' + (i < 10 ? '0' : '') + i;
-        var dataPoint = {
-            "date": dateString,
-            "market1": randomValue1,
-            "market2": randomValue2
-        };
-        chartData.push(dataPoint);
-    }
-    // deal-analytic-chart
-    var chart = AmCharts.makeChart("deal-analytic-chart", {
-        "type": "serial",
-        "theme": "light",
-        "dataDateFormat": "YYYY-MM-DD",
-        "precision": 2,
-        "valueAxes": [{
-            "id": "v1",
-            "position": "left",
-            "autoGridCount": false,
-            "labelFunction": function (value) {
-                return "$" + Math.round(value) + "M";
-            }
-        }, {
-            "id": "v2",
-            "gridAlpha": 0,
-            "autoGridCount": false
-        }],
-        "graphs": [{
-            "id": "g1",
-            "valueAxis": "v2",
-            /*"bullet": "round",
-            "bulletBorderAlpha": 1,
-            "bulletColor": "#FFFFFF",
-            "bulletSize": 8,
-            "hideBulletsCount": 50,
-            "lineThickness": 3,
-            "lineColor": "#2ed8b6",*/
-            "lineColor": "#2ed8b6",
-            "fillColors": "#2ed8b6",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Positive Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market1",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }, {
-            "id": "g2",
-            "valueAxis": "v2",
-            //"bullet": "round",
-            //"bulletBorderAlpha": 1,
-            //"bulletColor": "#FFFFFF",
-            //"bulletSize": 8,
-            //"hideBulletsCount": 50,
-            //"lineThickness": 3,
-            //"lineColor": "#e95753",
-            "lineColor": "#F22613",
-            "fillColors": "#F22613",
-            "type": "column",
-            "fillAlphas": 0.3,
-            "columnWidth": 0.5,
-            "title": "Negative Feedback",
-            "useLineColorForBulletBorder": true,
-            "valueField": "market2",
-            "balloonText": "[[[[title]]]]<br /><b style='font-size: 130%'>[[[[value]]]]</b>"
-        }],
-        "chartCursor": {
-            "pan": true,
-            "valueLineEnabled": true,
-            "valueLineBalloonEnabled": true,
-            "cursorAlpha": 0,
-            "valueLineAlpha": 0.2
-        },
-        "categoryField": "date",
-        "categoryAxis": {
-            "parseDates": true,
-            "dashLength": 1,
-            "minorGridEnabled": true
-        },
-        "legend": {
-            "useGraphSettings": true,
-            "position": "top"
-        },
-        "balloon": {
-            "borderThickness": 1,
-            "shadowAlpha": 0
-        },
-        "dataProvider": chartData,
-    });
-</script>
-</body>
-</html>
diff --git a/src/main/resources/templates/modules/works/non-erp-works-add.html b/src/main/resources/templates/modules/works/non-erp-works-add.html
deleted file mode 100644
index e515ff95..00000000
--- a/src/main/resources/templates/modules/works/non-erp-works-add.html
+++ /dev/null
@@ -1,975 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<body>
-<link rel="stylesheet" type="text/css"
-      href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css">
-
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header">
-                    <div class="row align-items-end">
-                        <div class="col-lg-8">
-                            <div class="page-header-title">
-                                <i class="far fa-calendar-plus bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>Non ERP New Entry Form</h5>
-                                    <span>Works Module</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-4">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item"><a href="index"><i
-                                            class="ik ik-home"></i></a></li>
-                                    <li class="breadcrumb-item" aria-current="page">Works
-                                        Module
-                                    </li>
-                                    <li class="breadcrumb-item active" aria-current="page">Non
-                                        ERP - New Entry Form
-                                    </li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-                <div class="row">
-
-
-                    <div class="col-md-12">
-                        <div class="card">
-                            <form class="non-erp-form" id="non-erp-form" method="post"
-                                  onsubmit="return savenonERPform();"
-                                  enctype="multipart/form-data">
-                                <div class="card-header">
-                                    <h3>Non ERP - Add Form</h3>
-                                </div>
-                                <div class="card-body" id="ptaxPersonalInfo">
-                                    <div class="form-group">
-                                        <div class="title text-warning">
-                                            <h5>1. Basic Details</h5>
-                                            <hr>
-                                        </div>
-
-                                        <div class="row">
-                                            <!--<div class="col-md-4">
-                                            <label for="estno">Estimate No <font style="color:red">*</font></label>
-                                            <input type="text" class="form-control" name="estno" id="estno"
-                                                   placeholder="Estimate No" th:value="${temp_id}"
-                                                   autocomplete="off" required readonly>
-                                        </div>-->
-                                            <div class="col-md-4">
-                                                <label for="estdate">Estimate Date <font
-                                                        style="color: red">*</font></label> <input type="text"
-                                                                                                   class="form-control"
-                                                                                                   name="estdate"
-                                                                                                   id="estdate"
-                                                                                                   placeholder="Estimate Date"
-                                                                                                   autocomplete="off"
-                                                                                                   required>
-                                            </div>
-                                            <div class="col-md-2">
-                                                <label for="zone">Zone <font style="color: red">*</font></label>
-                                                <select class="form-control" id="zone" name="zone" onchange="loadWards()" required>
-												    <option value="" disabled selected>Select Zone</option>
-												    <option value="00">00</option>
-												    <option value="01">01</option>
-												    <option value="02">02</option>
-												    <option value="03">03</option>
-												    <option value="04">04</option>
-												    <option value="05">05</option>
-												    <option value="06">06</option>
-												    <option value="07">07</option>
-												    <option value="08">08</option>
-												    <option value="09">09</option>
-												    <option value="10">10</option>
-												    <option value="11">11</option>
-												    <option value="12">12</option>
-												    <option value="13">13</option>
-												    <option value="14">14</option>
-												    <option value="15">15</option>
-												</select>
-                                            </div>
-                                            <div class="col-md-2">
-                                                <label for="ward">Ward <font style="color: red">*</font></label>
-                                                <select class="form-control" id="ward" name="ward" required>
-                                                    <option value="" disabled selected>Select Ward</option>
-                                                </select>
-
-
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="estdate">File Nummber: <font
-                                                        style="color: red">*</font></label> <input type="text"
-                                                                                                   class="form-control"
-                                                                                                   name="filenumber"
-                                                                                                   id="filenumber"
-                                                                                                   placeholder="File Number"
-                                                                                                   autocomplete="off"
-                                                                                                   required>
-                                            </div>
-                                            <!-- vishnuchange -->
-
-
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-8">
-                                                <label for="projectname">Project Description <font
-                                                        style="color: red">*</font></label>
-                                                <textarea class="form-control" name="projectname"
-                                                          id="projectname" placeholder="Project Description"
-                                                          autocomplete="off" required></textarea>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="location">Location <font
-                                                        style="color: red">*</font></label>
-                                                <textarea class="form-control" name="location"
-                                                          id="location" placeholder="Location" autocomplete="off"
-                                                          required></textarea>
-                                            </div>
-
-                                        </div>
-                                        <br>
-                                        <div class="title text-warning">
-                                            <h5>2. Department and Contractor Details</h5>
-                                            <hr>
-                                        </div>
-
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="department">Department <font
-                                                        style="color: red">*</font></label> <select class="form-control"
-                                                                                                    id="department"
-                                                                                                    name="department"
-                                                                                                    required>
-                                                <option value="" disabled selected>Select
-                                                    Department
-                                                </option>
-                                            </select>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="contractorname">Contractor Name <font
-                                                        style="color: red">*</font></label> <input type="text"
-                                                                                                   class="form-control"
-                                                                                                   name="contractorname"
-                                                                                                   id="contractorname"
-                                                                                                   placeholder="Contractor Name"
-                                                                                                   autocomplete="off"
-                                                                                                   required>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="contractorperiod">Contractor Period <font
-                                                        style="color: red">*</font></label> <input type="number"
-                                                                                                   class="form-control"
-                                                                                                   name="contractorperiod"
-                                                                                                   id="contractorperiod"
-                                                                                                   placeholder="Contractor Period"
-                                                                                                   autocomplete="off"
-                                                                                                   required step="1"
-                                                                                                   min="0">
-                                            </div>
-                                        </div>
-
-                                        <br>
-                                        <div class="title text-warning">
-                                            <h5>3. Funding and Scheme Details</h5>
-                                            <hr>
-                                        </div>
-
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="fundsource">Details Source of Fund <font
-                                                        style="color: red">*</font></label> <select class="form-control"
-                                                                                                    id="fundsource"
-                                                                                                    name="fundsource"
-                                                                                                    required>
-                                                <option value="" disabled selected>Select Source
-                                                    of Fund
-                                                </option>
-                                            </select>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="scheme">Scheme<font style="color: red">*</font></label>
-                                                <select class="form-control" id="scheme" name="scheme"
-                                                        required>
-                                                    <option value="" disabled selected>Select Scheme</option>
-                                                </select>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="category">Category<font
-                                                        style="color: red">*</font></label> <select class="form-control"
-                                                                                                    id="category"
-                                                                                                    name="category"
-                                                                                                    required>
-                                                <option value="" disabled selected>Select
-                                                    Category
-                                                </option>
-                                            </select>
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="subcategory">Sub-Category<font
-                                                        style="color: red">*</font></label> <select class="form-control"
-                                                                                                    id="subcategory"
-                                                                                                    name="subcategory"
-                                                                                                    required>
-                                                <option value="" disabled selected>Select
-                                                    SubCategory
-                                                </option>
-                                            </select>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="estamount">Estimation Amount<font
-                                                        style="color: red">*</font></label> <input type="number"
-                                                                                                   class="form-control"
-                                                                                                   name="estamount"
-                                                                                                   id="estamount"
-                                                                                                   placeholder="Estimation Amount"
-                                                                                                   autocomplete="off"
-                                                                                                   required step="1"
-                                                                                                   min="0">
-                                            </div>
-                                        </div>
-                                        <br>
-                                         <div class="title text-warning">
-                                            <h5>4. Project Type Details</h5>
-                                            <hr>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="projecttype">Project Type:<font style="color:red">*</font></label>
-                                                <select name="projecttype" id="projecttype" class="form-control"  style="width: 100%;" required>
-													<option value=""  selected>Select</option>
-													<option value="1">Capital</option>
-													<option value="2">Maintenance</option>
-													<option value="3">Service</option>
-													<option value="4">Consultancy</option>
-												</select>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="govtfund">Govt. Funded Project:<font style="color:red">*</font></label>
-                                                <select name="govtfund" id="govtfund" class="form-control"  style="width: 100%;" required>
-													<option value=""  selected>Select</option>
-													<option value="1">Yes</option>
-													<option value="0">No</option>
-												</select>
-                                            </div>
-                                            
-                                            <div class="col-md-4">
-                                                <label for="specialcat">Special Category:<font style="color:red">*</font></label>
-                                                <select name="specialcat" id="specialcat" class="form-control"  style="width: 100%;" required>
-													<option value=""  selected>Select</option>
-													<option value="1">Yes</option>
-													<option value="0">No</option>
-												</select>
-                                            </div>
-                                        </div>
-                                        
-                                        <br>
-                                        <div class="title text-warning">
-                                            <h5>5. Sanctions and Tender Process</h5>
-                                            <hr>
-                                        </div>
-
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="techsanctiondate">Tech Sanction Date<!-- <font style="color:red">*</font> --></label>
-                                                <input
-                                                        type="text" class="form-control" name="techsanctiondate"
-                                                        id="techsanctiondate" placeholder="Tech Sanction Date"
-                                                        autocomplete="off" required>
-                                            </div>
-                                            <div class="col-md-8"></div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="adminsanctiondate">Admin Sanction Date
-                                                <!--  <font style="color:red">*</font> --></label>
-                                                <input type="text" class="form-control"
-                                                       name="adminsanctiondate" id="adminsanctiondate"
-                                                       placeholder="Admin Sanction Date" autocomplete="off"
-                                                       required>
-                                            </div>
-                                            <div class="col-md-8">
-                                                <label for="adminsanctionfile">Admin Sanction File<!-- <font style="color:red">*</font> --></label>
-                                                <input name="adminsanctionfile" id="adminsanctionfile"
-                                                       class="form-control" type="file" capture="camera"
-                                                       accept="application/pdf, image/*" required>
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="tendercalldate">Tender Called Date<!-- <font style="color:red">*</font> --></label>
-                                                <input type="text" class="form-control" name="tendercalldate"
-                                                       id="tendercalldate" placeholder="Tender Called Date"
-                                                       autocomplete="off">
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="tenderfinalizeddate">Tender Finalized Date <!-- <font style="color:red">*</font> --></label>
-                                                <input type="text" class="form-control"
-                                                       name="tenderfinalizeddate"
-                                                       id="tenderfinalizeddate"
-                                                       placeholder="Tender Finalized Date"
-                                                       autocomplete="off">
-                                            </div>
-                                        </div>
-
-                                        <br>
-                                        <div class="title text-warning">
-                                            <h5>6. Contract and Execution Details</h5>
-                                            <hr>
-                                        </div>
-
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="loadate">LOA Date<!-- <font style="color:red">*</font> --></label>
-                                                <input type="text"
-                                                       class="form-control"
-                                                       name="loadate"
-                                                       id="loadate"
-                                                       placeholder="LOA Date"
-                                                       autocomplete="off">
-                                            </div>
-                                            <div class="col-md-8">
-                                                <label for="loafile">LOA File<!-- <font style="color:red">*</font> --></label>
-                                                <input
-                                                        name="loafile" id="loafile" class="form-control"
-                                                        type="file" capture="camera"
-                                                        accept="application/pdf, image/*" >
-                                            </div>
-                                        </div>
-
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="agreementdate">Agreement Date<!-- <font style="color:red">*</font> --></label> <input
-                                                    type="text" class="form-control" name="agreementdate"
-                                                    id="agreementdate" placeholder="Agreement Date"
-                                                    autocomplete="off">
-                                            </div>
-                                            <div class="col-md-8">
-                                                <label for="agreementfile">Agreement File<!-- <font style="color:red">*</font> --></label> <input
-                                                    name="agreementfile" id="agreementfile"
-                                                    class="form-control" type="file" capture="camera"
-                                                    accept="application/pdf, image/*" >
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="workorderdate">Work Order Date<!-- <font style="color:red">*</font> --></label> <input
-                                                    type="text" class="form-control" name="workorderdate"
-                                                    id="workorderdate" placeholder="Sub-Category"
-                                                    autocomplete="off" >
-                                            </div>
-                                            <div class="col-md-8">
-                                                <label for="workorderfile">Work Order File
-                                                <!-- <font style="color:red">*</font> --></label> <input
-                                                    name="workorderfile" id="workorderfile"
-                                                    class="form-control" type="file" capture="camera"
-                                                    accept="application/pdf, image/*" >
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="workcommenceddate">Work Commenced Date
-                                                <!-- <font style="color:red">*</font> --></label>
-                                                <input type="text" class="form-control"
-                                                       name="workcommenceddate" id="workcommenceddate"
-                                                       placeholder="Work Commenced Date" autocomplete="off" >
-                                            </div>
-                                            <div class="col-md-8">
-                                                <label for="ward"><font style="color: red"> </font></label>
-
-                                                <div style="padding: 10px; font-size: 1.2rem;">
-                                                    <input type="hidden" id="iconicProjectHidden" name="iconicProject"
-                                                           value="0">
-                                                    <input type="checkbox" id="iconicProject" name="iconicProject"
-                                                           value="1" style="width: 20px; height: 20px;">
-                                                    <label for="iconicProject" style="font-size: 1.2rem;">Iconic
-                                                        Project</label>
-                                                </div>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="Reason">Select Reason:</label><font
-                                                    style="color: red">*</font>
-                                                <select id="Reason" name="reason" class="form-control" required>
-                                                    <option value=""></option>
-                                                </select>
-                                            </div>
-
-                                            <div class="col-md-4" id="remarksContainer"
-                                                 style="display: none;">
-                                                <label for="remarks">Remarks</label>
-                                                <textarea class="form-control" id="remarks" name="remarks"
-                                                          placeholder="Enter remarks if needed" required></textarea>
-                                            </div>
-                                            
-                                        </div>
-                                    </div>
-                                    <div class="card-footer text-right">
-                                        <button type="reset" class="btn btn-secondary mr-2">
-                                            <i class="ik ik-refresh-cw"></i>Reset
-                                        </button>
-                                        <button type="submit" class="btn btn-success"
-                                                id="requestSubmitBtn">
-                                            <i class="ik ik-save"></i>Save
-                                        </button>
-                                    </div>
-                                </div>
-                            </form>
-
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-    </div>
-</div>
-
-
-<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-<script th:replace="~{fragments/modules/base/script :: script}"></script>
-<script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-<script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-<script src="node_modules/amcharts3/amcharts/serial.js"></script>
-<script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-<script
-        src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-<script th:inline="javascript">
-    var loginUserID = /*[[${LoginUserId}]]*/'';
-    $(document).ready(function () {
-        // Input masking for the desired format
-        /*$('#ptax').mask('00-000-00000-000');
-        $('#mobileno').mask('0000000000');*/
-
-        // For datetime picker
-        jQuery('#estdate').datetimepicker({
-            //minTime:'10:00',
-            //maxTime:'18:01',
-            //minDate: 0, // Today
-            //minDate:'-1970/01/2',
-            //maxDate:'+1970/01/2',
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            //disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#techsanctiondate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#adminsanctiondate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#tendercalldate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#tenderfinalizeddate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#loadate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#agreementdate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#workorderdate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-
-        jQuery('#workcommenceddate').datetimepicker({
-            timepicker: false, // Disable time picker
-            mask: false,
-            disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-            format: 'd-m-Y', // Date format (you can change it as per your needs)
-            scrollInput: false
-        });
-    });
-
-
-</script>
-<script>
-
-    function validateDateFormat(dateStr) {
-        // Regex to validate date in dd-mm-yyyy format
-        const datePattern = /^\d{2}-\d{2}-\d{4}$/;
-        return datePattern.test(dateStr); // returns true if it matches the format
-    }
-
-    document.addEventListener("DOMContentLoaded", function () {
-        let checkbox = document.getElementById("iconicProject");
-        let hiddenInput = document.getElementById("iconicProjectHidden");
-
-        checkbox.addEventListener("change", function () {
-            if (checkbox.checked) {
-                hiddenInput.disabled = true;  // Prevents 0 from being sent when checked
-            } else {
-                hiddenInput.disabled = false; // Ensures 0 is sent when unchecked
-            }
-        });
-    });
-
-
-    //for restrict other documents ak
-    document.addEventListener("DOMContentLoaded", function () {
-        document.querySelectorAll('input[type="file"]').forEach(input => {
-            input.addEventListener("change", function () {
-                let allowedTypes = ["application/pdf", "image/png", "image/jpeg", "image/jpg"];
-                let file = this.files[0];
-
-                if (file && !allowedTypes.includes(file.type)) {
-                    alert("Only PDF and image files (JPG, JPEG, PNG) are allowed!");
-                    this.value = ""; // Reset file input
-                }
-            });
-        });
-    });
-    document.getElementById("contractorname").addEventListener("input", function () {
-        this.value = this.value.replace(/[^A-Za-z\s]/g, ''); // Remove numbers & special characters
-    });
-
-
-    function loadWards() {
-        var zone = document.getElementById("zone").value;
-        var wardDropdown = document.getElementById("ward");
-        wardDropdown.innerHTML = '<option value="" disabled selected>Select a Ward</option>';
-
-        if (zone) {
-            fetch('/gcc/works/wards?zone=' + zone)
-                .then(response => response.json())
-                .then(data => {
-                    data.forEach(ward => {
-                        var option = document.createElement("option");
-                        option.value = ward;
-                        option.textContent = ward;
-                        wardDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error loading wards:', error));
-        }
-    }
-
-    function loadScheme() {
-        fetch('/gcc/works/api/estimates/getSchemeList')
-            .then(response => response.json())
-            .then(data => {
-                let schemeDropdown = document.getElementById('scheme');
-                schemeDropdown.innerHTML = '<option value="" disabled selected>Select Scheme</option>'; // Reset dropdown
-
-                data.forEach(scheme => {
-                    let option = document.createElement('option');
-                    option.value = scheme.id;  // Use ID as the value
-                    option.textContent = scheme.name; // Display Name
-                    schemeDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching schemes:', error));
-    }
-
-    function loadCategory() {
-        fetch('/gcc/works/api/estimates/getCategoryList')
-            .then(response => response.json())
-            .then(data => {
-                let categoryDropdown = document.getElementById('category');
-                categoryDropdown.innerHTML = '<option value="" disabled selected>Select Category</option>'; // Reset dropdown
-
-                data.forEach(category => {
-                    let option = document.createElement('option');
-                    option.value = category.id;  // Use ID as the value
-                    option.textContent = category.name; // Display Name
-                    categoryDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Category:', error));
-    }
-
-    function loadSubCategory() {
-        fetch('/gcc/works/api/estimates/getSubCategoryList')
-            .then(response => response.json())
-            .then(data => {
-                let subCategoryDropdown = document.getElementById('subcategory');
-                subCategoryDropdown.innerHTML = '<option value="" disabled selected>Select SubCategory</option>'; // Reset dropdown
-
-                data.forEach(subCategory => {
-                    let option = document.createElement('option');
-                    option.value = subCategory.id;  // Use ID as the value
-                    option.textContent = subCategory.description; // Display Name
-                    subCategoryDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching subCategory:', error));
-    }
-
-    function loadDepartment() {
-        fetch('/gcc/works/api/estimates/getDepartmentList')
-            .then(response => response.json())
-            .then(data => {
-                let departmentDropdown = document.getElementById('department');
-                departmentDropdown.innerHTML = '<option value="" disabled selected>Select Department</option>'; // Reset dropdown
-
-                data.forEach(department => {
-                    let option = document.createElement('option');
-                    option.value = department.id;  // Use ID as the value
-                    option.textContent = department.dept_name; // Display Name
-                    departmentDropdown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Department:', error));
-    }
-
-    function loadSource() {
-        fetch('/gcc/works/api/estimates/getSourceofFundList')
-            .then(response => response.json())
-            .then(data => {
-                let SourceDropDown = document.getElementById('fundsource');
-                SourceDropDown.innerHTML = '<option value="" disabled selected>Select Source of Fund</option>'; // Reset dropdown
-
-                data.forEach(source => {
-                    let option = document.createElement('option');
-                    option.value = source.id;  // Use ID as the value
-                    option.textContent = source.name; // Display Name
-                    SourceDropDown.appendChild(option);
-                });
-            })
-            .catch(error => console.error('Error fetching Department:', error));
-    }
-
-    function savenonERPform() {
-
-        var formData = new FormData(document.getElementById("non-erp-form"));
-
-
-        let iconicProjectElement = document.getElementById("iconicProject");
-        let iconicProjectValue = iconicProjectElement.checked ? 1 : 0; // Set 1 if checked, else 0
-
-        formData.append("iconicProject", iconicProjectValue);
-        console.log("Submitting iconicProject:", iconicProjectValue);
-
-        let reasonDropdown = document.getElementById("Reason");
-        let reasonValue = reasonDropdown.value.trim();
-        let remarksElement = document.getElementById("remarks");
-        let remarksValue = remarksElement ? remarksElement.value.trim() : "";
-
-        if (reasonValue.toLowerCase() === "other") {
-            if (!remarksValue) {
-                alert("Please enter remarks when selecting 'Other'");
-                remarksElement.focus();
-                event.preventDefault(); // Prevent form submission
-                return false;
-            }
-        } else {
-            remarksValue = ""; // ✅ Ensure remarks is NULL for predefined reasons
-        }
-
-        // Append updated values to FormData
-        //  let formData = new FormData(this);
-        formData.set("reason", reasonValue); // ✅ "Other" if selected
-        formData.set("remarks", remarksValue); // ✅ Only filled if "Other" is selected
-        
-        formData.set("loginid", loginUserID);
-        
-        var requiredDates = [
-            '#estdate', '#techsanctiondate', '#adminsanctiondate', '#tendercalldate',
-            '#tenderfinalizeddate', '#loadate', '#agreementdate', '#workorderdate', '#workcommenceddate'
-        ];
-
-
-     	// Get date input values
-     	let estDate = $("#estdate").val().trim();
-		let techSanctionDate = $("#techsanctiondate").val().trim();
-		let adminSanctionDate = $("#adminsanctiondate").val().trim();
-		let tenderCallDate = $("#tendercalldate").val().trim();
-		let tenderFinalizedDate = $("#tenderfinalizeddate").val().trim();
-
-		let loaDate = $("#loadate").val().trim();
-		let agreementDate = $("#agreementdate").val().trim();
-		let workOrderDate = $("#workorderdate").val().trim();
-		let workCommencedDate = $("#workcommenceddate").val().trim();
-		
-		// Convert to Date format
-	    function parseDate(dateStr) {
-	        return dateStr ? new Date(dateStr.split("-").reverse().join("-")) : null;
-	    }
-
-	    estDate = parseDate(estDate);
-	    let techDate = parseDate(techSanctionDate);
-	    let adminDate = parseDate(adminSanctionDate);
-	    let tenderDate = parseDate(tenderCallDate);
-	    let finalizedDate = parseDate(tenderFinalizedDate);
-	    let loa = parseDate(loaDate);
-	    let agreement = parseDate(agreementDate);
-	    let workOrder = parseDate(workOrderDate);
-	    let workCommenced = parseDate(workCommencedDate);
-		
-	    if (!estDate) {
-	    	Swal.fire("Missing Dates", "Estimate Date is required.", "error");
-	        return false;
-	    }
-	    /*
-	 	// Validation checks
-	    if (!estDate && !adminDate && !techDate) {
-	    	Swal.fire("Missing Dates", "Estimate, Admin and Tech Sanction Dates are required.", "error");
-	        return false;
-	    }
-		 */
-	 	// Parent-child dependency checks
-	    if (!techDate && (adminDate || tenderDate || finalizedDate || loa || agreement || workOrder || workCommenced)) {
-	        Swal.fire("Error", "Tech Sanction Date is required before entering other dates.", "error");
-	        return false;
-	    }
-
-	    if (!adminDate && (tenderDate || finalizedDate || loa || agreement || workOrder || workCommenced)) {
-	        Swal.fire("Error", "Admin Sanction Date is required before entering Tender and later dates.", "error");
-	        return false;
-	    }
-
-	    if (!tenderDate && (finalizedDate || loa || agreement || workOrder || workCommenced)) {
-	        Swal.fire("Error", "Tender Call Date is required before entering Finalized and later dates.", "error");
-	        return false;
-	    }
-
-	    if (!finalizedDate && (loa || agreement || workOrder || workCommenced)) {
-	        Swal.fire("Error", "Tender Finalized Date is required before entering LOA and later dates.", "error");
-	        return false;
-	    }
-
-	    if (!loa && (agreement || workOrder || workCommenced)) {
-	        Swal.fire("Error", "LOA Date is required before entering Agreement and later dates.", "error");
-	        return false;
-	    }
-
-	    if (!agreement && (workOrder || workCommenced)) {
-	        Swal.fire("Error", "Agreement Date is required before entering Work Order and later dates.", "error");
-	        return false;
-	    }
-
-	    if (!workOrder && workCommenced) {
-	        Swal.fire("Error", "Work Order Date is required before entering Work Commenced Date.", "error");
-	        return false;
-	    }
-
-	    // Chronological validations
-	    if (adminDate && techDate && adminDate < techDate) {
-	        Swal.fire("Error", "Admin Sanction Date must be on or after Tech Sanction Date.", "error");
-	        return false;
-	    }
-
-	    if (tenderDate && adminDate && tenderDate < adminDate) {
-	        Swal.fire("Error", "Tender Call Date must be on or after Admin Sanction Date.", "error");
-	        return false;
-	    }
-
-	    if (finalizedDate && tenderDate && finalizedDate < tenderDate) {
-	        Swal.fire("Error", "Tender Finalized Date must be on or after Tender Call Date.", "error");
-	        return false;
-	    }
-
-	    if (loa && finalizedDate && loa < finalizedDate) {
-	        Swal.fire("Error", "LOA Date must be on or after Tender Finalized Date.", "error");
-	        return false;
-	    }
-
-	    if (agreement && loa && agreement < loa) {
-	        Swal.fire("Error", "Agreement Date must be on or after LOA Date.", "error");
-	        return false;
-	    }
-
-	    if (workOrder && agreement && workOrder <= agreement) {
-	        Swal.fire("Error", "Work Order Date must be after Agreement Date.", "error");
-	        return false;
-	    }
-
-	    if (workCommenced && loa && workCommenced < workOrder) {
-	        Swal.fire("Error", "Work Commenced Date must be on or after LOA Date.", "error");
-	        return false;
-	    }
-	    
-	    let adminSanctionFile = $("#adminsanctionfile")[0].files[0];
-	    let loaFile = $("#loafile")[0].files[0];
-	    let agreementFile = $("#agreementfile")[0].files[0];
-	    let workOrderFile = $("#workorderfile")[0].files[0];
-	    
-	    let missingFiles = [];
-
-	    if (adminDate && !adminSanctionFile) {
-	        missingFiles.push("Admin Sanction File");
-	    }
-	    if (loa && !loaFile) {
-	        missingFiles.push("LOA File");
-	    }
-	    if (agreement && !agreementFile) {
-	        missingFiles.push("Agreement File");
-	    }
-	    if (workOrder && !workOrderFile) {
-	        missingFiles.push("Work Order File");
-	    }
-
-	    if (missingFiles.length > 0) {
-	        Swal.fire({
-	            title: "Error",
-	            html: "Please upload the following required file(s):<br><b>" + missingFiles.join(", ") + "</b>",
-	            icon: "error",
-	            confirmButtonText: "OK"
-	        });
-	        return false;
-	    }
-	    
-        // Submit the form data using AJAX
-        $.ajax({
-            url: "/gcc/works/api/estimates/nonerpForm",
-            type: "POST",
-            data: formData,
-            processData: false,
-            contentType: false,
-            success: function (response) {
-                // console.log("Form submitted successfully:", response);
-                Swal.fire({
-                    title: "Success",
-                    text: "Form submitted successfully. Estimate No: " + response.estNo,
-                    icon: "success",
-                    confirmButtonText: "OK",
-                }).then(() => {
-                    $("#estNo").text(response.estNo);
-
-                    window.location.reload();
-                });
-            },
-            error: function (xhr, status, error) {
-                console.error("Error:", xhr.responseText, error);
-                Swal.fire({
-                    title: "Error",
-                    text: "Failed to submit form: " + xhr.responseText,
-                    icon: "error",
-                    confirmButtonText: "OK",
-                });
-            }
-        });
-
-        return false; // Prevent default form submission
-    }
-
-    $(document).ready(function () {
-        loadScheme();
-        loadCategory();
-        loadSubCategory();
-        loadDepartment();
-        loadSource();
-    });
-
-
-    $(document).ready(function () {
-        $.ajax({
-            url: "/gcc/works/api/estimates/reasonlist",
-            type: "GET",
-            dataType: "json",
-            success: function (response) {
-                let reasonDropdown = $("#Reason");
-                reasonDropdown.empty();
-                reasonDropdown.append('<option value="" disabled selected>Select Reason</option>');
-
-                $.each(response, function (index, reason) {
-                    reasonDropdown.append(`<option value="${reason.reasons}">${reason.reasons}</option>`);
-                });
-
-                // Add "Other" as an extra option at the end
-                // reasonDropdown.append('<option value="Other">Other</option>');
-            },
-            error: function (xhr, status, error) {
-                console.error("Error loading reasons:", xhr.responseText);
-            }
-        });
-    });
-
-    function toggleRemarks() {
-        var reasonDropdown = document.getElementById("Reason");
-        var remarksContainer = document.getElementById("remarksContainer");
-        var remarksField = document.getElementById("remarks");
-
-        if (reasonDropdown.value.toLowerCase() === "other") {
-            remarksContainer.style.display = "block";
-            remarksField.required = true; // Make remarks required when "Other" is selected
-        } else {
-            remarksContainer.style.display = "none";
-            remarksField.required = false;
-            remarksField.value = ""; // Clear remarks when hidden
-        }
-    }
-
-    // Attach event listener for dropdown change
-    document.getElementById("Reason").addEventListener("change", toggleRemarks);
-
-    // Attach the function to the dropdown change event
-    $(document).on("change", "#Reason", function () {
-        toggleRemarks();
-    });
-
-
-
-
-</script>
-</body>
-</html>
diff --git a/src/main/resources/templates/modules/works/nonerpworkslist.html b/src/main/resources/templates/modules/works/nonerpworkslist.html
deleted file mode 100644
index d2e41240..00000000
--- a/src/main/resources/templates/modules/works/nonerpworkslist.html
+++ /dev/null
@@ -1,2716 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css">
-
-
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
-<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .is-invalid {
-        border: 2px solid red !important;
-        background-color: #ffcccc !important;
-    }
-
-    .checkbox-large {
-        width: 20px;
-        height: 20px;
-    }
-
-    #returnworksdetailsModal .modal-body {
-
-        max-height: 80vh;
-        overflow-y: auto;
-    }
-
-    .remove-card {
-        width: 150px; /* Adjust the width as needed */
-        display: block;
-        margin: 10px auto; /* Centers the button */
-    }
-
-
-    .input-group .form-select {
-        max-width: 80px; /* Adjust the width of dropdown */
-    }
-
-    .readonly-select {
-        pointer-events: none; /* Prevent user interaction */
-        background-color: #e9ecef; /* Light grey background (like disabled) */
-    }
-
-</style>
-
-<body>
-<link rel="stylesheet" type="text/css" href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css"/>
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header">
-                    <div class="row align-items-end">
-                        <div class="col-lg-8">
-                            <div class="page-header-title">
-                                <i class="far fa-calendar-plus bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>List of Works</h5>
-                                    <span>Non-ERP Works list</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-4">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item">
-                                        <a href="index"><i class="ik ik-home"></i></a>
-                                    </li>
-                                    <li class="breadcrumb-item" aria-current="page">Non-ERP Works list</li>
-                                    </li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-
-                <div class="col-md-14">
-                    <div class="card p-3">
-                        <!-- <form id="downloadForm" action="/gcc/works/api/estimates/downloadexcel" method="GET"> -->
-
-                        <div class="row">
-                            <div class="col-md-2">
-                                <label for="filterType">Filter By <font style="color:red"></font></label>
-                                <select class="form-control" id="filterType" name="filterType"
-                                        onchange="handleFilterSelection()">
-                                    <option value="" disabled selected>Select Filter Option</option>
-                                    <option value="estimateDate">Estimate Date</option>
-                                    <!--<option value="erpWorks">ERP Works</option>
-                                    <option value="nonErpWorks">Non ERP Works</option>-->
-                                </select>
-                            </div>
-                            <div class="col-md-2" id="estimateDateFields" style="display: none;">
-                                <label>From Date <font style="color:red"></font></label>
-
-                                <input type="date" id="fromDate" name="fromDate" class="form-control"
-                                       placeholder="From Date" required>
-                            </div>
-                            <div class="col-md-2" id="estimatetoDateFields" style="display: none;">
-                                <label>To Date <font style="color:red"></font></label>
-
-                                <input type="date" id="toDate" name="toDate" class="form-control"
-                                       placeholder="To Date" required>
-
-                            </div>
-
-
-                            <div class="col-md-2">
-                                <label for="zonef">Zone <font style="color:red"></font></label>
-                                <select class="form-control" id="zonef" name="zonef" onchange="loadWardsFilter()">
-                                   
-                                    <option value="" disabled selected>Select Zone</option>
-												    <option value="00">00</option>
-												    <option value="01">01</option>
-												    <option value="02">02</option>
-												    <option value="03">03</option>
-												    <option value="04">04</option>
-												    <option value="05">05</option>
-												    <option value="06">06</option>
-												    <option value="07">07</option>
-												    <option value="08">08</option>
-												    <option value="09">09</option>
-												    <option value="10">10</option>
-												    <option value="11">11</option>
-												    <option value="12">12</option>
-												    <option value="13">13</option>
-												    <option value="14">14</option>
-												    <option value="15">15</option>
-                                    </option>
-                                </select>
-                            </div>
-                            <div class="col-md-2">
-                                <label for="wardf">Ward <font style="color:red"></font></label>
-                                <select class="form-control" id="wardf" name="wardf">
-                                    <option value="" disabled selected>Select Ward</option>
-                                </select>
-                            </div>
-                            <div class="col-md-4">
-                                <label for="departmentf">Department <font style="color:red"></font></label>
-                                <select class="form-control" id="departmentf" name="departmentf">
-                                    <option value="" disabled selected>Select Department</option>
-                                </select>
-                            </div>
-                            <div class="col-md-4">
-                                <label for="fundsourcef">Details Source of Fund <font style="color:red"></font>
-                                </label>
-                                <select class="form-control" id="fundsourcef" name="fundsourcef">
-                                    <option value="" disabled selected>Select Scheme</option>
-                                </select>
-                            </div>
-
-                            <div class="col-md-2">
-                                <label for="estimateno">Estimate No </label>
-                                <input class="form-control" id="estimateno" name="estimateno" type="text">
-                            </div>
-
-                            <div class="col-md-2 d-flex align-items-end gap-2">
-                                <button id="submitFilter" class="btn btn-primary">Submit</button>
-                                <button class="btn btn-danger mt-2" onclick="resetpage()" name="reset"
-                                        type="reset">Reset
-                                </button>
-                                <!--<button type="button" class="btn btn-sm btn-success mt-2" name="downloadBtn"
-                                    onclick="downloadExcel()">Download Excel</button>-->
-                            </div>
-                        </div>
-                        </form>
-                    </div>
-                </div>
-                <br>
-                <div class="row">
-                    <div class="card-block">
-                        <div>
-                            <table id="worksDatatable" class="table table-striped table-bordered table-hover"
-                                   role="grid" style="text-align:center;">
-
-                                <thead class="thead-dark">
-                                <tr role="row">
-                                    <th>S.No</th>
-                                    <th>Estimate No</th>
-                                    <th>Estimate Date</th>
-                                    <th>Zone</th>
-                                    <th>Ward</th>
-                                    <th>Category</th>
-                                    <th>Sub Category</th>
-                                    <th>File Number</th>
-                                    <th>Estimation Amount</th>
-                                    <th>Add Works</th>
-                                    <!-- <th>Action</th> -->
-
-                                </tr>
-                                </thead>
-                                <tbody style="text-align:center;">
-                                <tr th:each="work, status : ${workDetails}">
-                                    <!--<td th:text="${work['id']}"></td>-->
-                                    <td th:text="${status.index + 1}"></td>
-                                    <td th:text="${work['estimate_no']}" style="cursor: pointer;"></td>
-                                    <td th:text="${#dates.format(work['estimate_date'], 'dd-MM-yyyy')}"></td>
-                                    <td th:text="${work['zone']}"></td>
-                                    <td th:text="${work['ward']}"></td>
-                                    <td th:text="${work['category']}"></td>
-                                    <td th:text="${work['sub_category']}"></td>
-                                    <td th:text="${work['filenumber']}"></td>
-                                    <td th:text="${work['estimation_amount']}"></td>
-                                    <td>
-                                        <button class="btn btn-primary btn-sm view-btn"
-                                                th:attr="data-id=${work['estimate_no']}">
-                                            Add Works
-                                        </button>
-                                    </td>
-                                    <!-- <td>
-                                        <button class="btn btn-primary btn-sm btn-view"
-                                                th:attr="data-id=${work['estimate_no']}">
-                                            View
-                                        </button>
-                                    </td> -->
-                                </tr>
-                                </tbody>
-                            </table>
-
-                            <!-- Pagination Controls -->
-                            <div class="pagination-container">
-                                <div class="d-flex justify-content-between align-items-center my-3">
-                                    <span id="entriesInfo" class="text-muted"></span>
-                                    <ul id="pagination" class="pagination mb-0"></ul>
-                                </div>
-                                <ul class="pagination justify-content-center"
-                                    style="justify-content: right !important;" id="pagination"></ul>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-        <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-
-    </div>
-</div>
-
-    <!-- add works model box -->
-
-
-    <div class="modal fade" id="returnworksdetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel"
-         aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="detailsModalLabel">
-                        Estimate List(<span id="modalEstimateCode"></span>)
-                    </h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-
-                        <!-- Estimate No -->
-                        <div class="col-md-4">
-                            <label for="estimatenumber" class="form-label fw-bold">Estimate No</label>
-                            <input type="text" id="estimatenumber" class="form-control" readonly>
-                        </div>
-
-                        <!-- Estimate Date -->
-                        <div class="col-md-4">
-                            <label for="estimateddate" class="form-label fw-bold">Estimate Date </label>
-                            <input type="date" id="estimateddate" class="form-control" readonly>
-                        </div>
-
-                        <!-- Zone -->
-                        <div class="col-md-4">
-                            <label for="estimatezone" class="form-label fw-bold">Zone</label>
-                            <input type="text" id="estimatezone" class="form-control" readonly>
-                        </div>
-
-                        <!-- Ward -->
-                        <div class="col-md-4">
-                            <label for="estimateward" class="form-label fw-bold">Ward</label>
-                            <input type="text" id="estimateward" class="form-control" readonly>
-                        </div>
-
-                        <!-- Project Name -->
-                        <div class="col-md-4">
-                            <label for="estimateproject" class="form-label fw-bold">Project Name</label>
-                            <input type="text" id="estimateproject" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- Location -->
-                        <div class="col-md-4">
-                            <label for="estimatelocation" class="form-label fw-bold">Location</label>
-                            <input type="text" id="estimatelocation" class="form-control" readonly>
-                        </div>
-
-                        <!-- Department -->
-                        <div class="col-md-4">
-                            <label for="estimatedepartment" class="form-label fw-bold">Department</label>
-                            <input type="text" id="estimatedepartment" class="form-control" readonly>
-                        </div>
-
-                        <!-- Estimate Amount -->
-                        <div class="col-md-4">
-                            <label for="estimateamounts" class="form-label fw-bold">Estimate Amount</label>
-                            <input type="text" id="estimateamounts" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- source fund -->
-                        <div class="col-md-4">
-                            <label for="sourcefund" class="form-label fw-bold">Source Of Fund</label>
-                            <input type="text" id="sourcefund" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- Scheme -->
-                        <div class="col-md-4">
-                            <label for="estimatescheme" class="form-label fw-bold">Scheme</label>
-                            <input type="text" id="estimatescheme" class="form-control" onclick="this.showPicker()"
-                                   readonly>
-                        </div>
-
-                        <!-- Category -->
-                        <div class="col-md-4">
-                            <label for="estimatecategory" class="form-label fw-bold">Category</label>
-                            <input type="text" id="estimatecategory" class="form-control" readonly></input>
-                        </div>
-
-                        <!-- Sub Category -->
-                        <div class="col-md-4">
-                            <label for="estimatesubcategory" class="form-label fw-bold">Sub-Category</label>
-                            <input type="text" id="estimatesubcategory" class="form-control" readonly></input>
-                        </div>
-
-
-                    </div>
-
-                    <hr>
-
-                    <div class="container mt-4">
-                        <div class="row mb-4">
-                            <div class="col-md-6">
-                                <h5 style="font-weight:bold;">Add Works Details</h5>
-                            </div>
-                            <div class="col-md-6 button-container d-flex justify-content-end">
-                                <button type="button" class="btn btn-primary" id="addMore">Add More</button>
-                            </div>
-                        </div>
-
-                        <div id="dynamicCardsViewContainer"></div>
-                        <div id="dynamicCardsContainer" style="display: none"></div>
-                        <!-- Container for dynamically added cards -->
-
-                        <div class="row mb-2 mt-2">
-                            <div class="col-md-12 d-flex justify-content-center">
-                                <button type="button" class="btn btn-success " style="display: none;" id="saveWorks">
-                                    Save
-                                </button>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <div class="row mb-2 mt-2">
-                        <div class="col-md-12 d-flex justify-content-center">
-                            <button type="button" class="btn btn-secondary" data-dismiss="modal" id="back">Back</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-
-
-    <!-- view model box -->
-    <div class="modal fade" id="viewworksdetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel"
-         aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="detailsModalLabel">
-                        Estimate List(<span id="modalEstimateCode"></span>)
-                    </h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-
-                        <!-- Estimate No -->
-                        <div class="col-md-4">
-                            <label for="esnumber" class="form-label fw-bold">Estimate No</label>
-                            <input type="text" id="esnumber" class="form-control" readonly>
-                        </div>
-
-                        <!-- Estimate Date -->
-                        <div class="col-md-4">
-                            <label for="esdate" class="form-label fw-bold">Estimate Date </label>
-                            <input type="date" id="esdate" class="form-control" readonly>
-                        </div>
-
-                        <!-- Zone -->
-                        <div class="col-md-4">
-                            <label for="eszone" class="form-label fw-bold">Zone</label>
-                            <input type="text" id="eszone" class="form-control" readonly>
-                        </div>
-
-                        <!-- Ward -->
-                        <div class="col-md-4">
-                            <label for="esward" class="form-label fw-bold">Ward</label>
-                            <input type="text" id="esward" class="form-control" readonly>
-                        </div>
-
-                        <!-- Project Name -->
-                        <div class="col-md-4">
-                            <label for="esproject" class="form-label fw-bold">Project Name</label>
-                            <input type="text" id="esproject" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- Location -->
-                        <div class="col-md-4">
-                            <label for="eslocation" class="form-label fw-bold">Location</label>
-                            <input type="text" id="eslocation" class="form-control" readonly>
-                        </div>
-
-                        <!-- Department -->
-                        <div class="col-md-4">
-                            <label for="esdepartment" class="form-label fw-bold">Department</label>
-                            <input type="text" id="esdepartment" class="form-control" readonly>
-                        </div>
-
-                        <!-- Estimate Amount -->
-                        <div class="col-md-4">
-                            <label for="esamounts" class="form-label fw-bold">Estimate Amount</label>
-                            <input type="text" id="esamounts" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- source fund -->
-                        <div class="col-md-4">
-                            <label for="essourcefund" class="form-label fw-bold">Source Of Fund</label>
-                            <input type="text" id="essourcefund" class="form-control" readonly>
-                        </div>
-
-
-                        <!-- Scheme -->
-                        <div class="col-md-4">
-                            <label for="esscheme" class="form-label fw-bold">Scheme</label>
-                            <input type="text" id="esscheme" class="form-control" onclick="this.showPicker()" readonly>
-                        </div>
-
-                        <!-- Category -->
-                        <div class="col-md-4">
-                            <label for="escategory" class="form-label fw-bold">Category</label>
-                            <input type="text" id="escategory" class="form-control" readonly></input>
-                        </div>
-
-                        <!-- Sub Category -->
-                        <div class="col-md-4">
-                            <label for="essubcategory" class="form-label fw-bold">Sub-Category</label>
-                            <input type="text" id="essubcategory" class="form-control" readonly></input>
-                        </div>
-
-
-                    </div>
-                    <div class="row mb-2 mt-2">
-                        <div class="col-md-12 d-flex justify-content-center">
-                            <button type="button" class="btn btn-secondary" data-dismiss="modal" id="backbutton">Back
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-
-
-    <!-- Non ERP Modal Structure -->
-    <div class="modal fade" id="nonErpWorksDetailsModal" tabindex="-1" role="dialog"
-         aria-labelledby="nonErpWorksDetailsModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="nonErpWorksDetailsModalLabel">List of Works Details</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <form id="updateNonErpWorksForm" method="post" enctype="multipart/form-data">
-
-                        <div class="card-body" id="ptaxPersonalInfo">
-                            <div class="form-group">
-                                <div class="title text-warning">
-                                    <h5>1. Basic Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="estno">Estimate No <font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="estno" id="estno"
-                                               placeholder="Estimate No" th:value="${temp_id}" autocomplete="off"
-                                               readonly>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="estdate">Estimate Date <font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="estdate" id="estdate"
-                                               placeholder="Estimate Date" autocomplete="off">
-                                    </div>
-                                    <div class="col-md-2">
-                                        <label for="zone">Zone <font style="color:red">*</font></label>
-                                        <select class="form-control" id="zone" name="zone" onchange="loadWards()"
-                                                required>
-                                            <option value="" disabled selected>Select Zone</option>
-                                            <option th:each="zone : ${zones}" th:value="${zone}" th:text="${zone}">
-                                            </option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-2">
-                                        <label for="ward">Ward <font style="color:red">*</font></label>
-                                        <select class="form-control" id="ward" name="ward" required>
-                                            <option value="" disabled selected>Select Ward</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="projectname">Project Name <font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="projectname" id="projectname"
-                                               placeholder="Project Name" autocomplete="off">
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="location">Location <font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="location" id="location"
-                                               placeholder="Location" autocomplete="off">
-                                    </div>
-									<div class="col-md-4">
-                                        <label for="estno">File Number<font style="color:red">*</font></label>
-                                        <input type="text" class="form-control" name="filenumber" id="filenumber"
-                                               placeholder="File number" th:value="${filenumber}" autocomplete="off"
-                                               >
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>2. Department and Contractor Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="department">Department <font style="color:red">*</font></label>
-                                        <select class="form-control" id="department" name="department" required>
-                                            <option value="" disabled selected>Select Department</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="contractorname">Contractor Name <font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="contractorname"
-                                               id="contractorname" placeholder="Contractor Name" autocomplete="off">
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="contractorperiod">Contractor Period <font style="color:red">*
-                                        </font>
-                                        </label>
-                                        <input type="text" class="form-control" name="contractorperiod"
-                                               id="contractorperiod" placeholder="Contractor Period"
-                                               autocomplete="off">
-                                    </div>
-                                </div>
-
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>3. Funding and Scheme Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="fundsource">Details Source of Fund <font style="color:red">*
-                                        </font>
-                                        </label>
-                                        <select class="form-control" id="fundsource" name="fundsource" required>
-                                            <option value="" disabled selected>Select Scheme</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="scheme">Scheme<font style="color:red">*</font></label>
-                                        <select class="form-control" id="scheme" name="scheme" required>
-                                            <option value="" disabled selected>Select Scheme</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="category">Category<font style="color:red">*</font></label>
-                                        <select class="form-control" id="category" name="category" required>
-                                            <option value="" disabled selected>Select Category</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="subcategory">Sub-Category<font style="color:red">*</font>
-                                        </label>
-                                        <select class="form-control" id="subcategory" name="subcategory" required>
-                                            <option value="" disabled selected>Select SubCategory</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="estamount">Estimation Amount<font style="color:red">*</font>
-                                        </label>
-                                        <input type="text" class="form-control" name="estamount" id="estamount"
-                                               placeholder="Estimation Amount" autocomplete="off">
-                                    </div>
-                                </div>
-                                <br>
-                                         <div class="title text-warning">
-                                            <h5>4. Project Type Details</h5>
-                                            <hr>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <label for="projecttype">Project Type:<font style="color:red">*</font></label>
-                                                <select name="projecttype" id="projecttype" class="form-control"  style="width: 100%;" required>
-													<option value=""  selected>Select</option>
-													<option value="1">Capital</option>
-													<option value="2">Maintenance</option>
-													<option value="3">Service</option>
-													<option value="4">Consultancy</option>
-												</select>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <label for="govtfund">Govt. Funded Project:<font style="color:red">*</font></label>
-                                                <select name="govtfund" id="govtfund" class="form-control"  style="width: 100%;" required>
-													<option value=""  selected>Select</option>
-													<option value="1">Yes</option>
-													<option value="0">No</option>
-												</select>
-                                            </div>
-                                            
-                                            <div class="col-md-4">
-                                                <label for="specialcat">Special Category:<font style="color:red">*</font></label>
-                                                <select name="specialcat" id="specialcat" class="form-control"  style="width: 100%;" required>
-													<option value=""  selected>Select</option>
-													<option value="1">Yes</option>
-													<option value="0">No</option>
-												</select>
-                                            </div>
-                                        </div>
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>5. Sanctions and Tender Process</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="techsanctiondate">Tech Sanction Date <!-- <font style="color:red">*</font> --></label>
-                                        <input type="text" class="form-control" name="techsanctiondate"
-                                               id="techsanctiondate" placeholder="Tech Sanction Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                    <div class="col-md-8">
-
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="adminsanctiondate">Admin Sanction Date<!-- <font style="color:red">*</font> --></label>
-                                        <input type="text" class="form-control" name="adminsanctiondate"
-                                               id="adminsanctiondate" placeholder="Admin Sanction Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>Admin Sanction File<!-- <font style="color:red">*</font> --></label>
-                                        <input name="adminsanctionfile" id="adminsanctionfile" class="form-control"
-                                               type="file" capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="adminsanctionfilePreview"></div>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="tendercalldate">Tender Called Date<!-- <font style="color:red">*</font> -->
-                                        </label>
-                                        <input type="text" class="form-control" name="tendercalldate"
-                                               id="tendercalldate" placeholder="Tender Called Date" autocomplete="off"
-                                               required>
-                                    </div>
-                                    <div class="col-md-4">
-                                        <label for="tenderfinalizeddate">Tender Finalized Date <!-- <font style="color:red">*</font> --></label>
-                                        <input type="text" class="form-control" name="tenderfinalizeddate"
-                                               id="tenderfinalizeddate" placeholder="Tender Finalized Date"
-                                               autocomplete="off" required>
-                                    </div>
-                                </div>
-
-                                <br>
-                                <div class="title text-warning">
-                                    <h5>6. Contract and Execution Details</h5>
-                                    <hr>
-                                </div>
-
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="loadate">LOA Date<!-- <font style="color:red">*</font> --></label>
-                                        <input type="text" class="form-control" name="loadate" id="loadate"
-                                               placeholder="LOA Date" autocomplete="off" required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>LOA File<!-- <font style="color:red">*</font> --></label>
-                                        <input name="loafile" id="loafile" class="form-control" type="file"
-                                               capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="loafilePreview"></div>
-                                    </div>
-                                </div>
-
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="agreementdate">Agreement Date<!-- <font style="color:red">*</font> -->
-                                        </label>
-                                        <input type="text" class="form-control" name="agreementdate"
-                                               id="agreementdate" placeholder="Agreement Date" autocomplete="off"
-                                               required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>Agreement File<!-- <font style="color:red">*</font> -->
-                                        </label>
-                                        <input name="agreementfile" id="agreementfile" class="form-control"
-                                               type="file" capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="agreementfilePreview"></div>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="workorderdate">Work Order Date<!-- <font style="color:red">*</font> -->
-                                        </label>
-                                        <input type="text" class="form-control" name="workorderdate"
-                                               id="workorderdate" placeholder="Sub-Category" autocomplete="off"
-                                               required>
-                                    </div>
-                                    <div class="col-md-8">
-                                        <label>Work Order File<!-- <font style="color:red">*</font> -->
-                                        </label>
-                                        <input name="workorderfile" id="workorderfile" class="form-control"
-                                               type="file" capture="camera" accept="application/pdf, image/*" required>
-
-                                        <div id="workorderfilePreview"></div>
-                                    </div>
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-md-4">
-                                        <label for="workcommenceddate">Work Commenced Date<!-- <font style="color:red">*</font> --></label>
-                                        <input type="text" class="form-control" name="workcommenceddate"
-                                               id="workcommenceddate" placeholder="Work Commenced Date"
-                                               autocomplete="off" required>
-                                    </div>
-
-									<div class="col-md-4 d-flex align-items-center">
-                                        <label for="nonErpIconicProject">Iconic Project</label>
-
-                                        <!-- Hidden input ensures "0" is sent when unchecked -->
-                                        <input type="checkbox" id="nonErpIconicProject" class="mr-2 checkbox-large"
-                                               th:checked="${work != null and work['iconic_project'] != null and work['iconic_project'] == 1}"
-                                               onchange="updateIconicProjectValue()">
-
-                                        <!-- Hidden input to store actual value (0 or 1) -->
-                                        <input type="hidden" id="hiddenNonErpIconicProject" name="nonErpIconicProject"
-                                               th:value="${work != null and work['iconic_project'] != null and work['iconic_project'] == true ? 1 : 0}">
-                                    </div>
-                                    
-                                    <div class="col-md-4">
-                                        <label for="Reason">Select Reason <font style="color:red">*
-                                        </font></label>
-                                        <select id="Reason" name="reason" class="form-control"
-                                                onchange="toggleRemarks()">
-                                            <option value="">Select Reason</option>
-                                            <option th:each="reason : ${reasons}" th:value="${reason.reasons}"
-                                                    th:text="${reason.reasons}"></option>
-                                        </select>
-
-                                    </div>
-                                    <div class="col-md-4" id="remarksContainer"
-                                         style="display: none;">
-                                        <label for="remarks">Remarks <font style="color:red">*
-                                        </font></label>
-                                        <textarea class="form-control" id="remarks" name="remarks"
-                                                  placeholder="Enter remarks if needed"></textarea>
-                                    </div>
-                                    <!-- <div class="col-md-4">
-                                 <label for="workcommenceddate">Work Description<font style="color:red">*</font>
-                                 </label>
-                                 <input type="text" class="form-control" name="worksdesc" id="worksdesc"
-                                        autocomplete="off" readonly>
-
-                             </div>-->
-
-                                </div>
-                            </div>
-                        </div>
-
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" id="updateEstimate" class="btn btn-primary">Update</button>
-                    <button type="button" class="btn btn-secondary closebutton" data-dismiss="modal">Close</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-    <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-    <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-    <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-
-
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/perfect-scrollbar/1.5.5/perfect-scrollbar.min.js"></script>
-
-    <!-- Bootstrap Bundle with Popper -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-
-    <script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-
-    <script th:inline="javascript">
-
-
-    var loginUserID = /*[[${LoginUserId}]]*/'';
-    var createdBy = /*[[${LoginUserId}]]*/'';
-    
-    var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-    
- 	// Loading Div id
-	const loading = $("#tableLoading");
- 	
-	// DataTables buttons configuration
-    var buttons = [
-    	{
-			extend: 'pageLength',
-			className: 'btn btn-warning'
-		},
-        {
-			title: 'Data export',
-            extend: 'copyHtml5',
-            text: 'Copy',
-            className: 'btn btn-secondary',
-            id: 'copyBtn'
-        },
-        {
-            extend: 'excelHtml5',
-            text: 'Excel',
-            className: 'btn btn-secondary',
-            id: 'excelBtn',
-            title: 'Works List'
-        },
-        {
-            extend: 'csvHtml5',
-            text: 'CSV',
-            className: 'btn btn-secondary',
-            id: 'csvBtn',
-            title: 'Works List'
-        },
-        {
-            extend: 'pdfHtml5',
-            text: 'PDF',
-            className: 'btn btn-secondary',
-            id: 'pdfBtn',
-            title: 'Works List'
-        },
-        {
-            extend: 'print',
-            text: 'Print',
-            className: 'btn btn-secondary',
-            id: 'printBtn',
-            title: 'Works List',
-            exportOptions: {
-                columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-            }
-        },
-        {
-			extend: 'colvis',
-			className: 'btn btn-warning'
-		},
-    ];
-	
-	
-    function call_loading(){
-		loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-	}
-	
-	function remove_loading(){
-		loading.html("");
-	}
-	
-	/* Get works data List */
-    function get_erp_works_data_list(){
-    	get_erp_work_data().then(function(erpWorksDataList) {
-		    // Handle the data list
-		    generate_table(erpWorksDataList);
-		    
-		}).catch(function(error) {
-		    // Handle errors
-	        if (error && error.message) {
-	            console.error('Error fetching ERP Data list:', error.message);
-	        } else {
-	            console.error('An error occurred while fetching ERP Data list:', error);
-	        }
-		});
-	}
-    
-    /* Get Erp works Data */
-    async function get_erp_work_data() {
-    	
-    	var apiUrl = '/gcc/works/api/estimates/getFilteredERpWorksList?loginId='+createdBy;
-	    // Return a Promise
-	    return new Promise(function(resolve, reject) {
-	        $.ajax({
-	            url: apiUrl,
-	            type: 'GET',
-	            dataType: 'json',
-	            success: function(jsonResponse) {
-	                // Resolve the Promise with the department list
-	                resolve(jsonResponse);
-	            },
-	            error: function(xhr, status, error) {
-	                // Reject the Promise with the error message
-	                reject(error);
-	            }
-	        });
-	    });
-    }
-    
-    /* Call DataTable function */
-    function generate_table(data){
-    	
-    	var table = $('#worksDatatable').DataTable({
-    	    dom: 'Bftip',
-    	    deferRender: true,  // Delays rendering of non-visible rows
-    	    columnDefs: [
-    	        { targets: 'no-sort', "orderable": false },
-    	        { targets: 'no-exportable', "exportable": false }
-    	    ],
-    	    lengthMenu: [
-    	        [50, 100, 200, 500, -1],
-    	        ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-    	    ],
-    	    fixedColumns: {
-    	        left: 0,
-    	        right: 0
-    	    },
-    	    buttons: [buttons],
-    	    responsive: false,
-    	    searching: true,
-    	    select: false,
-    	    processing: true, // Enables processing indicator
-    	});
-        
-    	// Clearn Table data
-    	table.clear();
-    	            
-    	// Add rows to DataTable
-    	var rowNum = 1;
-    	$.each(data, function(index, row) {
-    	    actionHTML = `<div class="dropdown d-inline-block show">
-    	                     <a class="nav-link dropdown-toggle text-warning" href="#" id="moreDropdown" role="button" 
-    	                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-animation="true" 
-    	                    data-placement="top" data-html="true" title="`+row['ESTIMATE_NO']+`" >`+row['ESTIMATE_NO']+`</a>
-    	                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-    	                    	<a class="dropdown-item" href="" onclick="return viewWorksSummary('`+row['id']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Full Details"><i class="ik ik-printer"></i> View Details</a>
-    	                    	<a class="dropdown-item" href="" onclick="return updateWorksSummary('`+row['id']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Update Details"><i class="ik ik-edit"></i> Update Details</a>
-    	                    </div>
-    	              </div>`;
-
-    	    table.row.add([
-    	        rowNum++,
-    	        actionHTML,
-    	        convertdate(row['ESTIMATE_DATE']),
-    	        row['ZONE'],
-    	        row['WARD'],
-    	        row['DEPARTMENT_NAME'],
-    	        row['CATEGORY'],
-    	        row['SUB_CATEGORY'],
-    	        row['PROJECT_NAME']
-    	    ]);
-    	});
-
-    	// **Call draw() only once**
-    	table.draw(false);
-        
-        // Enable tooltips for all elements with data-toggle="tooltip"
-        $('[data-toggle="tooltip"]').tooltip();
-        remove_loading(); // remove Loading 
-	}
-    
-    
-	
-        $(document).ready(function () {
-            // Input masking for the desired format
-            /*$('#ptax').mask('00-000-00000-000');
-            $('#mobileno').mask('0000000000');*/
-
-            // For datetime picker
-            jQuery('#estdate').datetimepicker({
-                //minTime:'10:00',
-                //maxTime:'18:01',
-                //minDate: 0, // Today
-                //minDate:'-1970/01/2',
-                //maxDate:'+1970/01/2',
-                timepicker: false, // Disable time picker
-                mask: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                //disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#techsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#adminsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#tendercalldate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#tenderfinalizeddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#loadate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#agreementdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#workorderdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#workcommenceddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-        });
-
-
-        function searchRequest() {
-            displayEstInfo();
-            return false;
-        }
-
-        function validateDateFormat(dateStr) {
-            // Regex to validate date in dd-mm-yyyy format
-            const datePattern = /^\d{2}-\d{2}-\d{4}$/;
-            return datePattern.test(dateStr); // returns true if it matches the format
-        }
-
-        $(document).ready(function () {
-            var rowsPerPage = 50;
-            var rows;
-            var totalRows;
-            var totalPages;
-            var currentPage = 1;
-
-            function showPage(page) {
-                var start = (page - 1) * rowsPerPage;
-                var end = Math.min(start + rowsPerPage, totalRows);
-                rows.hide().slice(start, end).show();
-                $("#entriesInfo").text(`Showing ${start + 1}-${end} of ${totalRows} entries`);
-            }
-
-            function setupPagination() {
-                $("#pagination").empty();
-
-                if (totalPages <= 1) return; // Hide pagination if only 1 page
-
-                var prevDisabled = currentPage === 1 ? "disabled" : "";
-                var nextDisabled = currentPage === totalPages ? "disabled" : "";
-
-                // First button
-                $("#pagination").append(`<li class="page-item ${prevDisabled}"><a class="page-link" href="#" data-page="1">«</a></li>`);
-
-                // Previous button
-                $("#pagination").append(`<li class="page-item ${prevDisabled}"><a class="page-link" href="#" data-page="${currentPage - 1}">‹</a></li>`);
-
-                // Page numbers
-                for (var i = 1; i <= totalPages; i++) {
-                    var activeClass = i === currentPage ? "active" : "";
-                    $("#pagination").append(`<li class="page-item ${activeClass}"><a class="page-link" href="#" data-page="${i}">${i}</a></li>`);
-                }
-
-                // Next button
-                $("#pagination").append(`<li class="page-item ${nextDisabled}"><a class="page-link" href="#" data-page="${currentPage + 1}">›</a></li>`);
-
-                // Last button
-                $("#pagination").append(`<li class="page-item ${nextDisabled}"><a class="page-link" href="#" data-page="${totalPages}">»</a></li>`);
-            }
-
-            $(document).on("click", "#pagination li a", function (event) {
-                event.preventDefault();
-                var page = parseInt($(this).attr("data-page"));
-                if (!isNaN(page) && page >= 1 && page <= totalPages) {
-                    currentPage = page;
-                    showPage(currentPage);
-                    setupPagination();
-                }
-            });
-
-
-            $("#submitFilter").on("click", function () {
-                var zone = $("#zonef").val();
-                var ward = $("#wardf").val();
-                var department = $("#departmentf").val();
-                var fundsource = $('#fundsourcef').val();
-                var fromDate = $('#fromDate').val();
-                var toDate = $('#toDate').val();
-                var filterType = $('#filterType').val();
-                var estno = $('#estimateno').val();
-
-                var filterDropdown = document.getElementById("filterType");
-
-                if (filterDropdown.value === "estimateDate" && (!fromDate || !toDate)) {
-                    Swal.fire({
-                        icon: "warning",
-                        title: "Date Required",
-                        text: "Please select Both From date and To Date",
-                        confirmButtonText: "OK",
-                    });
-                } else {
-                    $.ajax({
-                        url: "/gcc/works/api/estimates/getFilteredWorks",
-                        type: "GET",
-                        data: {
-                            zone: zone,
-                            ward: ward,
-                            department: department,
-                            fundsource: fundsource,
-                            fromDate: fromDate,
-                            toDate: toDate,
-                            filterType: filterType,
-                            estno: estno
-                        },
-                        success: function (data) {
-                            updateTable(data);
-                        }
-                    });
-                }
-            });
-
-            function updateTable(data) {
-                var tbody = $("#worksDatatable tbody");
-                tbody.empty(); // Clear existing rows
-
-                if (data.length === 0) {
-                    tbody.append("<tr><td colspan='14' class='text-center'>No data found</td></tr>");
-                    $("#entriesInfo").text("Showing 0 of 0 entries");
-                    $("#pagination").empty(); // Remove pagination when no results
-                    return;
-                }
-
-                data.forEach(function (work, index) {
-                    var row = `<tr>
-			                <td>${index + 1}</td>
-			                <td>${work.estimate_no}</td>
-			                <td>${work.estimate_date}</td>
-			                <td>${work.zone}</td>
-			                <td>${work.ward}</td>
-			                <td>${work.category}</td>
-			                <td>${work.sub_category}</td>
-			                <td>${work.filenumber}</td>
-			                <td>
-                        <button class="btn btn-primary btn-sm view-btn" data-id="${work.estimate_no}">
-                            Add Works
-                        </button>
-                    </td>
-                    <!--<td>
-                        <button class="btn btn-primary btn-sm btn-view" data-id="${work.estimate_no}">
-                            View
-                        </button>-->
-                    </td>
-			            </tr>`;
-                    tbody.append(row);
-                });
-
-                // Update pagination values
-                rows = $("#worksDatatable tbody tr"); // Get the updated rows
-                totalRows = rows.length;
-                totalPages = Math.ceil(totalRows / rowsPerPage) || 1;
-                currentPage = 1; // Reset to first page
-
-                showPage(currentPage);
-                setupPagination();
-            }
-
-
-            // Initial pagination setup
-            rows = $("#worksDatatable tbody tr");
-            totalRows = rows.length;
-            totalPages = Math.ceil(totalRows / rowsPerPage) || 1;
-            showPage(currentPage);
-            setupPagination();
-        });
-
-        function resetpage() {
-            window.location.href = "/gcc/works/nonerpworkslist";
-        }
-
-        function handleFilterSelection() {
-            var filterDropdown = document.getElementById("filterType");
-            var estimateDateFields = document.getElementById("estimateDateFields");
-
-            if (filterDropdown.value === "estimateDate") {
-                estimateDateFields.style.display = "block";
-                estimatetoDateFields.style.display = "block";
-
-            } else {
-                estimateDateFields.style.display = "none";
-                estimatetoDateFields.style.display = "none";
-
-            }
-        }
-
-        function downloadExcel() {
-            const form = document.getElementById('downloadForm');
-
-            // Explicitly get the form element by ID to avoid conflicts
-            if (form && form.tagName.toLowerCase() === 'form') {
-                // Use the HTMLFormElement prototype to call submit directly to avoid any shadowing issues
-                HTMLFormElement.prototype.submit.call(form);
-            } else {
-                console.error('The element with id "downloadForm" is not a form.');
-            }
-        }
-
-        $('#worksDatatable').on('click', 'td:nth-child(2)', function () {
-            var estimateNo = $(this).text().trim();
-            $.ajax({
-                url: '/gcc/works/api/estimates/fetchnonerpdetails',
-                method: 'GET',
-                data: {estimateNo: estimateNo},
-                success: function (response) {
-
-                    /*if (response.status === "NonErp") {*/
-                        // Populate Non-ERP Works Form
-
-                    $('#nonErpIconicProject').prop('checked', response.iconic_project == 1);
-                    $('#hiddenNonErpIconicProject').val(response.iconic_project ? "1" : "0");
-
-                    $('#nonErpIconicProject').prop('disabled', false); // ✅ Editable in Non-ERP
-                        $('#Reason').val(response.reason || ""); // Set Reason
-                        $('#remarks').val(response.remarks || ""); // Set Remarks
-
-                        /*if (response.status === "NonErp") {*/
-                            // ✅ Populate Non-ERP form
-                            $('#nonErpIconicProject').prop('checked', response.iconic_project == 1);
-                            $('#hiddenNonErpIconicProject').val(response.iconic_project == 1 ? "1" : "0");
-
-                            $('#Reason').val(response.reason || ""); // Populate reason dropdown
-                            $('#remarks').val(response.remarks || ""); // Populate remarks field
-
-                            if (response.reason && response.reason.toLowerCase() === "other") {
-                                $('#remarksContainer').show();
-                            } else {
-                                $('#remarksContainer').hide();
-                            }
-
-                            // Show modal
-                            $('#nonErpWorksDetailsModal').modal('show');
-                        /*} else {*/
-                            // ✅ Populate ERP form (Iconic Project is read-only)
-                            $('#erpIconicProject').prop('checked', response.iconic_project === 1);
-                            $('#erpIconicProject').prop('disabled', true);
-
-                            $('#erpWorksDetailsModal').modal('show');
-
-                        /*}*/
-                        // Open Non-ERP Modal
-                    /*} else {
-                        // Populate ERP Works Form
-                        $('#erpiconicProject').prop('checked', response.iconic_project === 1);
-                        $('#erpiconicProject').prop('disabled', true); // ❌ Not Editable in ERP
-
-                        $('#erpWorksDetailsModal').modal('show'); // Open ERP Modal
-
-
-                    }*/
-
-                    /*if (response.status == "NonErp") {*/
-                        let zoneDropDwon = $('#zone');
-                        let wardDropDown = $('#ward');
-                        let depDropDown = $('#department');
-                        let schemeDropDown = $('#scheme');
-                        let catDropDown = $('#category');
-                        let subCatdDropDown = $('#subcategory');
-                        let sourceDropDown = $('#fundsource');
-
-                        zoneDropDwon.append(`<option value="${response.zone}" selected>${response.zone}</option>`);
-                        wardDropDown.append(`<option value="${response.ward}" selected>${response.ward}</option>`);
-                        depDropDown.append(`<option value="${response.department}" selected>${response.dept_name}</option>`);
-                        schemeDropDown.append(`<option value="${response.schemeid}" selected>${response.scheme}</option>`);
-                        catDropDown.append(`<option value="${response.categoryid}" selected>${response.category}</option>`);
-                        subCatdDropDown.append(`<option value="${response.subcategoryid}" selected>${response.sub_category}</option>`);
-                        sourceDropDown.append(`<option value="${response.fundsource}" selected>${response.fund_source}</option>`);
-
-                        // Populate text fields
-                        $('#estno').val(response.estimate_no);
-                        $('#estdate').val(formatDate(response.estimate_date));
-                        $('#filenumber').val(formatDate(response.filenumber));
-                        $('#zone').val(response.zone);
-                        $('#ward').val(response.ward);
-                        $('#projectname').val(response.project_name);
-                        $('#location').val(response.location);
-                        // $('#department').val(response.department);
-                        $('#contractorname').val(response.contractor_name);
-                        $('#contractorperiod').val(response.contractor_period);
-                        // $('#fundsource').val(response.fund_source);
-                        // $('#scheme').val(response.scheme);
-                        // $('#category').val(response.category);
-                        // $('#subcategory').val(response.sub_category);
-                        $('#estamount').val(response.est_amount);
-                        $('#techsanctiondate').val(response.tech_sanc_date ? formatDate(response.tech_sanc_date) : '');
-                        $('#adminsanctiondate').val(response.admin_sanc_date ? formatDate(response.admin_sanc_date) : '');
-                        $('#tendercalldate').val(response.tender_call_date ? formatDate(response.tender_call_date) : '');
-                        $('#tenderfinalizeddate').val(response.tender_fin_date ? formatDate(response.tender_fin_date) : '');
-                        $('#loadate').val(response.loa_date ? formatDate(response.loa_date) : '');
-                        $('#agreementdate').val(response.agreement_date ? formatDate(response.agreement_date) : '');
-                        $('#workorderdate').val(response.work_order_date ? formatDate(response.work_order_date) : '');
-                        $('#workcommenceddate').val(response.work_comm_date ? formatDate(response.work_comm_date) : '');
-
-                        if (response.reason) {
-                            $('#Reason').val(response.reason);
-                        } else {
-                            $('#Reason').val(""); // Default empty if no reason
-                        }
-
-                        if (response.remarks) {
-                            $('#remarks').val(response.remarks);
-                            $('#remarksContainer').show(); // Show remarks if a reason exists
-                        } else {
-                            $('#remarks').val("");
-                            $('#remarksContainer').hide(); // Hide remarks if empty
-                        }
-
-
-                        if (response.iconic_project === 1) {
-                            $('#nonErpIconicProject').prop('checked', true);
-                        } else {
-                            $('#nonErpIconicProject').prop('checked', false);
-                        }
-                        $('#nonErpIconicProject').prop('disabled', false);
-
-                        // File preview for uploaded documents
-                        showPreview('adminsanctionfilePreview', "/gcc/files" + response.adm_san_file);
-                        showPreview('loafilePreview', "/gcc/files" + response.loa_file);
-                        showPreview('agreementfilePreview', "/gcc/files" + response.agreement_file);
-                        showPreview('workorderfilePreview', "/gcc/files" + response.work_order_file);
-                        
-                        if(response.project_type){
-    						$("#projecttype").val(response.project_type);
-    					}
-    					
-                        
-    					govt_funded_project = 0;
-    					//alert(response.govt_funded_project);
-    					if(response.govt_funded_project){
-    						govt_funded_project = 1;
-    					}
-    					$("#govtfund").val(govt_funded_project);
-    					
-    					special_category = 0;
-    					if(response.special_category){
-    						special_category = 1;
-    					}
-    					$("#specialcat").val(special_category);
-
-    					
-                        // Open the modal
-                        $('#nonErpWorksDetailsModal').modal('show');
-                    
-
-                },
-                error: function () {
-                    alert('Error fetching estimate details.');
-                }
-            });
-        });
-        //for restrict other documents ak
-        document.addEventListener("DOMContentLoaded", function () {
-            document.querySelectorAll('input[type="file"]').forEach(input => {
-                input.addEventListener("change", function () {
-                    let allowedTypes = ["application/pdf", "image/png", "image/jpeg", "image/jpg"];
-                    let file = this.files[0];
-
-                    if (file && !allowedTypes.includes(file.type)) {
-                        alert("Only PDF and image files (JPG, JPEG, PNG) are allowed!");
-                        this.value = ""; // Reset file input
-                    }
-                });
-            });
-        });
-
-        $("#updateEstimate").click(function () {
-            var formData = new FormData(document.getElementById("updateNonErpWorksForm"));
-
-            // Ensure reason and remarks are not empty
-            let reason = $("#Reason").val();
-            if (!reason) {
-                Swal.fire({
-                    title: "Error",
-                    text: "Please select a reason before submitting.",
-                    icon: "warning",
-                    confirmButtonText: "OK",
-                });
-                return;
-            }
-
-            let remarks = $("#remarks").val();
-            if (reason.toLowerCase() === "other" && !remarks) {
-                Swal.fire({
-                    title: "Error",
-                    text: "Please enter remarks when selecting 'Other' as the reason.",
-                    icon: "warning",
-                    confirmButtonText: "OK",
-                });
-                return;
-            }
-
-            let isValid = false;
-
-            var requiredDates = [
-                '#estdate', '#techsanctiondate', '#adminsanctiondate', '#tendercalldate',
-                '#tenderfinalizeddate', '#loadate', '#agreementdate', '#workorderdate', '#workcommenceddate'
-            ];
-
-         	// Get date input values
-         	let estDate = $("#estdate").val().trim();
-    		let techSanctionDate = $("#techsanctiondate").val().trim();
-    		let adminSanctionDate = $("#adminsanctiondate").val().trim();
-    		let tenderCallDate = $("#tendercalldate").val().trim();
-    		let tenderFinalizedDate = $("#tenderfinalizeddate").val().trim();
-
-    		let loaDate = $("#loadate").val().trim();
-    		let agreementDate = $("#agreementdate").val().trim();
-    		let workOrderDate = $("#workorderdate").val().trim();
-    		let workCommencedDate = $("#workcommenceddate").val().trim();
-    		
-    		// Convert to Date format
-    	    function parseDate(dateStr) {
-    	        return dateStr ? new Date(dateStr.split("-").reverse().join("-")) : null;
-    	    }
-
-    	    estDate = parseDate(estDate);
-    	    let techDate = parseDate(techSanctionDate);
-    	    let adminDate = parseDate(adminSanctionDate);
-    	    let tenderDate = parseDate(tenderCallDate);
-    	    let finalizedDate = parseDate(tenderFinalizedDate);
-    	    let loa = parseDate(loaDate);
-    	    let agreement = parseDate(agreementDate);
-    	    let workOrder = parseDate(workOrderDate);
-    	    let workCommenced = parseDate(workCommencedDate);
-    		
-    	 // Validation checks
-    	    if (!estDate) {
-    	    	Swal.fire("Missing Dates", "Estimate Date is required.", "error");
-    	        return false;
-    	    }
-    	 /*
-    	 	// Validation checks
-    	    if (!estDate && !adminDate && !techDate) {
-    	    	Swal.fire("Missing Dates", "Estimate, Admin and Tech Sanction Dates are required.", "error");
-    	        return false;
-    	    }
-    	 */
-    	 	// Parent-child dependency checks
-    	    if (!techDate && (adminDate || tenderDate || finalizedDate || loa || agreement || workOrder || workCommenced)) {
-    	        Swal.fire("Error", "Tech Sanction Date is required before entering other dates.", "error");
-    	        return false;
-    	    }
-
-    	    if (!adminDate && (tenderDate || finalizedDate || loa || agreement || workOrder || workCommenced)) {
-    	        Swal.fire("Error", "Admin Sanction Date is required before entering Tender and later dates.", "error");
-    	        return false;
-    	    }
-
-    	    if (!tenderDate && (finalizedDate || loa || agreement || workOrder || workCommenced)) {
-    	        Swal.fire("Error", "Tender Call Date is required before entering Finalized and later dates.", "error");
-    	        return false;
-    	    }
-
-    	    if (!finalizedDate && (loa || agreement || workOrder || workCommenced)) {
-    	        Swal.fire("Error", "Tender Finalized Date is required before entering LOA and later dates.", "error");
-    	        return false;
-    	    }
-
-    	    if (!loa && (agreement || workOrder || workCommenced)) {
-    	        Swal.fire("Error", "LOA Date is required before entering Agreement and later dates.", "error");
-    	        return false;
-    	    }
-
-    	    if (!agreement && (workOrder || workCommenced)) {
-    	        Swal.fire("Error", "Agreement Date is required before entering Work Order and later dates.", "error");
-    	        return false;
-    	    }
-
-    	    if (!workOrder && workCommenced) {
-    	        Swal.fire("Error", "Work Order Date is required before entering Work Commenced Date.", "error");
-    	        return false;
-    	    }
-
-    	    // Chronological validations
-    	    if (adminDate && techDate && adminDate < techDate) {
-    	        Swal.fire("Error", "Admin Sanction Date must be on or after Tech Sanction Date.", "error");
-    	        return false;
-    	    }
-
-    	    if (tenderDate && adminDate && tenderDate < adminDate) {
-    	        Swal.fire("Error", "Tender Call Date must be on or after Admin Sanction Date.", "error");
-    	        return false;
-    	    }
-
-    	    if (finalizedDate && tenderDate && finalizedDate < tenderDate) {
-    	        Swal.fire("Error", "Tender Finalized Date must be on or after Tender Call Date.", "error");
-    	        return false;
-    	    }
-
-    	    if (loa && finalizedDate && loa < finalizedDate) {
-    	        Swal.fire("Error", "LOA Date must be on or after Tender Finalized Date.", "error");
-    	        return false;
-    	    }
-
-    	    if (agreement && loa && agreement < loa) {
-    	        Swal.fire("Error", "Agreement Date must be on or after LOA Date.", "error");
-    	        return false;
-    	    }
-
-    	    if (workOrder && agreement && workOrder <= agreement) {
-    	        Swal.fire("Error", "Work Order Date must be after Agreement Date.", "error");
-    	        return false;
-    	    }
-
-    	    if (workCommenced && loa && workCommenced < workOrder) {
-    	        Swal.fire("Error", "Work Commenced Date must be on or after LOA Date.", "error");
-    	        return false;
-    	    }
-    	    /*
-
-            // Validate date fields
-            requiredDates.forEach(function (dateFieldSelector) {
-                var dateField = document.querySelector(dateFieldSelector);
-                console.log("Validating:", dateField.value); // Log the value for debugging
-
-                if (!dateField.value || !validateDateFormat(dateField.value)) {
-                    isValid = false;
-                    dateField.classList.add("is-invalid");
-                    return false;
-                } else {
-                    isValid = true;
-                    dateField.classList.remove("is-invalid");
-                }
-            });
-
-            // If form is valid, submit the form
-            if (isValid) {
-                console.log("Form is valid, submitting data...");
-            } else {
-                console.log("Form has errors. Please fill out all required fields.");
-            }
-*/
-
-            for (let pair of formData.entries()) {
-                console.log(pair[0] + ':', pair[1]); // Log each form field and file
-            }
-
-            $.ajax({
-                url: "/gcc/works/api/estimates/updateEstimate",
-                type: "POST",
-                contentType: false,
-                processData: false,
-                data: formData,
-                success: function (response) {
-                    // console.log(formData);
-                    Swal.fire({
-                        title: "Updated!",
-                        text: "Estimate details have been updated successfully.",
-                        icon: "success",
-                        confirmButtonText: "OK",
-                    }).then(() => {
-                        location.reload();
-                    });
-                },
-                error: function (xhr, status, error) {
-                    // console.log(xhr.responseText);
-                    Swal.fire({
-                        title: "Error",
-                        text: "Failed to update estimate. " + xhr.responseText,
-                        icon: "error",
-                        confirmButtonText: "OK",
-                    });
-                }
-            });
-        });
-
-
-        /*$("#updateErpWorks").click(function () {
-            var formData = new FormData(document.getElementById("updateErpWorksForm"));
-
-            var requiredDates = [
-                '#estdate', '#techsanctiondate', '#adminsanctiondate', '#tendercalldate',
-                '#tenderfinalizeddate', '#loadate', '#agreementdate', '#workorderdate', '#workcommenceddate'
-            ];
-
-            // Validate date fields
-            requiredDates.forEach(function (dateFieldSelector) {
-                var dateField = document.querySelector(dateFieldSelector);
-                console.log("Validating:", dateField.value); // Log the value for debugging
-
-                if (!dateField.value || !validateDateFormat(dateField.value)) {
-                    isValid = false;
-                    dateField.classList.add("is-invalid");
-                } else {
-                    dateField.classList.remove("is-invalid");
-                }
-            });
-
-            // If form is valid, submit the form
-            if (isValid) {
-                console.log("Form is valid, submitting data...");
-            } else {
-                console.log("Form has errors. Please fill out all required fields.");
-            }
-
-
-            for (let pair of formData.entries()) {
-                console.log(pair[0] + ':', pair[1]); // Log each form field and file
-            }
-
-            $.ajax({
-                url: "/gcc/works/api/estimates/updateERPEstimate",
-                type: "POST",
-                contentType: false,
-                processData: false,
-                data: formData,
-                success: function (response) {
-                    // console.log(formData);
-                    Swal.fire({
-                        title: "Updated!",
-                        text: "Estimate details have been updated successfully.",
-                        icon: "success",
-                        confirmButtonText: "OK",
-                    }).then(() => {
-                        location.reload();
-                    });
-                },
-                error: function (xhr, status, error) {
-                    // console.log(xhr.responseText);
-                    Swal.fire({
-                        title: "Error",
-                        text: "Failed to update estimate. " + xhr.responseText,
-                        icon: "error",
-                        confirmButtonText: "OK",
-                    });
-                }
-            });
-        });*/
-
-        // Function to show file preview with an edit icon
-        function showPreview(containerId, filePath) {
-            const previewContainer = document.getElementById(containerId);
-            previewContainer.innerHTML = ""; // Clear previous content
-            // console.log(filePath);
-
-            if (!filePath) {
-                previewContainer.innerHTML = "<p>No file available</p>";
-                return;
-            }
-
-            // Check if the filePath is a base64-encoded string
-            if (filePath.startsWith("data:image/")) {
-                // Display image preview from base64 data
-                const imgPreview = document.createElement("img");
-                imgPreview.src = filePath;
-                imgPreview.style.maxWidth = "200px";
-                imgPreview.style.maxHeight = "200px";
-                imgPreview.style.cursor = "pointer";
-                imgPreview.addEventListener("click", () => {
-                    window.open(filePath, "_blank");
-                });
-
-                // Create the edit icon
-                const editIcon = document.createElement("i");
-                editIcon.classList.add("fa", "fa-edit");
-                editIcon.style.cursor = "pointer";
-                editIcon.style.marginLeft = "10px";
-                editIcon.addEventListener("click", function () {
-                    openFileDialog(containerId, filePath); // Trigger file dialog for editing
-                });
-
-                // Append the image preview and edit icon
-                previewContainer.appendChild(imgPreview);
-                previewContainer.appendChild(editIcon);
-            } else {
-            	let fileExtension ="";
-            	//alert(filePath);
-            	if (filePath) {
-            		fileExtension = filePath.split('.').pop().toLowerCase();
-            	}
-                if (["jpg", "jpeg", "png", "gif"].includes(fileExtension)) {
-                    // Display image preview for valid image formats
-                    const imgPreview = document.createElement("img");
-                    imgPreview.src = filePath;
-                    imgPreview.style.maxWidth = "200px";
-                    imgPreview.style.maxHeight = "200px";
-                    imgPreview.style.cursor = "pointer";
-                    imgPreview.addEventListener("click", () => {
-                        window.open(filePath, "_blank");
-                    });
-
-                    // Append the image preview and edit icon
-                    previewContainer.appendChild(imgPreview);
-                } else if (fileExtension === "pdf") {
-                    // Display PDF preview link
-                    const pdfPreview = document.createElement("a");
-                    pdfPreview.href = filePath;
-                    pdfPreview.target = "_blank";
-                    pdfPreview.textContent = "Preview PDF";
-                    pdfPreview.style.display = "block";
-                    pdfPreview.style.color = "blue";
-                    previewContainer.appendChild(pdfPreview);
-                } else {
-                    previewContainer.innerHTML = "<p>Unsupported file format</p>";
-                }
-            }
-        }
-
-        // Function to handle file dialog for editing
-        function openFileDialog(containerId, oldFilePath) {
-            const input = document.createElement('input');
-            input.type = 'file';
-            input.accept = 'image/*'; // Allow image files for editing
-
-            input.addEventListener('change', function (event) {
-                const file = event.target.files[0];
-                if (file) {
-                    const reader = new FileReader();
-                    reader.onload = function (e) {
-                        const newFilePath = e.target.result;
-                        showPreview(containerId, newFilePath);
-                    };
-
-                    reader.readAsDataURL(file); // Convert image to base64
-                }
-            });
-
-            // Trigger the file input click
-            input.click();
-        }
-
-        function formatDate(dateString) {
-            if (!dateString) return ""; // return empty string if null/undefined/empty
-            return dateString.split('-').reverse().join('-');
-        }
-
-        $(document).ready(function () {
-            loadScheme();
-            loadCategory();
-            loadSubCategory();
-            loadDepartment();
-            loadSource();
-            loadWardsFilter();
-            loadDepartmentFilter();
-            loadSourceFilter();
-
-        });
-
-        function loadWards() {
-            var zone = document.getElementById("zone").value;
-            var wardDropdown = document.getElementById("ward");
-            wardDropdown.innerHTML = '<option value="" disabled selected>Select a Ward</option>';
-
-            if (zone) {
-                fetch('/gcc/works/wards?zone=' + zone)
-                    .then(response => response.json())
-                    .then(data => {
-                        data.forEach(ward => {
-                            var option = document.createElement("option");
-                            option.value = ward;
-                            option.textContent = ward;
-                            wardDropdown.appendChild(option);
-                        });
-                    })
-                    .catch(error => console.error('Error loading wards:', error));
-            }
-        }
-
-        function loadScheme() {
-            fetch('/gcc/works/api/estimates/getSchemeList')
-                .then(response => response.json())
-                .then(data => {
-                    let schemeDropdown = document.getElementById('scheme');
-                    schemeDropdown.innerHTML = '<option value="" disabled selected>Select Scheme</option>'; // Reset dropdown
-
-                    data.forEach(scheme => {
-                        let option = document.createElement('option');
-                        option.value = scheme.name;  // Use ID as the value
-                        option.textContent = scheme.name; // Display Name
-                        schemeDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching schemes:', error));
-        }
-
-        function loadCategory() {
-            fetch('/gcc/works/api/estimates/getCategoryList')
-                .then(response => response.json())
-                .then(data => {
-                    let categoryDropdown = document.getElementById('category');
-                    categoryDropdown.innerHTML = '<option value="" disabled selected>Select Category</option>'; // Reset dropdown
-
-                    data.forEach(category => {
-                        let option = document.createElement('option');
-                        option.value = category.name;  // Use ID as the value
-                        option.textContent = category.name; // Display Name
-                        categoryDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching Category:', error));
-        }
-
-        function loadSubCategory() {
-            fetch('/gcc/works/api/estimates/getSubCategoryList')
-                .then(response => response.json())
-                .then(data => {
-                    let subCategoryDropdown = document.getElementById('subcategory');
-                    subCategoryDropdown.innerHTML = '<option value="" disabled selected>Select SubCategory</option>'; // Reset dropdown
-
-                    data.forEach(subCategory => {
-                        let option = document.createElement('option');
-                        option.value = subCategory.description;  // Use ID as the value
-                        option.textContent = subCategory.description; // Display Name
-                        subCategoryDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching subCategory:', error));
-        }
-
-        function loadDepartment() {
-            fetch('/gcc/works/api/estimates/getDepartmentList')
-                .then(response => response.json())
-                .then(data => {
-                    let departmentDropdown = document.getElementById('department');
-                    departmentDropdown.innerHTML = '<option value="" disabled selected>Select Department</option>'; // Reset dropdown
-
-                    data.forEach(department => {
-                        let option = document.createElement('option');
-                        option.value = department.dept_name;  // Use ID as the value
-                        option.textContent = department.dept_name; // Display Name
-                        departmentDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching Department:', error));
-        }
-
-        function loadSource() {
-            fetch('/gcc/works/api/estimates/getSourceofFundList')
-                .then(response => response.json())
-                .then(data => {
-                    let SourceDropDown = document.getElementById('fundsource');
-                    SourceDropDown.innerHTML = '<option value="" disabled selected>Select Source of Fund</option>'; // Reset dropdown
-
-                    data.forEach(source => {
-                        let option = document.createElement('option');
-                        option.value = source.name;  // Use ID as the value
-                        option.textContent = source.name; // Display Name
-                        SourceDropDown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching Department:', error));
-        }
-
-        function loadWardsFilter() {
-            var zone = document.getElementById("zonef").value;
-            var wardDropdown = document.getElementById("wardf");
-            wardDropdown.innerHTML = '<option value="" disabled selected>Select a Ward</option>';
-
-            if (zone) {
-                fetch('/gcc/works/wards?zone=' + zone)
-                    .then(response => response.json())
-                    .then(data => {
-                        data.forEach(ward => {
-                            var option = document.createElement("option");
-                            option.value = ward;
-                            option.textContent = ward;
-                            wardDropdown.appendChild(option);
-                        });
-                    })
-                    .catch(error => console.error('Error loading wards:', error));
-            }
-        }
-
-        function loadDepartmentFilter() {
-            fetch('/gcc/works/api/estimates/getDepartmentList')
-                .then(response => response.json())
-                .then(data => {
-                    let departmentDropdown = document.getElementById('departmentf');
-                    departmentDropdown.innerHTML = '<option value="" disabled selected>Select Department</option>'; // Reset dropdown
-
-                    data.forEach(department => {
-                        let option = document.createElement('option');
-                        option.value = department.dept_name;  // Use ID as the value
-                        option.textContent = department.dept_name; // Display Name
-                        departmentDropdown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching Department:', error));
-        }
-
-        function loadSourceFilter() {
-            fetch('/gcc/works/api/estimates/getSourceofFundList')
-                .then(response => response.json())
-                .then(data => {
-                    let SourceDropDown = document.getElementById('fundsourcef');
-                    SourceDropDown.innerHTML = '<option value="" disabled selected>Select Source of Fund</option>'; // Reset dropdown
-
-                    data.forEach(source => {
-                        let option = document.createElement('option');
-                        option.value = source.name;  // Use ID as the value
-                        option.textContent = source.name; // Display Name
-                        SourceDropDown.appendChild(option);
-                    });
-                })
-                .catch(error => console.error('Error fetching Department:', error));
-        }
-
-
-        function form_btn_enable() {
-            $("#resetFormBtn").prop("disabled", false);
-            $("#requestSubmitBtn").prop("disabled", false);
-            $("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-        }
-
-        function form_btn_disable() {
-            $("#resetFormBtn").prop("disabled", true);
-            $("#requestSubmitBtn").prop("disabled", true);
-            // Show the loading icon on the button
-            $("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-        }
-
-
-        // close button function
-
-        $(document).ready(function () {
-
-            // Initialize the modal with static backdrop and disabled keyboard closing
-            $('#nonErpWorksDetailsModal').modal({
-                backdrop: 'static',
-                keyboard: false,
-                show: false // Ensure it doesn't auto-show on page load
-            });
-
-            // Initialize the modal with static backdrop and disabled keyboard closing
-            $('#erpWorksDetailsModal').modal({
-                backdrop: 'static',
-                keyboard: false,
-                show: false // Ensure it doesn't auto-show on page load
-            });
-
-
-            $('.closebutton').click(function () {
-                $('#nonErpWorksDetailsModal').modal('hide');
-                $('#erpWorksDetailsModal').modal('hide');
-
-            });
-        });
-
-
-        //model show view button function
-
-
-        function fetchEstimateInformation(estimateCode) {
-            $.ajax({
-                url: '/gcc/works/api/estimates/getestimatedetails', // API to fetch employee details
-                type: 'GET',
-                data: {estimateCode: estimateCode}, // Pass EMPLOYEE_CODE as a parameter
-                success: function (response) {
-                    if (response && response.length > 0) {
-
-                        let estimateDetails = response[0]; // Access the first object in the array
-                        // console.log("response:", response);
-
-                        // Populate modal fields
-                        $('#esnumber').val(estimateDetails.estimate_no);
-                        $('#eszone').val(estimateDetails.zone);
-                        $('#esward').val(estimateDetails.ward);
-                        $('#esdate').val(estimateDetails.estimate_date);
-                        $('#esproject').val(estimateDetails.project_name);
-                        $('#eslocation').val(estimateDetails.location);
-                        $('#esdepartment').val(estimateDetails.department);
-                        $('#esamounts').val(estimateDetails.est_amount);
-                        $('#essourcefund').val(estimateDetails.fund_source);
-                        $('#esscheme').val(estimateDetails.scheme);
-                        $('#escategory').val(estimateDetails.category);
-                        $('#essubcategory').val(estimateDetails.sub_category);
-
-
-                        // Update the modal title with the employee code
-                        $('#modalEstimateCode').text(estimateDetails.estimate_no);
-
-                        // Show the modal
-                        $('#viewworksdetailsModal').modal('show');
-
-                    } else {
-                        Swal.fire({
-                            icon: 'info',
-                            title: 'No Data',
-                            text: 'No details found.',
-                            confirmButtonText: 'OK',
-                        });
-                    }
-                },
-                error: function () {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Failed to fetch Estimate details. Please try again.',
-                        confirmButtonText: 'OK',
-                    });
-                },
-            });
-        }
-
-
-        //add works function
-
-        $(document).ready(function () {
-
-            $(document).on('click', '.view-btn', function () {
-                const estimateCode = $(this).data('id'); // Fetch `data-id` value
-
-                // console.log("estimateCode=====" + estimateCode);
-
-                // Hide the receivedcard section before showing the modal
-
-                fetchEstimateDetails(estimateCode); // Call the function to fetch employee details
-                // fetchEstimateworkDetails(estimateCode);
-
-
-            });
-
-
-            // Initialize the modal with static backdrop and disabled keyboard closing
-            $('#returnworksdetailsModal').modal({
-                backdrop: 'static',
-                keyboard: false,
-                show: false // Ensure it doesn't auto-show on page load
-            });
-
-
-            // Handle close button click
-            $('#back').click(function () {
-                $('#returnworksdetailsModal').modal('hide');
-                $("#saveWorks").hide();
-            });
-
-            $('.close').click(function () {
-                $('#returnworksdetailsModal').modal('hide');
-                $('#nonErpWorksDetailsModal').modal('hide');
-                $('#erpWorksDetailsModal').modal('hide');
-                $('#viewworksdetailsModal').modal('hide');
-
-                $("#saveWorks").hide();
-            });
-        });
-
-
-        // Action label  button functionality
-
-        $(document).ready(function () {
-
-            $(document).on('click', '.btn-view', function () {
-                const estimateCode = $(this).data('id'); // Fetch `data-id` value
-
-                // console.log("estimateCode=====" + estimateCode);
-
-                // Hide the receivedcard section before showing the modal
-
-                fetchEstimateInformation(estimateCode); // Call the function to fetch employee details
-
-
-            });
-
-
-            // Initialize the modal with static backdrop and disabled keyboard closing
-            $('#viewworksdetailsModal').modal({
-                backdrop: 'static',
-                keyboard: false,
-                show: false // Ensure it doesn't auto-show on page load
-            });
-
-
-            // Handle close button click
-            $('#backbutton').click(function () {
-                $('#viewworksdetailsModal').modal('hide');
-
-            });
-
-        });
-
-
-        function fetchEstimateDetails(estimateCode) {
-            $.ajax({
-                url: '/gcc/works/api/estimates/getestimatedetails', // API to fetch employee details
-                type: 'GET',
-                data: {estimateCode: estimateCode}, // Pass EMPLOYEE_CODE as a parameter
-                success: function (response) {
-                    if (response && response.length > 0) {
-
-                        let estimateDetails = response[0]; // Access the first object in the array
-                        // console.log("response:", response);
-
-                        // Populate modal fields
-                        $('#estimatenumber').val(estimateDetails.estimate_no);
-                        $('#estimatezone').val(estimateDetails.zone);
-                        $('#estimateward').val(estimateDetails.ward);
-                        $('#estimateddate').val(estimateDetails.estimate_date);
-                        $('#estimateproject').val(estimateDetails.project_name);
-                        $('#estimatelocation').val(estimateDetails.location);
-                        $('#estimatedepartment').val(estimateDetails.department);
-                        $('#estimateamounts').val(estimateDetails.est_amount);
-                        $('#sourcefund').val(estimateDetails.fund_source);
-                        $('#estimatescheme').val(estimateDetails.scheme);
-                        $('#estimatecategory').val(estimateDetails.category);
-                        $('#estimatesubcategory').val(estimateDetails.sub_category);
-
-
-                        // Update the modal title with the employee code
-                        $('#modalEstimateCode').text(estimateDetails.estimate_no);
-
-                        // Show the modal
-                        $('#returnworksdetailsModal').modal('show');
-
-                    } else {
-                        Swal.fire({
-                            icon: 'info',
-                            title: 'No Data',
-                            text: 'No details found.',
-                            confirmButtonText: 'OK',
-                        });
-                    }
-                },
-                error: function () {
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Error',
-                        text: 'Failed to fetch Estimate details. Please try again.',
-                        confirmButtonText: 'OK',
-                    });
-                },
-            });
-        }
-
-
-        $(document).ready(function () {
-            $.ajax({
-                url: "/gcc/works/api/estimates/reasonlist",
-                type: "GET",
-                dataType: "json",
-                success: function (response) {
-                    let reasonDropdown = $("#Reason");
-                    reasonDropdown.empty();
-                    reasonDropdown.append('<option value="">Select Reason</option>');
-                    $.each(response, function (index, reason) {
-                        reasonDropdown.append(`<option value="${reason.reasons}">${reason.reasons}</option>`);
-                    });
-                },
-                error: function (xhr, status, error) {
-                    console.error("Error loading reasons:", xhr.responseText);
-                }
-            });
-        });
-
-        function toggleRemarks() {
-            var reasonDropdown = document.getElementById("Reason");
-            var remarksContainer = document.getElementById("remarksContainer");
-            var remarksField = document.getElementById("remarks");
-
-            if (reasonDropdown.value.toLowerCase() === "other") {
-                remarksContainer.style.display = "block";
-            } else {
-                remarksContainer.style.display = "none";
-                remarksField.value = ""; // Clear remarks when hidden
-            }
-        }
-
-        function updateIconicProjectValue() {
-            let checkbox = document.getElementById("nonErpIconicProject");
-            let hiddenField = document.getElementById("hiddenNonErpIconicProject");
-
-            // If checked, set value to 1, otherwise set to 0
-            hiddenField.value = checkbox.checked ? "1" : "0";
-        }
-
-        document.getElementById('fromDate').addEventListener('change', validateEndDate);
-
-        function validateEndDate() {
-            const startDate = document.getElementById('fromDate').value;
-            const endDateInput = document.getElementById('toDate');
-
-            if (startDate) {
-                const startDateObj = new Date(startDate);
-                const minEndDateISO = startDateObj.toISOString().split('T')[0];
-                endDateInput.setAttribute('min', minEndDateISO);
-
-                // Clear endDate if it's less than startDate
-                if (endDateInput.value && new Date(endDateInput.value) < startDateObj) {
-                    endDateInput.value = '';
-                }
-            }
-        }
-
-        $("#filterType").on("change", function () {
-            $("#zonef").val('');
-            $("#wardf").val('');
-            $("#departmentf").val('');
-            $('#fundsourcef').val('');
-            $('#fromDate').val('');
-            $('#toDate').val('');
-            $('#estimateno').val('');
-        });
-
-
-        // save function for dynamic concept
-
-        $(document).ready(function () {
-            $("#saveWorks").hide(); // Initially hide the Save button
-
-
-            $(document).on("click", "#addMore", function () {
-
-                let subCategoryName = $('#estimatesubcategory').val().trim(); // Get Sub-Category Name
-
-                $("#dynamicCardsContainer").show();
-                $("#saveWorks").show();
-
-
-                console.log("subCategoryName", subCategoryName)
-
-                if (!subCategoryName) {
-                    alert("Please select a sub-category first!");
-                    return;
-                }
-
-                // First, fetch the sub-category ID using its name
-                $.ajax({
-                    url: "/gcc/works/api/estimates/subcategory/id",
-                    //working one
-                    type: "GET",
-                    data: {name: subCategoryName},
-                    dataType: "json",
-                    success: function (response) {
-                        let subCategoryId = response.subCatId;
-                        console.log("subCategoryId", subCategoryId)
-                        fetchQuestions(subCategoryId);
-                    },
-                    error: function () {
-                        alert("Failed to fetch Sub-Category ID for: " + subCategoryName);
-                    }
-                });
-            });
-
-
-            function fetchQuestions(subCategoryId) {
-
-                console.log("subCategoryId", subCategoryId)
-
-                $.ajax({
-                    url: "/gcc/works/api/estimates/questions", // Your API endpoint
-                    type: "GET",
-                    data: {subCatId: subCategoryId},  // Passing sub_cat_id dynamically
-                    dataType: "json",
-                    success: function (data) {
-                        console.log("data", data)
-                        displayQuestions(data, subCategoryId);
-                    },
-                    error: function () {
-                        alert("Failed to load questions for Sub-Category ID: " + subCategory);
-                    }
-                });
-            }
-
-            function displayQuestions(questions, subCatId) {
-                let formHtml = `<div class="card p-3" data-subcat="${subCatId}">`;
-
-                let groupedQuestions = {};
-
-                // Grouping questions by question_name
-                questions.forEach(question => {
-                    let key = question.question_name;
-
-                    if (!groupedQuestions[key]) {
-                        groupedQuestions[key] = {
-                            id: question.id,
-                            type: question.input_type_name,
-                            haschild: question.q_haschild,
-                            subCatCode: question.sub_cat_code,
-                            answers: []
-                        };
-                    }
-
-                    groupedQuestions[key].answers.push({
-                        id: question.answer_id,
-                        name: question.answer_name,
-                        haschild: question.a_haschild
-                    });
-                });
-
-                // Generate form fields dynamically
-                Object.keys(groupedQuestions).forEach(key => {
-                    let question = groupedQuestions[key];
-
-                    formHtml += `<div class="form-group">
-			                            <label class="fw-bold">${key}</label>`;
-
-                    switch (question.type) {
-                        case "text":
-                            formHtml += `<input type="text" class="form-control text-answer" name="q_${question.id}" >`;
-                            break;
-
-                        case "radio":
-                            formHtml += `<div class="d-flex flex-wrap">`;
-                            question.answers.forEach(answer => {
-                                let childClass = answer.haschild ? "child-trigger" : "child-remove";
-                                formHtml += `<div class="form-check me-3">
-			                                        <input type="radio" class="form-check-input ${childClass} answer-inputs" name="q_${question.id}" value="${answer.name}"
-			                                        data-answer-id="${answer.id}" data-haschild="${answer.haschild}" data-hidestatus="${answer.hide_status}" >
-			                                        <label class="form-check-label">${answer.name}</label>
-			                                    </div>`;
-                            });
-                            formHtml += `</div>`;
-                            break;
-
-                        case "checkbox":
-                            formHtml += `<div class="d-flex flex-wrap">`;
-                            question.answers.forEach(answer => {
-                                let childClass = answer.haschild ? "child-trigger" : "child-remove";
-                                formHtml += `<div class="form-check me-3">
-			                                        <input type="checkbox" class="form-check-input ${childClass} answer-inputs" name="q_${question.id}" value="${answer.name}"
-			                                        data-answer-id="${answer.id}" data-haschild="${answer.haschild}">
-			                                        <label class="form-check-label">${answer.name}</label>
-			                                    </div>`;
-                            });
-                            formHtml += `</div>`;
-                            break;
-
-                        case "dropdown":
-                            formHtml += `<select class="form-select child-trigger" name="q_${question.id}">`;
-                            formHtml += `<option value="">Select</option>`;
-                            question.answers.forEach(answer => {
-                                formHtml += `<option value="${answer.name}" data-answer-id="${answer.id}" data-haschild="${answer.haschild}"
-			                        class="${answer.haschild ? 'child-trigger' : 'child-remove'}">${answer.name}</option>`;
-                            });
-                            formHtml += `</select>`;
-                            break;
-
-                        case "textarea":
-                            formHtml += `<textarea class="form-control text-answer" name="q_${question.id}"></textarea>`;
-                            break;
-
-                        case "number":
-                            formHtml += `<input type="number" class="form-control" name="q_${question.id}">`;
-                            break;
-
-                        case "date":
-                            formHtml += `<input type="date" class="form-control" name="q_${question.id}">`;
-                            break;
-
-
-                    }
-
-                    formHtml += `</div>`; // Closing form-group div
-                });
-
-                formHtml += `</div>`; // Closing card div
-
-                $("#dynamicCardsContainer").append(formHtml);
-
-            }
-
-
-            $(document).on("change", ".form-check-input, .form-select", function () {
-                let selectedOption = $(this).find(":selected");
-                let answerId = selectedOption.data("answer-id") || $(this).data("answer-id");
-                let hasChild = selectedOption.data("haschild") || $(this).data("haschild");
-                let parentDiv = $(this).closest(".card");
-                let hideStatus = selectedOption.data("hidestatus") || $(this).data("hidestatus");
-
-                console.log("Selected answerId:", answerId, "Has Child:", hasChild);
-
-                let previousHasChild = parentDiv.data("previous-haschild") || false; // Store previous state
-
-                if (hasChild) {
-                    // If answer has a child, fetch new related questions
-                    fetchRelatedQuestions(answerId, parentDiv);
-                    //parentDiv.data("previous-haschild", true); // Set the flag
-                } else {
-                    if (hideStatus) {
-                        // If the previous answer was also haschild: false, remove child questions
-                        parentDiv.find(".child-questions").remove();
-                    }
-                    //parentDiv.data("previous-haschild", false); // Update the flag
-                }
-            });
-
-
-            function fetchRelatedQuestions(answerId, parentDiv) {
-                $.ajax({
-                    url: `/gcc/works/api/estimates/answerIdd?answerId=${answerId}`, // Your API URL
-                    type: "GET",
-                    dataType: "json",
-                    success: function (response) {
-                        console.log("Fetched Related Questions:", response);
-
-                        if (response && response.length > 0) {
-                            let questionDetails = response[0]; // The first object contains question details
-                            let answers = response.slice(1); // The rest are answers
-                            answers.forEach(answer => console.log(answer));
-
-                            let childHtml = `<div class="child-questions mt-3">
-			                                        <div class="form-group">
-			                                            <label class="fw-bold">${questionDetails.question_name}</label>
-			                                            <div class="d-flex flex-wrap">`;
-
-
-                            // Append answers based on input type
-                            if (questionDetails.input_type_name === "radio") {
-                                answers.forEach(answer => {
-                                    console.log(" radio answer.haschild..." + answer.haschild);
-                                    let childClass = answer.haschild ? "child-trigger" : "child-remove";
-
-                                    childHtml += `<div class="form-check me-3">
-			                                            <input type="radio" class="form-check-input ${childClass} answer-inputs" name="q_${questionDetails.id}" value="${answer.answer_name}"
-			                                            data-answer-id="${answer.AId}" data-haschild="${answer.haschild}" data-hidestatus="${answer.hide_status}">
-			                                            <label class="form-check-label">${answer.answer_name}</label>
-			                                          </div>`;
-                                });
-                            } else if (questionDetails.input_type_name === "checkbox") {
-
-                                answers.forEach(answer => {
-                                    console.log(" checkbox answer.haschild..." + answer.haschild);
-                                    let childClass = answer.haschild ? "child-trigger" : "child-remove";
-                                    childHtml += `<div class="form-check me-3">
-			                                            <input type="checkbox" class="form-check-input ${childClass} answer-inputs" name="q_${questionDetails.id}" value="${answer.answer_name}"
-			                                            data-answer-id="${answer.AId}" data-haschild="${answer.haschild}">
-			                                            <label class="form-check-label">${answer.answer_name}</label>
-			                                          </div>`;
-                                });
-                            } else if (questionDetails.input_type_name === "dropdown") {
-                                childHtml += `<select class="form-select child-trigger" name="q_${questionDetails.id}">
-			                                        <option value="">Select</option>`;
-                                answers.forEach(answer => {
-                                    console.log(" dropdown answer.haschild..." + answer.haschild);
-                                    childHtml += `<option value="${answer.answer_name}" data-answer-id="${answer.AId}" data-haschild="${answer.haschild}"
-			                            class="${answer.haschild ? 'child-trigger' : 'child-remove'}">${answer.answer_name}</option>`;
-                                });
-                                childHtml += `</select>`;
-                            }
-
-                            childHtml += `</div></div></div>`; // Closing tags
-
-                            // Append child questions inside the parent div
-                            parentDiv.append(childHtml);
-                        } else {
-                            console.log("No related questions found.");
-                        }
-                    },
-                    error: function () {
-                        alert("Failed to fetch related questions!");
-                    }
-                });
-            }
-
-
-        });
-
-
-        $("#saveWorks").on("click", function () {
-            let selectedData = [];
-
-            // Collect checked answers
-            $(".answer-inputs:checked").each(function () {
-                let questionId = $(this).attr("name").split("_")[1];
-                let answerText = $(this).val();
-                let answerId = $(this).data("answer-id");
-                let estimateNumber = $("#estimatenumber").val().trim();
-
-                selectedData.push({
-                    questionId: parseInt(questionId),
-                    answerText: answerText,
-                    answerId: parseInt(answerId),
-                    estimateNumber: estimateNumber
-                });
-            });
-
-            // Collect text input values
-            $(".text-answer").each(function () {
-                let questionId = $(this).attr("name").split("_")[1];
-                let answerText = $(this).val();
-                let estimateNumber = $("#estimatenumber").val().trim();
-
-                if (answerText.trim() !== "") { // Only add non-empty text inputs
-                    selectedData.push({
-                        questionId: parseInt(questionId),
-                        answerText: answerText,
-                        answerId: null, //No predefined answer ID for text fields
-                        estimateNumber: estimateNumber
-
-                    });
-                }
-            });
-
-            if (selectedData.length === 0) {
-                alert("No answers selected!");
-                return;
-            }
-
-            $.ajax({
-                url: "/gcc/works/api/estimates/save",
-                type: "POST",
-                contentType: "application/json",
-                data: JSON.stringify(selectedData),
-                success: function (response) {
-                    alert("Answers saved successfully!");
-                },
-                error: function () {
-                    alert("Failed to save answers.");
-                }
-            });
-        });
-
-
-        // view function for saved data
-
-        $('#returnworksdetailsModal').on('show.bs.modal', function () {
-            $('#dynamicCardsContainer').empty(); // Clear old data before opening
-        });
-
-
-        $(document).on("click", ".view-btn", function () {
-            const estimateNo = $(this).closest('tr').find('td:eq(1)').text().trim();
-            console.log("estimateNo<<<<<<<<< : " + estimateNo);
-            $("#estimatenumber").val(estimateNo);
-            $("#dynamicCardsContainer").empty(); // Clear previous data
-
-
-            // Fetch Saved Data for the Estimate Number
-            $.ajax({
-                url: `/gcc/works/api/estimates/fetch?estimateNumber=${encodeURIComponent(estimateNo)}`,
-                type: "GET",
-                success: function (response) {
-                    console.log("response>>>>>>>>>>>>>>", response)
-                    if (response.length > 0) {
-                        createCardHtml(response);
-                        /* response.forEach((item, index) => {
-                            const cardHtml = createCardHtml([item], item.sub_cat_code); // Pass data as an array
-                            $("#dynamicCardsContainer").append(cardHtml);
-                        }); */
-                    } else {
-                        // alert("No saved data found for this Estimate Number.");
-                    }
-                    $("#returnworksdetailsModal").modal("show"); // Open Modal
-                }
-                ,
-                error: function () {
-                    alert("Failed to fetch saved data.");
-                }
-            });
-        });
-
-
-        const responseData = [];
-
-        function createCardHtml(questions) {
-            const groupedQuestions = {};
-
-            questions.forEach((question) => {
-                const key = question.question_name;
-                if (!groupedQuestions[key]) {
-                    groupedQuestions[key] = {
-                        id: question.question_id,
-                        type: question.name || "text",
-                        answers: [],
-                        answerText: question.answer_text || "",
-                        answerId: question.ans_id,
-                    };
-                }
-                if (question.answer_name !== null) {
-                    groupedQuestions[key].answers.push({
-                        id: question.answer_id,
-                        name: question.answer_name,
-                        isSaved: question.is_saved_answer === 1,
-                    });
-                }
-            });
-
-            let formHtml = "";
-
-            Object.keys(groupedQuestions).forEach((key) => {
-                const question = groupedQuestions[key];
-
-
-                formHtml += `<div class="mb-3"><label class='fw-bold'>${key}</label>`;
-
-                switch (question.type) {
-                    case "radio":
-                        formHtml += `<div class="d-flex flex-wrap">`;
-                        question.answers.forEach((answer) => {
-                            const isChecked = answer.isSaved ? "checked" : "";
-                            formHtml += `<div class="form-check me-3">
-				                            <input type='radio' class='form-check-input' name='q_${question.id}' value='${answer.name}' ${isChecked} disabled>
-				                            <label class='form-check-label'>${answer.name}</label>
-				                          </div>`;
-                        });
-                        formHtml += `</div>`;
-                        break;
-
-                    case "text":
-                        formHtml += `<input type='text' class='form-control' value='${question.answerText}' readonly>`;
-                        break;
-
-                    case "textarea":
-                        formHtml += `<textarea class='form-control' readonly>${question.answerText}</textarea>`;
-                        break;
-                }
-
-                formHtml += `</div>`;
-            });
-
-            $("#dynamicCardsViewContainer").html(formHtml);
-        }
-
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/works/project_status_update.html b/src/main/resources/templates/modules/works/project_status_update.html
deleted file mode 100644
index c5a338f2..00000000
--- a/src/main/resources/templates/modules/works/project_status_update.html
+++ /dev/null
@@ -1,500 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<link rel="stylesheet"
-      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
-<link rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    .is-invalid {
-        border: 2px solid red !important;
-        background-color: #ffcccc !important;
-    }
-
-    .checkbox-large {
-        width: 20px;
-        height: 20px;
-    }
-
-    .readonly-select {
-        pointer-events: none; /* Prevent user interaction */
-        background-color: #e9ecef; /* Light grey background (like disabled) */
-    }
-</style>
-
-<body>
-<link rel="stylesheet" type="text/css"
-      href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css"/>
-<!--[if lt IE 8]>
-<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade
-    your browser</a> to improve your experience.</p>
-<![endif]-->
-
-<div class="wrapper">
-    <!-- header top menu Start -->
-    <header th:replace="~{fragments/modules/base/header :: header}"></header>
-    <!-- header top menu end -->
-
-    <div class="page-wrap">
-        <!--=============== Left Menu side Start ================-->
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <!--=============== Left side End ================-->
-        <div class="main-content">
-            <div class="container-fluid">
-                <div class="page-header">
-                    <div class="row align-items-end">
-                        <div class="col-lg-8">
-                            <div class="page-header-title">
-                                <i class="far fa-calendar-plus bg-blue"></i>
-                                <div class="d-inline">
-                                    <h5>List of Projects</h5>
-                                    <span>Project Status</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-4">
-                            <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                <ol class="breadcrumb">
-                                    <li class="breadcrumb-item"><a href="index"><i
-                                            class="ik ik-home"></i></a></li>
-                                    <li class="breadcrumb-item" aria-current="page">Project Status
-                                    </li>
-                                    </li>
-                                </ol>
-                            </nav>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-
-                <div class="col-md-14">
-                    <div class="card p-3">
-                        
-
-                        <div class="row">
-                            <div class="col-md-12">
-                                <label for="projectid">Select Project: <font style="color: red">*</font></label> 
-                                <select class="form-control" id="projectid">
-	                                <option value="" >Select project</option>
-	                                <option th:each="project : ${projects}" 
-								            th:value="${project.pid}" 
-								            th:text="${project.name}">
-								    </option>
-                            	</select>
-                            </div>
-                            
-                            <div class="col-md-12">
-                                <label for="filterType">Project Status: <font style="color: red">*</font></label> 
-                                <textarea class="form-control" id="statustxt"></textarea>
-                            </div>
-                            
-                            <div class="col-md-12">
-                                <label for="filterType">Photo / File: <font style="color: red">*</font></label> 
-                                <input name="projectfile" id="projectfile" class="form-control"
-                                                       type="file" capture="camera" accept="application/pdf, image/*" required>
-                            </div>
-                            
-                            <div class="col-md-2 d-flex align-items-end gap-2">
-                                <button id="submitFilter" class="btn btn-primary" onclick="save_project_data()">Submit</button>
-                                <button class="btn btn-danger mt-2" onclick="resetpage()"
-                                        name="reset" type="reset">Reset
-                                </button>
-                                <!--<button type="button" class="btn btn-sm btn-success mt-2" name="downloadBtn"
-                                        onclick="downloadExcel()">Download Excel</button>-->
-                            </div>
-                        </div>
-                       
-                    </div>
-                </div>
-                <br>
-                <div class="row">
-                    <div class="card-block">
-                    <div id="tableLoading"></div>
-                        <div>
-                            <table id="worksDatatable"
-                                   class="table table-striped table-bordered table-hover"
-                                   width="99.5%">
-                               
-                                <thead class="thead-dark">
-                                <tr>
-                                    <th>S.No</th>
-                                    <th>Type</th>
-                                    <th>Department</th>
-                                    <th>Project Name</th>
-                                    <th>Status</th>
-                                    <th>Photo/File</th>
-                                    <th>Updated Date</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                
-                                </tbody>
-                            </table>
-
-                            <!-- Pagination Controls -->
-                            <div class="pagination-container">
-                                <div
-                                        class="d-flex justify-content-between align-items-center my-3">
-                                    <span id="entriesInfo" class="text-muted"></span>
-                                    <ul id="pagination" class="pagination mb-0"></ul>
-                                </div>
-                                <ul class="pagination justify-content-center"
-                                    style="justify-content: right !important;" id="pagination"></ul>
-                            </div>
-
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-
-            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-        </div>
-    </div>
-</div>
-
-	<div th:replace="~{fragments/modules/works/modal-box :: div}"></div> 
-	
-    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
-
-    <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    <script th:replace="~{fragments/modules/works/script :: script}"></script>
-    
-    <script src="node_modules/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-    <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-    <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-    <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-    <script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-    <script th:inline="javascript">
-        var loginUserID = /*[[${LoginUserId}]]*/'';
-        var createdBy = /*[[${LoginUserId}]]*/'';
-        
-        var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        
-     	// Loading Div id
-    	const loading = $("#tableLoading");
-     	
-    	// DataTables buttons configuration
-        var buttons = [
-        	{
-				extend: 'pageLength',
-				className: 'btn btn-warning'
-			},
-            {
-				title: 'Data export',
-                extend: 'copyHtml5',
-                text: 'Copy',
-                className: 'btn btn-secondary',
-                id: 'copyBtn'
-            },
-            {
-                extend: 'excelHtml5',
-                text: 'Excel',
-                className: 'btn btn-secondary',
-                id: 'excelBtn',
-                title: 'Project List'
-            },
-            {
-                extend: 'csvHtml5',
-                text: 'CSV',
-                className: 'btn btn-secondary',
-                id: 'csvBtn',
-                title: 'Project List'
-            },
-            {
-                extend: 'pdfHtml5',
-                text: 'PDF',
-                className: 'btn btn-secondary',
-                id: 'pdfBtn',
-                title: 'Project List'
-            },
-            {
-                extend: 'print',
-                text: 'Print',
-                className: 'btn btn-secondary',
-                id: 'printBtn',
-                title: 'Project List',
-                exportOptions: {
-                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-                }
-            },
-            {
-				extend: 'colvis',
-				className: 'btn btn-warning'
-			},
-        ];
-		
-    	
-        function call_loading(){
-			loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-		}
-		
-		function remove_loading(){
-			loading.html("");
-		}
-		
-        /* 
-        	===============================================================================================
-        	===============================================================================================
-        */
-        
-        function form_btn_enable() {
-            $("#resetFormBtn").prop("disabled", false);
-            $("#requestSubmitBtn").prop("disabled", false);
-            $("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-        }
-
-        function form_btn_disable() {
-            $("#resetFormBtn").prop("disabled", true);
-            $("#requestSubmitBtn").prop("disabled", true);
-            // Show the loading icon on the button
-            $("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-        }
-
-        function validateEndDate() {
-            const startDate = document.getElementById('fromDate').value;
-            const endDateInput = document.getElementById('toDate');
-
-            if (startDate) {
-                const startDateObj = new Date(startDate);
-                const minEndDateISO = startDateObj.toISOString().split('T')[0];
-                endDateInput.setAttribute('min', minEndDateISO);
-
-                // Clear endDate if it's less than startDate
-                if (endDateInput.value && new Date(endDateInput.value) < startDateObj) {
-                    endDateInput.value = '';
-                }
-            }
-        }
-
-        /*
-        =========================================================================================
-        */
-
-        
-        /* Get works data List */
-        function get_project_list(){
-        	
-        	call_loading();
-        	var table = $('#worksDatatable').DataTable();
-        	table.clear();
-        	// Destroy the DataTable before reinitializing
-        	table.destroy();
-        	
-        	
-        	get_erp_work_data().then(function(erpWorksDataList) {
-    		    // Handle the data list
-    		    generate_table(erpWorksDataList);
-    		    
-    		}).catch(function(error) {
-    		    // Handle errors
-		        if (error && error.message) {
-		            console.error('Error fetching project data list:', error.message);
-		        } else {
-		            console.error('An error occurred while fetching project data list:', error);
-		        }
-    		});
-		}
-        
-        /* Get Erp works Data */
-        async function get_erp_work_data() {
-
-        	
-        	var apiUrl = '/gcc/works/api/estimates/getProjectUpdatedList?loginid='+createdBy;
-    	    // Return a Promise
-    	    return new Promise(function(resolve, reject) {
-    	        $.ajax({
-    	            url: apiUrl,
-    	            type: 'GET',
-    	            dataType: 'json',
-    	            success: function(jsonResponse) {
-    	                // Resolve the Promise with the department list
-    	                resolve(jsonResponse);
-    	            },
-    	            error: function(xhr, status, error) {
-    	                // Reject the Promise with the error message
-    	                reject(error);
-    	            }
-    	        });
-    	    });
-        }
-        
-        /* Call DataTable function */
-        function generate_table(data){
-        	var table = $('#worksDatatable').DataTable();
-
-        	// Destroy the DataTable before reinitializing
-        	table.destroy();
-
-        	// Now, reinitialize the table
-        	table = $('#worksDatatable').DataTable({
-        	    dom: 'Bftip',
-        	    deferRender: true,  // Delays rendering of non-visible rows
-        	    columnDefs: [
-        	        { targets: 'no-sort', "orderable": false },
-        	        { targets: 'no-exportable', "exportable": false }
-        	    ],
-        	    lengthMenu: [
-        	        [50, 100, 200, 500, -1],
-        	        ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-        	    ],
-        	    fixedColumns: {
-        	        left: 0,
-        	        right: 0
-        	    },
-        	    buttons: [buttons],
-        	    responsive: false,
-        	    searching: true,
-        	    select: false,
-        	    processing: true, // Enables processing indicator
-        	});
-            
-        	// Clearn Table data
-        	table.clear();
-        	            
-        	// Add rows to DataTable
-        	var rowNum = 1;
-        	$.each(data, function(index, row) {
-        	    /*
-        		actionHTML = `<div class="dropdown d-inline-block show">
-        	                     <a class="nav-link dropdown-toggle text-warning" href="#" id="moreDropdown" role="button" 
-        	                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-animation="true" 
-        	                    data-placement="top" data-html="true" title="`+row['ESTIMATE_NO']+`" >`+row['ESTIMATE_NO']+`</a>
-        	                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-        	                    	<a class="dropdown-item" href="" onclick="return viewWorksSummary('`+row['id']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Full Details"><i class="ik ik-printer"></i> View Details</a>
-        	                    	<a class="dropdown-item" href="" onclick="return updateWorksSummary('`+row['id']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Update Details"><i class="ik ik-edit"></i> Update Details</a>
-        	                    </div>
-        	              </div>`;
-        	              */
-        	              
-        	    //actionHTML = row['ESTIMATE_NO'];
-        	    
-        	    table.row.add([
-        	        rowNum++,
-        	        row['type'],
-        	        row['department'],
-        	        row['name'],
-        	        row['status'],
-        	        row['file'],
-        	        row['lastupdatedate'],
-        	        
-        	    ]);
-        	});
-        	
-        	
-
-        	// **Call draw() only once**
-        	table.draw(false);
-            
-            // Enable tooltips for all elements with data-toggle="tooltip"
-            $('[data-toggle="tooltip"]').tooltip();
-            remove_loading(); // remove Loading 
-		}
-        
-        function formatDBDate(inputDate) {
-            let parts = inputDate.split("-");
-            if (parts.length === 3) {
-                return `${parts[2]}-${parts[1]}-${parts[0]}`; // Convert to YYYY-MM-DD
-            }
-            return inputDate; // Return as-is if format is incorrect
-        }
-        
-        function save_project_data(){
-        	let formData = new FormData();
-        	
-        	// Append form fields
-            //formData.append("estid", estid);
-            formData.append("loginid", loginUserID);
-         	// Append files (only if a file is selected)
-         	
-         	
-         	let projectid = document.getElementById("projectid");
-            let projectidValue = projectid.value; // Get selected value
-
-	         // Validate selected
-	         if (!projectidValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please select a project before submission.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-            
-	        formData.set("pid", projectidValue);
-            
-         	let statustxt = document.getElementById("statustxt");
-         	let statustxtValue = statustxt.value; // Get selected value
-
-	         // Validate selection
-	         if (!statustxtValue) {
-	             Swal.fire({
-	                 title: "Error",
-	                 text: "Please add project status.",
-	                 icon: "error",
-	                 confirmButtonText: "OK"
-	             });
-	             return; // Stop execution if not selected
-	         }
-
-         	// Set the form data
-         	formData.set("status", statustxtValue);
-         	
-         	// Get file inputs
-		    
-		    let projectFile = $("#projectfile")[0].files[0];
-		    formData.append("projectfile", projectFile);
-            
-            $.ajax({
-                url: "/gcc/works/api/estimates/saveProjectStatus",
-                type: "POST",
-                contentType: false,
-                processData: false,
-                data: formData,
-                success: function (response) {
-                    // console.log(formData);
-                    Swal.fire({
-                        title: "Updated!",
-                        text: "Project status have been updated successfully.",
-                        icon: "success",
-                        confirmButtonText: "OK",
-                    }).then(() => {
-                        location.reload();
-                    });
-                },
-                error: function (xhr, status, error) {
-                    // console.log(xhr.responseText);
-                    Swal.fire({
-                        title: "Error",
-                        text: "Failed to update project." + "Error: " + error + "\nStatus: " + status + "\nResponse: " + xhr.responseText,
-                        icon: "error",
-                        confirmButtonText: "OK",
-                    });
-                }
-            });
-        	
-        }
-        
-        /*
-        	===============================================================
-        */
-        
-        $(document).ready(function () {
-        	//call_loading();
-           // loadWardsFilter();
-           // loadDepartmentFilter();
-           // loadSourceFilter();
-            get_project_list();
-        });
-        
-    </script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/works/update_works_stage_modal.html b/src/main/resources/templates/modules/works/update_works_stage_modal.html
deleted file mode 100644
index a96e6dc4..00000000
--- a/src/main/resources/templates/modules/works/update_works_stage_modal.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row" id="printarea">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Works Details</h3>
-					                	<!-- <div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="printContent()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div> -->
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-												<h5 class="text-warning">1. Basic Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimate No: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estno"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimate Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estdate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Zone / Ward:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="zone_ward"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">Project Name:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="projectname"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Location:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="location"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											
-											
-											<h5 class="text-warning">2. Department and Contractor Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Department: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="department"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Contractor Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="contractorname"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Contractor Period:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="contractorperiod"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											
-											
-											<h5 class="text-warning">3. Funding and Scheme Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Source of Fund: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="sourceoffund"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Scheme:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="scheme"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="category"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Sub-Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="subcategory"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimation Amount:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estamount"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Order Value:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="ordervalue"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <h5 class="text-warning">Stage Details Update Form</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Stages Master:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-											          	<select name="perstage" id="perstage" class="form-control"  style="width: 100%;">
-															<option value=""  selected>Select Stages master</option>
-															<option value="1">Capital</option>
-															<option value="2">Maintenance</option>
-															<option value="3">Service</option>
-															<option value="4">Consultancy</option>
-														</select>
-											          </td>
-											        </tr>
-								                   </tbody>
-								              	</table>
-								              	
-								              	<h5 class="text-warning">Stage Details Update Form</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-								                  <thead>
-												    <tr>
-												      <th style="padding: 0.45rem 0.45rem;">S.No</th>
-												      <th class="fw-semibold" style="padding: 0.45rem 0.45rem;">Stage Name</th>
-												      <th class="fw-semibold" style="padding: 0.45rem 0.45rem;">Stage Order</th>
-												      <th class="fw-semibold" style="padding: 0.45rem 0.45rem;">Action</th>
-												    </tr>
-												  </thead>
-											      <tbody id="stageListHTML">
-											        
-								                  </tbody>
-								              	</table>
-											</div>
-										</div>
-										<!-- 
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-										 -->
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/works/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/works/user_works_view_script :: script}"></script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/works/user_works_details_update_modal_page.html b/src/main/resources/templates/modules/works/user_works_details_update_modal_page.html
deleted file mode 100644
index 2ed60259..00000000
--- a/src/main/resources/templates/modules/works/user_works_details_update_modal_page.html
+++ /dev/null
@@ -1,370 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row" id="printarea">
-							<div class="col-12">
-                                <div class="card mb-0" id="worksUpadtetable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Works Details Update Form </h3>
-					                	<!-- <div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="printContent()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-									     -->
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-												<h5 class="text-warning">1. Basic Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimate No: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estno"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimate Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estdate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Zone / Ward:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="zone_ward"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">Project Name:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="projectname"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Location:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="location"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											
-											
-												<h5 class="text-warning">2. Department and Contractor Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Department: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="department"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Contractor Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="contractorname"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Contractor Period:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="contractorperiod"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											
-											
-												<h5 class="text-warning">3. Funding and Scheme Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Source of Fund: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="sourceoffund"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Scheme:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="scheme"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="category"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Sub-Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="subcategory"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimation Amount:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estamount"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Order Value:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="ordervalue"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    
-												<h5 class="text-warning">4. Project Type Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Project Type: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-											          	<select name="projecttype" id="projecttype" class="form-control"  style="width: 100%;" required>
-															<option value=""  selected>Select</option>
-															<option value="1">Capital</option>
-															<option value="2">Maintenance</option>
-															<option value="3">Service</option>
-															<option value="4">Consultancy</option>
-														</select>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Govt. Funded Project:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												        <select name="govtfund" id="govtfund" class="form-control"  style="width: 100%;" required>
-															<option value=""  selected>Select</option>
-															<option value="1">Yes</option>
-															<option value="0">No</option>
-														</select>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Special Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												        <select name="specialcat" id="specialcat" class="form-control"  style="width: 100%;" required>
-															<option value=""  selected>Select</option>
-															<option value="1">Yes</option>
-															<option value="0">No</option>
-														</select>
-											          </td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <h5 class="text-warning">5. Sanctions and Tender Process</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tech Sanction Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="techsanctiondate">
-											          <input type="text" class="form-control" name="erptechsanctiondate" id="erptechsanctiondate"
-                                                       placeholder="Tech Sanction Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Admin Sanction Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="adminsanctiondate">
-											          <input type="text" class="form-control" name="erpadminsanctiondate" id="erpadminsanctiondate"
-                                                       placeholder="Admin Sanction Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tender Called Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="tendercalleddate">
-											          <input type="text" class="form-control" name="erptendercalldate" id="erptendercalldate"
-                                                       placeholder="Tender Called Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tender Finalized Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="tenderfinalizeddate">
-											          <input type="text" class="form-control" name="erptenderfinalizeddate" id="erptenderfinalizeddate"
-                                                       placeholder="Tender Finalized Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    
-											    <h5 class="text-warning">6. Contract and Execution Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">LOA Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="loadate">
-											          <input type="text" class="form-control" name="erploadate" id="erploadate"
-                                                       placeholder="LOA Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Agreement Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="agreementdate">
-											          <input type="text" class="form-control" name="erpagreementdate" id="erpagreementdate"
-                                                       placeholder="Agreement Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Order Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workorderdate">
-											          <input type="text" class="form-control" name="erpworkorderdate" id="erpworkorderdate"
-                                                       placeholder="Work Order Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Commenced Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workcommenceddate">
-											          <input type="text" class="form-control" name="erpworkcommenceddate" id="erpworkcommenceddate"
-                                                       placeholder="Work Commenced Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    
-											    <h5 class="text-warning">6. File Upload</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Admin Sanction File: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="loadate">
-											          <input name="adminsanctionfile" id="adminsanctionfile" class="form-control" type="file"
-                                                       capture="camera" accept="application/pdf, image/*">
-                                                       <div id="adminfileHTML"></div>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">LOA File:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="agreementdate">
-											          <input name="loafile" id="loafile" class="form-control" type="file"
-                                                       capture="camera" accept="application/pdf, image/*">
-                                                       <div id="loafileHTML"></div>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Agreement File:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workorderdate">
-											          <input name="agreementfile" id="agreementfile" class="form-control" type="file"
-                                                       capture="camera" accept="application/pdf, image/*">
-                                                       <div id="agreementfileHTML"></div>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Order File:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workcommenceddate">
-											          <input name="workorderfile" id="workorderfile" class="form-control" type="file"
-                                                       capture="camera" accept="application/pdf, image/*">
-                                                       <div id="workorderfileHTML"></div>
-											          </td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    <div class="text-center">
-								              		<input type="checkbox" id="isiconic" name="isiconic" value="1">
-								              		<input type="hidden" name="selectedestid" id="selectedestid" value="0">
-								              		<label for="isiconic"> Yes, this project is an iconic project.</label><br>
-								              		<button class="btn btn-primary" onclick="updateData();">Save</button>
-								              	</div>
-											</div>
-										</div>
-										<!-- 
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-										-->
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/works/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/works/user_works_update_script :: script}"></script>
-       	<script>
-       	$(document).ready(function () {
-            // Input masking for the desired format
-           
-            $('#mobileno').mask('0000000000');
-
-            // For datetime picker
-            jQuery('#erpestdate').prop('readonly', true); // Make input readonly
-            jQuery('#erpestdate').datetimepicker({
-                //minTime:'10:00',
-                //maxTime:'18:01',
-                //minDate: 0, // Today
-                //minDate:'-1970/01/2',
-                //maxDate:'+1970/01/2',
-                timepicker: false, // Disable time picker
-                mask: false,
-                readonly: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                //disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-            
-            jQuery('#erptechsanctiondate').prop('readonly', true); // Make input readonly
-            jQuery('#erptechsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpadminsanctiondate').prop('readonly', true); // Make input readonly
-            jQuery('#erpadminsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                readonly: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erptendercalldate').prop('readonly', true); // Make input readonly
-            jQuery('#erptendercalldate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erptenderfinalizeddate').prop('readonly', true); // Make input readonly
-            jQuery('#erptenderfinalizeddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erploadate').prop('readonly', true); // Make input readonly
-            jQuery('#erploadate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpagreementdate').prop('readonly', true); // Make input readonly
-            jQuery('#erpagreementdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpworkorderdate').prop('readonly', true); // Make input readonly
-            jQuery('#erpworkorderdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpworkcommenceddate').prop('readonly', true); // Make input readonly
-            jQuery('#erpworkcommenceddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-        	/*
-        	=================================
-        	*/
-        });
-       	</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/works/user_works_details_view_modal_page.html b/src/main/resources/templates/modules/works/user_works_details_view_modal_page.html
deleted file mode 100644
index cdf53029..00000000
--- a/src/main/resources/templates/modules/works/user_works_details_view_modal_page.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row" id="printarea">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Works Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="printContent()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-												<h5 class="text-warning">1. Basic Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimate No: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estno"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimate Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estdate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Zone / Ward:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="zone_ward"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">Project Name:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="projectname"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Location:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="location"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											
-											
-											<h5 class="text-warning">2. Department and Contractor Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Department: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="department"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Contractor Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="contractorname"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Contractor Period:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="contractorperiod"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											
-											
-											<h5 class="text-warning">3. Funding and Scheme Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Source of Fund: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="sourceoffund"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Scheme:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="scheme"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="category"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Sub-Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="subcategory"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimation Amount:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estamount"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Order Value:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="ordervalue"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												<h5 class="text-warning">4. Project Type Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Project Type: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="project_type"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Govt. Funded Project:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="govt_funded_project"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Special Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="special_category"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    
-								                <h5 class="text-warning">5. Sanctions and Tender Process</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tech Sanction Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="techsanctiondate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Admin Sanction Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="adminsanctiondate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tender Called Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="tendercalleddate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tender Finalized Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="tenderfinalizeddate"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    
-											    <h5 class="text-warning">6. Contract and Execution Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">LOA Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="loadate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Agreement Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="agreementdate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Order Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workorderdate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Commenced Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workcommenceddate"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    
-											    <h5 class="text-warning">7. Uploaded File Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Admin Sanction File: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="adminfile"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">LOA File:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="loafile"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Agreement File:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="agreementfile"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Order File:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workorderfile"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-								              	
-											</div>
-										</div>
-										<!-- 
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-										 -->
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/works/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/works/user_works_view_script :: script}"></script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/works/works_details_update_modal_page.html b/src/main/resources/templates/modules/works/works_details_update_modal_page.html
deleted file mode 100644
index 18ccfba3..00000000
--- a/src/main/resources/templates/modules/works/works_details_update_modal_page.html
+++ /dev/null
@@ -1,366 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row" id="printarea">
-							<div class="col-12">
-                                <div class="card mb-0" id="worksUpadtetable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Works Details Update Form </h3>
-					                	<!-- <div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="printContent()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-									     -->
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-												<h5 class="text-warning">1. Basic Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimate No: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estno"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimate Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estdate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Zone / Ward:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="zone_ward"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">Project Name:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="projectname"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Location:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="location"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											
-											
-												<h5 class="text-warning">2. Department and Contractor Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Department: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="department"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Contractor Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="contractorname"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Contractor Period:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="contractorperiod"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											
-											
-												<h5 class="text-warning">3. Funding and Scheme Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Source of Fund: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="sourceoffund"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Scheme:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="scheme"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="category"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Sub-Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="subcategory"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimation Amount:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estamount"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Order Value:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="ordervalue"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    
-												<h5 class="text-warning">4. Project Type Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Project Type: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-											          	<select name="projecttype" id="projecttype" class="form-control"  style="width: 100%;" required>
-															<option value=""  selected>Select</option>
-															<option value="1">Capital</option>
-															<option value="2">Maintenance</option>
-															<option value="3">Service</option>
-															<option value="4">Consultancy</option>
-														</select>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Govt. Funded Project:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												        <select name="govtfund" id="govtfund" class="form-control"  style="width: 100%;" required>
-															<option value=""  selected>Select</option>
-															<option value="1">Yes</option>
-															<option value="0">No</option>
-														</select>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Special Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												        <select name="specialcat" id="specialcat" class="form-control"  style="width: 100%;" required>
-															<option value=""  selected>Select</option>
-															<option value="1">Yes</option>
-															<option value="0">No</option>
-														</select>
-											          </td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <h5 class="text-warning">5. Sanctions and Tender Process</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tech Sanction Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="techsanctiondate">
-											          <input type="text" class="form-control" name="erptechsanctiondate" id="erptechsanctiondate"
-                                                       placeholder="Tech Sanction Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Admin Sanction Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="adminsanctiondate">
-											          <input type="text" class="form-control" name="erpadminsanctiondate" id="erpadminsanctiondate"
-                                                       placeholder="Admin Sanction Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tender Called Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="tendercalleddate">
-											          <input type="text" class="form-control" name="erptendercalldate" id="erptendercalldate"
-                                                       placeholder="Tender Called Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tender Finalized Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="tenderfinalizeddate">
-											          <input type="text" class="form-control" name="erptenderfinalizeddate" id="erptenderfinalizeddate"
-                                                       placeholder="Tender Finalized Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    
-											    <h5 class="text-warning">6. Contract and Execution Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">LOA Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="loadate">
-											          <input type="text" class="form-control" name="erploadate" id="erploadate"
-                                                       placeholder="LOA Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Agreement Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="agreementdate">
-											          <input type="text" class="form-control" name="erpagreementdate" id="erpagreementdate"
-                                                       placeholder="Agreement Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Order Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workorderdate">
-											          <input type="text" class="form-control" name="erpworkorderdate" id="erpworkorderdate"
-                                                       placeholder="Work Order Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Commenced Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workcommenceddate">
-											          <input type="text" class="form-control" name="erpworkcommenceddate" id="erpworkcommenceddate"
-                                                       placeholder="Work Commenced Date" autocomplete="off" required>
-											          </td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    
-											    <h5 class="text-warning">6. File Upload</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Admin Sanction File: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="loadate">
-											          <input name="adminsanctionfile" id="adminsanctionfile" class="form-control" type="file"
-                                                       capture="camera" accept="application/pdf, image/*" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">LOA File:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="agreementdate">
-											          <input name="loafile" id="loafile" class="form-control" type="file"
-                                                       capture="camera" accept="application/pdf, image/*" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Agreement File:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workorderdate">
-											          <input name="agreementfile" id="agreementfile" class="form-control" type="file"
-                                                       capture="camera" accept="application/pdf, image/*" required>
-											          </td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Order File:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workcommenceddate">
-											          <input name="workorderfile" id="workorderfile" class="form-control" type="file"
-                                                       capture="camera" accept="application/pdf, image/*" required>
-											          </td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    <div class="text-center">
-								              		<input type="checkbox" id="isiconic" name="isiconic" value="1">
-								              		<input type="hidden" name="selectedestid" id="selectedestid" value="0">
-								              		<label for="isiconic"> Yes, this project is an iconic project.</label><br>
-								              		<button class="btn btn-primary" onclick="saveData();">Save</button>
-								              	</div>
-											</div>
-										</div>
-										<!-- 
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-										-->
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/works/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/works/works_view_script :: script}"></script>
-       	<script>
-       	$(document).ready(function () {
-            // Input masking for the desired format
-           
-            $('#mobileno').mask('0000000000');
-
-            // For datetime picker
-            jQuery('#erpestdate').prop('readonly', true); // Make input readonly
-            jQuery('#erpestdate').datetimepicker({
-                //minTime:'10:00',
-                //maxTime:'18:01',
-                //minDate: 0, // Today
-                //minDate:'-1970/01/2',
-                //maxDate:'+1970/01/2',
-                timepicker: false, // Disable time picker
-                mask: false,
-                readonly: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                //disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-            
-            jQuery('#erptechsanctiondate').prop('readonly', true); // Make input readonly
-            jQuery('#erptechsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpadminsanctiondate').prop('readonly', true); // Make input readonly
-            jQuery('#erpadminsanctiondate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                readonly: true,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erptendercalldate').prop('readonly', true); // Make input readonly
-            jQuery('#erptendercalldate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erptenderfinalizeddate').prop('readonly', true); // Make input readonly
-            jQuery('#erptenderfinalizeddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erploadate').prop('readonly', true); // Make input readonly
-            jQuery('#erploadate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpagreementdate').prop('readonly', true); // Make input readonly
-            jQuery('#erpagreementdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpworkorderdate').prop('readonly', true); // Make input readonly
-            jQuery('#erpworkorderdate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-            jQuery('#erpworkcommenceddate').prop('readonly', true); // Make input readonly
-            jQuery('#erpworkcommenceddate').datetimepicker({
-                timepicker: false, // Disable time picker
-                mask: false,
-                disabledWeekDays: [0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-                format: 'd-m-Y', // Date format (you can change it as per your needs)
-                scrollInput: false
-            });
-
-        	/*
-        	=================================
-        	*/
-        });
-       	</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/works/works_details_view_modal_page.html b/src/main/resources/templates/modules/works/works_details_view_modal_page.html
deleted file mode 100644
index 7c6afd2d..00000000
--- a/src/main/resources/templates/modules/works/works_details_view_modal_page.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row" id="printarea">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Works Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="printContent()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-												<h5 class="text-warning">1. Basic Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimate No: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estno"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimate Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estdate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Zone / Ward:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="zone_ward"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">Project Name:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="projectname"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Location:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="location"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											
-											
-											<h5 class="text-warning">2. Department and Contractor Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Department: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="department"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Contractor Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="contractorname"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Contractor Period:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="contractorperiod"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											
-											
-											<h5 class="text-warning">3. Funding and Scheme Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Source of Fund: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="sourceoffund"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Scheme:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="scheme"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="category"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Sub-Category:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="subcategory"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Estimation Amount:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="estamount"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Order Value:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="ordervalue"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <h5 class="text-warning">4. Sanctions and Tender Process</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tech Sanction Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="techsanctiondate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Admin Sanction Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="adminsanctiondate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tender Called Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="tendercalleddate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Tender Finalized Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="tenderfinalizeddate"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											    
-											    <h5 class="text-warning">5. Contract and Execution Details</h5>
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">LOA Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="loadate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Agreement Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="agreementdate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Order Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workorderdate"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Work Commenced Date:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="workcommenceddate"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-								              	
-											</div>
-										</div>
-										<!-- 
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-										 -->
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/works/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/works/works_view_script :: script}"></script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/zerohours_petition/complaint_list.html b/src/main/resources/templates/modules/zerohours_petition/complaint_list.html
deleted file mode 100644
index 29b49422..00000000
--- a/src/main/resources/templates/modules/zerohours_petition/complaint_list.html
+++ /dev/null
@@ -1,882 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Complaint List</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Complaint List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <!-- <div class="card">
-                                    
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-										
-										<div class="form-group">
-                                            <label for="eventid">Select Event / நிகழ்வை தேர்ந்தெடுக்கவும்</label>
-                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required onchange="get_complaint_list(this.value);">
-												<option value=""></option>
-											</select>
-                                        </div>
-                                        
-                                        <div>
-											<table id="complaintDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<!-- <th class="text-center">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Address&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th> -->
-														<!-- <th class="text-center">Postal Code</th> -->
-						                                <!-- <th class="text-center">Type of Complaint</th> -->
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th>
-													</tr>
-                                                </tfoot> -->
-                                                 
-                                            </table>
-                                        </div>
-                                   <!--  </div>
-                                </div>-->
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/zerohours_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_complaint_data(id){
-	        	
-	        	var apiUrl = '/gcc/api/zerohours_petition/getComplaintList?eventId='+id+'&loginId='+createdBy;
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-	        
-	        
-	        /* Get Complaints List */
-	        function get_complaint_list(id){
-	        	call_loading();
-	        	get_complaint_data(id).then(function(complaintList) {
-	    		    // Handle the complaint list
-	    		    generate_table(complaintList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching complaint list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching complaint list:', error);
-			        }
-	    		});
-			}
-	        
-	        function viewPetitionSummary(petitionNo){
-alert(petitionNo);
-	        	$("#viewpetition").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				var url = '/gcc/zerohours_petition/view-petition-modal?petitionNo='+petitionNo;
-				$.ajax({
-				    url: url,
-				    type: 'GET',
-				    dataType: 'html',
-				    success: function(data) {
-				      $('#viewPetitionBoxBody').html(data); // Inject content into modal body
-				    },
-				    error: function(xhr, status, error) {
-				      console.error("Error loading URL:", error);
-				      // Handle error, display a message, etc.
-				    }
-				  });
-				
-				return false;
-			}
-	        
-	        function updateStatus(mapId){
-	        	$("#ComplaintStatusBox").modal({
-				    backdrop: 'static',
-				    keyboard: false
-				}); // Show Modal Box
-				
-				callComplaintDetails(mapId);
-				return false;
-			}
-	        
-	        function callComplaintDetails(mapId){
-	        	loading_text_msg = getLoadingMessage(); // get Loading random text
-	        	var loading=searchinfo("<b>"+loading_text_msg+"</b>");
-	    		var complaintContentHTML=`
-	    							<div class="row">
-	    							    <div class="col-lg-6">
-	    						        <div class="block block-rounded">
-	    						           
-	    						                <div id="leftContainer">${loading}</div>
-	    						            
-	    						        </div>
-	    						    </div>
-	    						    
-	    						    <div class="col-lg-6 printack2">
-	    						        <div class="block block-rounded">
-	    						            
-	    						                <div id="rightContainer">${loading}</div>
-	    						           
-	    						        </div>
-	    						    </div>
-	    						    <!--<div class="col-lg-12 text-center block-options pt-10">
-	    						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-	    						    </div>-->
-	    						</div>`;
-	    		
-	    		$('#ComplaintStatusBoxBody').html(complaintContentHTML); // Box content (Body)
-	    		
-	    		getComplaintData(mapId,false);
-			}
-	        
-	        function getComplaintData(mapId,edit=false){
-				//alert(mapId);
-	        	get_complaint_details_byId(mapId).then(function(complaintDetails) {
-	        		
-	        		var complaintStatus = complaintDetails[0].status;
-					
-	        		var statusBadge = complaintStatus.charAt(0).toUpperCase() + complaintStatus.slice(1);
-	        		var refRibben = `<div class="card-header-right" style="top:auto;">
-	        							Ref ID: ${mapId}
-				              	      </div>`;
-           	        var statusRibben = ""; 
-	        		if(complaintStatus=='pending'){
-	        			statusRibben = `<div class="ribbon">
-		              	      <div class="wrap">
-		              	        <span class="ribbon6 bg-danger"><div styel="color:#fff;">${statusBadge}</div></span>
-		              	      </div>
-		              	    </div>`;
-		              	statusRibben = "";    
-	        			statusBadge = `<span class="badge badge-danger" style="font-size:10px;padding:0.25em 0.4em;">${statusBadge}</span>`;
-	        			
-					}
-	        		else if(complaintStatus=='close'){   
-	        			statusBadge = `<span class="badge badge-success" style="font-size:10px;padding:0.25em 0.4em;">${statusBadge}</span>`;
-					}
-	        		var complaintRightBody = "";
-					var complaintLeftBody = `<div class="card mb-0">
-								             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                	<h3>Complaint Details</h3>
-								                	${statusRibben}
-								                </div>
-								                <div class="card-body">
-									                <table class="table table-borderless table-vcenter mb-0" style="font-size:12px;">
-												      <tbody>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${convertdate(complaintDetails[0].cdate)}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petition_no}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petitioner_name}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-												          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-												           ${complaintDetails[0].petitioner_mobile}
-												          </td>
-												        </tr>
-												        <tr>
-												          <th colspan="2" style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:<br><p class="fw-semibold mb-0" style="font-weight:normal;">${complaintDetails[0].complaint_nature}</p></th>
-												        </tr>
-												        <tr>
-												        	<td colspan="2" style="padding: 0.45rem 0.45rem;">
-													        	<table class="table table-bordered table-vcenter mb-0">
-													                <thead>
-													                  <tr>
-													                    <th>Complaint <i class="fa fa-arrow-right"></i> Status</th>
-													                    <th class="text-right" id="complaint_forward_link"><!--<a href="javascript:void(0);" onclick="return forward_compliant(${complaintDetails[0].mapid}, '${complaintDetails[0].complaint_type}');" class="link" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Click here to forward this complaint to another department officer."><i class="far fa-share-square"></i> Click to forward </a>--></th>
-													                  </tr>
-													                </thead>
-												                	<tbody>
-												                 		<tr>
-															            	<td colspan="2" class="fw-semibold">
-															            	${complaintDetails[0].petition_no} <i class="fa fa-arrow-right"></i> ${statusBadge} <i class="fa fa-arrow-right"></i> ${complaintDetails[0].off_nm}
-														                    </td>
-													                  	</tr>
-												                	</tbody>
-												              	</table>
-												        	</td>
-												        </tr>
-												      </tbody>
-												    </table>
-								                </div>
-								            </div>`;
-					
-					$('#leftContainer').html(complaintLeftBody);
-					
-					if(complaintStatus!='close'|| edit){
-						if(edit){
-							get_complaint_action_byId(mapId).then(function(complaintAction) {
-							complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-													<div class="card mb-0">
-								                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                    		<h3>Complaint Update Details</h3>
-								                    	    ${refRibben}
-								                		</div>
-								                		<div class="card-body">
-									                		<div class="form-group">
-						                                    	<label for="complaintActionText">நடவடிக்கை / Action:</label>
-										   						<textarea class="form-control" id="complaintActionText" name="complaintActionText" rows="6" maxlength="250" placeholder="புகாரின் தன்மை..." required>${complaintAction[0].comments}</textarea>
-										   					</div>
-										   					
-										   					<div class="form-group">
-										                       <label for="action_san_page1">ஆவணப் பதிவேற்றம் / Document Upload:</label>
-															   <input name="action_san_page1" id="action_san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*" required>
-															 </div>
-															 <div class="form-group mb-0 text-center">
-															 	<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveandclose(${mapId},${complaintDetails[0].petition_id},'${complaintDetails[0].petition_no}');" id="updatebtn"><i class="ik ik-save"></i> Save and Close </button>
-															 </div>
-								                		</div>
-								            		</div>
-							            		</form>`;
-							$('#rightContainer').html(complaintRightBody);
-							}).catch(function(error) {
-				    		    // Handle errors
-				    		    console.error('Error fetching action details ('+mapId+'):', error);
-				    		});	
-							//alert(complaintRightBody);
-							
-						}
-						else{
-							complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-													<div class="card mb-0">
-								                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                    		<h3>Complaint Update Details</h3>
-								                    	    ${refRibben}
-								                		</div>
-								                		<div class="card-body">
-									                		<div class="form-group">
-						                                    	<label for="complaintActionText">நடவடிக்கை / Action:</label>
-										   						<textarea class="form-control" id="complaintActionText" name="complaintActionText" rows="6" maxlength="250" placeholder="புகாரின் தன்மை..." required></textarea>
-										   					</div>
-										   					
-										   					<div class="form-group">
-										                       <label for="action_san_page1">ஆவணப் பதிவேற்றம் / Document Upload:</label>
-															   <input name="action_san_page1" id="action_san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*" required>
-															 </div>
-															 <div class="form-group mb-0 text-center">
-															 	<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveandclose(${mapId},${complaintDetails[0].petition_id},'${complaintDetails[0].petition_no}');" id="updatebtn"><i class="ik ik-save"></i> Save and Close </button>
-															 </div>
-								                		</div>
-								            		</div>
-							            		</form>`;
-						}
-						$('#rightContainer').html(complaintRightBody);
-					}
-					else{
-						// first remove forward link
-						$("#complaint_forward_link").html("");
-						
-						get_complaint_action_byId(mapId).then(function(complaintAction) {
-							var fileType = complaintAction[0].file_type;
-							fileType = fileType.split("/").pop();
-							var filetypeico = "file-lines";
-							if(fileType=='pdf'){
-								filetypeico = "file-pdf";
-							}
-							else{
-								filetypeico = "file-image";
-							}
-							
-							complaintRightBody =`<form class="action-form" id="action-form" onsubmit="return saveandclose();" enctype="multipart/form-data">
-													<div class="card mb-0">
-								                    	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-								                    		<h3>Complaint Update Details</h3>
-								                    	    ${refRibben} 
-								                		</div>
-								                		<div class="card-body">
-									                		<div>
-									                			<b>நடவடிக்கை தேதி / Action Date:</b> ${convertdate(complaintAction[0].cdate)}
-					                                            <hr>
-					                                            <b>நடவடிக்கை / Action:</b><br>
-					                                            <p class="mt-10">${complaintAction[0].comments}</p>
-					                                        </div>
-					                                        	<hr>
-					                                        <div class="like-comm mt-20 mb-0"> 
-					                                        	<b>ஆவணப் பதிவேற்றம் / Document Upload:</b><br>
-					                                        	
-						                                        	<table class="table table-bordered table-vcenter mb-0">
-														                <thead>
-														                  <tr>
-														                    <th>S.no</th>
-														                    <th>File Name</th>
-														                    <th>Size</th>
-														                    <th>Type</th>
-														                    <th><i class="ik ik-more-horizontal"></i></th>
-														                  </tr>
-														                </thead>
-													                	<tbody>
-													                 		<tr>
-																            	<td class="fw-semibold">1</td>
-																            	<td class="fw-semibold">${complaintAction[0].file_name}</td>
-																            	<td class="fw-semibold">${formatFileSize(complaintAction[0].file_size)}</td>
-																            	<td class="fw-semibold">${fileType}</td>
-																            	<td class="fw-semibold">
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="downloadFile('action','${complaintAction[0].file_name}','${complaintAction[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Download File"><i class="fa fa-fw fa-download" style="font-size: 18px;"></i></a>
-																            		<a href="javascript:void(0)" class="link mr-10" onclick="viewFile('action','${complaintAction[0].file_name}','${complaintAction[0].file_type}');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View File"><i class="far fa-3x fa-${filetypeico}" style="font-size: 18px;"></i></a>
-																            	</td>
-														                  	</tr>
-													                	</tbody>
-													              	</table>
-					                                   		</div>
-								                		</div>
-								                		<!--<a href="javascript:void(0)" onclick="getComplaintData(${mapId}, true);">Edit</a>-->
-								                		<button type="button" class="btn btn-success" id="edit" onclick="getComplaintData(${mapId}, true);"><i class="ik ik-edit"></i>Edit</button>
-								            		</div>
-							            		</form>`;
-							$('#rightContainer').html(complaintRightBody);
-							// Enable tooltips for all elements with data-toggle="tooltip"
-				            $('[data-toggle="tooltip"]').tooltip();
-						}).catch(function(error) {
-			    		    // Handle errors
-			    		    console.error('Error fetching action details ('+mapId+'):', error);
-			    		});	 
-						
-					}
-					// Enable tooltips for all elements with data-toggle="tooltip"
-		            $('[data-toggle="tooltip"]').tooltip();
-	        	}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching Complaint details ('+mapId+'):', error);
-	    		});	            
-	        	
-			}
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-	        	$('#complaintDatatable').DataTable().destroy();
-	        	
-	            var table = $('#complaintDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        //scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: false,
-				        searching: true,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	            	var complaint_status=row["status"];
-					complaint_status=complaint_status.charAt(0).toUpperCase() + complaint_status.slice(1);
-					
-					actionHTML = `<div class="dropdown d-inline-block show">
-			                        <a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="ik ik-more-horizontal"></i></a>
-			                        <!--<div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-			                        Action for: `+row['petition_no']+` 
-			                        	<a class="dropdown-item" href="" onclick="return viewAck('`+row['petition_no']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View Acknowledgement"><i class="ik ik-eye"></i> Acknowledgement</a>
-			                        	<a class="dropdown-item" href="/gcc/zerohours_petition/petition-ack/`+row['petition_no']+`" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Print Acknowledgement"><i class="ik ik-printer"></i> Acknowledgement</a>
-			                        </div>-->
-			                    </div>`
-	                table.row.add([
-	                	rowNum++,
-	                    //'<a href="/gcc/zerohours_petition/update-petition?petitionNo='+row['petitionNoEncode']+'" onclick="return viewPetitionSummary(\''+row['petitionNoEncode']+'\');">'+row['petition_no']+'</a>',
-	                    row['petition_no'],
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    //row['petitioner_address'],
-	                    //row['petitioner_pincode'],
-	                    //row['complaint_type'],
-	                    convertdate(row['cdate']),
-	                    '<a href="#" class="link" onclick="return updateStatus('+row['mapid']+');" style="text-transform: capitalize;"">'+complaint_status+'</a>',
-	                    row['off_nm'],
-	                    actionHTML
-	                ]).draw(false);
-	            });
-	            
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-			}
-			
-	        /* Get Event Data */
-	        function get_event_data(){
-	        	get_event_list().then(function(eventList) {
-	        		$('#ward').empty();
-					if(eventList.length>0){
-						// Iterate through the department list and add options to the select element
-		    		    $.each(eventList, function(index, events) {
-		    	            // Create an option element
-		    	            //alert(events.name);
-		    	            var option = $('<option>', {
-		    	            	value: events.id, // case-sensitive as per object
-		    	                text: events.name
-		    	            });
-		    	            // Append the option to the select element
-		    	            $('#eventid').append(option);
-		    	        });
-					}
-					else{
-						$("#card-body").html("<center>No Active Event Found!</center>");
-					}
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching event list:', error);
-	    		    
-	    		});
-	        	remove_loading();
-			}
-	        
-	      //Save Forward Details
-			function saveForward(mapid){
-				
-				var offidto = $("#dept2").val();
-				
-				if(offidto=='' || offidto==0){
-					var formError= "Select Department Required!";
-					$('#forwardFormError').html(formError);
-					return false;
-				}
-				
-				var comments = $("#forwardcomp").val();
-				var textLength = comments.length;
-				var formError= "";
-				if(textLength<=10){
-					formError= "Forward Comments Required!";
-					$('#forwardFormError').html(formError);
-					return false;
-				}
-				else{
-					$('#forwardFormError').html(formError);
-				}
-				
-				$.ajax({
-				    type: "POST",
-				    url: '/api/insertForwardLog',
-				    data: {
-				        'mapid': mapid,
-						'comments':comments,
-						'offidto':offidto
-				    },
-				}).done(function(response) {
-				      Swal.fire(
-				        'Complaint Forward Status!',
-				        'Complaint Forwarded Successfully!',
-				        'success'
-				      ).then(() => {
-							    location.reload();
-							 });
-					console.log(response);
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					/*
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-				    console.error("URL: /api/setEventId");
-				    console.error("Query parameters:", {
-				        'upass': upass
-				    });
-					*/
-				});
-				return false;
-			}
-	     	
-	      // Save New Action  
-			function saveandclose(mapId,petitionId,petitionNo){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var comments = $('#complaintActionText');
-				var textLength = comments.val().length;
-				comments.removeClass('is-invalid');
-				
-				var fileInput = $("#action_san_page1");
-				fileInput.removeClass('is-invalid');
-				var selectedFile = fileInput.val();
-				
-				if (textLength>=10 && selectedFile) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#action-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        formData.append('mapId',mapId);
-			        formData.append('petitionId',petitionId);
-			        formData.append('petitionNo',petitionNo);
-			        formData.append('complaintStatus','close');
-			        
-			        saveActionFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Complaint action saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					$("#ComplaintStatusBox").modal('hide');
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save complaint action. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					if(textLength<10){
-						comments.addClass('is-invalid');
-					}
-					
-					if (!selectedFile) {
-						fileInput.addClass('is-invalid');
-					}
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveActionFormData(formData){
-				var apiUrl = '/gcc/api/zerohours_petition/saveComplanitStatus';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#updatebtn").prop("disabled", false);
-				$("#updatebtn").html('<i class="ik ik-save"></i> Save and Close ');
-			}
-			
-			function form_btn_disable(){
-				$("#updatebtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#updatebtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			// For Complient Map Select HTML 
-			function calloffice(val,id){
-				if(val==1){ // Intenal
-					var officeSelectHTML = `<div class="mb-4">
-	                							<label for="office${id}">Select Office</label>
-	                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-									                <option value="0">Select Office</option>
-									                <option value="1">HQ</option>
-									                <option value="2">Zonal Office</option>
-							                	</select>
-						                	</div>`;
-					$("#officedata"+id).html(officeSelectHTML);
-				}
-				else if(val==2){ // External
-					$("#officers"+id).html('');
-					var ExSelectHTML = getselect(id,"ExSelect");
-					var departmentSelectHTML = `<div class="mb-4">
-													<label for="dept3">Select Department</label>
-													${ExSelectHTML}
-											 	</div>`;
-					$("#officedata"+id).html(departmentSelectHTML);
-				}
-				else{
-					$("#officedata"+id).html('');
-					$("#officers"+id).html('');
-				}
-				$("#officers"+id).html('');
-			}
-			
-			function callofficers(val,id){
-				
-				if(val==1){
-					// HQ
-					var HQSelectHTML = getselect(id,"HQSelect");
-				 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-				}
-				else if(val==2){
-					// Zone Office
-					var ZoneSelectHTML = getselect(id,"ZoneSelect");
-					$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-				}
-				else{
-					$("#officers"+id).html('');
-				}
-				
-			}
-			
-			function getselect(comid,type){
-		  	  var HQSelect = '';
-		  	  var ZoneSelect = '';
-		  	  var ExSelect = '';
-		  
-		  	  for (var i = 0; i < officerMasterList.length; i++) {
-		  		  if(officerMasterList[i].zone_id=="HQ"){
-		  			  HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else if(officerMasterList[i].zone_id=="99"){
-		  			  ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else{
-		  			  ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  	  }
-		  	  
-		  	// Forward Save Button
-			  var forward_Btn = `<div class="col-12 pt-3 mb-0 pb-0" id="submitdiv">
-									<label class="form-label" for="forwardcomp">Forward Comments</label>
-									<textarea class="js-maxlength form-control" id="forwardcomp" name="forwardcomp" rows="6" maxlength="250" placeholder="கருத்துகள்..." data-always-show="true" data-placement="right" th:utext="" required></textarea>
-			  						<div class="text-center pt-3">
-									<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveForward(${comid});" id="updatebtn"><i class="si si-rocket me-1"></i> Save and Forward</button>
-			  						<div id="forwardFormError" class="text-danger"></div>
-			  						</div>
-								</div>`;
-								
-		  	  if(type=="HQSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ZoneSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ExSelect"){
-		  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  return '';
-			}
-			$(document).ready(function() {
-				call_loading();
-				get_officer_master_data();
-				get_event_data();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/zerohours_petition/new_petition.html b/src/main/resources/templates/modules/zerohours_petition/new_petition.html
deleted file mode 100644
index 22cd4e61..00000000
--- a/src/main/resources/templates/modules/zerohours_petition/new_petition.html
+++ /dev/null
@@ -1,456 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Add New Petition</h5>
-                                            <span>Zero Hours Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Zero Hours Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Add Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-                        	<div class="col-md-2"></div>
-							<div class="col-md-8">
-                                <div class="card">
-									<form class="request-form" id="request-form" onsubmit="return saveRequest();" enctype="multipart/form-data">
-	                                    <div class="card-header"><h3>New Petition Form</h3></div>
-	                               		<div class="card-body" id="card-body">
-	                               			<div class="row">
-	                               				<div class="col-lg-12">
-													<div class="form-group">
-			                                            <label for="eventid">Select Current Event / ததற்போதைய நிகழ்வை தேர்ந்தெடுக்கவும்</label>
-			                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required>
-															<option value=""></option>
-														</select>
-			                                           <!-- <div class="form-radio" id="petition_type"></div> -->
-			                                        </div>
-		                                      	</div>
-	                               				<div class="col-lg-6">
-													<div class="form-group">
-			                                            <label for="zone">Select Zone / தேர்வு செய்யும் மண்டலம்</label>
-			                                            <select class="form-control" id="zone" name="zone" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." onchange="get_ward_list(this.value);" required>
-															<option value=""></option>
-														</select>
-			                                           <!-- <div class="form-radio" id="petition_type"></div> -->
-			                                        </div>
-		                                      	</div>
-	                                        	<div class="col-lg-6">
-			                                        <div class="form-group">
-			                                            <label for="ward">Select Ward / தேர்வு செய்யும் வார்டு</label>
-			                                            <select class="form-control" id="ward" name="ward" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required  onchange="get_councillor_details(this.value);">
-															<option value=""></option>
-														</select>
-			                                           <!-- <div class="form-radio" id="petition_type"></div> -->
-			                                        </div>
-	                                        	</div>
-	                                        </div>
-	                                        <div class="row">
-	                               				<div class="col-lg-6">
-													<div class="form-group">
-			                                            <label for="councillorName">Councillor Name / கௌன்சிலர் பெயர்</label>
-			                                            <input type="text" readonly class="form-control" name="councillorName" id="councillorName" autocomplete="off" placeholder="கௌன்சிலர் பெயர்"  maxlength="250" required>
-			                                        </div>
-			                                    </div>
-	                                        	<div class="col-lg-6">
-			                                        <div class="form-group">
-			                                            <label for="councillorMobile">Mobile NO / கைபேசி எண்</label>
-					                       				<input type="text" readonly class="js-maxlength form-control" id="councillorMobile" name="councillorMobile" autocomplete="off" placeholder="கைபேசி எண்" maxlength="10" data-always-show="true" data-placement="top" required>
-			                                        </div>
-			                                     </div>
-			                                </div>
-			                                <div class="form-group">
-	                                        	<label for="complaintNature">புகாரின் தன்மை / Nature Of Complaint</label>
-						   						<textarea class="form-control" id="complaintNature" name="complaintNature" rows="6" placeholder="புகாரின் தன்மை..."></textarea>
-						   					</div>
-											<!-- 
-	                                        <div class="row">
-												 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page1">Petition Page 1 / மனு பக்கம் 1</label>
-													   <input name="san_page1" id="san_page1" class="form-control" type="file" capture="camera"  accept="application/pdf, image/*">
-													 </div>
-												 </div>
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page2">Petition Page 2 / மனு பக்கம் 2</label>
-													   <input name="san_page2" id="san_page2" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-												 
-											</div>	 
-											<div class="row">	 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page3">Petition Page 3 / மனு பக்கம் 3</label>
-													   <input name="san_page3" id="san_page3" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-												 
-							                     <div class="col-lg-6">
-								                     <div class="form-group">
-								                       <label for="san_page4">Petition Page 4 / மனு பக்கம் 4</label>
-													   <input name="san_page4" id="san_page4" class="form-control" type="file" capture="camera" accept="application/pdf, image/*">
-													 </div>
-												 </div>
-											</div>
-										 	
-	                                  	</div>
-	                                  	 -->
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-							<div class="col-md-2"></div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var complaintTypeList = "";
-			var zoneList="";
-			var wardList="";
-			
-			/* Get Event Data */
-	        function get_event_data(){
-	        	get_current_event_list().then(function(eventList) {
-	        		$('#ward').empty();
-					if(eventList.length>0){
-						// Iterate through the department list and add options to the select element
-		    		    $.each(eventList, function(index, events) {
-		    	            // Create an option element
-		    	            //alert(events.name);
-		    	            var option = $('<option>', {
-		    	            	value: events.id, // case-sensitive as per object
-		    	                text: events.name
-		    	            });
-		    	            // Append the option to the select element
-		    	            $('#eventid').append(option);
-		    	        });
-					}
-					else{
-						$("#card-body").html("<center>No Active Event Found!</center>");
-					}
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching event list:', error);
-	    		    
-	    		});
-			}
-			
-			/* Get Zone and Ward Data */
-	        function get_zone_ward_data(){
-	        	get_zone_ward_list().then(function(zoneWard) {
-	    		    // Handle the zoneward list
-	    		    zoneWardList = zoneWard;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(zoneWardList, function(index, zoneWards) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: zoneWards.zone, // case-sensitive as per object
-	    	                text: "Zone "+ zoneWards.zone
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#zone').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			
-	        /* Get Ward List */
-	        function get_ward_list(zone) {
-
-	            // Assuming get_zone_ward_list() returns a promise that resolves to the zoneWardList
-	            get_zone_ward_list().then(function(zoneWard) {
-	                // Handle the zoneWard list
-	                zoneWardList = zoneWard;
-	                
-	                // Clear any existing options in the ward dropdown
-	                $('#ward').empty();
-	                
-	                var option = $('<option>', {
-                        value:"" ,  // Set ward number as the value
-                        text:""  // Display as "Ward 1", "Ward 2", etc.
-                    });
-	                
-	                $('#ward').append(option);
-	                
-	                $('#councillorName').val('');
-					$('#councillorMobile').val('');
-					
-	            	 // Find the correct zone in the zoneWardList
-	                var selectedZone = zoneWardList.find(function(zoneWards) {	                    
-						return zoneWards.zone == zone;  // Compare the zone value
-	                });
-	                // If the zone is found, iterate over its wards and add options
-	                if (selectedZone) {
-	                    var wardsArray = selectedZone.wards.split(',');  // Split wards string into array
-	                    $.each(wardsArray, function(index, ward) {
-	                        // Create an option element
-	                        option = $('<option>', {
-	                            value: ward.trim(),  // Set ward number as the value
-	                            text: 'Ward ' + ward.trim()  // Display as "Ward 1", "Ward 2", etc.
-	                        });
-	                        // Append the option to the select element
-	                        $('#ward').append(option);
-	                    });
-	                } else {
-	                    console.error('Zone not found');
-	                }
-
-	            }).catch(function(error) {
-	                // Handle errors
-	                console.error('Error fetching ward list:', error);
-	            });
-	        }
-	        
-	        /* Get Ward List */
-	        function get_councillor_details(ward) {
-
-	            // Assuming get_zone_ward_list() returns a promise that resolves to the zoneWardList
-	            get_councillor_list(ward).then(function(councillors) {
-	                // Handle the zoneWard list
-	                councillorList = councillors;
-	                
-	                // Clear any existing options in the ward dropdown
-	                $('#councillorName').val('');
-					$('#councillorMobile').val('');
-	                
-				   	// Iterate through the department list and add options to the select element
-				   	$.each(councillorList, function(index, councillor) {
-				   		$('#councillorName').val(councillor.name)
-		                $('#councillorMobile').val(councillor.mobile1);
-				   	});   
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-	        }
-	        
-	       
-			/* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(complaintTypeList, function(index, complaintType) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: complaintType.complaint_typeid, // case-sensitive as per object
-	    	                text: complaintType.complaint_type
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#complaintType').append(option);
-	    	        });
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			
-	        /* Get Petition Type Data */
-	        function get_petition_type_data(){
-	        	var petitionTypeHTML="";
-	    		get_petition_type_list().then(function(petitionTypes) {
-	    		    // Handle the Complaint list
-	    		    petitionTypeList = petitionTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(petitionTypeList, function(index, petitionType) {
-	    	            // Create an option element
-	    	            
-	    	            petitionTypeHTML +=`<div class="radio radiofill ${petitionType.color_class} radio-inline">
-						                            <label class="cursure_poiter">
-						                            <input type="radio" name="petitionType" value="${petitionType.petition_type_id}">
-						                            <i class="helper"></i>${petitionType.name}
-						                        </label>
-						                    </div>`;
-	    	        });
-	    		 // Append the option to the select element
-    	         $('#petition_type').html(petitionTypeHTML);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching petition type list:', error);
-	    		});
-			}
-			 
-			// Save New petition 
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#request-form')[0]);
-			        formData.append('createdBy',createdBy);
-			        saveFormData(formData).then(function(response) {
-						if(response!="error"){
-							// Handle the response
-		    		    	Swal.fire({
-		        				title: 'Petition data saved successfully.',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'success',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					// Reload the current page
-		        					//location.reload();
-		        					// Navigate to a Ack page
-		        					//window.location = "/gcc/zerohours_petition/petition-ack/"+response;
-		        					window.location = "/gcc/zerohours_petition/new_petition";
-		        				}
-		        			});
-						}
-						else{
-							// Handle the response
-							// if response == "error"
-		    		    	Swal.fire({
-		        				title: 'Failed to save petition data. Please try again!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-		    		    
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function saveFormData(formData){
-				var apiUrl = '/gcc/api/zerohours_petition/savePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function form_btn_enable(){
-				$("#resetFormBtn").prop("disabled", false);
-				$("#requestSubmitBtn").prop("disabled", false);
-				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-			}
-			
-			function form_btn_disable(){
-				$("#resetFormBtn").prop("disabled", true);
-				$("#requestSubmitBtn").prop("disabled", true);
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-			}
-			
-			$(document).ready(function() {
-				get_event_data();
-				get_zone_ward_data();
-				get_complaint_type_data();
-				$('#petitionerMobile').mask('0000000000');
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/zerohours_petition/pending_list.html b/src/main/resources/templates/modules/zerohours_petition/pending_list.html
deleted file mode 100644
index 63ce8efb..00000000
--- a/src/main/resources/templates/modules/zerohours_petition/pending_list.html
+++ /dev/null
@@ -1,290 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    /* Add space between buttons inside the container */
-    .col-md-3.d-flex button {
-        margin-right: 10px; /* Adjust the value as needed */
-    }
-    /* Remove extra margin from the last button */
-    .col-md-3.d-flex button:last-child {
-        margin-right: 0;
-    }
-</style>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Pending List</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Pending List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <!-- <div class="card">
-                                    
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-										
-
-
-										
-										<div class="row mb-3">
-    <div class="col-md-3">
-        <label for="fromDate">From Date:</label>
-        <input type="date" id="fromDate" class="form-control">
-    </div>
-    <div class="col-md-3">
-        <label for="toDate">To Date:</label>
-        <input type="date" id="toDate" class="form-control">
-    </div>
-<div class="col-md-3 d-flex align-items-end">
-    <button id="filterBtn" class="btn btn-primary">Search</button>
-    <button id="resetBtn" class="btn btn-secondary">Reset</button>
-</div>
-
-
-
-
-</div>
-										
-										
-			<!-- 							<div class="form-group">
-                                            <label for="eventid">Select Event / நிகழ்வை தேர்ந்தெடுக்கவும்</label>
-                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required onchange="get_complaint_list(this.value);">
-												<option value=""></option>
-											</select>
-                                        </div>
-                                         -->
-                                        <div>
-											<table id="ReportDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-														<th class="text-center">Counsilor Ward</th>
-						 								<th class="text-center">Counsilor Zone</th>
-						 								<th class="text-center">Counsilor Name</th>
-						 								<th class="text-center">Content</th>
-						 								<!-- <th class="text-center">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Address&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th> -->
-														<!-- <th class="text-center">Postal Code</th> -->
-						                                <!-- <th class="text-center">Type of Complaint</th> -->
-						                                <!-- <th class="text-center">Date</th> -->
-						                                <th class="text-center">Department Officer</th>
-						                                <th class="text-center">Status</th>
-						                                
-						                                <!-- <th class="text-center no-sort no-exportable no-print"><i class="ik ik-more-horizontal"></i></th> -->
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                          
-                          
-                                                 
-                                            </table>
-                                        </div>
-                                 
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/zerohours_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-        <script th:inline="javascript">
-       		var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            },
-	            {
-					extend: 'colvis',
-					className: 'btn btn-warning'
-				},
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-			
-			//Report List
-			
-
-
-    
-	function loadReportData(fromDate, toDate, isReset = false) {
-	    let apiUrl = '/gcc/api/zerohours_petition/getReportList';
-
-	    // Add params only if dates are provided AND not reset
-	    if (!isReset && fromDate && toDate) {
-	        apiUrl += '?fromDate=' + fromDate + '&toDate=' + toDate;
-	    }
-
-	    $.ajax({
-	        url: apiUrl,
-	        type: 'GET',
-	        dataType: 'json',
-	        success: function (response) {
-	            if ($.fn.DataTable.isDataTable('#ReportDatatable')) {
-	                $('#ReportDatatable').DataTable().clear().destroy();
-	            }
-
-	            $('#ReportDatatable').DataTable({
-	                data: response,
-	                dom: 'Bfrtip',   // 👈 this line enables buttons
-	                buttons: buttons, // 👈 your defined buttons array
-	                columns: [
-	                    {
-	                        data: null,
-	                        className: "text-center",
-	                        render: function (data, type, row, meta) {
-	                            return meta.row + 1;
-	                        }
-	                    },
-	                    { data: 'petition_no', className: "text-center" },
-	                    { data: 'ward', className: "text-center" },
-	                    { data: 'zone', className: "text-center" },
-	                    { data: 'petitioner_name', className: "text-center" },
-	                    { data: 'complaint_nature', className: "text-center" },
-	                    { data: 'officer_name', className: "text-center" },
-	                    { data: 'status', className: "text-center" }
-	                ]
-	            });
-	        },
-	        error: function (xhr, status, error) {
-	            console.error("Error fetching report list:", error);
-	        }
-	    });
-	}
-
-	$(document).ready(function () {
-	    // Default load today's data
-	    let today = new Date().toISOString().split('T')[0];
-	    $("#fromDate").val(today);
-	    $("#toDate").val(today);
-	    loadReportData(today, today);
-
-	    // On Filter Button Click
-	    $("#filterBtn").click(function () {
-	        let fromDate = $("#fromDate").val();
-	        let toDate = $("#toDate").val();
-
-	        if (fromDate && toDate) {
-	            loadReportData(fromDate, toDate);
-	        } else {
-	            alert("Please select both From Date and To Date");
-	        }
-	    });
-
-	    // Reset button click
-	    $("#resetBtn").click(function () {
-	        location.reload();
-	    });
-	});
-    
-			
- 
-		    
-		    //////////
-			
-
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/zerohours_petition/petition_ack.html b/src/main/resources/templates/modules/zerohours_petition/petition_ack.html
deleted file mode 100644
index 5dcb1ccd..00000000
--- a/src/main/resources/templates/modules/zerohours_petition/petition_ack.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5 th:utext="'Petition Acknowledgement ('+${petitionNo}+')'">Petition Acknowledgement</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition Acknowledgement</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr class="print_no">
-                        <!-- 
-                        <div class="row">
-                        	<div class="col-lg-6">
-								<div class="block block-rounded ack ack-container">
-									<div id="ack1table" style="border: 1px solid black;">
-										<div id="ack1"></div>
-									</div>
-								</div>
-							</div>
-						 
-							<div class="col-lg-6">
-								<div class="block block-rounded ack ack-container">
-									<div id="ack2table" style="border: 1px solid black;">
-										<div id="ack2"></div>
-									</div>
-								</div>
-							</div>
-		   	 	            <div class="col-lg-12 text-center block-options pt-10">
-		   	 					<button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-		   	 	            </div>
-                        </div>
-                         -->
-                        <div class="row">
-						    <div class="col-lg-6">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack1table" class="ack-content">
-						                <div id="ack1">This is ack1</div>
-						            </div>
-						        </div>
-						    </div>
-						    
-						    <div class="col-lg-6 printack2">
-						        <div class="block block-rounded ack ack-container">
-						            <div id="ack2table" class="ack-content">
-						                <div id="ack2">This is ack2</div>
-						            </div>
-						        </div>
-						    </div>
-						    <div class="col-lg-12 text-center block-options pt-10">
-						        <button type="button" class="btn btn-warning btn-rounded btn-block-option" onclick="window.print()"><i class="ik ik-printer"></i> Print</button>
-						    </div>
-						</div>
-						                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var complaintTypeList = "";
-			
-			 /* Get Complaint Type Data */
-			function get_complaint_type_data(){
-			
-				get_complaint_type_list().then(function(complaintTypes) {
-				    // Handle the Complaint list
-				    complaintTypeList = complaintTypes;
-					
-				    // After Complaint Type list created we call petition details
-				    get_petition_data();
-				    
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching complaint type list:', error);
-				});
-			}
-			
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint_txt;
-					
-					var complaintArray = complaint.split(',');
-					
-					for(j = 0; j < complaintArray.length; j++){
-						if(j>0){
-							complaintHTML+="<br>";
-						}
-						complaintHTML+= (j+1)+') '+complaintArray[j];
-					}
-					var ack =`
-					<table class="table table-borderless table-vcenter p-0 m-0">
-					  <tbody>
-					    <tr>
-					      <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-					      <td class="fw-semibold text-center">
-								<b>பெருநகர சென்னை மாநகராட்சி | Greater Chennai Corporation<br>
-								மக்களை தேடி மேயர் திட்டம்<br>
-								ஒப்புகை சீட்டு / Acknowledgement Receipt</b>
-						  </td>
-						  <td scope="row"><img src="images/logo-sm.png" width="80px"/></td>
-					    </tr>
-					</tbody>
-					</table>
-					<hr style="margin:0px">
-					  <div class="block-content p-0 m-0">
-					    <table class="table table-borderless table-vcenter" style="font-size:12px;">
-					      <tbody>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">நாள் / Date : </th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${convertdate(petitionDetails[0].cdate)}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petition_no}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name :</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petitioner_name}
-					          </td>
-					        </tr>
-					        <tr>
-					          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${petitionDetails[0].petitioner_mobile}
-					          </td>
-					        </tr>
-					        <tr style="font-size:12px;">
-					          <th style="padding: 0.45rem 0.45rem;">புகாரின் தன்மை / Nature of complaint:</th>
-					          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;">
-					           ${complaintHTML}
-							</td>
-					        </tr>
-					        <tr>
-					          <td scope="row" colspan="2" style="font-size:10px">இம்மனுவின் ஒப்புகைச் சீட்டு எண் மனு தாரரின் கைபேசி எண்ணிற்கு குறுஞ்செய்தி மூலம் அனுப்பி வைக்கப்படும் . இம்மனுவின் நிலை குறித்து https://chennaicorporation.gov.in/MTM/ என்ற இணையதளத்தில் மனுவின் எண்ணை குறிப்பிட்டு அறிந்துகொள்ளலாம்</th>
-					        </tr>
-					        <tr style="text-align: right;">
-					          <th scope="row" colspan="2" style="padding: 0.45rem 0.45rem;">வட்டார அலுவலகம்<br>Office of the Regional Deputy Commissioner</th>
-					        </tr>
-					      </tbody>
-					    </table>
-					  `;
-				    
-					$("#ack1").html(ack);
-					$("#ack2").html(ack);
-					  
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition details ('+petitionNo+'):', error);
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/zerohours_petition/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                resolve(jsonResponse);
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			$(document).ready(function() {
-				get_complaint_type_data();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/zerohours_petition/petition_list.html b/src/main/resources/templates/modules/zerohours_petition/petition_list.html
deleted file mode 100644
index d1996b1f..00000000
--- a/src/main/resources/templates/modules/zerohours_petition/petition_list.html
+++ /dev/null
@@ -1,325 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Petition List</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                               <!--  <div class="card">
-                                    
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-										
-										<div class="form-group">
-                                            <label for="eventid">Select Event / நிகழ்வை தேர்ந்தெடுக்கவும்</label>
-                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required onchange="get_petitions_list(this.value);">
-												<option value=""></option>
-											</select>
-                                        </div>
-			                                        
-                                        <div>
-                                        	
-											<table id="petitionDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered" style="font-size:10px;">
-						                                <th class="text-center no-sort" width="3%">S.No</th>
-														<th class="text-center" width="10%">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<!-- <th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>-->
-						                                <th class="text-center">Content</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center" width="7%">Status</th>
-						                                <!--<th class="text-center">Petition Type</th>-->
-						                                <th class="text-center no-sort no-exportable no-print" width="5%">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- 
-                                                <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-													</tr>
-                                                </tfoot> -->
-                                            </table>
-                                        </div>
-                                    <!--</div>
-                                </div>-->
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/zerohours_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-        <script th:inline="javascript">
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-			/* Get Event Data */
-	        function get_event_data(){
-	        	get_event_list().then(function(eventList) {
-	        		$('#ward').empty();
-					if(eventList.length>0){
-						// Iterate through the department list and add options to the select element
-		    		    $.each(eventList, function(index, events) {
-		    	            // Create an option element
-		    	            //alert(events.name);
-		    	            var option = $('<option>', {
-		    	            	value: events.id, // case-sensitive as per object
-		    	                text: events.name
-		    	            });
-		    	            // Append the option to the select element
-		    	            $('#eventid').append(option);
-		    	        });
-					}
-					else{
-						$("#card-body").html("<center>No Active Event Found!</center>");
-					}
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching event list:', error);
-	    		    
-	    		});
-	        	remove_loading();
-			}
-			
-	        /* Get Complaints Data */
-	        function get_petitions_data(id){
-	        	var apiUrl = '/gcc/api/zerohours_petition/getPetitionList?eventId='+id;
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_petitions_list(id){
-	        	call_loading();
-	        	get_petitions_data(id).then(function(petitionList) {
-	    		    // Handle the department list
-	    		    generate_table(petitionList);
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching petition list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching petition list:', error);
-			        }
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-
-	        	if ( $.fn.dataTable.isDataTable('#petitionDatatable') ) {
-	        	    $('#petitionDatatable').DataTable().destroy();  // Destroy the existing instance
-	        	}
-	        	
-	            var table = $('#petitionDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-						  { targets: 'no-sort', "orderable": false },
-						  { targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				        //scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: false,
-				        searching: true,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-
-	            	//View Acknowledgement: View the acknowledgement for petition MP10000001.
-					//Print Acknowledgement: Print the acknowledgement for petition MP10000001.
-					//View Petition Details: View the details of petition MP10000001.
-					//View Uploaded Files: View the files uploaded for petition MP10000001.
-
-					actionHTML = `<div class="dropdown d-inline-block show">
-			                        <a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><i class="ik ik-more-horizontal"></i></a>
-			                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown" x-placement="bottom-end">
-			                        
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the acknowledgement for petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Acknowledgement</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Print the acknowledgement for petition `+row['petition_no']+`."><i class="ik ik-printer"></i> Print Acknowledgement</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the details of petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Petition Details</a>
-			                        	<a class="dropdown-item" href="" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="View the files uploaded for petition `+row['petition_no']+`."><i class="ik ik-eye"></i> View Uploaded Files</a>
-			                        </div>
-			                    </div>`
-			                    
-			        actionHTML =`<i class="ik ik-more-horizontal"></i>`
-			        
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/zerohours_petition/update-petition?petitionNo='+row['petitionNoEncode']+'" class="link">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['petitioner_mobile'],
-	                    //row['petitioner_address'],
-	                    //row['petitioner_pincode'],
-	                    row['complaint_nature'],
-	                    convertdate(row['cdate']),
-	                    row['status'],
-	                    //row['petition_type_name'],
-	                    actionHTML
-	                ]).draw(false);
-	            });
-	            
-	           // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            remove_loading(); // remove Loading 
-			}
-			
-			$(document).ready(function() {
-				call_loading();
-				get_event_data();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/zerohours_petition/petition_not_mapped_list.html b/src/main/resources/templates/modules/zerohours_petition/petition_not_mapped_list.html
deleted file mode 100644
index affc7dbb..00000000
--- a/src/main/resources/templates/modules/zerohours_petition/petition_not_mapped_list.html
+++ /dev/null
@@ -1,463 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-6">
-                                    <div class="page-header-title">
-                                        <i class="far fa-list-alt bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Unmapped Petition List</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="/index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Unmapped Petition List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <!-- <div class="card">
-                                	<div class="card-header">
-                                        <h3>These are the petitions that are currently not assigned to any department officer:</h3>
-                                    </div>
-                                    <div class="card-block"> -->
-										<div id="tableLoading"></div>
-										
-										<div class="form-group">
-                                            <label for="eventid">Select Event / நிகழ்வை தேர்ந்தெடுக்கவும்</label>
-                                            <select class="form-control" id="eventid" name="eventid" style="width: 100%;" data-placeholder="தேர்ந்தெடு.." required onchange="get_petitions_list(this.value);">
-												<option value=""></option>
-											</select>
-                                        </div>
-                                        
-                                        <div>
-                                        <p style="font-size:12px">These are the petitions that are currently not assigned to any department officer:</p>
-											<table id="petitionDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                                <thead class="thead-dark">
-	                                                <tr class="table-bordered">
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Zone</th>
-														<th class="text-center">Ward</th>
-						                                <th class="text-center">Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-						                             </tr>
-                                                </thead>
-                                                <tbody>
-	                                                	
-                                                </tbody>
-                                                <!-- <tfoot class="thead-dark">
-	                                                <tr>
-						                                <th class="text-center no-sort">S.No</th>
-														<th class="text-center">Petition No.</th>
-						 								<th class="text-center">Name</th>
-						 								<th class="text-center">Mobile</th>
-						 								<th class="text-center">Address</th>
-														<th class="text-center">Postal Code</th>
-						                                <th class="text-center">Type of Complaint</th>
-						                                <th class="text-center">Date</th>
-						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
-						                                <th class="text-center no-sort no-exportable no-print">Action</th>
-													</tr>
-                                                </tfoot>-->
-                                            </table>
-                                        </div>
-                                   <!-- </div>
-                                </div> --> 
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-		
-	    <div th:replace="~{fragments/modules/zerohours_petition/modal-box :: div}"></div>   
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-        <script th:inline="javascript">
-        	var createdBy = /*[[${LoginUserId}]]*/'';
-        	var loading_text_msg = getLoadingMessage(); // get Random loading message from base/script
-        	var officerMasterList = "";
-        	
-        	// Loading Div id
-        	const loading = $("#tableLoading");
-	     	
-        	// DataTables buttons configuration
-	        var buttons = [
-	        	{
-					extend: 'pageLength',
-					className: 'btn btn-warning'
-				},
-	            {
-					title: 'Data export',
-	                extend: 'copyHtml5',
-	                text: 'Copy',
-	                className: 'btn btn-secondary',
-	                id: 'copyBtn'
-	            },
-	            {
-	                extend: 'excelHtml5',
-	                text: 'Excel',
-	                className: 'btn btn-secondary',
-	                id: 'excelBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'csvHtml5',
-	                text: 'CSV',
-	                className: 'btn btn-secondary',
-	                id: 'csvBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'pdfHtml5',
-	                text: 'PDF',
-	                className: 'btn btn-secondary',
-	                id: 'pdfBtn',
-	                title: 'Petition List'
-	            },
-	            {
-	                extend: 'print',
-	                text: 'Print',
-	                className: 'btn btn-secondary',
-	                id: 'printBtn',
-	                title: 'Petition List',
-	                exportOptions: {
-	                    columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
-	                }
-	            }
-	        ];
-			
-        	
-	        function call_loading(){
-				loading.html(searchinfo("<b>"+loading_text_msg+"</b>"));
-			}
-			
-			function remove_loading(){
-				loading.html("");
-			}
-			
-	        
-	        /* Get Complaints Data */
-	        function get_petitions_data(id){
-	        	var apiUrl = '/gcc/api/zerohours_petition/getUnmapPetitionList?eventId='+id;
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-	        }
-	        
-	        /* Get Complaints List */
-	        function get_petitions_list(id){
-	        	call_loading();
-	        	get_petitions_data(id).then(function(petitionList) {
-	    		    // Handle the department list
-	    		    generate_table(petitionList);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-			        if (error && error.message) {
-			            console.error('Error fetching petition list:', error.message);
-			        } else {
-			            console.error('An error occurred while fetching petition list:', error);
-			        }
-	    		});
-			}
-        
-	        
-	        /* Call DataTable function */
-	        function generate_table(data){
-
-	        	$('#petitionDatatable').DataTable().destroy();
-	        	
-	            var table = $('#petitionDatatable').DataTable( {
-				        dom: 'Bftip',
-				        columnDefs: [
-				        	{ targets: 'no-sort', "orderable": false },
-							{ targets: 'no-exportable', "exportable": false }
-						],
-				        lengthMenu: [
-				            [ 50, 100, 200, 500, -1 ],
-				            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-				        ],
-				       // scrollY: '50vh',
-				        fixedColumns: {
-					        left: 0,
-					        right: 0
-					    },
-				        buttons: [buttons],
-				        responsive: false,
-				        searching: true,
-				        select: false,
-				        processing: false,
-				    } );
-	            
-	            // Clearn Table data
-	            table.clear().draw();
-	            
-	         	// Add rows to DataTable
-	         	var rowNum = 1;
-	            $.each(data, function(index, row) {
-	                table.row.add([
-	                	rowNum++,
-	                    '<a href="/gcc/zerohours_petition/update-petition?petitionNo='+row['petitionNoEncode']+'">'+row['petition_no']+'</a>',
-	                    row['petitioner_name'],
-	                    row['zone'],
-	                    row['ward'],
-	                    row['complaint_nature'],
-	                    convertdate(row['cdate']),
-	                    row['status'],
-	                    '<a href="#" onclick="return compliant_mapping(\''+row['petition_id']+'\',\'Assign to the Department Officer\',\''+row['petition_no']+'\');"data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Assign to the Department Officer."><i class="far fa-handshake"></i></a>',
-	                ]).draw(false);
-	            });
-	            // Enable tooltips for all elements with data-toggle="tooltip"
-	            $('[data-toggle="tooltip"]').tooltip();
-	            
-	            remove_loading(); // remove Loading 
-			}
-	        
-	        /* Get Event Data */
-	        function get_event_data(){
-	        	get_event_list().then(function(eventList) {
-	        		$('#ward').empty();
-					if(eventList.length>0){
-						// Iterate through the department list and add options to the select element
-		    		    $.each(eventList, function(index, events) {
-		    	            // Create an option element
-		    	            //alert(events.name);
-		    	            var option = $('<option>', {
-		    	            	value: events.id, // case-sensitive as per object
-		    	                text: events.name
-		    	            });
-		    	            // Append the option to the select element
-		    	            $('#eventid').append(option);
-		    	        });
-					}
-					else{
-						$("#card-body").html("<center>No Active Event Found!</center>");
-					}
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching event list:', error);
-	    		    
-	    		});
-	        	remove_loading();
-			}
-			
-	        function get_mapped_list(petitionId){
-	        	var apiUrl = '/gcc/api/zerohours_petition/getPetitionMappingDetails2?petitionId='+petitionId
-	    	    // Return a Promise
-	    	    return new Promise(function(resolve, reject) {
-	    	        $.ajax({
-	    	            url: apiUrl,
-	    	            type: 'GET',
-	    	            //data: formData,
-	    	            dataType: 'json',
-	    	            success: function(jsonResponse) {
-	    	                // Resolve the Promise with the department list
-	    	                resolve(jsonResponse);
-	    	            },
-	    	            error: function(xhr, status, error) {
-	    	                // Reject the Promise with the error message
-	    	                console.error('Error fetching petition maping details ('+petitionNo+'):', error);
-	    	                reject(error);
-	    	            }
-	    	        });
-	    	    });
-			}
-	        
-	     	// For Complient Map Select HTML 
-			function calloffice(val,id){
-				if(val==1){ // Intenal
-					var officeSelectHTML = `<div class="mb-4">
-	                							<label for="office${id}">Select Office</label>
-	                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-									                <option value="0">Select Office</option>
-									                <option value="1">HQ</option>
-									                <option value="2">Zonal Office</option>
-							                	</select>
-						                	</div>`;
-					$("#officedata"+id).html(officeSelectHTML);
-				}
-				else if(val==2){ // External
-					$("#officers"+id).html('');
-					var ExSelectHTML = getselect(id,"ExSelect");
-					var departmentSelectHTML = `<div class="mb-4">
-													<label for="dept3">Select Department</label>
-													${ExSelectHTML}
-											 	</div>`;
-					$("#officedata"+id).html(departmentSelectHTML);
-				}
-				else{
-					$("#officedata"+id).html('');
-					$("#officers"+id).html('');
-				}
-				$("#officers"+id).html('');
-			}
-			
-			function callofficers(val,id){
-				
-				if(val==1){
-					// HQ
-					var HQSelectHTML = getselect(id,"HQSelect");
-				 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-				}
-				else if(val==2){
-					// Zone Office
-					var ZoneSelectHTML = getselect(id,"ZoneSelect");
-					$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-				}
-				else{
-					$("#officers"+id).html('');
-				}
-				
-			}
-			
-			function getselect(comid,type){
-		  	  var HQSelect = '';
-		  	  var ZoneSelect = '';
-		  	  var ExSelect = '';
-		  
-		  	  for (var i = 0; i < officerMasterList.length; i++) {
-		  		  if(officerMasterList[i].zone_id=="HQ"){
-		  			  HQSelect+=`<option value="${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else if(officerMasterList[i].zone_id=="99"){
-		  			  ExSelect+=`<option value="${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  		  else{
-		  			  ZoneSelect+=`<option value="${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  		  }
-		  	  }
-		  	  
-		  	  // Forward Save Button
-			  var forward_Btn = `<div class="col-12 pt-3 mb-0 pb-0 text-center" id="submitdiv">
-									<button type="button" class="btn btn-sm rounded-pill btn-hero btn-success me-1" onclick="javascript:saveMappingDepatment();" id="updatebtn"><i class="si si-rocket me-1"></i>Save</button>
-			  						<div id="forwardFormError" class="text-danger"></div>
-			  						</div>
-								</div>`;
-								
-		  	  if(type=="HQSelect"){
-		  	  	 return `<select name="mapOfficerid" id="mapOfficerid" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ZoneSelect"){
-		  	  	 return `<select name="mapOfficerid" id="mapOfficerid" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  if(type=="ExSelect"){
-		  	  	 return `<select name="mapOfficerid" id="mapOfficerid" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>${forward_Btn}`;
-		  	  }
-		  	  return '';
-			}
-			
-			/* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-		
-	     	//Save Forward Details
-			function saveMappingDepatment(){
-				
-				var offidto = $("#mapOfficerid").val();
-				var petitionId = $("#petitionid").val();
-				var petitionNo = $("#petitionno").val();
-				var formError= "";
-				if(offidto=='' || offidto==0){
-					formError= "Select Department Required!";
-					$('#forwardFormError').html(formError);
-					return false;
-				}
-				
-				$.ajax({
-				    type: "POST",
-				    url: '/gcc/api/zerohours_petition/mapPetitionToOfficer',
-				    data: {
-				        'petitionId': petitionId,
-				        'petitionNo': petitionNo,
-				        'createdBy':createdBy,
-						'offidto':offidto
-				    },
-				}).done(function(response) {
-				      Swal.fire(
-				        'Petition Mappiing Status!',
-				        'Petition Mapped Successfully!',
-				        'success'
-				      ).then(() => {
-							    //location.reload();
-				    	  	updateModelBox(petitionId,'Assign to the Department Officer',petitionNo)
-							 });
-					console.log(response);
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					
-				});
-				return false;
-			}
-		     	
-			$(document).ready(function() {
-				call_loading();
-				get_officer_master_data();
-				get_event_data();
-				//get_petitions_list();
-			});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/zerohours_petition/petition_update.html b/src/main/resources/templates/modules/zerohours_petition/petition_update.html
deleted file mode 100644
index 31d8c8ac..00000000
--- a/src/main/resources/templates/modules/zerohours_petition/petition_update.html
+++ /dev/null
@@ -1,775 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Edit / Update Petition</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Edit/Update Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card" id="petitionUpdateForm">
-									<form class="update-request-form" id="update-request-form" onsubmit="return updateRequest();">
-										<div class="card-header">
-		                                    <h3>Edit / Update Petition Form</h3>
-		                                    <div class="card-header-right">
-	                                            <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-	                                        </div>
-	                                    </div>
-	                               		<div class="card-body">
-	                               			<div class="row">
-	                               				<!-- <div class="col-12">
-	                               					<div class="form-group">
-			                                            <label for="petitionerName">Petition Type / மனுவின் வகை</label>
-			                                            <div class="form-radio" id="petition_type">
-				                                          
-				                                        </div>
-			                                        </div>
-	                               				</div> -->
-												<div class="col-6">
-													<div class="form-group">
-			                                            <label for="petitionerName">Petitioner's Name / மனுதாரரின் பெயர்</label>
-			                                            <input type="text" readonly class="form-control" name="petitionerName" id="petitionerName" autocomplete="off" placeholder="மனுதாரரின் பெயர்">
-			                                        </div>
-			                                    </div>
-												<div class="col-6">
-			                                        <div class="form-group">
-			                                            <label for="petitionerMobile">Mobile NO / கைபேசி எண்</label>
-					                       				<input type="text" readonly class="form-control" id="petitionerMobile" name="petitionerMobile" autocomplete="off" placeholder="கைபேசி எண்">
-			                                        </div>
-			                                   	</div>
-												<div class="col-6">
-			                                      	<div class="form-group">
-			                                        	<label for="complaintNature">புகாரின் தன்மை / Nature Of Complaint</label>
-								   						<textarea class="form-control" id="complaintNature" name="complaintNature" rows="6" placeholder="புகாரின் தன்மை..."></textarea>
-								   					</div>
-								   				</div>
-												<div class="col-6">
-													<!-- 
-													<div class="form-group">
-														<label for="petitionerAddress">Address of petitioner / மனுதாரரின் முகவரி</label>
-									   					<textarea class="form-control" id="petitionerAddress" name="petitionerAddress" rows="6" maxlength="250" placeholder="மனுதாரரின் முகவரி..."></textarea>
-													</div>
-													
-													<div class="form-group">
-														<label for="petitionerPincode">Postal code / தபால் குறியீடு</label>
-	   			                       					<input type="text" class="form-control" id="petitionerPincode" name="petitionerPincode" placeholder="தபால் குறியீடு" maxlength="6" required>
-													</div>
-													-->
-													<div class="form-group">
-		                                          		<label for="complaintType">Type of complaint / புகார் வகை (பலவற்றை தேர்ந்தெடு..) </label>
-														<select class="select2" id="complaintType" name="complaintType" style="width: 100%;" data-placeholder="பலவற்றை தேர்ந்தெடு.." multiple required onchange="javascript:load_mapper();">
-															<option></option>
-														</select>
-													</div>
-												</div>
-												<div class="col-12">
-													<div class="block-content" id="userinfo2">
-														<div id="comp_mapping_to_officers" class="row"></div>
-													</div>
-											 	</div>
-											</div>
-	                                  	</div>
-	                                  	<div class="card-footer text-right">
-											<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-                                        	<button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>
-	                                	</div>
-                                	</form>
-                                </div>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-       	<script th:inline="javascript">
-			var createdBy = /*[[${LoginUserId}]]*/'';
-			var petitionNo = /*[[${petitionNo}]]*/'';
-			var petitionId = 0;
-			var closedComplaintsList=[];
-			var complaintTypeList = "";
-			var officerMasterList = "";
-			
-			 /* Get Complaint Type Data */
-	        function get_complaint_type_data(){
-	
-	    		get_complaint_type_list().then(function(complaintTypes) {
-	    		    // Handle the Complaint list
-	    		    complaintTypeList = complaintTypes;
-					
-	    		    // Iterate through the Master Complanint Type and add options to the select element
-	    		    $.each(complaintTypeList, function(index, complaintType) {
-	    	            // Create an option element
-	    	            var option = $('<option>', {
-	    	            	value: complaintType.complaint_typeid, // case-sensitive as per object
-	    	                text: complaintType.complaint_type
-	    	            });
-	    	            // Append the option to the select element
-	    	            $('#complaintType').append(option);
-	    	        });
-	    		    // Call Petition function to fetch the data
-	    		    get_petition_data();
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching complaint type list:', error);
-	    		});
-			}
-			 
-	        /* Get Petition Type Data */
-	        function get_petition_type_data(){
-	        	var petitionTypeHTML="";
-	    		get_petition_type_list().then(function(petitionTypes) {
-	    		    // Handle the Complaint list
-	    		    petitionTypeList = petitionTypes;
-					
-	    		    // Iterate through the department list and add options to the select element
-	    		    $.each(petitionTypeList, function(index, petitionType) {
-	    	            // Create an option element
-	    	            
-	    	            petitionTypeHTML +=`<div class="radio radiofill ${petitionType.color_class} radio-inline">
-						                            <label class="cursure_poiter">
-						                            <input type="radio" name="petitionType" id="petition_type_${petitionType.petition_type_id}" value="${petitionType.petition_type_id}" disable>
-						                            <i class="helper"></i>${petitionType.name}
-						                        </label>
-						                    </div>`;
-	    	        });
-	    		 // Append the option to the select element
-    	         $('#petition_type').html(petitionTypeHTML);
-	    		    
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching petition type list:', error);
-	    		});
-			}
-	        
-	        /* Get Officer Master Data */
-	        function get_officer_master_data(){
-	
-	    		get_officer_list().then(function(officers) {
-	    		    // Handle the officer list
-	    		    officerMasterList = officers;
-					
-	    		}).catch(function(error) {
-	    		    // Handle errors
-	    		    console.error('Error fetching offcier master data:', error);
-	    		});
-			}
-			 
-	     	// Function to get complaint_type and complaint_typeid by complaint_typeid
-	        function getComplaintTypeById(complaintTypeId) {
-	            for (var i = 0; i < complaintTypeList.length; i++) {
-	                if (complaintTypeList[i].complaint_typeid == complaintTypeId) {
-	                    return {
-	                        complaint_type: complaintTypeList[i].complaint_type,
-	                        complaint_typeid: complaintTypeList[i].complaint_typeid
-	                    };
-	                }
-	            }
-	            return null; // Return null if no matching complaint_typeid is found
-	        }
-	     
-			// Save New petition 
-			function updateRequest(){
-				// Disable the button to prevent multiple clicks
-				form_btn_disable();
-				
-				var inputElementMobileNo = $('#petitionerMobile');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementComplaintType = $('#complaintType');
-				var complaintType = inputElementComplaintType.val();
-				
-				if (mobileNo !== null) {
-					
-					// Serialize form data
-			        var formData = new FormData($('#update-request-form')[0]);
-			        formData.append('petitionNo',petitionNo);
-			        formData.append('createdBy',createdBy);
-			        formData.append('petitionId',petitionId);
-			        updateFormData(formData).then(function(response) {
-		    		    // Handle the response
-		    		    if(response==true){
-							// Delete Old data in Petition Mapping table
-		    		    	savePetitionMapData(formData).then(function(response) {
-		    		    		if(response==true){
-		    		    			Swal.fire({
-				        				title: 'Petition updated successfully!',
-				        				customClass: {
-				        			        title: 'swal-title-custom' // Add a custom class for the title
-				        			    },
-				        				//text: "Error",
-				        				icon: 'success',
-				        				showCancelButton: false,
-				        				confirmButtonColor: '#3085d6',
-				        				cancelButtonColor: '#d33',
-				        				confirmButtonText: 'Ok',
-				        				}).then(function(result) {
-				        				if (result.isConfirmed) {
-				        					form_btn_enable();
-				        				}
-				        			});
-		    		    		}
-		    		    		else{
-		    		    			Swal.fire({
-				        				title: 'Petition details have been updated, but mapping the complaint to the officer has failed.',
-				        				customClass: {
-				        			        title: 'swal-title-custom' // Add a custom class for the title
-				        			    },
-				        				//text: "Error",
-				        				icon: 'warning',
-				        				showCancelButton: false,
-				        				confirmButtonColor: '#3085d6',
-				        				cancelButtonColor: '#d33',
-				        				confirmButtonText: 'Ok',
-				        				}).then(function(result) {
-				        				if (result.isConfirmed) {
-				        					form_btn_enable();
-				        				}
-				        			});
-								}
-		    		    	}).catch(function(error) {
-		    	    		    // Handle errors
-		    	    		    console.error('Error fetching offcier master data:', error);
-		    	    		    form_btn_enable();
-		    	    		});
-		    		    	
-						}
-		    		    else{
-		    		    	Swal.fire({
-		        				title: 'Failed to update petition details!',
-		        				customClass: {
-		        			        title: 'swal-title-custom' // Add a custom class for the title
-		        			    },
-		        				//text: "Error",
-		        				icon: 'error',
-		        				showCancelButton: false,
-		        				confirmButtonColor: '#3085d6',
-		        				cancelButtonColor: '#d33',
-		        				confirmButtonText: 'Ok',
-		        				}).then(function(result) {
-		        				if (result.isConfirmed) {
-		        					form_btn_enable();
-		        				}
-		        			});
-						}
-	    		    	
-	    		    	
-		    	    }).catch(function(error) {
-		    		    // Handle errors
-		    		    console.error('Error on save petition:', error.message);
-		    		    form_btn_enable();
-	    			});
-				}
-				else{
-					//inputElementMobileNo.addClass('is-invalid');
-					form_btn_enable();
-				}
-				return false;
-			}
-			
-			function updateFormData(formData){
-				var apiUrl = '/gcc/api/zerohours_petition/updatePetition';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			function savePetitionMapData(formData){
-				var apiUrl = '/gcc/api/zerohours_petition/mapComplientToOfficer';
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-					$.ajax({
-						url: apiUrl,
-					    type: 'POST',
-					    data: formData,
-					    processData: false,
-					    contentType: false,
-					    success: function(response) {
-					        console.log(response);
-					        // Handle success response
-					        resolve(response);
-					    },
-					    error: function(xhr, status, error) {
-					        console.error('Error:', error);
-					        // Handle error response
-					        reject(error);
-					    }
-					});
-			    });
-			}
-			
-			 /* Get Petition data */
-			function get_petition_data(){
-				get_petition_details().then(function(petitionDetails) {
-				    // Handle the Complaint list
-				    var complaintHTML = "";
-					var complaint = petitionDetails[0].petitioner_complaint;
-					
-					var complaintArray;
-					
-					petitionId = petitionDetails[0].petition_id;
-					if (complaint != null && complaint !== '') {
-					    complaintArray = complaint.split(",");
-					} else {
-					    complaintArray = [];  // Initialize to an empty array
-					}
-					//complaintArray = complaint.split(",");
-					
-					$("#complaintType").val(complaintArray);
-					
-					$('#complaintType').trigger('change');
-					
-					closedComplaintsList = complaintArray;
-					//var petition_type = "#petition_type_"+petitionDetails[0].petition_type;
-					// Suppose you want to select the radio button with the value 'option2'
-					//$(petition_type).prop('checked', true);
-
-					$("#petitionerName").val(petitionDetails[0].petitioner_name);
-					$("#petitionerMobile").val(petitionDetails[0].petitioner_mobile);
-					$("#petitionerAddress").val(petitionDetails[0].petitioner_address);
-					$("#petitionerPincode").val(petitionDetails[0].petitioner_pincode);
-					
-					$("#complaintNature").val(petitionDetails[0].complaint_nature);
-					
-					//load_mapper(); // Call for Complaint Mapping Form
-					
-					// IDs of the values you want to prevent from being deselected
-					var valuesToPreventDeselection = closedComplaintsList;//['value1', 'value2', 'value3'];
-
-					$('#complaintType').on('select2:unselect', function (e) {
-					    var deselectedValue = e.params.data.id;
-					    
-					    // Check if the deselected value should be prevented from being deselected
-					    if (valuesToPreventDeselection.includes(deselectedValue)) {
-					        // Prevent the deselection
-					        e.preventDefault();
-					    	// Re-select the deselected value to prevent it from being deselected
-					        $(this).val(valuesToPreventDeselection).trigger('change.select2');
-					        // Optionally, you can display a message or perform any other action
-					        console.log('Deselection of value ' + deselectedValue + ' prevented');
-					        alert('Deselection of value ' + deselectedValue + ' prevented');
-					    }
-					});
-					
-				}).catch(function(error) {
-				    // Handle errors
-				    console.error('Error fetching petition Data ('+petitionNo+'):', error.message);
-				    call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				});
-			}
-			 
-			/* Get Petition details by petition number */
-			function get_petition_details() {
-			    
-				var formData = new FormData();
-		        formData.append('petitionNo',petitionNo);
-		        
-				var apiUrl = '/gcc/api/zerohours_petition/getPetitionDetails?petitionNo='+petitionNo;
-			    // Return a Promise
-			    return new Promise(function(resolve, reject) {
-			        $.ajax({
-			            url: apiUrl,
-			            type: 'GET',
-			            //data: formData,
-			            dataType: 'json',
-			            success: function(jsonResponse) {
-			                // Resolve the Promise with the department list
-			                //alert(jsonResponse.length);
-			                if(jsonResponse.length>0){
-			                	resolve(jsonResponse);
-							}else{
-								call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
-							}
-			                
-			            },
-			            error: function(xhr, status, error) {
-			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
-			                reject(error);
-			            }
-			        });
-			    });
-			}
-			
-			function load_mapper(){
-			  	var complaintArray = $("#complaintType").val();
-			  	//var complaintArray = complaint.split(',');
-				var compPetitionNo = petitionNo;
-				var compPetitionId = petitionId;
-				
-				var compmapHTML='';
-				for(j = 0; j < complaintArray.length; j++){
-					var complaintTypeDetails = getComplaintTypeById(complaintArray[j]); // Pass the complaint_typeid
-					var title=(j+1)+') '+ complaintTypeDetails.complaint_type; // Map form title
-					var compID="comp"+j;
-					var complaintTypeId = complaintTypeDetails.complaint_typeid;
-					
-					getMappingByComplaintsID(complaintTypeId);
-					
-					compmapHTML+=`<div class="col-lg-6" id="comp${complaintArray[j]}">
-										
-										<div class="widget">
-					                        <div class="widget-header" style="background-color:#2a807f;color:#fff;">
-					                            <h3 class="widget-title" style="font-size:13px;">${title}</h3>
-					                        </div>
-					                        <div class="widget-body">
-					                        	<div class="form-group">
-						                        	<label for="dept${complaintArray[j]}">Select Department Type</label>
-													<select name="dept[]" id="dept${complaintArray[j]}" class="form-control" onchange="javascript:calloffice(this.value,${complaintArray[j]})">
-														<option value="0">Select Department</option>
-														<option value="1">GCC Department</option>
-														<option value="2">External Department</option>
-												    </select>
-												</div>
-												<div id="officedata${complaintArray[j]}"></div>
-												<div id="officers${complaintArray[j]}"></div>
-					                        </div>
-					                    </div>
-									
-								  </div>`;
-						
-				}
-				$('#comp_mapping_to_officers').html(compmapHTML);
-				
-			  }
-			
-		</script>
-		
-		<script>
-		// For Complient Map Select HTML 
-		function calloffice(val,id){
-			if(val==1){ // Intenal
-				var officeSelectHTML = `<div class="mb-4">
-                							<label for="office${id}">Select Office</label>
-                							<select name="office[]" id="office${id}" class="form-control" onchange="javascript:callofficers(this.value,${id})">
-								                <option value="0">Select Office</option>
-								                <option value="1">HQ</option>
-								                <option value="2">Zonal Office</option>
-						                	</select>
-					                	</div>`;
-				$("#officedata"+id).html(officeSelectHTML);
-			}
-			else if(val==2){ // External
-				$("#officers"+id).html('');
-				var ExSelectHTML = getselect(id,"ExSelect");
-				var departmentSelectHTML = `<div class="mb-4">
-												<label for="dept3">Select Department</label>
-												${ExSelectHTML}
-										 	</div>`;
-				$("#officedata"+id).html(departmentSelectHTML);
-			}
-			else{
-				$("#officedata"+id).html('');
-				$("#officers"+id).html('');
-			}
-			$("#officers"+id).html('');
-		}
-		
-		function callofficers(val,id){
-			
-			if(val==1){
-				// HQ
-				var HQSelectHTML = getselect(id,"HQSelect");
-			 	$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${HQSelectHTML}</div>`);
-			}
-			else if(val==2){
-				// Zone Office
-				var ZoneSelectHTML = getselect(id,"ZoneSelect");
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${id}">Select Department</label>${ZoneSelectHTML}</div>`);
-			}
-			else{
-				$("#officers"+id).html('');
-			}
-			
-		}
-		
-		function getselect(comid,type){
-	  	  var HQSelect = '';
-	  	  var ZoneSelect = '';
-	  	  var ExSelect = '';
-	  
-	  	  for (var i = 0; i < officerMasterList.length; i++) {
-	  		  if(officerMasterList[i].zone_id=="HQ"){
-	  			  HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  		  else if(officerMasterList[i].zone_id=="99"){
-	  			  ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  		  else{
-	  			  ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-	  		  }
-	  	  }
-	  	  
-	  	  if(type=="HQSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>`;
-	  	  }
-	  	  if(type=="ZoneSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>`;
-	  	  }
-	  	  if(type=="ExSelect"){
-	  	  	 return `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>`;
-	  	  }
-	  	  return '';
-		}
-		
-		function form_btn_enable(){
-			$("#resetFormBtn").prop("disabled", false);
-			$("#requestSubmitBtn").prop("disabled", false);
-			$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-		}
-		
-		function form_btn_disable(){
-			$("#resetFormBtn").prop("disabled", true);
-			$("#requestSubmitBtn").prop("disabled", true);
-			// Show the loading icon on the button
-			$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-		}
-		
-		function getMappingByComplaintsID(complaintTypeId){
-				
-				$.ajax({
-				    type: "GET",
-				    url: '/gcc/api/zerohours_petition/getComplaintMappingDetails',
-				    data: {
-				        'petitionId': petitionId,
-						'petitionNo': petitionNo,
-						'complaintTypeId': complaintTypeId
-				    },
-					dataType: 'json',
-				}).done(function(response) {
-					
-					//console.log(response);
-					
-					if(response.length>0){
-						var comid = response[0]["complaint_typeid"];
-						var offid = response[0]["off_id"];
-						var mapid = response[0]["mapid"];
-						loadSelectforUpdate(comid,offid,comid);
-					}
-					
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-						
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-					    
-				});
-		}
-		
-		function loadSelectforUpdate(comid,offid,id){
-			var type ="NULL";
-	  	  	var HQSelect = '';
-	  	  	var ZoneSelect = '';
-	  	  	var ExSelect = '';
-	  
-			for (var i = 0; i < officerMasterList.length; i++) {
-		  		//console.log(officerMasterList[i]);
-				if(officerMasterList[i].zone_id=="HQ"){
-			  
-				  	if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "HQSelect";
-				  		HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-				  	}
-				  	else{
-				  		HQSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-				  	}
-					  
-				}
-				else if(officerMasterList[i].zone_id=="99"){
-					if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "ExSelect";
-						ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-		  			}
-		  			else{
-		  				ExSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-		  			}
-				}
-				else{
-					if(offid>0 && officerMasterList[i].off_id == offid){
-						type = "ZoneSelect";
-						//console.log(type + " === "+ officerMasterList[i].offId +" == "+ offid);
-						ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}" selected>${officerMasterList[i].off_nm}</option>`;
-				  	}
-				  	else{
-				  		ZoneSelect+=`<option value="${comid}_${officerMasterList[i].off_id}">${officerMasterList[i].off_nm}</option>`;
-				  	}  
-				}
-			}  
-			
-			//console.log("comid : "+comid +",\noffid : "+offid+",\nid : "+id+",\ntype : "+type);
-			
-			if(type=="HQSelect"){
-				//console.log("I am from HQSelect: \n #officers"+id);
-				$("#officedata"+id).html('<div class="mb-4">' +
-				           '<label for="office$'+id+'">Select Office</label>' +
-				           '<select name="office[]" id="office$'+id+'" class="form-control" onchange="javascript:callofficers(this.value,'+id+')">' +
-				           '<option value="0">Select Office</option>' +
-				           '<option value="1" Selected>HQ</option>' +
-				           '<option value="2">Zonal Office</option>' +
-				           '</select>' +
-				           '</div>');
-			  	 HQSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${HQSelect}</select>`;
-		 		$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${HQSelectHTML}</div>`);
-		 
-			}
-			if(type=="ZoneSelect"){
-				//console.log("I am from ZoneSelect: \n #officers"+id);
-				$("#officedata"+id).html('<div class="mb-4">' +
-				           '<label for="office$'+id+'">Select Office</label>' +
-				           '<select name="office[]" id="office$'+id+'" class="form-control" onchange="javascript:callofficers(this.value,'+id+')">' +
-				           '<option value="0">Select Office</option>' +
-				           '<option value="1">HQ</option>' +
-				           '<option value="2" Selected>Zonal Office</option>' +
-				           '</select>' +
-				           '</div>');
-				  
-				ZoneSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ZoneSelect}</select>`;
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${ZoneSelectHTML}</div>`);
-			}
-			if(type=="ExSelect"){
-				//console.log("I am from ExSelect: \n #officers"+id);
-				ExSelectHTML = `<select name="mapOfficers" id="mapOfficers${comid}" class="form-control"> <option value="0"> &nbsp; </option>${ExSelect}</select>`;
-				$("#officers"+id).html(`<div class="mb-4"><label for="mapOfficers${comid}">Select Department</label>${ExSelectHTML}</div>`);
-			}
-		 
-		}
-		
-		function call_petition_search_from(errorTXT){
-			var errorHTML = "";
-			if(errorTXT!=""){
-				errorHTML = `<div class="form-group text-center text-danger">${errorTXT}</div>`;
-			}
-			var searchFormHTML = `<form class="search-form" id="search-form" onsubmit="return searchRequest();">
-										<div class="card-header">
-						                <h3>Edit / Update Petition Form</h3>
-						                <div class="card-header-right">
-						                    <h3 th:utext="'Petition No: '+${petitionNo}+''"></h3>
-						                </div>
-						            </div>
-						       		<div class="card-body">
-						       			<div class="row">
-											<div class="col-12 text-center">
-												${errorHTML}
-												<div class="form-group">
-						                            <label for="petitionNoSearch">Petition No / மனு எண் </label>
-						                            <input type="text" class="form-control text-center" name="petitionNoSearch" id="petitionNoSearch" autocomplete="off" placeholder="ZH00000000" maxlength="11" required>
-						                        </div>
-						                        
-											</div>
-											<div class="col-12">
-												<div class="block-content" id="userinfo2">
-													<div id="comp_mapping_to_officers" class="row"></div>
-												</div>
-										 	</div>
-										</div>
-						          	</div>
-						          	<div class="card-footer text-center">
-										<button type="reset" class="btn btn-secondary mr-2" id="resetFormBtn"><i class="ik ik-refresh-cw"></i>Reset</button>
-						            	<button type="submit" class="btn btn-success" id="searchSubmitBtn"><i class="ik ik-search"></i>Search</button>
-						        	</div>
-						    	</form>`;
-			
-			$("#petitionUpdateForm").html(searchFormHTML);
-			$('#petitionNoSearch').mask('ZH00000000');
-		}
-		
-		function searchRequest(){
-			var searchValue = $('#petitionNoSearch').val();
-			if (searchValue && searchValue.trim() !== '') {
-				searchValue = encodeBase64(searchValue);
-				window.location.href = "/gcc/zerohours_petition/update-petition?petitionNo="+searchValue;
-			}
-			else{
-				call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-			}
-			return false;
-		}
-		</script>
-		<script>
-		$(document).ready(function() {
-			
-			if(petitionNo!=null && petitionNo!="error"){
-				get_complaint_type_data();
-				//get_petition_type_data();
-				get_officer_master_data();
-			}
-			else{
-				if(petitionNo=="error"){
-					call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-				}
-				else{
-					call_petition_search_from("");
-				}
-			}
-			
-		});
-		</script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/zerohours_petition/petition_view.html b/src/main/resources/templates/modules/zerohours_petition/petition_view.html
deleted file mode 100644
index e2ac7da8..00000000
--- a/src/main/resources/templates/modules/zerohours_petition/petition_view.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="far fa-calendar-plus bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>View Petition</h5>
-                                            <span>Commissioner Petition</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">Commissioner Petition</li>
-                                            <li class="breadcrumb-item active" aria-current="page">View Petition</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Petition Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="window.print()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">நாள் / Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="cdate_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petition_no_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_name_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_mobile_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Address of petitioner / மனுதாரரின் முகவரி:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_address_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">புகாரின் தன்மை / Nature of complaint:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="complaint_nature_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											      	<tr>
-											          <th style="padding: 0.45rem 0.45rem;">Petition Status: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_status_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total number of complaints in this petition: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Completed:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_completed_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Pending:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_pending_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-												
-												
-												<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th id="petition_summary_title">Pending Summary</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-									                	<tr style="background-color:#fbffe0;">
-												          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_summary_html"></td>
-												        </tr>
-								                	</tbody>
-								              	</table>
-								              	
-											</div>
-										</div>
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-       
-        
-        <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
-       	
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-        <script th:replace="~{fragments/modules/zerohours_petition/petition_view_script :: script}"></script>
-       	
-    </body>
-</html>
diff --git a/src/main/resources/templates/modules/zerohours_petition/petition_view_modal_page.html b/src/main/resources/templates/modules/zerohours_petition/petition_view_modal_page.html
deleted file mode 100644
index f2f4fd32..00000000
--- a/src/main/resources/templates/modules/zerohours_petition/petition_view_modal_page.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        
-                        <div class="row">
-							<div class="col-12">
-                                <div class="card mb-0" id="petitionViewtable">
-					             	<div class="card-header" style="color: #004085;background-color: #e7eff7;">
-					                	<h3>Petition Details</h3>
-					                	<div class="card-header-right text-center block-options pt-10" style="padding-right: 20px;">
-									        <a href="javascript:void(0);" onclick="window.print()" class="link"><i class="ik ik-printer"></i> Print</a>
-									    </div>
-					                </div>
-					                <div class="card-body">
-					                	<div class="row">
-											<div class="col-6">
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">நாள் / Date: </th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="cdate_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">ஒப்புகை சீட்டு எண்/ Acknowledgement No:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petition_no_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">பெயர் / Name:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_name_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">கைபேசி எண் / Mobile No.</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_mobile_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">மனுதாரரின் முகவரி / Address of petitioner:</th>
-											          <td class="fw-semibold" style="padding: 0.45rem 0.45rem;" id="petitioner_address_value"></td>
-											        </tr>
-											        <tr>
-											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">புகாரின் தன்மை / Nature of complaint:<br>
-											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="complaint_nature_value"></p>
-											          </th>
-											        </tr>
-											        <tr>
-											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-											</div>
-											
-											<div class="col-6">
-												
-								                <table class="table table-bordered table-vcenter" style="font-size:12px;">
-											      <tbody>
-											      	<tr>
-											          <th style="padding: 0.45rem 0.45rem;">Petition Status: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_status_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total number of complaints in this petition: </th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Completed:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_completed_value"></td>
-											        </tr>
-											        <tr>
-											          <th style="padding: 0.45rem 0.45rem;">Total Complaints Pending:</th>
-											          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="total_complaints_pending_value"></td>
-											        </tr>
-											      </tbody>
-											    </table>
-												
-												
-												<table class="table table-bordered table-vcenter mb-0">
-									                <thead>
-									                  <tr>
-									                    <th id="petition_summary_title">Pending Summary</th>
-									                  </tr>
-									                </thead>
-								                	<tbody>
-									                	<tr style="background-color:#fbffe0;">
-												          <td class="fw-semibold text-center" style="padding: 0.45rem 0.45rem;" id="petition_summary_html"></td>
-												        </tr>
-								                	</tbody>
-								              	</table>
-								              	
-											</div>
-										</div>
-										<div class="row">
-											
-											<div class="col-12">
-												<div class="card-title">List of Complaints in this Petition and Their Status:</div>
-												<div id="listOfComplaintsHTML"></div>
-											</div>
-										</div>
-					                </div>
-					            </div>
-                            </div>
-                            
-                        </div>
-                        
-        <script th:replace="~{fragments/modules/zerohours_petition/script :: script}"></script>
-       	<script th:replace="~{fragments/modules/zerohours_petition/petition_view_script :: script}"></script>
-    </body>
-</html>
diff --git a/src/main/resources/templates/widget-statistic.html b/src/main/resources/templates/widget-statistic.html
deleted file mode 100644
index 339154f6..00000000
--- a/src/main/resources/templates/widget-statistic.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-        <div class="wrapper">
-			<!-- header top menu Start -->
-			 <header th:replace="~{fragments/modules/base/header :: header}"></header>
-			<!-- header top menu end -->
-
-            <div class="page-wrap">
-				<!--=============== Left Menu side Start ================-->
-				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-				<!--=============== Left side End ================-->
-                <div class="main-content">
-                    <div class="container-fluid">
-                        <div class="page-header">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="ik ik-menu bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Navbar</h5>
-                                            <span th:each="menuItem : ${menuItems}">lorem ipsum dolor sit amet, consectetur adipisicing elit</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <nav class="breadcrumb-container" aria-label="breadcrumb">
-                                        <ol class="breadcrumb">
-                                            <li class="breadcrumb-item">
-                                                <a href="../index.html"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item active" aria-current="page">Navbar</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    <div class="card-header">
-                                        <h3>Header Color</h3>
-                                    </div>
-                                    <div class="card-body">
-                                        
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-        
-        
-        
-
-        <div class="modal fade apps-modal" id="appsModal" tabindex="-1" role="dialog" aria-labelledby="appsModalLabel" aria-hidden="true" data-backdrop="false">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="ik ik-x-circle"></i></button>
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <div class="quick-search">
-                        <div class="container">
-                            <div class="row">
-                                <div class="col-md-4 ml-auto mr-auto">
-                                    <div class="input-wrap">
-                                        <input type="text" id="quick-search" class="form-control" placeholder="Search..." />
-                                        <i class="ik ik-search"></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-body d-flex align-items-center">
-                        <div class="container">
-                            <div class="apps-wrap">
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-bar-chart-2"></i><span>Dashboard</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-mail"></i><span>Message</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-users"></i><span>Accounts</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-shopping-cart"></i><span>Sales</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-briefcase"></i><span>Purchase</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-server"></i><span>Menus</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-clipboard"></i><span>Pages</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-message-square"></i><span>Chats</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-map-pin"></i><span>Contacts</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-box"></i><span>Blocks</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-calendar"></i><span>Events</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-bell"></i><span>Notifications</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-pie-chart"></i><span>Reports</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-layers"></i><span>Tasks</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-edit"></i><span>Blogs</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-settings"></i><span>Settings</span></a>
-                                </div>
-                                <div class="app-item">
-                                    <a href="#"><i class="ik ik-more-horizontal"></i><span>More</span></a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <script th:replace="~{fragments/modules/base/script :: script}"></script>
-    </body>
-</html>